You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2014/10/30 13:18:18 UTC
git commit: STRATOS-934
Repository: stratos
Updated Branches:
refs/heads/docker-grouping-merge be580189e -> 622404640
STRATOS-934
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/62240464
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/62240464
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/62240464
Branch: refs/heads/docker-grouping-merge
Commit: 62240464052b72134a9d0feab29730e350ddf9e1
Parents: be58018
Author: R-Rajkumar <rr...@gmail.com>
Authored: Thu Oct 30 17:48:01 2014 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Thu Oct 30 17:48:01 2014 +0530
----------------------------------------------------------------------
.../manager/CartridgeSubscriptionManager.java | 10 +++++-----
.../endpoint/bean/util/converter/PojoConverter.java | 15 +++++++--------
.../stratos/rest/endpoint/services/ServiceUtils.java | 8 ++------
.../stratos/rest/endpoint/services/StratosAdmin.java | 2 --
4 files changed, 14 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/62240464/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 7d59bc9..6991947 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
@@ -616,7 +616,7 @@ public class CartridgeSubscriptionManager {
eventPublisher.publish(event);
}
- public List<SubscriptionDomain> getSubscriptionDomains(int tenantId, String subscriptionAlias)
+ public static List<SubscriptionDomain> getSubscriptionDomains(int tenantId, String subscriptionAlias)
throws ADCException {
try {
@@ -634,7 +634,7 @@ public class CartridgeSubscriptionManager {
}
}
- public SubscriptionDomain getSubscriptionDomain(int tenantId, String subscriptionAlias, String domain)
+ public static SubscriptionDomain getSubscriptionDomain(int tenantId, String subscriptionAlias, String domain)
throws ADCException {
try {
@@ -692,7 +692,7 @@ public class CartridgeSubscriptionManager {
}
}
- public Collection<CartridgeSubscription> getCartridgeSubscriptions (int tenantId, String type) throws ADCException {
+ public static Collection<CartridgeSubscription> getCartridgeSubscriptions (int tenantId, String type) throws ADCException {
if (type == null || type.isEmpty()) {
return new DataInsertionAndRetrievalManager().getCartridgeSubscriptions(tenantId);
@@ -715,7 +715,7 @@ public class CartridgeSubscriptionManager {
* @throws ADCException
* @throws NotSubscribedException
*/
- public void unsubscribeFromCartridge (String tenantDomain, String alias)
+ public static void unsubscribeFromCartridge (String tenantDomain, String alias)
throws ADCException, NotSubscribedException {
DataInsertionAndRetrievalManager dataInsertionAndRetrievalManager = new DataInsertionAndRetrievalManager();
@@ -791,7 +791,7 @@ public class CartridgeSubscriptionManager {
* @param cartridgeType
* @return
*/
- public Collection<CartridgeSubscription> isCartridgeSubscribed(int tenantId, String cartridgeType) {
+ public static Collection<CartridgeSubscription> isCartridgeSubscribed(int tenantId, String cartridgeType) {
DataInsertionAndRetrievalManager dataInsertionAndRetrievalManager = new DataInsertionAndRetrievalManager();
return dataInsertionAndRetrievalManager.getCartridgeSubscriptions(tenantId, cartridgeType);
http://git-wip-us.apache.org/repos/asf/stratos/blob/62240464/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 871078f..172f252 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
@@ -24,8 +24,13 @@ import org.apache.stratos.autoscaler.stub.kubernetes.PropertiesE;
import org.apache.stratos.autoscaler.stub.kubernetes.PropertyE;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.pojo.application.xsd.ApplicationContext;
+import org.apache.stratos.cloud.controller.pojo.application.xsd.ComponentContext;
+import org.apache.stratos.cloud.controller.pojo.application.xsd.DependencyContext;
+import org.apache.stratos.cloud.controller.pojo.application.xsd.GroupContext;
+import org.apache.stratos.cloud.controller.pojo.application.xsd.SubscribableContext;
+import org.apache.stratos.cloud.controller.pojo.application.xsd.SubscribableInfoContext;
import org.apache.stratos.cloud.controller.stub.pojo.*;
-import org.apache.stratos.cloud.controller.stub.pojo.application.*;
import org.apache.stratos.manager.composite.application.beans.ApplicationDefinition;
import org.apache.stratos.manager.composite.application.beans.GroupDefinition;
import org.apache.stratos.manager.composite.application.beans.SubscribableDefinition;
@@ -197,16 +202,12 @@ public class PojoConverter {
}
public static Persistence getPersistence(PersistenceBean persistenceBean) {
- public static Persistence getPersistence(PersistenceBean persistenceBean) {
-
Persistence persistence = new Persistence();
persistence.setPersistanceRequired(persistenceBean.isRequired);
VolumeBean[] volumeBean = new VolumeBean[persistenceBean.volume.size()];
persistenceBean.volume.toArray(volumeBean);
Volume[] volumes = new Volume[persistenceBean.volume.size()];
for (int i = 0; i < volumes.length; i++) {
- Volume[] volumes = new Volume[persistenceBean.volume.size()];
- for (int i = 0 ; i < volumes.length ; i++) {
Volume volume = new Volume();
volume.setId(volumeBean[i].id);
volume.setVolumeId(volumeBean[i].volumeId);
@@ -892,8 +893,6 @@ public class PojoConverter {
return portRangeBean;
}
- private static Log log = LogFactory.getLog(PojoConverter.class);
-
public static ApplicationContext convertApplicationBeanToApplicationContext (ApplicationDefinition compositeAppDefinition) {
ApplicationContext applicationContext = new ApplicationContext();
@@ -985,7 +984,7 @@ public class PojoConverter {
return groupContexts;
}
- private static SubscribableContext [] getSubscribableContextArrayFromSubscribableDefinitions(List<SubscribableDefinition> subscribableDefinitions) {
+ private static SubscribableContext[] getSubscribableContextArrayFromSubscribableDefinitions(List<SubscribableDefinition> subscribableDefinitions) {
SubscribableContext[] subscribableContexts = new SubscribableContext[subscribableDefinitions.size()];
int i = 0;
http://git-wip-us.apache.org/repos/asf/stratos/blob/62240464/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 53b8e52..dc164b8 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
@@ -25,15 +25,14 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.autoscaler.stub.*;
import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy;
+import org.apache.stratos.cloud.controller.pojo.application.xsd.ApplicationContext;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeTypeExceptionException;
-import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPartitionExceptionException;
import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPolicyExceptionException;
import org.apache.stratos.cloud.controller.stub.*;
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;
-import org.apache.stratos.cloud.controller.stub.pojo.application.ApplicationContext;
import org.apache.stratos.manager.client.AutoscalerServiceClient;
import org.apache.stratos.manager.client.CloudControllerServiceClient;
import org.apache.stratos.manager.deploy.cartridge.CartridgeDeploymentManager;
@@ -42,10 +41,6 @@ import org.apache.stratos.manager.deploy.service.Service;
import org.apache.stratos.manager.deploy.service.ServiceDeploymentManager;
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.manager.exception.DomainMappingExistsException;
-import org.apache.stratos.manager.exception.NotSubscribedException;
-import org.apache.stratos.manager.exception.ServiceDoesNotExistException;
import org.apache.stratos.manager.exception.*;
import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition;
import org.apache.stratos.manager.grouping.manager.ServiceGroupingManager;
@@ -82,6 +77,7 @@ import org.apache.stratos.rest.endpoint.exception.RestAPIException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
+
import java.rmi.RemoteException;
import java.util.*;
import java.util.regex.Pattern;
http://git-wip-us.apache.org/repos/asf/stratos/blob/62240464/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 f889e02..f28a8e6 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
@@ -547,8 +547,6 @@ public class StratosAdmin extends AbstractAdmin {
public Response getAvailableLbCartridges() throws RestAPIException {
List<Cartridge> lbCartridges = ServiceUtils.getAvailableLbCartridges(false, getConfigContext());
return Response.ok().entity(lbCartridges.isEmpty() ? new Cartridge[0] : lbCartridges.toArray(new Cartridge[lbCartridges.size()])).build();
- List<Cartridge> lbCartridges = ServiceUtils.getAvailableLbCartridges(false, getConfigContext());
- return Response.ok().entity(lbCartridges.isEmpty() ? new Cartridge[0] : lbCartridges.toArray(new Cartridge[lbCartridges.size()])).build();
}
@GET