stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ud...@apache.org
Subject [08/10] git commit: Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping
Date Tue, 07 Oct 2014 12:18:10 GMT
Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping

Conflicts:
	components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d3e6bb50
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d3e6bb50
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d3e6bb50

Branch: refs/heads/4.0.0-grouping
Commit: d3e6bb5039a8e827418900d2f9fec81bc3d2b73c
Parents: a07a753 7778756
Author: Udara Liyanage <udara@wso2.com>
Authored: Tue Oct 7 17:20:07 2014 +0530
Committer: Udara Liyanage <udara@wso2.com>
Committed: Tue Oct 7 17:20:07 2014 +0530

----------------------------------------------------------------------
 .../grouping/dependency/DependencyBuilder.java  |   2 +-
 .../grouping/dependency/DependencyTree.java     |  55 +++-
 .../stratos/autoscaler/monitor/Monitor.java     |  84 ++---
 .../monitor/application/ApplicationMonitor.java |  12 +-
 .../autoscaler/monitor/group/GroupMonitor.java  |   9 -
 .../parser/DefaultApplicationParser.java        | 328 ++++++++-----------
 .../impl/CloudControllerServiceImpl.java        |  35 +-
 .../interfaces/ApplicationParser.java           |  17 +
 .../controller/topology/TopologyBuilder.java    |   9 +-
 .../messaging/domain/topology/Application.java  |  28 +-
 .../domain/topology/ClusterDataHolder.java      |   7 +
 .../messaging/domain/topology/Group.java        |  12 +-
 .../domain/topology/ParentBehavior.java         |  76 ++++-
 13 files changed, 356 insertions(+), 318 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/d3e6bb50/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java
index 2a7b25f,156ab77..7865dde
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java
@@@ -504,35 -571,35 +572,35 @@@ public class DefaultApplicationParser i
          }
  
          return clusterDataMap;
-         //return new ClusterDataHolder(clusterDataMap, clusters);
-         //clusterDataHolder.setPayloadDataHolders(payloadDataHolders);
      }
  
-     private ApplicationClusterContext createApplicationClusterContext(String appId, String
groupName, Cartridge cartridge,
-                                                                       String subscriptionKey,
int tenantId, String repoUrl,
-                                                                       String alias, String
clusterId, String hostname,
-                                                                       String deploymentPolicy,
boolean isLB, String[] dependencyAliases)
+     /**
+      * Creates a ApplicationClusterContext object to keep information related to a Cluster
in this Application
+      *
+      * @param appId Application id
+      * @param groupName Group name
+      * @param cartridge Cartridge information
+      * @param subscriptionKey Generated key for the Application
+      * @param tenantId Tenant Id of the tenant which deployed the Application
+      * @param repoUrl Repository URL
+      * @param alias alias specified for this Subscribable in the Application Definition
+      * @param clusterId Cluster id
+      * @param hostname Hostname
+      * @param deploymentPolicy Deployment policy used
+      * @param isLB if this cluster is an LB
+      * @return ApplicationClusterContext object with relevant information
+      *
+      * @throws ApplicationDefinitionException If any error occurs
+      */
+     private ApplicationClusterContext createApplicationClusterContext (String appId, String
groupName, Cartridge cartridge,
+                                                                        String subscriptionKey,
int tenantId, String repoUrl,
+                                                                        String alias, String
clusterId, String hostname,
 -                                                                       String deploymentPolicy,
boolean isLB)
++                                                                       String deploymentPolicy,
boolean isLB, String[] dependencyAliases)
              throws ApplicationDefinitionException {
  
          // Create text payload
-         //String textPayload = ApplicationUtils.getTextPayload(appId, groupName, clusterId).toString();
- 
          String textPayload = ApplicationUtils.createPayload(appId, groupName, cartridge,
subscriptionKey, tenantId, clusterId,
 -                hostname, repoUrl, alias, null).toString();
 +                hostname, repoUrl, alias, null, dependencyAliases).toString();
  
          return new ApplicationClusterContext(cartridge.getType(), clusterId, hostname, textPayload,
deploymentPolicy, isLB);
      }


Mime
View raw message