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/02/14 11:36:28 UTC

[1/2] git commit: throwing RestAPIException from the rest EP in place of ADCException

Updated Branches:
  refs/heads/master c6df23163 -> 029cca0e3


throwing RestAPIException from the rest EP in place of ADCException


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

Branch: refs/heads/master
Commit: ede099b274272db130eccca49481a5506e216bb9
Parents: 3024588
Author: Isuru <is...@wso2.com>
Authored: Fri Feb 14 16:05:46 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Feb 14 16:05:46 2014 +0530

----------------------------------------------------------------------
 .../rest/endpoint/services/ServiceUtils.java    | 19 +++++++---------
 .../rest/endpoint/services/StratosAdmin.java    | 23 ++++++++++----------
 2 files changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ede099b2/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 3f6b7e1..af0f61e 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
@@ -20,7 +20,6 @@ package org.apache.stratos.rest.endpoint.services;
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
@@ -51,16 +50,14 @@ import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition;
 import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup;
 import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy;
 import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PersistanceMappingBean;
 import org.apache.stratos.rest.endpoint.bean.cartridge.definition.ServiceDefinitionBean;
 import org.apache.stratos.rest.endpoint.bean.util.converter.PojoConverter;
 import org.apache.stratos.rest.endpoint.exception.RestAPIException;
 
+import javax.ws.rs.core.Response;
 import java.util.*;
 import java.util.regex.Pattern;
 
