You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/07/20 18:48:13 UTC
[3/3] git commit: removing duplicated groups from top level
removing duplicated groups from top level
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b097cbc4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b097cbc4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b097cbc4
Branch: refs/heads/4.0.0-grouping
Commit: b097cbc48fae7e56d0b2d22d9b0d6c4c69d2699f
Parents: 7443868
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Sun Jul 20 22:17:33 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Sun Jul 20 22:17:33 2014 +0530
----------------------------------------------------------------------
.../CompositeApplicationManager.java | 2 --
.../DefaultCompositeApplicationParser.java | 4 ++--
.../structure/CompositeAppContext.java | 22 ++++++++++++++++++++
.../application/structure/GroupContext.java | 19 ++++++++++++++++-
.../application/structure/StartupOrder.java | 18 ++++++++++++++++
.../structure/SubscribableContext.java | 18 ++++++++++++++++
.../deployer/DefaultServiceGroupDeployer.java | 2 +-
.../RegistryBasedPersistenceManager.java | 2 +-
8 files changed, 80 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b097cbc4/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java
index 75434d0..b4db5de 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java
@@ -35,8 +35,6 @@ public class CompositeApplicationManager {
CompositeApplicationParser compositeAppParser = new DefaultCompositeApplicationParser();
CompositeAppContext compositeAppContext = compositeAppParser.parse(compositeAppDefinition);
- Set<GroupContext> topLevelGroupsContexts = compositeAppContext.getGroupContexts();
-
log.info("Composite Application [ Id: " + compositeAppDefinition.getApplicationId() + " , alias: "
+ compositeAppDefinition.getAlias() + " ] deployed successfully");
http://git-wip-us.apache.org/repos/asf/stratos/blob/b097cbc4/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java
index 436e647..ef6814b 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java
@@ -186,10 +186,10 @@ public class DefaultCompositeApplicationParser implements CompositeApplicationPa
Map<String, SubscribableInfo> subscribableInformation)
throws CompositeApplicationDefinitionException {
- CompositeAppContext compositeAppContext = new CompositeAppContext();
+ CompositeAppContext compositeAppContext = new CompositeAppContext(compositeAppDefinition.getApplicationId());
- // get top level Subscribables
if (compositeAppDefinition.getComponents() != null) {
+ // get top level Subscribables
if (compositeAppDefinition.getComponents().getSubscribables() != null) {
compositeAppContext.setSubscribableContexts(getSubsribableContexts(compositeAppDefinition.getComponents().getSubscribables(),
subscribableInformation));
http://git-wip-us.apache.org/repos/asf/stratos/blob/b097cbc4/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/CompositeAppContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/CompositeAppContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/CompositeAppContext.java
index 6a589e7..4cb7073 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/CompositeAppContext.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/CompositeAppContext.java
@@ -33,6 +33,10 @@ public class CompositeAppContext {
private String killBehaviour;
+ public CompositeAppContext (String appId) {
+ this.appId = appId;
+ }
+
public String getAppId() {
return appId;
}
@@ -72,4 +76,22 @@ public class CompositeAppContext {
public void setKillBehaviour(String killBehaviour) {
this.killBehaviour = killBehaviour;
}
+
+ public boolean equals(Object other) {
+
+ if(this == other) {
+ return true;
+ }
+ if(!(other instanceof CompositeAppContext)) {
+ return false;
+ }
+
+ CompositeAppContext that = (CompositeAppContext)other;
+ return this.appId.equals(that.appId);
+ }
+
+ public int hashCode () {
+
+ return appId.hashCode();
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b097cbc4/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/GroupContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/GroupContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/GroupContext.java
index e7736ea..b235c1b 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/GroupContext.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/GroupContext.java
@@ -19,7 +19,6 @@
package org.apache.stratos.manager.composite.application.structure;
-import java.util.List;
import java.util.Set;
public class GroupContext {
@@ -104,4 +103,22 @@ public class GroupContext {
public void setSubscribableContexts(Set<SubscribableContext> subscribableContexts) {
this.subscribableContexts = subscribableContexts;
}
+
+ public boolean equals(Object other) {
+
+ if(this == other) {
+ return true;
+ }
+ if(!(other instanceof GroupContext)) {
+ return false;
+ }
+
+ GroupContext that = (GroupContext)other;
+ return this.name.equals(that.name) && this.alias.equals(that.alias);
+ }
+
+ public int hashCode () {
+
+ return name.hashCode() + alias.hashCode();
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b097cbc4/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/StartupOrder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/StartupOrder.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/StartupOrder.java
index 4553a9f..4617090 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/StartupOrder.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/StartupOrder.java
@@ -45,4 +45,22 @@ public class StartupOrder {
public void setAfter(String after) {
this.after = after;
}
+
+ public boolean equals(Object other) {
+
+ if(this == other) {
+ return true;
+ }
+ if(!(other instanceof StartupOrder)) {
+ return false;
+ }
+
+ StartupOrder that = (StartupOrder)other;
+ return this.start.equals(that.start) && this.after.equals(that.after);
+ }
+
+ public int hashCode () {
+
+ return start.hashCode() + after.hashCode();
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b097cbc4/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/SubscribableContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/SubscribableContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/SubscribableContext.java
index 2e30c1b..a336a62 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/SubscribableContext.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/SubscribableContext.java
@@ -105,4 +105,22 @@ public class SubscribableContext {
public void setPassword(String password) {
this.password = password;
}
+
+ public boolean equals(Object other) {
+
+ if(this == other) {
+ return true;
+ }
+ if(!(other instanceof SubscribableContext)) {
+ return false;
+ }
+
+ SubscribableContext that = (SubscribableContext)other;
+ return this.cartridgeType.equals(that.cartridgeType) && this.alias.equals(that.alias);
+ }
+
+ public int hashCode () {
+
+ return cartridgeType.hashCode() + alias.hashCode();
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b097cbc4/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java
index 4744f9f..2fd3eee 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java
@@ -59,7 +59,7 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer {
throw new InvalidServiceGroupException("Service Group definition not found");
}
- // if any cartridges are specified in the group, they should be already deployed
+// if any cartridges are specified in the group, they should be already deployed
if (serviceGroupDefinition.getCartridges() != null) {
List<String> cartridgeTypes = serviceGroupDefinition.getCartridges();
http://git-wip-us.apache.org/repos/asf/stratos/blob/b097cbc4/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java
index 6a829bb..9bab469 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java
@@ -81,7 +81,7 @@ public class RegistryBasedPersistenceManager extends PersistenceManager {
// persist
try {
- RegistryManager.getInstance().persist(STRATOS_MANAGER_REOSURCE + CARTRIDGES + ACTIVE_SUBSCRIPTIONS + "/" +
+ RegistryManager.getInstance().persist(STRATOS_MANAGER_REOSURCE + ACTIVE_SUBSCRIPTIONS + CARTRIDGES + "/" +
Integer.toString(cartridgeSubscription.getSubscriber().getTenantId()) + "/" +
cartridgeSubscription.getType() + "/" +
cartridgeSubscription.getAlias(), Serializer.serializeSubscriptionSontextToByteArray(cartridgeSubscription), cartridgeSubscription.getClusterDomain());