http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java index fbc4030..1dc4240 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java @@ -22,7 +22,6 @@ package org.apache.stratos.common.statistics.publisher.wso2.cep; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.statistics.publisher.HealthStatisticsPublisher; -import org.apache.stratos.common.statistics.publisher.ThriftStatisticsPublisher; import org.wso2.carbon.databridge.commons.Attribute; import org.wso2.carbon.databridge.commons.AttributeType; import org.wso2.carbon.databridge.commons.StreamDefinition; @@ -33,16 +32,15 @@ import java.util.List; /** * Health statistics publisher for publishing statistics to WSO2 CEP. */ -public class WSO2CEPHealthStatisticsPublisher extends ThriftStatisticsPublisher implements HealthStatisticsPublisher { +public class WSO2CEPHealthStatisticsPublisher extends WSO2CEPStatisticsPublisher implements HealthStatisticsPublisher { private static final Log log = LogFactory.getLog(WSO2CEPHealthStatisticsPublisher.class); private static final String DATA_STREAM_NAME = "cartridge_agent_health_stats"; private static final String VERSION = "1.0.0"; - private static final String CEP_THRIFT_CLIENT_NAME = "cep"; public WSO2CEPHealthStatisticsPublisher() { - super(createStreamDefinition(), CEP_THRIFT_CLIENT_NAME); + super(createStreamDefinition()); } private static StreamDefinition createStreamDefinition() { @@ -54,7 +52,6 @@ public class WSO2CEPHealthStatisticsPublisher extends ThriftStatisticsPublisher // Set payload definition List<Attribute> payloadData = new ArrayList<Attribute>(); - payloadData.add(new Attribute("timestamp", AttributeType.LONG)); payloadData.add(new Attribute("cluster_id", AttributeType.STRING)); payloadData.add(new Attribute("cluster_instance_id", AttributeType.STRING)); payloadData.add(new Attribute("network_partition_id", AttributeType.STRING)); @@ -73,26 +70,22 @@ public class WSO2CEPHealthStatisticsPublisher extends ThriftStatisticsPublisher /** * Publish health statistics to cep. * - * @param timestamp Time - * @param clusterId Cluster id of the member - * @param clusterInstanceId Cluster instance id of the member - * @param networkPartitionId Network partition id of the member - * @param memberId Member id - * @param partitionId Partition id of the member - * @param health Health type: memory_consumption | load_average - * @param value Health type value + * @param clusterId + * @param clusterInstanceId + * @param networkPartitionId + * @param memberId + * @param partitionId + * @param health + * @param value */ @Override - public void publish(Long timestamp, String clusterId, String clusterInstanceId, String networkPartitionId, - String memberId, String partitionId, String health, double value) { + public void publish(String clusterId, String clusterInstanceId, String networkPartitionId, String memberId, String partitionId, String health, double value) { if (log.isDebugEnabled()) { - log.debug(String.format("Publishing health statistics: [cluster] %s [network-partition] %s " + - "[partition] %s [member] %s [health] %s [value] %d", + log.debug(String.format("Publishing health statistics: [cluster] %s [network-partition] %s [partition] %s [member] %s [health] %s [value] %f", clusterId, networkPartitionId, partitionId, memberId, health, value)); } // Set payload values List<Object> payload = new ArrayList<Object>(); - payload.add(timestamp); payload.add(clusterId); payload.add(clusterInstanceId); payload.add(networkPartitionId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java index 9114074..2ed8883 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java @@ -19,10 +19,7 @@ package org.apache.stratos.common.statistics.publisher.wso2.cep; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.statistics.publisher.InFlightRequestPublisher; -import org.apache.stratos.common.statistics.publisher.ThriftStatisticsPublisher; import org.wso2.carbon.databridge.commons.Attribute; import org.wso2.carbon.databridge.commons.AttributeType; import org.wso2.carbon.databridge.commons.StreamDefinition; @@ -36,15 +33,13 @@ import java.util.List; * In-flight request count: * Number of requests being served at a given moment could be identified as in-flight request count. */ -public class WSO2CEPInFlightRequestPublisher extends ThriftStatisticsPublisher implements InFlightRequestPublisher { - private static final Log log = LogFactory.getLog(WSO2CEPInFlightRequestPublisher.class); +public class WSO2CEPInFlightRequestPublisher extends WSO2CEPStatisticsPublisher implements InFlightRequestPublisher { private static final String DATA_STREAM_NAME = "in_flight_requests"; private static final String VERSION = "1.0.0"; - private static final String CEP_THRIFT_CLIENT_NAME = "cep"; public WSO2CEPInFlightRequestPublisher() { - super(createStreamDefinition(), CEP_THRIFT_CLIENT_NAME); + super(createStreamDefinition()); } private static StreamDefinition createStreamDefinition() { @@ -56,7 +51,6 @@ public class WSO2CEPInFlightRequestPublisher extends ThriftStatisticsPublisher i List<Attribute> payloadData = new ArrayList<Attribute>(); // Set payload definition - payloadData.add(new Attribute("timestamp", AttributeType.LONG)); payloadData.add(new Attribute("cluster_id", AttributeType.STRING)); payloadData.add(new Attribute("cluster_instance_id", AttributeType.STRING)); payloadData.add(new Attribute("network_partition_id", AttributeType.STRING)); @@ -71,23 +65,15 @@ public class WSO2CEPInFlightRequestPublisher extends ThriftStatisticsPublisher i /** * Publish in-flight request count of a cluster. * - * @param timestamp Time - * @param clusterId Cluster id - * @param clusterInstanceId Cluster instance id - * @param networkPartitionId Network partition id of the cluster - * @param inFlightRequestCount In-flight request count of the cluster + * @param clusterId + * @param clusterInstanceId + * @param networkPartitionId + * @param inFlightRequestCount */ @Override - public void publish(Long timestamp, String clusterId, String clusterInstanceId, String networkPartitionId, - int inFlightRequestCount) { - if (log.isDebugEnabled()) { - log.debug(String.format("Publishing health statistics: [timestamp] %d [cluster] %s " + - "[cluster-instance] %s [network-partition] %s [in-flight-request-count] %d", - timestamp, clusterId, clusterInstanceId, networkPartitionId, inFlightRequestCount)); - } + public void publish(String clusterId, String clusterInstanceId, String networkPartitionId, int inFlightRequestCount) { // Set payload values List<Object> payload = new ArrayList<Object>(); - payload.add(timestamp); payload.add(clusterId); payload.add(clusterInstanceId); payload.add(networkPartitionId); http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPStatisticsPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPStatisticsPublisher.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPStatisticsPublisher.java new file mode 100644 index 0000000..653288d --- /dev/null +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPStatisticsPublisher.java @@ -0,0 +1,114 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.stratos.common.statistics.publisher.wso2.cep; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.stratos.common.statistics.publisher.StatisticsPublisher; +import org.wso2.carbon.databridge.agent.thrift.Agent; +import org.wso2.carbon.databridge.agent.thrift.AsyncDataPublisher; +import org.wso2.carbon.databridge.agent.thrift.conf.AgentConfiguration; +import org.wso2.carbon.databridge.agent.thrift.exception.AgentException; +import org.wso2.carbon.databridge.commons.Event; +import org.wso2.carbon.databridge.commons.StreamDefinition; + +import java.util.HashMap; + +/** + * WSO2 CEP statistics publisher. + */ +public class WSO2CEPStatisticsPublisher implements StatisticsPublisher { + + private static final Log log = LogFactory.getLog(WSO2CEPStatisticsPublisher.class); + + private StreamDefinition streamDefinition; + private AsyncDataPublisher asyncDataPublisher; + private String ip; + private String port; + private String username; + private String password; + private boolean enabled = false; + + /** + * Credential information stored inside thrift-client-config.xml file + * is parsed and assigned into ip,port,username and password fields + * + * @param streamDefinition + */ + public WSO2CEPStatisticsPublisher(StreamDefinition streamDefinition) { + ThriftClientConfig thriftClientConfig = ThriftClientConfig.getInstance(); + thriftClientConfig.getThriftClientInfo(); + + this.streamDefinition = streamDefinition; + this.ip = thriftClientConfig.getThriftClientInfo().getIp(); + this.port = thriftClientConfig.getThriftClientInfo().getPort(); + this.username = thriftClientConfig.getThriftClientInfo().getUsername(); + this.password = thriftClientConfig.getThriftClientInfo().getPassword(); + + enabled = Boolean.getBoolean("cep.stats.publisher.enabled"); + if (enabled) { + init(); + } + } + + private void init() { + AgentConfiguration agentConfiguration = new AgentConfiguration(); + Agent agent = new Agent(agentConfiguration); + + // Initialize asynchronous data publisher + asyncDataPublisher = new AsyncDataPublisher("tcp://" + ip + ":" + port + "", username, password, agent); + asyncDataPublisher.addStreamDefinition(streamDefinition); + } + + @Override + public void setEnabled(boolean enabled) { + this.enabled = enabled; + if (this.enabled) { + init(); + } + } + + @Override + public boolean isEnabled() { + return enabled; + } + + @Override + public void publish(Object[] payload) { + if (!isEnabled()) { + throw new RuntimeException("Statistics publisher is not enabled"); + } + + Event event = new Event(); + event.setPayloadData(payload); + event.setArbitraryDataMap(new HashMap<String, String>()); + + try { + if (log.isDebugEnabled()) { + log.debug(String.format("Publishing cep event: [stream] %s [version] %s", streamDefinition.getName(), streamDefinition.getVersion())); + } + asyncDataPublisher.publish(streamDefinition.getName(), streamDefinition.getVersion(), event); + } catch (AgentException e) { + if (log.isErrorEnabled()) { + log.error(String.format("Could not publish cep event: [stream] %s [version] %s", streamDefinition.getName(), streamDefinition.getVersion()), e); + } + } + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java index fc709c7..c0ae8ae 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java @@ -24,7 +24,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.util.Map; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; /** * Utility class for Stratos thread pool @@ -32,7 +35,6 @@ import java.util.concurrent.*; public class StratosThreadPool { private static final Log log = LogFactory.getLog(StratosThreadPool.class); - private static final int MAXIMUM_POOL_SIZE = 1000; private static Map<String, ExecutorService> executorServiceMap = new ConcurrentHashMap<String, ExecutorService>(); private static Map<String, ScheduledExecutorService> scheduledServiceMap = new ConcurrentHashMap<String, ScheduledExecutorService>(); @@ -51,20 +53,7 @@ public class StratosThreadPool { if (executorService == null) { synchronized (executorServiceMapLock) { if (executorService == null) { - final BlockingQueue<Runnable> queue = new ArrayBlockingQueue(threadPoolSize); - ThreadPoolExecutor threadPool=new ThreadPoolExecutor(threadPoolSize, MAXIMUM_POOL_SIZE, - 0L, TimeUnit.MILLISECONDS, - queue); - threadPool.setRejectedExecutionHandler(new RejectedExecutionHandler() { - public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) { - try { - executor.getQueue().put(r); - } catch (InterruptedException e) { - log.error("Failed to add the rejected jobs to executor service blocking queue",e); - } - } - }); - executorService=threadPool; + executorService = Executors.newFixedThreadPool(threadPoolSize); executorServiceMap.put(identifier, executorService); log.info(String.format("Thread pool created: [type] Executor Service [id] %s [size] %d", identifier, threadPoolSize)); } http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.common/src/test/java/org/apache/stratos/common/test/ThriftClientConfigParserTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/test/java/org/apache/stratos/common/test/ThriftClientConfigParserTest.java b/components/org.apache.stratos.common/src/test/java/org/apache/stratos/common/test/ThriftClientConfigParserTest.java index 1627c40..09d5b5e 100644 --- a/components/org.apache.stratos.common/src/test/java/org/apache/stratos/common/test/ThriftClientConfigParserTest.java +++ b/components/org.apache.stratos.common/src/test/java/org/apache/stratos/common/test/ThriftClientConfigParserTest.java @@ -20,8 +20,7 @@ package org.apache.stratos.common.test; import junit.framework.TestCase; -import org.apache.stratos.common.statistics.publisher.ThriftClientConfig; -import org.apache.stratos.common.statistics.publisher.ThriftClientInfo; +import org.apache.stratos.common.statistics.publisher.wso2.cep.ThriftClientConfig; import org.junit.Test; import java.net.URL; @@ -42,21 +41,11 @@ public class ThriftClientConfigParserTest extends TestCase { URL configFileUrl = ThriftClientConfigParserTest.class.getResource("/thrift-client-config.xml"); System.setProperty(ThriftClientConfig.THRIFT_CLIENT_CONFIG_FILE_PATH, configFileUrl.getPath()); ThriftClientConfig thriftClientConfig = ThriftClientConfig.getInstance(); - ThriftClientInfo cepThriftClientInfo = thriftClientConfig.getThriftClientInfo( - ThriftClientConfig.CEP_THRIFT_CLIENT_NAME); - ThriftClientInfo dasThriftClientInfo = thriftClientConfig.getThriftClientInfo( - ThriftClientConfig.DAS_THRIFT_CLIENT_NAME); + thriftClientConfig.getThriftClientInfo(); - assertEquals("CEP Stats Publisher not enabled",true,cepThriftClientInfo.isStatsPublisherEnabled()); - assertEquals("Incorrect Username", "admin", cepThriftClientInfo.getUsername()); - assertEquals("Incorrect Password", "1234", cepThriftClientInfo.getPassword()); - assertEquals("Incorrect IP", "192.168.10.10", cepThriftClientInfo.getIp()); - assertEquals("Incorrect Port", "9300", cepThriftClientInfo.getPort()); - - assertEquals("DAS Stats Publisher not enabled",true,dasThriftClientInfo.isStatsPublisherEnabled()); - assertEquals("Incorrect Username", "admin1", dasThriftClientInfo.getUsername()); - assertEquals("Incorrect Password", "12345", dasThriftClientInfo.getPassword()); - assertEquals("Incorrect IP", "192.168.10.11", dasThriftClientInfo.getIp()); - assertEquals("Incorrect Port", "9301", dasThriftClientInfo.getPort()); + assertEquals("Incorrect Password", "admin", thriftClientConfig.getThriftClientInfo().getUsername()); + assertEquals("Incorrect Password", "1234", thriftClientConfig.getThriftClientInfo().getPassword()); + assertEquals("Incorrect IP", "192.168.10.10", thriftClientConfig.getThriftClientInfo().getIp()); + assertEquals("Incorrect Port", "9300", thriftClientConfig.getThriftClientInfo().getPort()); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.common/src/test/resources/thrift-client-config.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/test/resources/thrift-client-config.xml b/components/org.apache.stratos.common/src/test/resources/thrift-client-config.xml index 8b10756..7e9ff39 100644 --- a/components/org.apache.stratos.common/src/test/resources/thrift-client-config.xml +++ b/components/org.apache.stratos.common/src/test/resources/thrift-client-config.xml @@ -18,22 +18,10 @@ ~ under the License. --> -<!-- Apache thrift client configuration for publishing statistics to WSO2 CEP and WSO2 DAS --> +<!-- Apache thrift client configuration for publishing statistics to WSO2 CEP --> <thriftClientConfiguration> - <config> - <name>cep</name> - <statsPublisherEnabled>true</statsPublisherEnabled> - <username>admin</username> - <password>1234</password> - <ip>192.168.10.10</ip> - <port>9300</port> - </config> - <config> - <name>das</name> - <statsPublisherEnabled>true</statsPublisherEnabled> - <username>admin1</username> - <password>12345</password> - <ip>192.168.10.11</ip> - <port>9301</port> - </config> + <username>admin</username> + <password>1234</password> + <ip>192.168.10.10</ip> + <port>9300</port> </thriftClientConfiguration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java index 78504e9..ceeca1c 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java @@ -33,12 +33,12 @@ public interface KubernetesAPIClientInterface { /** * Create pod. * - * @param podId id of the pod - * @param podLabel pod label - * @param dockerImage docker image name - * @param cpu number of cpu cores - * @param memory memory allocation in mega bytes - * @param ports ports to be opened + * @param podId id of the pod + * @param podLabel pod label + * @param dockerImage docker image name + * @param cpu number of cpu cores + * @param memory memory allocation in mega bytes + * @param ports ports to be opened * @param environmentVariables environment variables * @throws KubernetesClientException */ @@ -80,7 +80,6 @@ public interface KubernetesAPIClientInterface { * @param serviceType * @param containerPortName * @param containerPort - * @param publicIPs * @param sessionAffinity * @throws KubernetesClientException */ http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java index 6d7b544..0feaab3 100644 --- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java +++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java @@ -242,7 +242,7 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv protected void onEvent(Event event) { ServiceRemovedEvent serviceRemovedEvent = (ServiceRemovedEvent) event; - String serviceName = serviceRemovedEvent.getServiceUuid(); + String serviceName = serviceRemovedEvent.getServiceName(); try { TopologyManager.acquireReadLockForService(serviceName); http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java index 1dd12c7..dc2233d 100644 --- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java +++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java @@ -81,8 +81,7 @@ public class LoadBalancerStatisticsNotifier implements Runnable { for (Cluster cluster : service.getClusters()) { // Publish in-flight request count of load balancer's network partition int requestCount = statsReader.getInFlightRequestCount(cluster.getClusterId()); - inFlightRequestPublisher.publish(System.currentTimeMillis(), cluster.getClusterId(), - clusterInstanceId, + inFlightRequestPublisher.publish(cluster.getClusterId(), clusterInstanceId, networkPartitionId, requestCount); if (log.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json index b94c5b8..cf4675d 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json @@ -13,14 +13,14 @@ "id": "root/id", "type": "string", "title": "Application Policy Id ", - "name": "Application Policy Id" + "name": "Application Policy Id", }, "algorithm": { "id": "root/algorithm", "type": "string", "title": "Application Policy Algorithm ", "name": "Application Policy Algorithm", - "enum": ["one-after-another","all-at-once"] + "enum": ["one-after-another","all-at-once"], }, "networkPartitions": { "id": "root/networkPartitions", http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json index 5b094f9..4c086d8 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json @@ -13,7 +13,7 @@ "id": { "type":"string", "id": "root/id", - "title":"Auto Scale policy Id", + "title":"Auto Scale policy ID", "minLength":4, "default":"Policy name", "maxItems":1 http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json index 29a27f1..396a26b 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json @@ -12,7 +12,7 @@ "id": { "id": "root/id", "type": "string", - "title":"Deployment Policy Id" + "title":"Deployment Policy ID" }, "networkPartitions": { "id": "root/networkPartitions", http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json index 2332650..22d781a 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json @@ -3,7 +3,7 @@ "id": "root", "type": "object", "title": "Network Partition Definition", - "name": "Network Partition", + "name": "Network Partition Policy", "options": { "disable_properties": true, "disable_collapse": true http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs index 36d4893..2071a60 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs @@ -434,10 +434,6 @@ $(document).ready(function () { }else if(editor.getEditor('root.type')){ editor.getEditor('root.type').disable(); } - - if(editor.getEditor('root.uuid')){ - editor.getEditor('root.uuid').disable(); - } {{/if}} // Hook up the validation indicator to update its http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.manager/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/pom.xml b/components/org.apache.stratos.manager/pom.xml index 4a70f8a..c94f8dc 100644 --- a/components/org.apache.stratos.manager/pom.xml +++ b/components/org.apache.stratos.manager/pom.xml @@ -112,7 +112,6 @@ <plugin> <groupId>org.apache.axis2</groupId> <artifactId>axis2-java2wsdl-maven-plugin</artifactId> - <version>1.6.1-wso2v10</version> <configuration> <className>org.apache.stratos.manager.services.impl.StratosManagerServiceImpl</className> <outputFileName>target/generated-resources/wsdl/StratosManagerService.wsdl</outputFileName> http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/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 5788e8e..e4fa435 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 @@ -52,26 +52,26 @@ public class StratosManagerContext implements Serializable { private static volatile StratosManagerContext instance; private final transient DistributedObjectProvider distributedObjectProvider; /** - * Key - cartridge type uuid - * Value - list of cartridgeGroupNames uuid + * Key - cartridge type + * Value - list of cartridgeGroupNames */ - private Map<String,Set<String>> cartridgeTypeToCartridgeGroupsMap; + private Map<String, Set<String>> cartridgeTypeToCartridgeGroupsMap; /** - * Key - cartridge type uuid - * Value - list of ApplicationNames uuid + * Key - cartridge type + * Value - list of ApplicationNames */ private Map<String, Set<String>> cartridgeTypeToApplicationsMap; /** - * Key - cartridge group name uuid - * Value - list of cartridgeGroupNames uuid + * Key - cartridge group name + * Value - list of cartridgeGroupNames */ private Map<String, Set<String>> cartridgeGroupToCartridgeSubGroupsMap; /** - * Key - cartridge group name uuid - * Value - list of ApplicationNames uuid + * Key - cartridge group name + * Value - list of ApplicationNames */ private Map<String, Set<String>> cartridgeGroupToApplicationsMap; @@ -145,46 +145,46 @@ public class StratosManagerContext implements Serializable { return acquireWriteLock(SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK); } - public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupUuid, String[] cartridgeUuids) { - if (cartridgeUuids == null) { + public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames) { + if (cartridgeNames == null) { return; } - for (String cartridgeNameUuid : cartridgeUuids) { + for (String cartridgeName : cartridgeNames) { Set<String> cartridgeGroupNames = null; - if (cartridgeTypeToCartridgeGroupsMap.containsKey(cartridgeNameUuid)) { - cartridgeGroupNames = cartridgeTypeToCartridgeGroupsMap.get(cartridgeNameUuid); + if (cartridgeTypeToCartridgeGroupsMap.containsKey(cartridgeName)) { + cartridgeGroupNames = cartridgeTypeToCartridgeGroupsMap.get(cartridgeName); } else { cartridgeGroupNames = new HashSet<String>(); - cartridgeTypeToCartridgeGroupsMap.put(cartridgeNameUuid, cartridgeGroupNames); + cartridgeTypeToCartridgeGroupsMap.put(cartridgeName, cartridgeGroupNames); } - cartridgeGroupNames.add(cartridgeGroupUuid); + cartridgeGroupNames.add(cartridgeGroupName); } } - public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupNameUuid, String[] cartridgeNamesUuid) { - if (cartridgeNamesUuid == null) { + public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames) { + if (cartridgeNames == null) { return; } - for (String cartridgeNameUuid : cartridgeNamesUuid) { + for (String cartridgeName : cartridgeNames) { Set<String> cartridgeGroupNames = null; - if (cartridgeTypeToCartridgeGroupsMap.containsKey(cartridgeNameUuid)) { - cartridgeGroupNames = cartridgeTypeToCartridgeGroupsMap.get(cartridgeNameUuid); + if (cartridgeTypeToCartridgeGroupsMap.containsKey(cartridgeName)) { + cartridgeGroupNames = cartridgeTypeToCartridgeGroupsMap.get(cartridgeName); // Remove current cartridge group name - cartridgeGroupNames.remove(cartridgeGroupNameUuid); + cartridgeGroupNames.remove(cartridgeGroupName); // Remove entry if there are no more cartridge group names for that cartridge type if (cartridgeGroupNames.isEmpty()) { cartridgeGroupNames = null; - cartridgeTypeToCartridgeGroupsMap.remove(cartridgeNameUuid); + cartridgeTypeToCartridgeGroupsMap.remove(cartridgeName); } } } } - public boolean isCartridgeIncludedInCartridgeGroups(String cartridgeNameUuid) { - if (cartridgeTypeToCartridgeGroupsMap.containsKey(cartridgeNameUuid)) { - if (!cartridgeTypeToCartridgeGroupsMap.get(cartridgeNameUuid).isEmpty()) { + public boolean isCartridgeIncludedInCartridgeGroups(String cartridgeName) { + if (cartridgeTypeToCartridgeGroupsMap.containsKey(cartridgeName)) { + if (!cartridgeTypeToCartridgeGroupsMap.get(cartridgeName).isEmpty()) { return true; } return false; @@ -192,12 +192,12 @@ public class StratosManagerContext implements Serializable { return false; } - public void addUsedCartridgesInApplications(String applicationNameUuid, String[] cartridgeNamesUuid) { - if (cartridgeNamesUuid == null) { + public void addUsedCartridgesInApplications(String applicationName, String[] cartridgeNames) { + if (cartridgeNames == null) { return; } - for (String cartridgeName : cartridgeNamesUuid) { + for (String cartridgeName : cartridgeNames) { Set<String> applicationNames = null; if (cartridgeTypeToApplicationsMap.containsKey(cartridgeName)) { applicationNames = cartridgeTypeToApplicationsMap.get(cartridgeName); @@ -205,33 +205,33 @@ public class StratosManagerContext implements Serializable { applicationNames = new HashSet<String>(); cartridgeTypeToApplicationsMap.put(cartridgeName, applicationNames); } - applicationNames.add(applicationNameUuid); + applicationNames.add(applicationName); } } - public void removeUsedCartridgesInApplications(String applicationNameUuid, String[] cartridgeNamesUuid) { - if (cartridgeNamesUuid == null) { + public void removeUsedCartridgesInApplications(String applicationName, String[] cartridgeNames) { + if (cartridgeNames == null) { return; } - for (String cartridgeNameUuid : cartridgeNamesUuid) { + for (String cartridgeName : cartridgeNames) { Set<String> applicationNames = null; - if (cartridgeTypeToApplicationsMap.containsKey(cartridgeNameUuid)) { - applicationNames = cartridgeTypeToApplicationsMap.get(cartridgeNameUuid); + if (cartridgeTypeToApplicationsMap.containsKey(cartridgeName)) { + applicationNames = cartridgeTypeToApplicationsMap.get(cartridgeName); // Remove current application name - applicationNames.remove(applicationNameUuid); + applicationNames.remove(applicationName); // Remove entry if there are no more cartridge group names for that cartridge type if (applicationNames.isEmpty()) { applicationNames = null; - cartridgeTypeToApplicationsMap.remove(cartridgeNameUuid); + cartridgeTypeToApplicationsMap.remove(cartridgeName); } } } } - public boolean isCartridgeIncludedInApplications(String cartridgeNameUuid) { - if (cartridgeTypeToApplicationsMap.containsKey(cartridgeNameUuid)) { - if (!cartridgeTypeToApplicationsMap.get(cartridgeNameUuid).isEmpty()) { + public boolean isCartridgeIncludedInApplications(String cartridgeName) { + if (cartridgeTypeToApplicationsMap.containsKey(cartridgeName)) { + if (!cartridgeTypeToApplicationsMap.get(cartridgeName).isEmpty()) { return true; } return false; @@ -239,46 +239,46 @@ public class StratosManagerContext implements Serializable { return false; } - public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupNameUuid, String[] cartridgeGroupNamesUuid) { - if (cartridgeGroupNamesUuid == null) { + public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) { + if (cartridgeGroupNames == null) { return; } - for (String cartridgeGroupNameUuid : cartridgeGroupNamesUuid) { + for (String cartridgeGroupName : cartridgeGroupNames) { Set<String> cartridgeSubGroupNames = null; - if (cartridgeGroupToCartridgeSubGroupsMap.containsKey(cartridgeGroupNameUuid)) { - cartridgeSubGroupNames = cartridgeGroupToCartridgeSubGroupsMap.get(cartridgeGroupNameUuid); + if (cartridgeGroupToCartridgeSubGroupsMap.containsKey(cartridgeGroupName)) { + cartridgeSubGroupNames = cartridgeGroupToCartridgeSubGroupsMap.get(cartridgeGroupName); } else { cartridgeSubGroupNames = new HashSet<String>(); - cartridgeGroupToCartridgeSubGroupsMap.put(cartridgeSubGroupNameUuid, cartridgeSubGroupNames); + cartridgeGroupToCartridgeSubGroupsMap.put(cartridgeSubGroupName, cartridgeSubGroupNames); } - cartridgeSubGroupNames.add(cartridgeGroupNameUuid); + cartridgeSubGroupNames.add(cartridgeGroupName); } } - public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupNameUuid, String[] cartridgeGroupNamesUuid) { - if (cartridgeGroupNamesUuid == null) { + public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) { + if (cartridgeGroupNames == null) { return; } - for (String cartridgeGroupNameUuid : cartridgeGroupNamesUuid) { + for (String cartridgeGroupName : cartridgeGroupNames) { Set<String> cartridgeSubGroupNames = null; - if (cartridgeGroupToCartridgeSubGroupsMap.containsKey(cartridgeGroupNameUuid)) { - cartridgeSubGroupNames = cartridgeGroupToCartridgeSubGroupsMap.get(cartridgeGroupNameUuid); + if (cartridgeGroupToCartridgeSubGroupsMap.containsKey(cartridgeGroupName)) { + cartridgeSubGroupNames = cartridgeGroupToCartridgeSubGroupsMap.get(cartridgeGroupName); // Remove current cartridge group name - cartridgeSubGroupNames.remove(cartridgeGroupNameUuid); + cartridgeSubGroupNames.remove(cartridgeGroupName); // Remove entry if there are no more cartridge group names for that cartridge type if (cartridgeSubGroupNames.isEmpty()) { cartridgeSubGroupNames = null; - cartridgeGroupToCartridgeSubGroupsMap.remove(cartridgeGroupNameUuid); + cartridgeGroupToCartridgeSubGroupsMap.remove(cartridgeGroupName); } } } } - public boolean isCartridgeGroupIncludedInCartridgeSubGroups(String cartridgeGroupNameUuid) { - if (cartridgeGroupToCartridgeSubGroupsMap.containsKey(cartridgeGroupNameUuid)) { - if (!cartridgeGroupToCartridgeSubGroupsMap.get(cartridgeGroupNameUuid).isEmpty()) { + public boolean isCartridgeGroupIncludedInCartridgeSubGroups(String cartridgeGroupName) { + if (cartridgeGroupToCartridgeSubGroupsMap.containsKey(cartridgeGroupName)) { + if (!cartridgeGroupToCartridgeSubGroupsMap.get(cartridgeGroupName).isEmpty()) { return true; } return false; @@ -286,46 +286,46 @@ public class StratosManagerContext implements Serializable { return false; } - public void addUsedCartridgeGroupsInApplications(String applicationNameUuid, String[] cartridgeGroupNamesUuid) { - if (cartridgeGroupNamesUuid == null) { + public void addUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames) { + if (cartridgeGroupNames == null) { return; } - for (String cartridgeGroupNameUuid : cartridgeGroupNamesUuid) { + for (String cartridgeGroupName : cartridgeGroupNames) { Set<String> applicationNames = null; - if (cartridgeGroupToApplicationsMap.containsKey(cartridgeGroupNameUuid)) { - applicationNames = cartridgeGroupToApplicationsMap.get(cartridgeGroupNameUuid); + if (cartridgeGroupToApplicationsMap.containsKey(cartridgeGroupName)) { + applicationNames = cartridgeGroupToApplicationsMap.get(cartridgeGroupName); } else { applicationNames = new HashSet<String>(); - cartridgeGroupToApplicationsMap.put(cartridgeGroupNameUuid, applicationNames); + cartridgeGroupToApplicationsMap.put(cartridgeGroupName, applicationNames); } - applicationNames.add(applicationNameUuid); + applicationNames.add(applicationName); } } - public void removeUsedCartridgeGroupsInApplications(String applicationNameUuid, String[] cartridgeGroupNamesUuid) { - if (cartridgeGroupNamesUuid == null) { + public void removeUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames) { + if (cartridgeGroupNames == null) { return; } - for (String cartridgeGroupNameUuid : cartridgeGroupNamesUuid) { + for (String cartridgeGroupName : cartridgeGroupNames) { Set<String> applicationNames = null; - if (cartridgeGroupToApplicationsMap.containsKey(cartridgeGroupNameUuid)) { - applicationNames = cartridgeGroupToApplicationsMap.get(cartridgeGroupNameUuid); + if (cartridgeGroupToApplicationsMap.containsKey(cartridgeGroupName)) { + applicationNames = cartridgeGroupToApplicationsMap.get(cartridgeGroupName); // Remove current application name - applicationNames.remove(applicationNameUuid); + applicationNames.remove(applicationName); // Remove entry if there are no more cartridge group names for that cartridge type if (applicationNames.isEmpty()) { applicationNames = null; - cartridgeGroupToApplicationsMap.remove(cartridgeGroupNameUuid); + cartridgeGroupToApplicationsMap.remove(cartridgeGroupName); } } } } - public boolean isCartridgeGroupIncludedInApplications(String cartridgeGroupNameUuid) { - if (cartridgeGroupToApplicationsMap.containsKey(cartridgeGroupNameUuid)) { - if (!cartridgeGroupToApplicationsMap.get(cartridgeGroupNameUuid).isEmpty()) { + public boolean isCartridgeGroupIncludedInApplications(String cartridgeGroupName) { + if (cartridgeGroupToApplicationsMap.containsKey(cartridgeGroupName)) { + if (!cartridgeGroupToApplicationsMap.get(cartridgeGroupName).isEmpty()) { return true; } return false; http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/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 9327b3e..4c4237a 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 @@ -129,80 +129,80 @@ public interface StratosManagerService { /** * Adds the used cartridges in cartridge groups to cache structure. * - * @param cartridgeGroupUuid the cartridge group name + * @param cartridgeGroupName the cartridge group name * @param cartridgeNames the cartridge names */ - public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupUuid, String[] cartridgeNames); + public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames); /** * Removes the used cartridges in cartridge groups from cache structure. * - * @param cartridgeGroupUuid the cartridge group UUID - * @param cartridgeNamesUuid the cartridge names + * @param cartridgeGroupName the cartridge group name + * @param cartridgeNames the cartridge names */ - public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupUuid, String[] cartridgeNamesUuid); + public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames); /** * Adds the used cartridges in applications to cache structure. * - * @param applicationUuid the application name + * @param applicationName the application name * @param cartridgeNames the cartridge names */ - public void addUsedCartridgesInApplications(String applicationUuid, String[] cartridgeNames); + public void addUsedCartridgesInApplications(String applicationName, String[] cartridgeNames); /** * Removes the used cartridges in applications from cache structure. * - * @param applicationUuid the application UUID + * @param applicationName the application name * @param cartridgeNames the cartridge names */ - public void removeUsedCartridgesInApplications(String applicationUuid, String[] cartridgeNames); + public void removeUsedCartridgesInApplications(String applicationName, String[] cartridgeNames); /** * Verifies whether a cartridge can be removed. * - * @param cartridgeUuid the cartridge name + * @param cartridgeName the cartridge name * @return true, if successful */ - public boolean canCartridgeBeRemoved(String cartridgeUuid); + public boolean canCartridgeBeRemoved(String cartridgeName); /** * Adds the used cartridge groups in cartridge sub groups to cache structure. * - * @param cartridgeSubGroupUuid the cartridge sub group name + * @param cartridgeSubGroupName the cartridge sub group name * @param cartridgeGroupNames the cartridge group names */ - public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupUuid, String[] cartridgeGroupNames); + public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames); /** * Removes the used cartridge groups in cartridge sub groups from cache structure. * - * @param cartridgeSubGroupUuid the cartridge sub group name + * @param cartridgeSubGroupName the cartridge sub group name * @param cartridgeGroupNames the cartridge group names */ - public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupUuid, String[] cartridgeGroupNames); + public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames); /** * Adds the used cartridge groups in applications to cache structure. * - * @param applicationUuid the application name + * @param applicationName the application name * @param cartridgeGroupNames the cartridge group names */ - public void addUsedCartridgeGroupsInApplications(String applicationUuid, String[] cartridgeGroupNames); + public void addUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames); /** * Removes the used cartridge groups in applications from cache structure. * - * @param applicationUuid the application name + * @param applicationName the application name * @param cartridgeGroupNames the cartridge group names */ - public void removeUsedCartridgeGroupsInApplications(String applicationUuid, String[] cartridgeGroupNames); + public void removeUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames); /** * Verifies whether a cartridge group can be removed. * - * @param cartridgeGroupUuid the cartridge group name + * @param cartridgeGroupName the cartridge group name * @return true, if successful */ - public boolean canCartirdgeGroupBeRemoved(String cartridgeGroupUuid); + public boolean canCartirdgeGroupBeRemoved(String cartridgeGroupName); } http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/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 7b7a5df..c164e1c 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 @@ -103,11 +103,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupUuid, String[] cartridgeNames) { + public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgesCartridgeGroupsWriteLock(); - StratosManagerContext.getInstance().addUsedCartridgesInCartridgeGroups(cartridgeGroupUuid, cartridgeNames); + StratosManagerContext.getInstance().addUsedCartridgesInCartridgeGroups(cartridgeGroupName, cartridgeNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -117,11 +117,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupUuid, String[] cartridgeNamesUuid) { + public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgesCartridgeGroupsWriteLock(); - StratosManagerContext.getInstance().removeUsedCartridgesInCartridgeGroups(cartridgeGroupUuid, cartridgeNamesUuid); + StratosManagerContext.getInstance().removeUsedCartridgesInCartridgeGroups(cartridgeGroupName, cartridgeNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -131,11 +131,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void addUsedCartridgesInApplications(String applicationUuid, String[] cartridgeNames) { + public void addUsedCartridgesInApplications(String applicationName, String[] cartridgeNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgesApplicationsWriteLock(); - StratosManagerContext.getInstance().addUsedCartridgesInApplications(applicationUuid, cartridgeNames); + StratosManagerContext.getInstance().addUsedCartridgesInApplications(applicationName, cartridgeNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -145,11 +145,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void removeUsedCartridgesInApplications(String applicationUuid, String[] cartridgeNames) { + public void removeUsedCartridgesInApplications(String applicationName, String[] cartridgeNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgesApplicationsWriteLock(); - StratosManagerContext.getInstance().removeUsedCartridgesInApplications(applicationUuid, cartridgeNames); + StratosManagerContext.getInstance().removeUsedCartridgesInApplications(applicationName, cartridgeNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -159,20 +159,20 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public boolean canCartridgeBeRemoved(String cartridgeUuid) { - if (StratosManagerContext.getInstance().isCartridgeIncludedInCartridgeGroups(cartridgeUuid) || - StratosManagerContext.getInstance().isCartridgeIncludedInApplications(cartridgeUuid)) { + public boolean canCartridgeBeRemoved(String cartridgeName) { + if (StratosManagerContext.getInstance().isCartridgeIncludedInCartridgeGroups(cartridgeName) || + StratosManagerContext.getInstance().isCartridgeIncludedInApplications(cartridgeName)) { return false; } return true; } @Override - public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupUuid, String[] cartridgeGroupNames) { + public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgeGroupsCartridgeSubGroupsWriteLock(); - StratosManagerContext.getInstance().addUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupUuid, cartridgeGroupNames); + StratosManagerContext.getInstance().addUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupName, cartridgeGroupNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -182,11 +182,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupUuid, String[] cartridgeGroupNames) { + public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgeGroupsCartridgeSubGroupsWriteLock(); - StratosManagerContext.getInstance().removeUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupUuid, cartridgeGroupNames); + StratosManagerContext.getInstance().removeUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupName, cartridgeGroupNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -196,11 +196,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void addUsedCartridgeGroupsInApplications(String applicationUuid, String[] cartridgeGroupNames) { + public void addUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgeGroupsApplicationsWriteLock(); - StratosManagerContext.getInstance().addUsedCartridgeGroupsInApplications(applicationUuid, cartridgeGroupNames); + StratosManagerContext.getInstance().addUsedCartridgeGroupsInApplications(applicationName, cartridgeGroupNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -210,11 +210,11 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public void removeUsedCartridgeGroupsInApplications(String applicationUuid, String[] cartridgeGroupNames) { + public void removeUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames) { Lock lock = null; try { lock = StratosManagerContext.getInstance().acquireCartridgeGroupsApplicationsWriteLock(); - StratosManagerContext.getInstance().removeUsedCartridgeGroupsInApplications(applicationUuid, cartridgeGroupNames); + StratosManagerContext.getInstance().removeUsedCartridgeGroupsInApplications(applicationName, cartridgeGroupNames); StratosManagerContext.getInstance().persist(); } finally { if (lock != null) { @@ -224,9 +224,9 @@ public class StratosManagerServiceImpl implements StratosManagerService { } @Override - public boolean canCartirdgeGroupBeRemoved(String cartridgeGroupUuid) { - if (StratosManagerContext.getInstance().isCartridgeGroupIncludedInCartridgeSubGroups(cartridgeGroupUuid) || - StratosManagerContext.getInstance().isCartridgeGroupIncludedInApplications(cartridgeGroupUuid)) { + public boolean canCartirdgeGroupBeRemoved(String cartridgeGroupName) { + if (StratosManagerContext.getInstance().isCartridgeGroupIncludedInCartridgeSubGroups(cartridgeGroupName) || + StratosManagerContext.getInstance().isCartridgeGroupIncludedInApplications(cartridgeGroupName)) { return false; } return true; http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Application.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Application.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Application.java index c9ccc91..0a0cb67 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Application.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Application.java @@ -35,7 +35,6 @@ public class Application extends ParentComponent<ApplicationInstance> { private static final long serialVersionUID = -5092959597171649688L; // Unique id for the Application, defined in Application Definition - private String uuid; private String id; private String name; private String description; @@ -50,29 +49,20 @@ public class Application extends ParentComponent<ApplicationInstance> { // Life cycle state manager //protected LifeCycleStateManager<ApplicationStatus> applicationStateManager; - // application policy uuid + // application policy id private String applicationPolicyId; - public Application(String uuid,int tenantId) { + public Application(String id) { super(); - this.uuid = uuid; - this.tenantId=tenantId; + this.id = id; this.key = RandomStringUtils.randomAlphanumeric(16); this.setInstanceIdToInstanceContextMap(new HashMap<String, ApplicationInstance>()); //this.applicationStateManager = //new LifeCycleStateManager<ApplicationStatus>(ApplicationStatus.Created, id); } - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - public String getUniqueIdentifier() { - return uuid; + return id; } public String getKey() { @@ -144,21 +134,21 @@ public class Application extends ParentComponent<ApplicationInstance> { } Application that = (Application) other; - return this.uuid.equals(that.uuid); + return this.id.equals(that.id); } public int hashCode() { - return uuid.hashCode(); + return id.hashCode(); } - public Instance getInstanceByNetworkPartitionId(String networkPartitionUuid) { + public Instance getInstanceByNetworkPartitionId(String networkPartitionId) { // if map is empty, return null if (getInstanceIdToInstanceContextMap().isEmpty()) { return null; } for (Instance instance : getInstanceIdToInstanceContextMap().values()) { - if (instance.getNetworkPartitionUuid().equals(networkPartitionUuid)) { + if (instance.getNetworkPartitionId().equals(networkPartitionId)) { return instance; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java index 442c56b..4d366f1 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java @@ -46,23 +46,11 @@ public class Applications implements Serializable { this.applicationMap.put(application.getUniqueIdentifier(), application); } - public synchronized Application getApplication(String applicationUuid) { - return this.getApplications().get(applicationUuid); + public synchronized Application getApplication(String appId) { + return this.getApplications().get(appId); } - public synchronized Application getApplicationByTenant(String applicationId, int tenantId) { - if(getApplications() != null) { - for (Application application : this.getApplications().values()) { - if (application.getId().equals(applicationId) && application.getTenantId() == tenantId) { - return application; - } - } - } - - return null; - } - - public boolean isInitialized() { + public synchronized boolean isInitialized() { return initialized; } http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ClusterDataHolder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ClusterDataHolder.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ClusterDataHolder.java index 1b2ef5a..3deeb6c 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ClusterDataHolder.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ClusterDataHolder.java @@ -30,35 +30,22 @@ public class ClusterDataHolder implements Serializable { // Service/Cartridge type private String serviceType; - - // Service uuid - private String serviceUuid; - // Cluster id private String clusterId; private int minInstances; private int maxInstances; - public ClusterDataHolder(String serviceType, String clusterId, String serviceUuid) { + public ClusterDataHolder(String serviceType, String clusterId) { this.serviceType = serviceType; this.clusterId = clusterId; - this.serviceUuid = serviceUuid; } public String getServiceType() { return serviceType; } - public String getServiceUuid() { - return serviceUuid; - } - - public void setServiceUuid(String serviceUuid) { - this.serviceUuid = serviceUuid; - } - public String getClusterId() { return clusterId; } http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java index 4a54028..fdd83ef 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java @@ -428,9 +428,9 @@ public abstract class ParentComponent<T extends Instance> implements Serializabl this.deploymentPolicy = deploymentPolicy; } - public String getNextInstanceId(String appUuid) { + public String getNextInstanceId(String alias) { int nextSequence = instanceIdSequence.incrementAndGet(); - String instanceId = appUuid + "-" + nextSequence; + String instanceId = alias + "-" + nextSequence; return instanceId; } http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java index ca32269..94dbd7b 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java @@ -38,7 +38,7 @@ public abstract class Instance<T extends LifeCycleState> implements Serializable //Parent instance id private String parentId; //Network partition id - private String networkPartitionUuid; + private String networkPartitionId; //partition id protected String partitionId; @@ -91,12 +91,12 @@ public abstract class Instance<T extends LifeCycleState> implements Serializable this.parentId = parentId; } - public String getNetworkPartitionUuid() { - return networkPartitionUuid; + public String getNetworkPartitionId() { + return networkPartitionId; } - public void setNetworkPartitionUuid(String networkPartitionUuid) { - this.networkPartitionUuid = networkPartitionUuid; + public void setNetworkPartitionId(String networkPartitionId) { + this.networkPartitionId = networkPartitionId; } public String getPartitionId() { http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java index 2194c05..ee0b89d 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java @@ -34,17 +34,15 @@ public class Service implements Serializable { private final String serviceName; private final ServiceType serviceType; - private String serviceUuid; // Key: Cluster.clusterId private Map<String, Cluster> clusterIdClusterMap; // Key: Port.proxy private Map<Integer, Port> portMap; private Properties properties; - public Service(String serviceName, ServiceType serviceType, String serviceUuid) { + public Service(String serviceName, ServiceType serviceType) { this.serviceName = serviceName; this.serviceType = serviceType; - this.serviceUuid = serviceUuid; this.clusterIdClusterMap = new HashMap<String, Cluster>(); this.portMap = new HashMap<Integer, Port>(); } @@ -57,14 +55,6 @@ public class Service implements Serializable { return serviceType; } - public String getServiceUuid() { - return serviceUuid; - } - - public void setServiceUuid(String serviceUuid) { - this.serviceUuid = serviceUuid; - } - public Collection<Cluster> getClusters() { return clusterIdClusterMap.values(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java index c8e903f..9f641ec 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java @@ -50,25 +50,25 @@ public class Topology implements Serializable { } public void addService(Service service) { - this.serviceMap.put(service.getServiceUuid(), service); + this.serviceMap.put(service.getServiceName(), service); } public void removeService(Service service) { - this.serviceMap.remove(service.getServiceUuid()); - TopologyLockHierarchy.getInstance().removeTopologyLockForService(service.getServiceUuid()); + this.serviceMap.remove(service.getServiceName()); + TopologyLockHierarchy.getInstance().removeTopologyLockForService(service.getServiceName()); } - public void removeService(String serviceUuid) { - this.serviceMap.remove(serviceUuid); - TopologyLockHierarchy.getInstance().removeTopologyLockForService(serviceUuid); + public void removeService(String serviceName) { + this.serviceMap.remove(serviceName); + TopologyLockHierarchy.getInstance().removeTopologyLockForService(serviceName); } - public Service getService(String serviceUuid) { - return this.serviceMap.get(serviceUuid); + public Service getService(String serviceName) { + return this.serviceMap.get(serviceName); } - public boolean serviceExists(String serviceUuid) { - return this.serviceMap.containsKey(serviceUuid); + public boolean serviceExists(String serviceName) { + return this.serviceMap.containsKey(serviceName); } public void addToCluterMap(Cluster cluster) { http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/locking/TopologyLockHierarchy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/locking/TopologyLockHierarchy.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/locking/TopologyLockHierarchy.java index a554c8f..8cfdd83 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/locking/TopologyLockHierarchy.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/locking/TopologyLockHierarchy.java @@ -61,14 +61,14 @@ public class TopologyLockHierarchy { return topologyLockHierarchy; } - public synchronized TopologyLock getTopologyLockForService(String serviceUuid, boolean forceCreationIfNotFound) { - TopologyLock topologyLock = serviceNameToTopologyLockMap.get(serviceUuid); + public synchronized TopologyLock getTopologyLockForService(String serviceName, boolean forceCreationIfNotFound) { + TopologyLock topologyLock = serviceNameToTopologyLockMap.get(serviceName); if (topologyLock == null && forceCreationIfNotFound) { topologyLock = new TopologyLock(); if (log.isDebugEnabled()) { - log.debug("Lock created for topology service: [service-uuid] " + serviceUuid); + log.debug("Lock created for topology service: [service-id] " + serviceName); } - serviceNameToTopologyLockMap.put(serviceUuid, topologyLock); + serviceNameToTopologyLockMap.put(serviceName, topologyLock); } return topologyLock; http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterInstanceCreatedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterInstanceCreatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterInstanceCreatedEvent.java index 61b9d67..928119f 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterInstanceCreatedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterInstanceCreatedEvent.java @@ -26,27 +26,27 @@ import org.apache.stratos.messaging.event.Event; */ public class ClusterInstanceCreatedEvent extends Event { - private final String serviceUuid; + private final String serviceName; private final String clusterId; private String partitionId; private String networkPartitionId; private ClusterInstance clusterInstance; - public ClusterInstanceCreatedEvent(String serviceUuid, String clusterId, + public ClusterInstanceCreatedEvent(String serviceName, String clusterId, ClusterInstance clusterInstance) { - this.serviceUuid = serviceUuid; + this.serviceName = serviceName; this.clusterId = clusterId; this.clusterInstance = clusterInstance; } - public String getServiceUuid() { - return serviceUuid; + public String getServiceName() { + return serviceName; } @Override public String toString() { - return "ClusterInstanceCreatedEvent [serviceName=" + serviceUuid + ", clusterStatus=" + + return "ClusterInstanceCreatedEvent [serviceName=" + serviceName + ", clusterStatus=" + "]"; } http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java index c3599e9..6e21518 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java @@ -34,15 +34,13 @@ public class ServiceCreatedEvent extends TopologyEvent implements Serializable { private final String serviceName; private final ServiceType serviceType; - private final String serviceUuid; // Key: Port.proxy private final Map<Integer, Port> portMap; private Properties properties; - public ServiceCreatedEvent(String serviceName, ServiceType serviceType, String serviceUuid) { + public ServiceCreatedEvent(String serviceName, ServiceType serviceType) { this.serviceName = serviceName; this.serviceType = serviceType; - this.serviceUuid = serviceUuid; this.portMap = new HashMap<Integer, Port>(); } @@ -54,10 +52,6 @@ public class ServiceCreatedEvent extends TopologyEvent implements Serializable { return serviceType; } - public String getServiceUuid() { - return serviceUuid; - } - public Collection<Port> getPorts() { return Collections.unmodifiableCollection(portMap.values()); } http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceRemovedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceRemovedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceRemovedEvent.java index 8d22900..d39fef1 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceRemovedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceRemovedEvent.java @@ -27,23 +27,13 @@ import java.io.Serializable; public class ServiceRemovedEvent extends TopologyEvent implements Serializable { private static final long serialVersionUID = -4835613174531768139L; - private final String serviceUuid; + private final String serviceName; - private String serviceName; - - public String getServiceName() { - return serviceName; - } - - public void setServiceName(String serviceName) { + public ServiceRemovedEvent(String serviceName) { this.serviceName = serviceName; } - public ServiceRemovedEvent(String serviceUuid) { - this.serviceUuid = serviceUuid; - } - - public String getServiceUuid() { - return serviceUuid; + public String getServiceName() { + return serviceName; } }