-import javax.ws.rs.core.Response;
-
 public class ServiceUtils {
     public static final String IS_VOLUME_REQUIRED = "volume.required";
     public static final String SHOULD_DELETE_VOLUME = "volume.delete.on.unsubscription";
@@ -424,7 +421,7 @@ public class ServiceUtils {
         return PojoConverter.populatePartitionGroupPojos(partitionGroups);
     }
 
-    static Cartridge getAvailableSingleTenantCartridgeInfo(String cartridgeType, Boolean multiTenant, ConfigurationContext configurationContext) throws ADCException, RestAPIException {
+    static Cartridge getAvailableSingleTenantCartridgeInfo(String cartridgeType, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
        List<Cartridge> cartridges = getAvailableCartridges(null, null, configurationContext);
         for(Cartridge cartridge : cartridges) {
             if(cartridge.getCartridgeType().equals(cartridgeType)) {
@@ -434,7 +431,7 @@ public class ServiceUtils {
          throw new RestAPIException("cannot find the required cartridge Type") ;
     }
 
-    static List<Cartridge> getAvailableLbCartridges(Boolean multiTenant, ConfigurationContext configurationContext) throws ADCException {
+    static List<Cartridge> getAvailableLbCartridges(Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
        List<Cartridge> cartridges = getAvailableCartridges(null, multiTenant, configurationContext);
         List<Cartridge> lbCartridges = new ArrayList<Cartridge>();
         for(Cartridge cartridge : cartridges) {
@@ -445,7 +442,7 @@ public class ServiceUtils {
         return lbCartridges;
     }
 
-    static List<Cartridge> getAvailableCartridges(String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext) throws ADCException {
+    static List<Cartridge> getAvailableCartridges(String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
         List<Cartridge> cartridges = new ArrayList<Cartridge>();
 
         if (log.isDebugEnabled()) {
@@ -542,7 +539,7 @@ public class ServiceUtils {
         } catch (Exception e) {
             String msg = "Error when getting available cartridges. " + e.getMessage();
             log.error(msg, e);
-            throw new ADCException("An error occurred getting available cartridges ", e);
+            throw new RestAPIException("An error occurred getting available cartridges ", e);
         }
 
         Collections.sort(cartridges);
@@ -601,7 +598,7 @@ public class ServiceUtils {
         return new ServiceDefinitionBean();
     }
 
-	static List<Cartridge> getSubscriptions (String cartridgeSearchString, ConfigurationContext configurationContext) throws ADCException {
+	static List<Cartridge> getSubscriptions (String cartridgeSearchString, ConfigurationContext configurationContext) throws RestAPIException {
 
         List<Cartridge> cartridges = new ArrayList<Cartridge>();
 
@@ -651,7 +648,7 @@ public class ServiceUtils {
         } catch (Exception e) {
             String msg = "Error when getting subscribed cartridges. " + e.getMessage();
             log.error(msg, e);
-            throw new ADCException("An Error occurred when getting subscribed cartridges.", e);
+            throw new RestAPIException("An Error occurred when getting subscribed cartridges.", e);
         }
 
         Collections.sort(cartridges);
@@ -689,7 +686,7 @@ public class ServiceUtils {
     	
     }
 
-    static int getActiveInstances(String cartridgeType, String cartridgeAlias, ConfigurationContext configurationContext) throws ADCException {
+    static int getActiveInstances(String cartridgeType, String cartridgeAlias, ConfigurationContext configurationContext) throws RestAPIException {
     	int noOfActiveInstances = 0;
         Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext)
                 ,cartridgeType , cartridgeAlias);

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ede099b2/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 cd907fd..6c0b4c0 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
@@ -26,7 +26,6 @@ import org.apache.stratos.common.util.ClaimsMgtUtil;
 import org.apache.stratos.common.util.CommonUtil;
 import org.apache.stratos.manager.dto.Cartridge;
 import org.apache.stratos.manager.dto.SubscriptionInfo;
-import org.apache.stratos.manager.exception.ADCException;
 import org.apache.stratos.rest.endpoint.ServiceHolder;
 import org.apache.stratos.rest.endpoint.Utils;
 import org.apache.stratos.rest.endpoint.annotation.AuthorizationAction;
@@ -274,7 +273,7 @@ public class StratosAdmin extends AbstractAdmin {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
-    public Cartridge[] getAvailableMultiTenantCartridges() throws ADCException {
+    public Cartridge[] getAvailableMultiTenantCartridges() throws RestAPIException {
         List<Cartridge> cartridges = ServiceUtils.getAvailableCartridges(null, true, getConfigContext());
         return cartridges.isEmpty() ? new Cartridge[0] : cartridges.toArray(new Cartridge[cartridges.size()]);
     }
@@ -284,7 +283,7 @@ public class StratosAdmin extends AbstractAdmin {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
-    public Cartridge[] getAvailableSingleTenantCartridges() throws ADCException {
+    public Cartridge[] getAvailableSingleTenantCartridges() throws RestAPIException {
         List<Cartridge> cartridges = ServiceUtils.getAvailableCartridges(null, false, getConfigContext());
         return cartridges.isEmpty() ? new Cartridge[0] : cartridges.toArray(new Cartridge[cartridges.size()]);
     }
@@ -294,7 +293,7 @@ public class StratosAdmin extends AbstractAdmin {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
-    public Cartridge[] getAvailableCartridges() throws ADCException {
+    public Cartridge[] getAvailableCartridges() throws RestAPIException {
         List<Cartridge> cartridges = ServiceUtils.getAvailableCartridges(null, null, getConfigContext());
         return cartridges.isEmpty() ? new Cartridge[0] : cartridges.toArray(new Cartridge[cartridges.size()]);
     }
@@ -305,7 +304,7 @@ public class StratosAdmin extends AbstractAdmin {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
-    public Cartridge[] getSubscribedCartridges() throws ADCException {
+    public Cartridge[] getSubscribedCartridges() throws RestAPIException {
         List<Cartridge> cartridgeList = ServiceUtils.getSubscriptions(null, getConfigContext());
         // Following is very important when working with axis2
         return cartridgeList.isEmpty() ? new Cartridge[0] : cartridgeList.toArray(new Cartridge[cartridgeList.size()]);
@@ -326,7 +325,7 @@ public class StratosAdmin extends AbstractAdmin {
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
     public Cartridge getAvailableSingleTenantCartridgeInfo(@PathParam("cartridgeType") String cartridgeType)
-                                            throws ADCException, RestAPIException {
+                                            throws RestAPIException {
         return ServiceUtils.getAvailableSingleTenantCartridgeInfo(cartridgeType, false, getConfigContext());
     }
 
@@ -336,7 +335,7 @@ public class StratosAdmin extends AbstractAdmin {
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
     public List<Cartridge> getAvailableLbCartridges()
-                                            throws ADCException {
+                                            throws RestAPIException {
         return ServiceUtils.getAvailableLbCartridges(false, getConfigContext());
     }
 
@@ -346,7 +345,7 @@ public class StratosAdmin extends AbstractAdmin {
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
     public int getActiveInstances(@PathParam("cartridgeType") String cartridgeType,
-                              @PathParam("subscriptionAlias") String subscriptionAlias) throws ADCException {
+                              @PathParam("subscriptionAlias") String subscriptionAlias) throws RestAPIException {
         return ServiceUtils.getActiveInstances(cartridgeType, subscriptionAlias, getConfigContext());
     }
 
@@ -373,7 +372,7 @@ public class StratosAdmin extends AbstractAdmin {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
-    public Cluster[] getClustersForTenant() throws ADCException {
+    public Cluster[] getClustersForTenant() throws RestAPIException {
 
         return ServiceUtils.getClustersForTenant(getConfigContext());
     }
@@ -383,7 +382,7 @@ public class StratosAdmin extends AbstractAdmin {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
-    public Cluster[] getClusters(@PathParam("cartridgeType") String cartridgeType) throws ADCException {
+    public Cluster[] getClusters(@PathParam("cartridgeType") String cartridgeType) throws RestAPIException {
 
         return ServiceUtils.getClustersForTenantAndCartridgeType(getConfigContext(), cartridgeType);
     }
@@ -394,7 +393,7 @@ public class StratosAdmin extends AbstractAdmin {
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
     public Cluster getCluster(@PathParam("cartridgeType") String cartridgeType,
-                              @PathParam("subscriptionAlias") String subscriptionAlias) throws ADCException, RestAPIException {
+                              @PathParam("subscriptionAlias") String subscriptionAlias) throws RestAPIException, RestAPIException {
 
         return ServiceUtils.getCluster(cartridgeType, subscriptionAlias, getConfigContext());
     }
@@ -404,7 +403,7 @@ public class StratosAdmin extends AbstractAdmin {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
-    public Cluster getCluster(@PathParam("clusterId") String clusterId) throws ADCException {
+    public Cluster getCluster(@PathParam("clusterId") String clusterId) throws RestAPIException {
     	Cluster cluster = null;
     	if(log.isDebugEnabled()) {
     		log.debug("Finding the Cluster for [id]: "+clusterId);


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos


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

Branch: refs/heads/master
Commit: 029cca0e30b66d84f345594f8a8ced548d6ea149
Parents: ede099b c6df231
Author: Isuru <is...@wso2.com>
Authored: Fri Feb 14 16:05:55 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Feb 14 16:05:55 2014 +0530

----------------------------------------------------------------------
 .../stratos/autoscaler/PartitionContext.java    | 17 +++++++
 .../topology/AutoscalerTopologyReceiver.java    | 20 ++++++--
 .../controllers/cartridgeSubscribeSubmit.jag    | 10 ++++
 .../theme1/partials/subscribe_cartridge.hbs     | 46 ++++++++++++++++---
 .../theme1/renderers/configure_stratos.js       |  7 ---
 .../renderers/configure_stratos_wizard.js       | 48 ++++++++++++++------
 .../console/themes/theme1/renderers/index.js    |  1 +
 .../theme1/renderers/subscribe_cartridge.js     |  3 --
 .../console/util/utility.jag                    |  6 +--
 .../apache/stratos/manager/dto/Cartridge.java   | 10 ++++
 .../rest/endpoint/services/ServiceUtils.java    |  3 ++
 .../main/webapp/stratos/WEB-INF/cxf-servlet.xml |  2 +-
 12 files changed, 134 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/029cca0e/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------