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/08/28 13:36:30 UTC

git commit: merging DomainSubscriptionDoesNotExist and CartridgeInfoBean classes

Repository: stratos
Updated Branches:
  refs/heads/4.0.0-grouping 92f26acbc -> 7a2dc588c


merging DomainSubscriptionDoesNotExist and CartridgeInfoBean classes


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

Branch: refs/heads/4.0.0-grouping
Commit: 7a2dc588c98ab738ce73fb24f545e2ce0faf3f9f
Parents: 92f26ac
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Thu Aug 28 17:06:06 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Thu Aug 28 17:06:06 2014 +0530

----------------------------------------------------------------------
 .../DomainSubscriptionDoesNotExist.java         | 27 --------------------
 .../manager/CartridgeSubscriptionManager.java   | 21 +--------------
 .../rest/endpoint/bean/CartridgeInfoBean.java   | 21 ---------------
 3 files changed, 1 insertion(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/7a2dc588/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/DomainSubscriptionDoesNotExist.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/DomainSubscriptionDoesNotExist.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/DomainSubscriptionDoesNotExist.java
index 69ab506..2e4e366 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/DomainSubscriptionDoesNotExist.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/DomainSubscriptionDoesNotExist.java
@@ -20,7 +20,6 @@ package org.apache.stratos.manager.exception;
 
 public class DomainSubscriptionDoesNotExist extends Exception {
 
-<<<<<<< HEAD
     private static final long serialVersionUID = 1L;
 
     private final String message;
@@ -46,31 +45,5 @@ public class DomainSubscriptionDoesNotExist extends Exception {
     public String getSubscriptionDomain() {
         return subscriptionDomain;
     }
-=======
-	private static final long serialVersionUID = 1L;
 
-	private final String message;
-
-	private final String subscriptionDomain;
-
-	public DomainSubscriptionDoesNotExist(String message, String subscriptionDomain, Throwable cause) {
-		super(message, cause);
-		this.message = message;
-		this.subscriptionDomain = subscriptionDomain;
-	}
-
-	public DomainSubscriptionDoesNotExist(String message, String subscriptionDomain) {
-		super(message);
-		this.message = message;
-		this.subscriptionDomain = subscriptionDomain;
-	}
-
-	public String getMessage() {
-		return message;
-	}
-
-	public String getSubscriptionDomain() {
-		return subscriptionDomain;
-	}
->>>>>>> master
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/7a2dc588/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
index 391aec6..86206fe 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
@@ -21,10 +21,6 @@ package org.apache.stratos.manager.manager;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.openjpa.util.java$util$ArrayList$proxy;
-import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
-import org.apache.stratos.cloud.controller.stub.pojo.*;
-import org.apache.stratos.cloud.controller.stub.pojo.Properties;
 import org.apache.stratos.manager.client.CloudControllerServiceClient;
 import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo;
 import org.apache.stratos.manager.deploy.service.Service;
@@ -35,14 +31,11 @@ import org.apache.stratos.manager.lb.category.*;
 import org.apache.stratos.manager.repository.Repository;
 import org.apache.stratos.manager.retriever.DataInsertionAndRetrievalManager;
 import org.apache.stratos.manager.subscriber.Subscriber;
-<<<<<<< HEAD
 import org.apache.stratos.manager.subscription.*;
-=======
 import org.apache.stratos.manager.subscription.CartridgeSubscription;
 import org.apache.stratos.manager.subscription.PersistenceContext;
 import org.apache.stratos.manager.subscription.SubscriptionData;
 import org.apache.stratos.manager.subscription.SubscriptionDomain;
->>>>>>> master
 import org.apache.stratos.manager.subscription.factory.CartridgeSubscriptionFactory;
 import org.apache.stratos.manager.subscription.tenancy.SubscriptionMultiTenantBehaviour;
 import org.apache.stratos.manager.subscription.tenancy.SubscriptionSingleTenantBehaviour;
@@ -434,18 +427,7 @@ public class CartridgeSubscriptionManager {
         }else {
         	// Generate and set the key
             subscriptionKey = CartridgeSubscriptionUtils.generateSubscriptionKey();
-<<<<<<< HEAD
-        }
-        
-        cartridgeSubscription.setSubscriptionKey(subscriptionKey);
 
-        if(log.isDebugEnabled()) {
-            log.debug("Repository with url: " + subscriptionData.getRepositoryURL() +
-                    " username: " + subscriptionData.getRepositoryUsername() +
-                    " Type: " + subscriptionData.getRepositoryType());
-        }
-        
-=======
         }
         
         cartridgeSubscription.setSubscriptionKey(subscriptionKey);
@@ -455,8 +437,7 @@ public class CartridgeSubscriptionManager {
                     " username: " + subscriptionData.getRepositoryUsername() +
                     " Type: " + subscriptionData.getRepositoryType());
         }
-        
->>>>>>> master
+
         // Create subscriber
         Subscriber subscriber = new Subscriber(subscriptionData.getTenantAdminUsername(), subscriptionData.getTenantId(), subscriptionData.getTenantDomain());
         cartridgeSubscription.setSubscriber(subscriber);

http://git-wip-us.apache.org/repos/asf/stratos/blob/7a2dc588/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
index 52973c0..6d67fe1 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
@@ -20,10 +20,6 @@ package org.apache.stratos.rest.endpoint.bean;
 
 import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PersistenceBean;
 import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PropertyBean;
-<<<<<<< HEAD
-
-=======
->>>>>>> master
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
 import java.util.List;
@@ -41,24 +37,17 @@ public class CartridgeInfoBean {
     String dataCartridgeType;
     String dataCartridgeAlias;
     boolean commitsEnabled;
-<<<<<<< HEAD
 
-=======
->>>>>>> master
     private String serviceGroup;
 
     private PersistenceBean persistence;
 
     private List<PropertyBean> property;
 
-<<<<<<< HEAD
-    public CartridgeInfoBean() {
-=======
     private List<String> domains;
 
     public CartridgeInfoBean() {
         this.domains = new ArrayList<String>();
->>>>>>> master
     }
 
     public String getCartridgeType() {
@@ -161,13 +150,8 @@ public class CartridgeInfoBean {
         return persistence;
     }
 
-<<<<<<< HEAD
-    public void setPersistence(PersistenceBean persistenceBean) {
-        this.persistence = persistenceBean;
-=======
     public void setPersistence(PersistenceBean persistence) {
         this.persistence = persistence;
->>>>>>> master
     }
 
     public List<PropertyBean> getProperty() {
@@ -177,12 +161,7 @@ public class CartridgeInfoBean {
     public void setProperty(List<PropertyBean> property) {
         this.property = property;
     }
-<<<<<<< HEAD
-=======
-
     public List<String> getDomains() { return domains; }
 
     public void setDomains(List<String> domains) { this.domains = domains; }
-
->>>>>>> master
 }