Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ceb407eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ceb407eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ceb407eb Branch: refs/heads/master Commit: ceb407eb033335b3fb5f324a8f8850734052c4e0 Parents: 5359937 d40d83f Author: Imesh Gunaratne <[email protected]> Authored: Tue Dec 3 15:32:19 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Dec 3 15:32:19 2013 +0530 ---------------------------------------------------------------------- .../apache/stratos/autoscaler/Constants.java | 2 + .../health/HealthEventMessageDelegator.java | 34 +------ .../processors/AutoscalerTopologyReceiver.java | 22 +++-- .../src/test/resources/autoscaler-old.drl | 97 ++++++++++++++------ .../src/test/resources/autoscaler.drl | 97 ++++++-------------- .../controller/topology/TopologyBuilder.java | 3 + .../event/topology/MemberActivatedEvent.java | 10 ++ .../topology/InstanceSpawnedEventProcessor.java | 1 + .../FaultMessageEventFormatter.xml | 2 +- tools/stratos-installer/conf/setup.conf | 4 +- .../config/cc/repository/conf/jndi.properties | 4 + tools/stratos-installer/setup.sh | 68 ++------------ tools/stratos-installer/start-servers.sh | 2 +- 13 files changed, 145 insertions(+), 201 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ceb407eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java ----------------------------------------------------------------------
