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 2014/03/31 18:38:57 UTC
[1/2] git commit: fix STRATOS-556: adding public ip associate option
with VPC
Repository: incubator-stratos
Updated Branches:
refs/heads/master d2499fbd4 -> 34e00b72e
fix STRATOS-556: adding public ip associate option with VPC
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/36fd85f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/36fd85f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/36fd85f1
Branch: refs/heads/master
Commit: 36fd85f1caf552e1145636697e0ba8d26325251b
Parents: de87ec6
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Mar 31 09:36:31 2014 -0700
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Mar 31 09:36:31 2014 -0700
----------------------------------------------------------------------
.../org.apache.stratos.cloud.controller/pom.xml | 2 +-
.../cloud/controller/iaases/AWSEC2Iaas.java | 18 ++++++++++++++----
.../impl/CloudControllerServiceImpl.java | 9 +++++----
.../controller/util/CloudControllerConstants.java | 2 +-
dependencies/pom.xml | 1 +
5 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36fd85f1/components/org.apache.stratos.cloud.controller/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml
index 582c02a..62e4da9 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -194,7 +194,7 @@
<dependency>
<groupId>org.apache.jclouds.provider</groupId>
<artifactId>aws-ec2</artifactId>
- <version>${jclouds.version}</version>
+ <version>${<jclouds class="stratos "></jclouds>version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36fd85f1/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
index 0702ace..56afc82 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
@@ -144,6 +144,17 @@ public class AWSEC2Iaas extends Iaas {
.inboundPorts(new int[] {});
// set EC2 specific options
+
+
+ if (iaasInfo.getProperty(CloudControllerConstants.ASSOCIATE_PUBLIC_IP_ADDRESS) != null) {
+ boolean associatePublicIp = Boolean.parseBoolean(iaasInfo.getProperty(
+ CloudControllerConstants.ASSOCIATE_PUBLIC_IP_ADDRESS));
+ if(associatePublicIp){
+ template.getOptions().as(AWSEC2TemplateOptions.class)
+ .associatePublicIpAddress();
+ }
+ }
+
if (iaasInfo.getProperty(CloudControllerConstants.SUBNET_ID) != null) {
template.getOptions().as(AWSEC2TemplateOptions.class)
.subnetId(iaasInfo.getProperty(CloudControllerConstants.SUBNET_ID));
@@ -158,9 +169,8 @@ public class AWSEC2Iaas extends Iaas {
if (iaasInfo.getProperty(CloudControllerConstants.SECURITY_GROUPS) != null) {
template.getOptions()
.as(AWSEC2TemplateOptions.class)
- .securityGroups(
- iaasInfo.getProperty(CloudControllerConstants.SECURITY_GROUPS).split(
- CloudControllerConstants.ENTRY_SEPARATOR));
+ .securityGroups(iaasInfo.getProperty(CloudControllerConstants.SECURITY_GROUPS).split(
+ CloudControllerConstants.ENTRY_SEPARATOR));
}
@@ -396,7 +406,7 @@ public class AWSEC2Iaas extends Iaas {
Set<AvailabilityZoneInfo> availabilityZones =
zoneRegionApi.describeAvailabilityZonesInRegion(region,
- new DescribeAvailabilityZonesOptions[0]);
+ new DescribeAvailabilityZonesOptions[0]);
for (AvailabilityZoneInfo zoneInfo : availabilityZones) {
String configuredZone = zoneInfo.getZone();
if (zone.equalsIgnoreCase(configuredZone)) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36fd85f1/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index adff085..625485e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -18,6 +18,7 @@
*/
package org.apache.stratos.cloud.controller.impl;
+import com.google.common.net.InetAddresses;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.concurrent.ThreadExecutor;
@@ -48,8 +49,6 @@ import java.util.*;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
-import com.google.common.net.InetAddresses;
-
/**
* Cloud Controller Service is responsible for starting up new server instances,
* terminating already started instances, providing pending instance count etc.
@@ -838,7 +837,8 @@ public class CloudControllerServiceImpl implements CloudControllerService {
ClusterContext ctxt = buildClusterContext(cartridge, clusterId,
payload, hostName, props, isLb);
-
+
+
dataHolder.addClusterContext(ctxt);
TopologyBuilder.handleClusterCreated(registrant, isLb);
@@ -850,7 +850,8 @@ public class CloudControllerServiceImpl implements CloudControllerService {
private ClusterContext buildClusterContext(Cartridge cartridge,
String clusterId, String payload, String hostName,
Properties props, boolean isLb) {
-
+
+
// initialize ClusterContext
ClusterContext ctxt = new ClusterContext(clusterId, cartridge.getType(), payload,
hostName, isLb);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36fd85f1/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index 0418078..c7c77a2 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -250,7 +250,7 @@ public final class CloudControllerConstants {
public static final String TAGS = "tags";
public static final String AUTO_ASSIGN_IP = "autoAssignIp";
public static final String INSTANCE_TYPE = "instanceType";
-
+ public static final String ASSOCIATE_PUBLIC_IP_ADDRESS = "associatePublicIpAddress";
public static final String LB_CLUSTER_ID_COL = "lbclusterId";
public static final String NETWORK_INTERFACES = "networkInterfaces";
public static final String NETWORK_FIXED_IP = "fixedIp";
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36fd85f1/dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 09b5fc8..3d37b55 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -37,6 +37,7 @@
<modules>
<module>jclouds/apis/vcloud/1.7.1-stratos</module>
<module>jclouds/apis/openstack-nova/1.7.1-stratos</module>
+ <module>jclouds/provider/aws-ec2/1.7.1-stratos</module>
</modules>
</project>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/34e00b72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/34e00b72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/34e00b72
Branch: refs/heads/master
Commit: 34e00b72e7e27cdeda37134ddf86d256c84e074b
Parents: 36fd85f d2499fb
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Mar 31 09:36:41 2014 -0700
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Mar 31 09:36:41 2014 -0700
----------------------------------------------------------------------
.gitignore | 3 +
.../stratos/autoscaler/AutoscalerContext.java | 20 +
.../apache/stratos/autoscaler/Constants.java | 21 +
.../exception/InvalidPartitionException.java | 21 +
.../exception/PartitionValidationException.java | 21 +
.../exception/PolicyValidationException.java | 21 +
.../autoscaler/exception/SpawningException.java | 21 +
.../exception/TerminationException.java | 21 +
.../interfaces/AutoScalerServiceInterface.java | 21 +
.../autoscaler/registry/RegistryManager.java | 21 +
.../apache/stratos/autoscaler/rule/RuleLog.java | 21 +
.../autoscaler/rule/RuleTasksDelegator.java | 21 +
.../stratos/autoscaler/util/Serializer.java | 21 +
.../autoscaler/util/ServiceReferenceHolder.java | 21 +
.../stratos/autoscaler/TestBasicRules.java | 60 ---
.../stratos/cartridge/agent/CartridgeAgent.java | 21 +
.../config/CartridgeAgentConfiguration.java | 21 +
.../publisher/CartridgeAgentEventPublisher.java | 21 +
.../stratos/cli/beans/topology/Cluster.java | 21 +
.../stratos/cli/beans/topology/Member.java | 21 +
.../cli/beans/topology/MemberStatus.java | 21 +
.../apache/stratos/cli/beans/topology/Port.java | 21 +
.../concurrent/PartitionValidatorCallable.java | 88 +++++
.../impl/CloudControllerServiceImpl.java | 67 ++--
.../controller/registry/RegistryManager.java | 8 +-
.../runtime/FasterLookUpDataHolder.java | 17 +-
.../console/data/cartridge_deployments.json | 10 -
.../console/data/cartridges.json | 35 --
.../console/data/clusters.json | 122 ------
.../console/data/config_status.json | 4 -
.../console/data/dashboard.json | 197 ----------
.../console/data/elbs.json | 20 -
.../console/data/lbs.json | 10 -
.../console/data/mt_service_deployments.json | 10 -
.../console/data/mycartridges.json | 35 --
.../console/data/node_mem_cpu.json | 114 ------
.../console/data/partition_deployments.json | 22 --
.../console/data/policy_deployments.json | 10 -
.../console/data/tenants.json | 19 -
.../console/subscribe_cartridge.jag | 4 +
.../console/themes/theme1/pages/index.hbs | 2 -
.../console/themes/theme1/pages/plain.hbs | 1 -
.../theme1/partials/subscribe_cartridge.hbs | 7 +-
.../theme1/renderers/subscribe_cartridge.js | 1 +
.../themes/theme1/ui/custom-fonts/Read Me.txt | 5 -
.../theme1/ui/custom-fonts/fonts/stratos.eot | Bin 6660 -> 0 bytes
.../theme1/ui/custom-fonts/fonts/stratos.svg | 21 -
.../theme1/ui/custom-fonts/fonts/stratos.ttf | Bin 6496 -> 0 bytes
.../theme1/ui/custom-fonts/fonts/stratos.woff | Bin 6572 -> 0 bytes
.../theme1/ui/custom-fonts/selection.json | 268 -------------
.../themes/theme1/ui/custom-fonts/style.css | 61 ---
.../console/themes/theme1/ui/js/main.js | 1 -
.../vendor/modernizr-2.6.2-respond-1.1.0.min.js | 11 -
.../themes/theme1/ui/js/vendor/raphael-min.js | 11 -
.../console/util/utility.jag | 4 +
.../messaging/message/filter/MessageFilter.java | 20 +
.../filter/topology/TopologyMemberFilter.java | 20 +
.../stat/HealthStatMessageProcessorChain.java | 20 +
.../stat/HealthStatEventMessageQueue.java | 23 +-
.../stratos/rest/endpoint/bean/Error.java | 20 +
.../HealthStatisticsEventBuilder.xml | 21 +
.../InstanceStatusStatisticsBuilder.xml | 21 +
.../LoadBalancerStatisticsEventBuilder.xml | 21 +
.../AverageInFlightRequestsEventFormatter.xml | 21 +
.../AverageLoadAverageEventFormatter.xml | 21 +
.../AverageMemoryConsumptionEventFormatter.xml | 21 +
.../FaultMessageEventFormatter.xml | 21 +
.../GradientInFlightRequestsEventFormatter.xml | 21 +
.../GradientLoadAverageEventFormatter.xml | 21 +
.../GradientMemoryConsumptionEventFormatter.xml | 21 +
.../MemberAverageLoadAverageEventFormatter.xml | 21 +
...erAverageMemoryConsumptionEventFormatter.xml | 21 +
.../MemberGradientLoadAverageEventFormatter.xml | 21 +
...rGradientMemoryConsumptionEventFormatter.xml | 21 +
...econdDerivativeLoadAverageEventFormatter.xml | 21 +
...erivativeMemoryConsumptionEventFormatter.xml | 21 +
...DerivativeInFlightRequestsEventFormatter.xml | 21 +
...econdDerivativeLoadAverageEventFormatter.xml | 21 +
...erivativeMemoryConsumptionEventFormatter.xml | 21 +
.../executionplans/AverageHeathRequest.xml | 21 +
.../AverageInFlightRequestsFinder.xml | 21 +
.../executionplans/GradientOfHealthRequest.xml | 21 +
.../GradientOfRequestsInFlightFinder.xml | 21 +
.../SecondDerivativeOfHealthRequest.xml | 21 +
...SecondDerivativeOfRequestsInFlightFinder.xml | 21 +
.../DefaultWSO2EventInputAdaptor.xml | 21 +
.../DefaultWSO2EventOutputAdaptor.xml | 21 +
.../outputeventadaptors/JMSOutputAdaptor.xml | 21 +
.../streamdefinitions/stream-manager-config.xml | 22 ++
.../distribution/src/main/conf/jndi.properties | 21 +
.../src/test/resources/automation.properties | 21 +
.../src/test/resources/jndi.properties | 23 +-
.../modules/scripts/ec2/clean.sh | 20 +
.../src/main/conf/cipher-tool.properties | 21 +
.../distribution/src/main/conf/jndi.properties | 21 +
products/stratos-manager/conf/jndi.properties | 21 +
products/stratos-manager/conf/log4j.properties | 6 +-
.../conf/temp-artifacts/carbon/module.xml | 24 +-
.../carbon/scripts/registry/artifacts.js | 21 +
.../carbon/scripts/registry/registry-osgi.js | 21 +
.../carbon/scripts/registry/registry-ws.js | 23 +-
.../carbon/scripts/registry/registry.js | 23 +-
.../carbon/scripts/server/config.js | 23 +-
.../carbon/scripts/server/osgi.js | 23 +-
.../carbon/scripts/server/server.js | 23 +-
.../carbon/scripts/server/tenant.js | 23 +-
.../carbon/scripts/user/registry-space.js | 23 +-
.../temp-artifacts/carbon/scripts/user/space.js | 23 +-
.../carbon/scripts/user/user-manager.js | 21 +
.../temp-artifacts/carbon/scripts/user/user.js | 21 +
.../conf/temp-artifacts/sso/module.xml | 24 +-
.../temp-artifacts/sso/scripts/sso.client.js | 21 +
products/stratos/conf/jndi.properties | 24 +-
.../conf/temp-artifacts/carbon/module.xml | 24 +-
.../carbon/scripts/registry/artifacts.js | 21 +
.../carbon/scripts/registry/registry-osgi.js | 21 +
.../carbon/scripts/registry/registry-ws.js | 23 +-
.../carbon/scripts/registry/registry.js | 23 +-
.../carbon/scripts/server/config.js | 23 +-
.../carbon/scripts/server/osgi.js | 23 +-
.../carbon/scripts/server/server.js | 23 +-
.../carbon/scripts/server/tenant.js | 23 +-
.../carbon/scripts/user/registry-space.js | 23 +-
.../temp-artifacts/carbon/scripts/user/space.js | 23 +-
.../carbon/scripts/user/user-manager.js | 21 +
.../temp-artifacts/carbon/scripts/user/user.js | 21 +
.../stratos/conf/temp-artifacts/sso/module.xml | 24 +-
.../temp-artifacts/sso/scripts/sso.client.js | 21 +
products/stratos/modules/distribution/pom.xml | 17 +
.../modules/distribution/src/assembly/bin.xml | 8 +
.../src/main/conf/cipher-tool.properties | 21 +
.../DefaultWSO2EventInputAdaptor.xml | 21 +
.../DefaultWSO2EventOutputAdaptor.xml | 21 +
.../distribution/src/main/conf/jndi.properties | 21 +
tools/cartridge-create/README | 50 ---
tools/cartridge-create/configure-software | 383 -------------------
tools/cartridge-create/create-kvm-image.sh | 24 --
tools/cartridge-create/image-action.sh | 165 --------
.../init-scripts/default/default | 43 ---
.../init-scripts/default/default.ctrg | 51 ---
.../init-scripts/default/get-launch-params.rb | 55 ---
.../default/stratos-openstack-init.sh | 57 ---
.../init-scripts/default/stratos.pem | 16 -
.../init-scripts/mysql/ec2/get-launch-params.rb | 51 ---
.../init-scripts/mysql/ec2/healthcheck.sh | 32 --
.../init-scripts/mysql/ec2/stratos-init.sh | 152 --------
.../init-scripts/mysql/get-launch-params.rb | 55 ---
tools/cartridge-create/init-scripts/mysql/mysql | 46 ---
.../init-scripts/mysql/mysql.ctrg | 58 ---
.../mysql/openstack/get-launch-params.rb | 55 ---
.../init-scripts/mysql/openstack/healthcheck.sh | 30 --
.../mysql/openstack/stratos-init.sh | 165 --------
.../init-scripts/mysql/stratos.pem | 16 -
.../init-scripts/mysql/vcloud/stratos-init.sh | 152 --------
.../php/cartridge-data-publisher-1.0.2.zip | Bin 2832200 -> 0 bytes
tools/cartridge-create/init-scripts/php/default | 59 ---
.../init-scripts/php/default-ssl | 190 ---------
.../init-scripts/php/ec2/get-launch-params.rb | 54 ---
.../init-scripts/php/ec2/healthcheck.sh | 32 --
.../init-scripts/php/ec2/stratos-init.sh | 304 ---------------
.../init-scripts/php/get-launch-params.rb | 55 ---
.../php/openstack/get-launch-params.rb | 55 ---
.../init-scripts/php/openstack/healthcheck.sh | 30 --
.../init-scripts/php/openstack/stratos-init.sh | 293 --------------
tools/cartridge-create/init-scripts/php/php | 49 ---
.../cartridge-create/init-scripts/php/php.ctrg | 65 ----
.../init-scripts/php/thrift-0.8.0.tar.gz | Bin 2379006 -> 0 bytes
.../cartridge-create/init-scripts/php/wso2.pem | 16 -
tools/cartridge-create/init-scripts/php/x.sh | 50 ---
tools/cartridge-create/init-scripts/php/y.sh | 32 --
.../init-scripts/tomcat/get-launch-params.rb | 53 ---
.../tomcat/openstack/get-launch-params.rb | 55 ---
.../tomcat/openstack/healthcheck.sh | 30 --
.../tomcat/openstack/stratos-init.sh | 289 --------------
.../init-scripts/tomcat/payload/README | 21 -
.../init-scripts/tomcat/payload/launch-params | 18 -
.../init-scripts/tomcat/stratos-init.sh | 274 -------------
.../init-scripts/tomcat/stratos.pem | 16 -
tools/cartridge-create/stratos-image | 100 -----
tools/cartridge-create/stratos-image-local | 310 ---------------
tools/cartridge-create/uploadimg.sh | 32 --
tools/puppet3-agent/config.sh | 6 +-
tools/puppet3/auth.conf | 17 +
tools/puppet3/autosign.conf | 16 +
tools/puppet3/fileserver.conf | 17 +
tools/puppet3/manifests/nodes.pp | 47 +--
tools/puppet3/manifests/site.pp | 17 +
tools/puppet3/modules/agent/manifests/init.pp | 17 +
.../modules/agent/manifests/initialize.pp | 33 +-
.../modules/agent/manifests/push_templates.pp | 33 +-
tools/puppet3/modules/agent/manifests/start.pp | 33 +-
.../templates/extensions/addons/_mysql.erb | 17 +
.../agent/templates/extensions/addons/_ruby.erb | 17 +
tools/puppet3/modules/java/manifests/init.pp | 17 +
.../modules/java/templates/java_home.sh.erb | 17 +
tools/puppet3/modules/lb/manifests/clean.pp | 33 +-
tools/puppet3/modules/lb/manifests/deploy.pp | 33 +-
tools/puppet3/modules/lb/manifests/init.pp | 33 +-
.../puppet3/modules/lb/manifests/initialize.pp | 33 +-
tools/puppet3/modules/lb/manifests/params.pp | 33 +-
.../modules/lb/manifests/push_templates.pp | 33 +-
tools/puppet3/modules/lb/manifests/start.pp | 33 +-
tools/puppet3/modules/mysql/manifests/init.pp | 17 +
.../modules/mysql/templates/000-default.erb | 17 +
.../puppet3/modules/mysql/templates/my.cnf.erb | 17 +
.../modules/mysql/templates/phpMyAdmin.conf.erb | 17 +
tools/puppet3/modules/nodejs/manifests/init.pp | 17 +
.../modules/php/lib/facter/stratos_facts.rb | 17 +
.../puppet3/modules/php/manifests/init.pp.cent | 17 +
tools/puppet3/modules/php/manifests/init.pp.deb | 17 +
tools/puppet3/modules/php/manifests/init.pp.rpm | 17 +
.../modules/php/templates/httpd/httpd.conf.erb | 17 +
tools/puppet3/modules/ruby/manifests/init.pp | 17 +
.../modules/ruby/templates/ruby-start.sh.erb | 18 +
tools/puppet3/modules/tomcat/manifests/init.pp | 17 +
.../puppet3/modules/wordpress/manifests/init.pp | 17 +
.../wordpress/templates/httpd/httpd.conf.erb | 17 +
tools/puppet3/puppet.conf | 17 +
.../config/as/repository/conf/jndi.properties | 21 +
.../config/cc/repository/conf/jndi.properties | 21 +
.../config/sm/repository/conf/jndi.properties | 21 +
tools/stratos-installer/stratos-db-clean.sh | 20 +
222 files changed, 2914 insertions(+), 5456 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/34e00b72/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index 625485e,05d98cb..d206722
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@@ -18,9 -18,9 +18,10 @@@
*/
package org.apache.stratos.cloud.controller.impl;
+import com.google.common.net.InetAddresses;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+ import org.apache.stratos.cloud.controller.concurrent.PartitionValidatorCallable;
import org.apache.stratos.cloud.controller.concurrent.ThreadExecutor;
import org.apache.stratos.cloud.controller.deployment.partition.Partition;
import org.apache.stratos.cloud.controller.exception.*;
@@@ -47,8 -47,12 +48,10 @@@ import org.wso2.carbon.registry.core.ex
import java.util.*;
import java.util.Properties;
+ import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
+ import java.util.concurrent.Future;
-import com.google.common.net.InetAddresses;
-
/**
* Cloud Controller Service is responsible for starting up new server instances,
* terminating already started instances, providing pending instance count etc.