Repository: stratos Updated Branches: refs/heads/4.0.0-grouping aadd589f3 -> 92f26acbc
messaging component merging Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/92f26acb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/92f26acb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/92f26acb Branch: refs/heads/4.0.0-grouping Commit: 92f26acbc976d03a4c328b7b8181036f877092bb Parents: aadd589 Author: Isuru Haththotuwa <[email protected]> Authored: Thu Aug 28 16:26:52 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Thu Aug 28 16:26:52 2014 +0530 ---------------------------------------------------------------------- .../event/topology/MemberActivatedEvent.java | 7 +------ .../event/topology/MemberTerminatedEvent.java | 8 +------- .../endpoint/bean/util/converter/PojoConverter.java | 8 +------- .../stratos/rest/endpoint/services/ServiceUtils.java | 14 -------------- .../stratos/rest/endpoint/services/StratosAdmin.java | 9 --------- 5 files changed, 3 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/92f26acb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java index 23ef560..20d1273 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java @@ -21,16 +21,11 @@ package org.apache.stratos.messaging.event.topology; import java.io.Serializable; import java.util.*; -<<<<<<< HEAD - import org.apache.stratos.messaging.domain.topology.Port; - -import java.io.Serializable; import java.util.Collection; import java.util.HashMap; import java.util.Map; -======= ->>>>>>> master + /** * This event is fired by Cloud Controller when a member has started it's server and http://git-wip-us.apache.org/repos/asf/stratos/blob/92f26acb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java index e0c0503..42f6d5f 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java @@ -34,10 +34,7 @@ public class private final String networkPartitionId; private final String partitionId; private final String memberId; -<<<<<<< HEAD private String groupId; -======= ->>>>>>> master private Properties properties; @@ -68,8 +65,6 @@ public class public String getNetworkPartitionId() { return networkPartitionId; } - -<<<<<<< HEAD public String getGroupId() { return groupId; } @@ -77,8 +72,7 @@ public class public void setGroupId(String groupId) { this.groupId = groupId; } -======= ->>>>>>> master + public Properties getProperties() { return properties; } http://git-wip-us.apache.org/repos/asf/stratos/blob/92f26acb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index 68dec87..974c34d 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@ -19,10 +19,7 @@ package org.apache.stratos.rest.endpoint.bean.util.converter; -<<<<<<< HEAD import org.apache.commons.logging.LogFactory; -======= ->>>>>>> master import org.apache.commons.lang.StringUtils; import org.apache.stratos.cloud.controller.stub.pojo.*; import org.apache.stratos.manager.deploy.service.Service; @@ -153,11 +150,8 @@ public class PojoConverter { return iaasConfigsArray; } -<<<<<<< HEAD - public static Persistence getPersistence(PersistenceBean persistenceBean) { -======= public static Persistence getPersistence(PersistenceBean persistenceBean) { ->>>>>>> master + Persistence persistence = new Persistence(); persistence.setPersistanceRequired(persistenceBean.isRequired); VolumeBean[] volumeBean = new VolumeBean[persistenceBean.volume.size()]; http://git-wip-us.apache.org/repos/asf/stratos/blob/92f26acb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index 0654c35..a2c2491 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -24,28 +24,22 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy; -<<<<<<< HEAD import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeConfig; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.CompositeApplicationDefinition; import org.apache.stratos.cloud.controller.stub.pojo.Property; -======= ->>>>>>> master import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPartitionExceptionException; import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPolicyExceptionException; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeDefinitionExceptionException; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeTypeExceptionException; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCompositeApplicationDefinitionExceptionException; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidIaasProviderExceptionException; -<<<<<<< HEAD import org.apache.stratos.manager.composite.application.beans.CompositeAppDefinition; import org.apache.stratos.manager.composite.application.CompositeApplicationManager; -======= import org.apache.stratos.cloud.controller.stub.pojo.CartridgeConfig; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Property; ->>>>>>> master import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.deploy.service.Service; @@ -1170,10 +1164,6 @@ public class ServiceUtils { subscriptionData.setRepositoryPassword(cartridgeInfoBean.getRepoPassword()); subscriptionData.setCommitsEnabled(cartridgeInfoBean.isCommitsEnabled()); subscriptionData.setServiceGroup(cartridgeInfoBean.getServiceGroup()); -<<<<<<< HEAD - -======= ->>>>>>> master PersistenceBean persistenceBean = cartridgeInfoBean.getPersistence(); if(persistenceBean != null) { @@ -1202,10 +1192,6 @@ public class ServiceUtils { subscriptionData.setPersistanceCtxt(persistenceContext); } */ -<<<<<<< HEAD - -======= ->>>>>>> master //subscribe SubscriptionInfo subscriptionInfo = null; try{ http://git-wip-us.apache.org/repos/asf/stratos/blob/92f26acb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java index e50214e..2759ad4 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java @@ -30,10 +30,7 @@ import org.apache.stratos.manager.dto.Cartridge; import org.apache.stratos.manager.dto.SubscriptionInfo; import org.apache.stratos.manager.exception.DomainMappingExistsException; import org.apache.stratos.manager.exception.ServiceDoesNotExistException; -<<<<<<< HEAD import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition; -======= ->>>>>>> master import org.apache.stratos.manager.subscription.CartridgeSubscription; import org.apache.stratos.manager.subscription.SubscriptionDomain; import org.apache.stratos.rest.endpoint.ServiceHolder; @@ -74,10 +71,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -<<<<<<< HEAD -======= ->>>>>>> master import java.net.URI; import java.util.ArrayList; import java.util.List; @@ -252,7 +246,6 @@ public class StratosAdmin extends AbstractAdmin { ServiceUtils.undeployCartridge(cartridgeType); return Response.noContent().build(); -<<<<<<< HEAD } @POST @@ -291,8 +284,6 @@ public class StratosAdmin extends AbstractAdmin { ServiceUtils.undeployServiceGroupDefinition(groupDefinitionName); return Response.noContent().build(); -======= ->>>>>>> master } @POST
