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/05/15 15:27:20 UTC
[1/6] stratos git commit: Remove commented out code and TODO as it is
not necessary anymore
Repository: stratos
Updated Branches:
refs/heads/master e87e7af75 -> d5f79d8e7
Remove commented out code and TODO as it is not necessary anymore
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d5f79d8e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d5f79d8e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d5f79d8e
Branch: refs/heads/master
Commit: d5f79d8e7ba7397790d0114a9c17aa9d9eee372b
Parents: 203db9f
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri May 15 18:30:51 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri May 15 18:41:12 2015 +0530
----------------------------------------------------------------------
.../controller/services/impl/CloudControllerServiceImpl.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f79d8e/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 677a9cb..9e94b85 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
@@ -771,10 +771,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
throw new UnregisteredClusterException(msg);
}
- // TODO: Fix kubernetes config
-// if (StratosConstants.KUBERNETES_DEPLOYER_TYPE.equals(cartridge.getDeployerType())) {
-// unregisterDockerService(clusterId_);
-// } else {
Runnable terminateInTimeout = new Runnable() {
@Override
public void run() {
[6/6] stratos git commit: Organize imports in rest endpoint and
metadata service
Posted by la...@apache.org.
Organize imports in rest endpoint and metadata service
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fe032336
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fe032336
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fe032336
Branch: refs/heads/master
Commit: fe032336755d0c40eb606003d74a2f551fac2ed6
Parents: a0ccfdd
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri May 15 18:14:12 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri May 15 18:41:12 2015 +0530
----------------------------------------------------------------------
.../handlers/AbstractAuthenticationAuthorizationHandler.java | 2 --
.../apache/stratos/rest/endpoint/api/StratosApiV40Utils.java | 1 -
.../org/apache/stratos/rest/endpoint/api/StratosApiV41.java | 6 ++++--
.../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 4 +++-
4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe032336/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/AbstractAuthenticationAuthorizationHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/AbstractAuthenticationAuthorizationHandler.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/AbstractAuthenticationAuthorizationHandler.java
index a6abcd9..e21374a 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/AbstractAuthenticationAuthorizationHandler.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/AbstractAuthenticationAuthorizationHandler.java
@@ -25,11 +25,9 @@ import org.apache.cxf.jaxrs.ext.RequestHandler;
import org.apache.cxf.jaxrs.impl.HttpHeadersImpl;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.message.Message;
-import org.apache.stratos.metadata.service.context.AuthenticationContext;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
-import java.util.List;
public abstract class AbstractAuthenticationAuthorizationHandler implements RequestHandler {
private final Log log = LogFactory.getLog(AbstractAuthenticationAuthorizationHandler.class);
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe032336/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
index 24374d2..abc02e9 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
@@ -23,7 +23,6 @@ import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.autoscaler.stub.AutoscalerServiceAutoScalingPolicyAlreadyExistExceptionException;
-import org.apache.stratos.autoscaler.stub.AutoscalerServiceInvalidPolicyExceptionException;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceCartridgeAlreadyExistsExceptionException;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeDefinitionExceptionException;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeTypeExceptionException;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe032336/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index b1450f4..057ce75 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -22,15 +22,17 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.autoscaler.stub.*;
import org.apache.stratos.cloud.controller.stub.*;
-import org.apache.stratos.common.beans.*;
+import org.apache.stratos.common.beans.ResponseMessageBean;
+import org.apache.stratos.common.beans.TenantInfoBean;
+import org.apache.stratos.common.beans.UserInfoBean;
import org.apache.stratos.common.beans.application.ApplicationBean;
import org.apache.stratos.common.beans.application.ApplicationNetworkPartitionIdListBean;
-import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
import org.apache.stratos.common.beans.application.domain.mapping.ApplicationDomainMappingsBean;
import org.apache.stratos.common.beans.application.domain.mapping.DomainMappingBean;
import org.apache.stratos.common.beans.application.signup.ApplicationSignUpBean;
import org.apache.stratos.common.beans.artifact.repository.GitNotificationPayloadBean;
import org.apache.stratos.common.beans.cartridge.CartridgeBean;
+import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
import org.apache.stratos.common.beans.kubernetes.KubernetesClusterBean;
import org.apache.stratos.common.beans.kubernetes.KubernetesHostBean;
import org.apache.stratos.common.beans.kubernetes.KubernetesMasterBean;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe032336/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 2d3dda5..2aca07c 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -34,7 +34,9 @@ import org.apache.stratos.cloud.controller.stub.domain.Volume;
import org.apache.stratos.common.beans.PropertyBean;
import org.apache.stratos.common.beans.TenantInfoBean;
import org.apache.stratos.common.beans.UserInfoBean;
-import org.apache.stratos.common.beans.application.*;
+import org.apache.stratos.common.beans.application.ApplicationBean;
+import org.apache.stratos.common.beans.application.ApplicationNetworkPartitionIdListBean;
+import org.apache.stratos.common.beans.application.ComponentBean;
import org.apache.stratos.common.beans.application.domain.mapping.ApplicationDomainMappingsBean;
import org.apache.stratos.common.beans.application.domain.mapping.DomainMappingBean;
import org.apache.stratos.common.beans.application.signup.ApplicationSignUpBean;
[3/6] stratos git commit: Organize imports and formatting
Posted by la...@apache.org.
Organize imports and formatting
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/478c3139
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/478c3139
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/478c3139
Branch: refs/heads/master
Commit: 478c3139bc1060c380dc89aa8118438fed859550
Parents: e87e7af
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri May 15 18:03:02 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri May 15 18:41:12 2015 +0530
----------------------------------------------------------------------
.../networkpartition/NetworkPartitionAlgorithmContext.java | 2 --
.../autoscaler/context/cluster/AbstractClusterContext.java | 1 -
.../stratos/autoscaler/monitor/cluster/ClusterMonitor.java | 5 ++++-
.../processor/cluster/ClusterStatusActiveProcessor.java | 2 +-
.../processor/cluster/ClusterStatusTerminatedProcessor.java | 2 +-
.../agent/event/publisher/CartridgeAgentEventPublisher.java | 2 +-
.../java/org/apache/stratos/cli/RestCommandLineService.java | 2 +-
.../stratos/cli/commands/RemoveDomainMappingCommand.java | 7 +------
.../org/apache/stratos/common/beans/topology/MemberBean.java | 2 +-
.../apache/stratos/common/client/AutoscalerServiceClient.java | 1 -
.../receivers/LoadBalancerCommonTopologyEventReceiver.java | 4 ----
11 files changed, 10 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/NetworkPartitionAlgorithmContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/NetworkPartitionAlgorithmContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/NetworkPartitionAlgorithmContext.java
index b605d4f..fc29b22 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/NetworkPartitionAlgorithmContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/NetworkPartitionAlgorithmContext.java
@@ -18,8 +18,6 @@
*/
package org.apache.stratos.autoscaler.algorithms.networkpartition;
-import org.apache.stratos.autoscaler.pojo.policy.deployment.ApplicationPolicy;
-
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java
index 4a1c117..ae12c7e 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java
@@ -23,7 +23,6 @@ import org.apache.commons.logging.LogFactory;
import org.apache.stratos.messaging.domain.instance.ClusterInstance;
import java.io.Serializable;
-import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
index 6f9cbe4..4cb2deb 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
@@ -63,7 +63,10 @@ import org.apache.stratos.messaging.domain.topology.ClusterStatus;
import org.apache.stratos.messaging.domain.topology.Member;
import org.apache.stratos.messaging.domain.topology.Service;
import org.apache.stratos.messaging.event.health.stat.*;
-import org.apache.stratos.messaging.event.topology.*;
+import org.apache.stratos.messaging.event.topology.MemberActivatedEvent;
+import org.apache.stratos.messaging.event.topology.MemberMaintenanceModeEvent;
+import org.apache.stratos.messaging.event.topology.MemberReadyToShutdownEvent;
+import org.apache.stratos.messaging.event.topology.MemberTerminatedEvent;
import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.rule.FactHandle;
http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusActiveProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusActiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusActiveProcessor.java
index 5c5ce94..978f742 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusActiveProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusActiveProcessor.java
@@ -54,7 +54,7 @@ public class ClusterStatusActiveProcessor extends ClusterStatusProcessor {
return nextProcessor.process(type, clusterId, instanceId);
} else {
log.warn(String.format("No possible state change found for [type] %s [cluster] %s " +
- "[instance] %s", type, clusterId, instanceId));
+ "[instance] %s", type, clusterId, instanceId));
}
}
return false;
http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java
index 21de1e2..e6495af 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java
@@ -60,7 +60,7 @@ public class ClusterStatusTerminatedProcessor extends ClusterStatusProcessor {
} else {
log.warn(String.format("No possible state change found for [type] %s " +
- "[cluster] %s [instance] %s", type, clusterId, instanceId));
+ "[cluster] %s [instance] %s", type, clusterId, instanceId));
}
}
return false;
http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
index 07c4dbb..82c0b1a 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
@@ -69,7 +69,7 @@ public class CartridgeAgentEventPublisher {
CartridgeAgentConfiguration.getInstance().getPartitionId());
/*
- *
+ *
public InstanceStartedEvent(String applicationId, String serviceName, String clusterId, String memberId,
String clusterInstanceId, String networkPartitionId, String partitionId)
http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index 97eb728..3e60294 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -37,10 +37,10 @@ import org.apache.stratos.cli.utils.RowMapper;
import org.apache.stratos.common.beans.TenantInfoBean;
import org.apache.stratos.common.beans.UserInfoBean;
import org.apache.stratos.common.beans.application.ApplicationBean;
-import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
import org.apache.stratos.common.beans.application.domain.mapping.DomainMappingBean;
import org.apache.stratos.common.beans.application.signup.ApplicationSignUpBean;
import org.apache.stratos.common.beans.cartridge.CartridgeBean;
+import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
import org.apache.stratos.common.beans.cartridge.IaasProviderBean;
import org.apache.stratos.common.beans.kubernetes.KubernetesClusterBean;
import org.apache.stratos.common.beans.kubernetes.KubernetesHostBean;
http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
index 6bb0437..8142b58 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
@@ -19,12 +19,7 @@
package org.apache.stratos.cli.commands;
-import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.*;
import org.apache.stratos.cli.Command;
import org.apache.stratos.cli.RestCommandLineService;
import org.apache.stratos.cli.StratosCommandContext;
http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java
index 53e4d6e..95c3d97 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java
@@ -18,8 +18,8 @@
*/
package org.apache.stratos.common.beans.topology;
-import org.apache.stratos.common.beans.cartridge.PortMappingBean;
import org.apache.stratos.common.beans.PropertyBean;
+import org.apache.stratos.common.beans.cartridge.PortMappingBean;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
index ccc89d6..cbf0183 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
@@ -29,7 +29,6 @@ import org.apache.stratos.autoscaler.stub.deployment.policy.ApplicationPolicy;
import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy;
import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext;
import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup;
-import org.apache.stratos.cloud.controller.stub.exception.CartridgeNotFoundException;
import org.apache.stratos.common.constants.StratosConstants;
import java.rmi.RemoteException;
http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/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 1202db2..faac524 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
@@ -25,10 +25,6 @@ import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.domain.LoadBalancingIPType;
import org.apache.stratos.load.balancer.common.topology.TopologyProvider;
import org.apache.stratos.messaging.domain.topology.*;
-import org.apache.stratos.messaging.domain.topology.Cluster;
-import org.apache.stratos.messaging.domain.topology.Member;
-import org.apache.stratos.messaging.domain.topology.Port;
-import org.apache.stratos.messaging.domain.topology.Service;
import org.apache.stratos.messaging.event.Event;
import org.apache.stratos.messaging.event.topology.*;
import org.apache.stratos.messaging.listener.topology.*;
[5/6] stratos git commit: Remove unnecessary code for locking code
and relevant try - atch block
Posted by la...@apache.org.
Remove unnecessary code for locking code and relevant try - atch block
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/203db9f8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/203db9f8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/203db9f8
Branch: refs/heads/master
Commit: 203db9f883454c6a6b8d1a28bf5e804a3f9e5963
Parents: ed853a5
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri May 15 18:29:33 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri May 15 18:41:12 2015 +0530
----------------------------------------------------------------------
.../publisher/ClusterStatusEventPublisher.java | 46 +++++++++-----------
1 file changed, 20 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/203db9f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java
index 6998646..c0ae737 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java
@@ -211,37 +211,31 @@ public class ClusterStatusEventPublisher {
public static void sendClusterTerminatedEvent(String appId, String serviceName,
String clusterId, String instanceId) {
- try {
- //TopologyManager.acquireReadLockForCluster(serviceName, clusterId);
- Service service = TopologyManager.getTopology().getService(serviceName);
- if (service != null) {
- Cluster cluster = service.getCluster(clusterId);
- ClusterInstance clusterInstance = cluster.getInstanceContexts(instanceId);
- if (clusterInstance == null) {
- log.warn(String.format("Cluster instance not found: [instance-id] %s", instanceId));
- return;
- }
+ Service service = TopologyManager.getTopology().getService(serviceName);
+ if (service != null) {
+ Cluster cluster = service.getCluster(clusterId);
+ ClusterInstance clusterInstance = cluster.getInstanceContexts(instanceId);
+ if (clusterInstance == null) {
+ log.warn(String.format("Cluster instance not found: [instance-id] %s", instanceId));
+ return;
+ }
- if (clusterInstance.isStateTransitionValid(ClusterStatus.Terminated)) {
- if (clusterInstance.getStatus() != ClusterStatus.Terminated) {
- ClusterStatusClusterTerminatedEvent appStatusClusterTerminatedEvent =
- new ClusterStatusClusterTerminatedEvent(appId, serviceName, clusterId, instanceId);
+ if (clusterInstance.isStateTransitionValid(ClusterStatus.Terminated)) {
+ if (clusterInstance.getStatus() != ClusterStatus.Terminated) {
+ ClusterStatusClusterTerminatedEvent appStatusClusterTerminatedEvent =
+ new ClusterStatusClusterTerminatedEvent(appId, serviceName, clusterId, instanceId);
- publishEvent(appStatusClusterTerminatedEvent);
- } else {
- if (log.isDebugEnabled()) {
- log.warn("Cluster is already terminated, [cluster] " + clusterId);
- }
- }
+ publishEvent(appStatusClusterTerminatedEvent);
} else {
- log.warn("Terminated is not in the possible state list for [ClusterInstance] " +
- clusterInstance.getInstanceId() + " of [cluster] " +
- clusterId + " as it is current state is " + clusterInstance.getStatus());
+ if (log.isDebugEnabled()) {
+ log.warn("Cluster is already terminated, [cluster] " + clusterId);
+ }
}
+ } else {
+ log.warn("Terminated is not in the possible state list for [ClusterInstance] " +
+ clusterInstance.getInstanceId() + " of [cluster] " +
+ clusterId + " as it is current state is " + clusterInstance.getStatus());
}
- } finally {
- //TopologyManager.releaseReadLockForCluster(serviceName, clusterId);
-
}
}
[2/6] stratos git commit: Remove unnecessary logs and commented code
Posted by la...@apache.org.
Remove unnecessary logs and commented code
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ed853a57
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ed853a57
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ed853a57
Branch: refs/heads/master
Commit: ed853a57a4c22cc061ccee7aafaaa7cd27170531
Parents: fe03233
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri May 15 18:18:42 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri May 15 18:41:12 2015 +0530
----------------------------------------------------------------------
.../impl/CloudControllerServiceImpl.java | 41 --------------------
1 file changed, 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ed853a57/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 b617cd9..677a9cb 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
@@ -235,44 +235,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
throw new IllegalArgumentException(msg);
}
-
- if (log.isDebugEnabled()) {
- log.debug("CloudControllerServiceImpl:addServiceGroup:" + servicegroup.getName());
- }
-
- String[] subGroups = servicegroup.getCartridges();
-
-
- if (log.isDebugEnabled()) {
- log.debug("CloudControllerServiceImpl:addServiceGroup:subGroups" + subGroups);
- if (subGroups != null) {
- log.debug("CloudControllerServiceImpl:addServiceGroup:subGroups:size" + subGroups.length);
- } else {
- log.debug("CloudControllerServiceImpl:addServiceGroup:subGroups: is null");
- }
- }
-
-
- Dependencies dependencies = servicegroup.getDependencies();
-
- if (log.isDebugEnabled()) {
- log.debug("CloudControllerServiceImpl:addServiceGroup:dependencies" + dependencies);
- }
-
- if (dependencies != null) {
- String[] startupOrders = dependencies.getStartupOrders();
-
- if (log.isDebugEnabled()) {
- log.debug("CloudControllerServiceImpl:addServiceGroup:startupOrders" + startupOrders);
-
- if (startupOrders != null) {
- log.debug("CloudControllerServiceImpl:addServiceGroup:startupOrder:size" + startupOrders.length);
- } else {
- log.debug("CloudControllerServiceImpl:addServiceGroup:startupOrder: is null");
- }
- }
- }
-
CloudControllerContext.getInstance().addServiceGroup(servicegroup);
CloudControllerContext.getInstance().persist();
return true;
@@ -468,9 +430,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
log.debug("Payload: " + payload.toString());
}
-// iaasProvider.setPayload(payload.toString().getBytes());
-// iaas.setDynamicPayload(iaasProvider.getPayload());
-
if (clusterContext.isVolumeRequired()) {
Volume[] volumes = clusterContext.getVolumes();
[4/6] stratos git commit: Fix formatting issues in LB extension
Posted by la...@apache.org.
Fix formatting issues in LB extension
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a0ccfdd8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a0ccfdd8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a0ccfdd8
Branch: refs/heads/master
Commit: a0ccfdd8a1af4266be8d2f32110c92daee83039f
Parents: 478c313
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri May 15 18:13:50 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri May 15 18:41:12 2015 +0530
----------------------------------------------------------------------
.../load/balancer/extension/api/LoadBalancer.java | 4 ++++
.../extension/api/LoadBalancerExtension.java | 15 ++++++++++++---
.../LoadBalancerExtensionAPIServiceComponent.java | 3 +++
3 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a0ccfdd8/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
index 266fb48..55836f8 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
+++ b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
@@ -29,18 +29,21 @@ public interface LoadBalancer {
/**
* Start a new load balancer instance.
+ *
* @throws LoadBalancerExtensionException if the start operation fails
*/
void start() throws LoadBalancerExtensionException;
/**
* Stop running load balancer instance.
+ *
* @throws LoadBalancerExtensionException if the stop operation fails.
*/
void stop() throws LoadBalancerExtensionException;
/**
* Configure the load balancer using the given topology.
+ *
* @param topology latest topology to be configured
* @return Returns true if configured correctly
* @throws LoadBalancerExtensionException if the configuration operation fails.
@@ -49,6 +52,7 @@ public interface LoadBalancer {
/**
* Reload load balancer configuration using the configuration written in configure() method.
+ *
* @throws LoadBalancerExtensionException if the reload operation fails.
*/
void reload() throws LoadBalancerExtensionException;
http://git-wip-us.apache.org/repos/asf/stratos/blob/a0ccfdd8/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java
index 585aace..421b261 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java
+++ b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java
@@ -107,7 +107,8 @@ public class LoadBalancerExtension {
/**
* Start topology event receiver thread.
- * @param executorService executor service instance
+ *
+ * @param executorService executor service instance
* @param topologyProvider topology provider instance
*/
private void startTopologyEventReceiver(ExecutorService executorService, TopologyProvider topologyProvider) {
@@ -140,7 +141,8 @@ public class LoadBalancerExtension {
/**
* Start domain mapping event receiver thread.
- * @param executorService executor service instance
+ *
+ * @param executorService executor service instance
* @param topologyProvider topology receiver instance
*/
private void startDomainMappingEventReceiver(ExecutorService executorService, TopologyProvider topologyProvider) {
@@ -154,7 +156,8 @@ public class LoadBalancerExtension {
/**
* Start application signup event receiver thread.
- * @param executorService executor service instance
+ *
+ * @param executorService executor service instance
* @param topologyProvider topology provider instance
*/
private void startApplicationSignUpEventReceiver(ExecutorService executorService, TopologyProvider topologyProvider) {
@@ -168,6 +171,7 @@ public class LoadBalancerExtension {
/**
* Add topology event listeners to the topology event receiver.
+ *
* @param topologyEventReceiver topology event receiver instance
*/
private void addTopologyEventListeners(final LoadBalancerCommonTopologyEventReceiver topologyEventReceiver) {
@@ -227,6 +231,7 @@ public class LoadBalancerExtension {
/**
* Configure and start the load balancer
+ *
* @throws LoadBalancerExtensionException if configuration or start process fails
*/
private void configureAndStart() throws LoadBalancerExtensionException {
@@ -246,6 +251,7 @@ public class LoadBalancerExtension {
/**
* Configure and reload the load balancer
+ *
* @throws LoadBalancerExtensionException if the configuration or reload process fails
*/
private void configureAndReload() throws LoadBalancerExtensionException {
@@ -258,6 +264,7 @@ public class LoadBalancerExtension {
/**
* Returns true if topology has populated with at least one member.
+ *
* @param topology topology to be validated
* @return true if at least one member was found else false
*/
@@ -316,6 +323,7 @@ public class LoadBalancerExtension {
/**
* Get executor service of the load balancer extension.
+ *
* @return executor service
*/
public ExecutorService getExecutorService() {
@@ -324,6 +332,7 @@ public class LoadBalancerExtension {
/**
* Set executor service for the load balancer extension.
+ *
* @param executorService executor service instance
*/
public void setExecutorService(ExecutorService executorService) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/a0ccfdd8/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java
index a856bce..10e0496 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java
+++ b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java
@@ -36,6 +36,7 @@ public class LoadBalancerExtensionAPIServiceComponent {
/**
* Service component activate method.
+ *
* @param context component context
*/
protected void activate(ComponentContext context) {
@@ -50,6 +51,7 @@ public class LoadBalancerExtensionAPIServiceComponent {
/**
* Set configuration context service.
+ *
* @param contextService
*/
protected void setConfigurationContextService(ConfigurationContextService contextService) {
@@ -57,6 +59,7 @@ public class LoadBalancerExtensionAPIServiceComponent {
/**
* Unset configuration context service.
+ *
* @param contextService
*/
protected void unsetConfigurationContextService(ConfigurationContextService contextService) {