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/11/11 07:51:53 UTC
git commit: type migration to Sope as enum
Updated Branches:
refs/heads/master 2e6af556a -> c5cabb718
type migration to Sope as enum
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c5cabb71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c5cabb71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c5cabb71
Branch: refs/heads/master
Commit: c5cabb718d5ff2b541326b21fc3e9b947ef98335
Parents: 2e6af55
Author: rekathiru <rt...@gmail.com>
Authored: Mon Nov 11 12:21:41 2013 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Mon Nov 11 12:21:41 2013 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/axiom/AxiomXpathParser.java | 7 ++++---
.../cloud/controller/topology/TopologyEventSender.java | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c5cabb71/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 7f36ddb..41742f1 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
@@ -35,6 +35,7 @@ import org.apache.stratos.cloud.controller.topology.TopologyBuilder;
import org.apache.stratos.cloud.controller.topology.TopologyManager;
import org.apache.stratos.cloud.controller.util.*;
import org.apache.stratos.messaging.domain.topology.Partition;
+import org.apache.stratos.messaging.domain.topology.Scope;
import org.jaxen.JaxenException;
import org.w3c.dom.Element;
import org.wso2.securevault.SecretResolver;
@@ -473,7 +474,7 @@ public class AxiomXpathParser {
if (partition == null) {
partition = new Partition();
partition.setId(id);
- partition.setScope(type);
+ partition.setScope(Scope.valueOf(type));
loadProperties(iaasElt, partition.getProperties());
//handle partition created event
TopologyBuilder.handlePartitionCreated(partition);
@@ -481,14 +482,14 @@ public class AxiomXpathParser {
} else {
Partition partition1 = new Partition();
partition1.setId(id);
- partition1.setScope(type);
+ partition1.setScope(Scope.valueOf(type));
loadProperties(iaasElt, partition1.getProperties());
Gson gson = new Gson();
String partitionS = gson.toJson(partition);
String partition1S = gson.toJson(partition1);
if (!partitionS.endsWith(partition1S)) {
partition.setId(id);
- partition.setScope(type);
+ partition.setScope(Scope.valueOf(type));
loadProperties(iaasElt, partition.getProperties());
//handle update partition event
TopologyBuilder.handlePartitionUpdated(partition, oldPartition);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c5cabb71/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
index 09c1202..bb879f9 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
@@ -60,7 +60,7 @@ public class TopologyEventSender {
public static void sendPartitionCreatedEvent(Partition partition) {
PartitionCreatedEvent partitionCreatedEvent =
new PartitionCreatedEvent(partition.getId(),
- partition.getScope());
+ partition.getScope().toString());
partitionCreatedEvent.setProperties(partition.getProperties());
publishEvent(partitionCreatedEvent);
}
@@ -68,7 +68,7 @@ public class TopologyEventSender {
public static void sendPartitionUpdatedEvent(Partition partition, String oldPartitionId) {
PartitionUpdatedEvent partitionUpdatedEvent =
new PartitionUpdatedEvent(partition.getId(),
- partition.getScope(),
+ partition.getScope().toString(),
oldPartitionId);
partitionUpdatedEvent.setProperties(partition.getProperties());
publishEvent(partitionUpdatedEvent);