You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2013/10/26 16:30:11 UTC
git commit: adding policy name to the service
Updated Branches:
refs/heads/master 9e7644b25 -> 5d603374d
adding policy name to the service
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5d603374
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5d603374
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5d603374
Branch: refs/heads/master
Commit: 5d603374db763aa71a5cf5ea749f8ad91dd21c36
Parents: 9e7644b
Author: rekathiru <rt...@gmail.com>
Authored: Sat Oct 26 19:59:43 2013 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Sat Oct 26 19:59:43 2013 +0530
----------------------------------------------------------------------
components/org.apache.stratos.cloud.controller/pom.xml | 6 ------
.../stratos/cloud/controller/axiom/AxiomXpathParser.java | 4 ++++
.../stratos/cloud/controller/deployers/ServiceDeployer.java | 5 ++---
.../cloud/controller/impl/CloudControllerServiceImpl.java | 5 +++++
.../stratos/cloud/controller/topology/TopologyBuilder.java | 5 ++---
.../controller/topology/TopologyEventMessageDelegator.java | 2 +-
.../cloud/controller/util/CloudControllerConstants.java | 1 +
.../src/main/resources/service.xsd | 1 +
.../src/main/resources/services.xsd | 1 +
9 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5d603374/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 2f92c46..b4e0715 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -254,12 +254,6 @@
<version>1.7.0.R1-wso2v3</version>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.cartridge.messages</artifactId>
- <version>2.1.1</version>
- </dependency>
-
- <dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
<version>4.1.0</version>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5d603374/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/axiom/AxiomXpathParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/axiom/AxiomXpathParser.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/axiom/AxiomXpathParser.java
index fe17fb9..035c74c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/axiom/AxiomXpathParser.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/axiom/AxiomXpathParser.java
@@ -581,6 +581,10 @@ public class AxiomXpathParser {
CloudControllerConstants.SERVICE_TENANT_RANGE_ATTR))
.getAttributeValue());
+ serviceCtxt.setAutoScalerPolicyName(node.getAttribute(new QName(
+ CloudControllerConstants.POLICY_NAME))
+ .getAttributeValue());
+
OMNode cartridgeNode =
getFirstMatchingNode(xpath +
CloudControllerConstants.CARTRIDGE_ELEMENT_XPATH,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5d603374/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/ServiceDeployer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/ServiceDeployer.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/ServiceDeployer.java
index d435dd4..fcf2a61 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/ServiceDeployer.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/ServiceDeployer.java
@@ -88,9 +88,8 @@ public class ServiceDeployer extends AbstractDeployer{
// deploy
List<ServiceContext> services = parser.getServiceContexts();
-
- // notify consumer by adding services
- TopologyBuilder.handleClusterCreated(services);
+
+
// update map
fileToServiceContextListMap.put(deploymentFileData.getAbsolutePath(), new ArrayList<ServiceContext>(services));
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5d603374/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 06753a2..bc58a5c 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
@@ -1031,6 +1031,10 @@ public class CloudControllerServiceImpl implements CloudControllerService {
// persist
String uniqueName = clusterId + "-"
+ UUID.randomUUID() + ".xml";
+ newServiceCtxt.setPayloadFile("/tmp/" + newServiceCtxt.getClusterId() + ".zip");
+ newServiceCtxt.generatePayload();
+ // notify consumer by adding services
+ TopologyBuilder.handleClusterCreated(newServiceCtxt);
try {
FileUtils.writeStringToFile(new File(CloudControllerConstants.SERVICES_DIR + uniqueName),
newServiceCtxt.toXml());
@@ -1102,6 +1106,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
// find the service context
ServiceContext subjectedSerCtxt = dataHolder
.getServiceContextFromDomain(clusterId);
+ TopologyBuilder.handleClusterRemoved(subjectedSerCtxt);
if (subjectedSerCtxt == null) {
throw new UnregisteredServiceException(
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5d603374/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
index 2990067..fe30c15 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
@@ -73,12 +73,11 @@ public class TopologyBuilder {
TopologyEventSender.sendServiceRemovedEvent(cartridgeList);
}
- public static void handleClusterCreated(List<ServiceContext> serviceContexts) {
+ public static void handleClusterCreated(ServiceContext serviceContext) {
Topology topology = TopologyManager.getInstance().getTopology();
Service service;
try {
TopologyManager.getInstance().acquireWriteLock();
- for(ServiceContext serviceContext : serviceContexts) {
service = topology.getService(serviceContext.getCartridgeType());
if(service == null) {
service = new Service(serviceContext.getClusterId());
@@ -111,7 +110,7 @@ public class TopologyBuilder {
}
TopologyManager.getInstance().updateTopology(topology);
TopologyEventSender.sendClusterCreatedEvent(serviceContext);
- }
+
} finally {
TopologyManager.getInstance().releaseWriteLock();
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5d603374/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventMessageDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventMessageDelegator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventMessageDelegator.java
index 780fc5b..bdca974 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventMessageDelegator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventMessageDelegator.java
@@ -46,7 +46,7 @@ public class TopologyEventMessageDelegator implements Runnable {
String json = message.getText();
if(MemberActivatedEvent.class.getName().equals(type)) {
TopologyBuilder.handleMemberStarted((MemberStartedEvent)Util.
- jsonToObject(json, MemberActivatedEvent.class));
+ jsonToObject(json, MemberStartedEvent.class));
} else if(MemberActivatedEvent.class.getName().equals(type)) {
TopologyBuilder.handleMemberActivated((MemberActivatedEvent) Util.
jsonToObject(json, MemberActivatedEvent.class));
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5d603374/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 3f588f8..f5ebd87 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
@@ -71,6 +71,7 @@ public final class CloudControllerConstants {
public static final String SERVICE_DOMAIN_ATTR = "domain";
public static final String SERVICE_SUB_DOMAIN_ATTR = "subDomain";
public static final String SERVICE_TENANT_RANGE_ATTR = "tenantRange";
+ public static final String POLICY_NAME = "policyName";
public static final String PAYLOAD_ELEMENT = "payload";
public static final String DATA_PUBLISHER_ELEMENT = "dataPublisher";
public static final String TOPOLOGY_SYNC_ELEMENT = "topologySync";
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5d603374/components/org.apache.stratos.cloud.controller/src/main/resources/service.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/resources/service.xsd b/components/org.apache.stratos.cloud.controller/src/main/resources/service.xsd
index 43fbf0b..6d4335f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/resources/service.xsd
+++ b/components/org.apache.stratos.cloud.controller/src/main/resources/service.xsd
@@ -57,6 +57,7 @@
</xs:element>
</xs:choice>
<xs:attribute type="xs:string" name="domain" />
+ <xs:attribute type="xs:string" name="policyName" />
<xs:attribute type="xs:string" name="tenantRange" />
</xs:complexType>
</xs:element>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5d603374/components/org.apache.stratos.cloud.controller/src/main/resources/services.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/resources/services.xsd b/components/org.apache.stratos.cloud.controller/src/main/resources/services.xsd
index ae9edd8..77b18ca 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/resources/services.xsd
+++ b/components/org.apache.stratos.cloud.controller/src/main/resources/services.xsd
@@ -60,6 +60,7 @@
</xs:choice>
<xs:attribute type="xs:string" name="domain"/>
<xs:attribute type="xs:string" name="tenantRange" />
+ <xs:attribute type="xs:string" name="policyName" />
</xs:complexType>
</xs:element>
</xs:choice>