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/01/08 06:51:25 UTC
[14/46] renamed adc.mgt to manager
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription_old.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription_old.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription_old.java
deleted file mode 100644
index 370988c..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription_old.java
+++ /dev/null
@@ -1,127 +0,0 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one
-// * or more contributor license agreements. See the NOTICE file
-// * distributed with this work for additional information
-// * regarding copyright ownership. The ASF licenses this file
-// * to you under the Apache License, Version 2.0 (the
-// * "License"); you may not use this file except in compliance
-// * with the License. You may obtain a copy of the License at
-// *
-// * http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing,
-// * software distributed under the License is distributed on an
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// * KIND, either express or implied. See the License for the
-// * specific language governing permissions and limitations
-// * under the License.
-// */
-//
-//package org.apache.stratos.adc.mgt.subscription;
-//
-//import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo;
-//import org.apache.stratos.adc.mgt.dao.DataCartridge;
-//import org.apache.stratos.adc.mgt.dto.Policy;
-//import org.apache.stratos.adc.mgt.exception.*;
-//import org.apache.stratos.adc.mgt.payload.PayloadArg;
-//import org.apache.stratos.adc.mgt.repository.Repository;
-//import org.apache.stratos.adc.mgt.subscriber.Subscriber;
-//import org.apache.stratos.adc.mgt.utils.ApplicationManagementUtil;
-//import org.apache.stratos.adc.mgt.utils.CartridgeConstants;
-//import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
-//
-//import java.util.Properties;
-//
-//public class DataCartridgeSubscription extends SingleTenantCartridgeSubscription {
-//
-// private String host;
-// private String username;
-// private String password;
-//
-// public DataCartridgeSubscription(CartridgeInfo cartridgeInfo) {
-//
-// super(cartridgeInfo);
-// this.setHost("localhost");
-// this.setUsername(CartridgeConstants.MYSQL_DEFAULT_USER);
-// this.setPassword(ApplicationManagementUtil.generatePassword());
-// }
-//
-// @Override
-// public void createSubscription(Subscriber subscriber, String alias, Policy autoscalingPolicy, Repository repository)
-//
-// throws InvalidCartridgeAliasException,
-// DuplicateCartridgeAliasException, ADCException, RepositoryCredentialsRequiredException,
-// RepositoryTransportException, UnregisteredCartridgeException, AlreadySubscribedException,
-// RepositoryRequiredException, InvalidRepositoryException, PolicyException {
-//
-// super.createSubscription(subscriber, alias, autoscalingPolicy, repository);
-// }
-//
-// public Repository manageRepository (String repoURL, String repoUserName, String repoUserPassword,
-// boolean privateRepo, String cartridgeAlias, CartridgeInfo cartridgeInfo,
-// String tenantDomain) {
-//
-// //no repository for data cartridge instances
-// return null;
-// }
-//
-// public PayloadArg createPayloadParameters() throws ADCException {
-//
-// PayloadArg payloadArg = super.createPayloadParameters();
-// payloadArg.setDataCartridgeHost(this.getHost());
-// payloadArg.setDataCartridgeAdminUser(getUsername());
-// payloadArg.setDataCartridgeAdminPassword(getPassword());
-//
-// return payloadArg;
-// }
-//
-// public CartridgeSubscriptionInfo registerSubscription(Properties payloadProperties)
-// throws ADCException, UnregisteredCartridgeException {
-//
-// ApplicationManagementUtil.registerService(getType(),
-// getCluster().getClusterDomain(),
-// getCluster().getClusterSubDomain(),
-// getPayloadData().createPayload(),
-// getPayloadData().getPayloadArg().getTenantRange(),
-// getCluster().getHostName(),
-// ApplicationManagementUtil.setRegisterServiceProperties(getAutoscalingPolicyName(),
-// getSubscriber().getTenantId(), getAlias()));
-//
-// getPayloadData().delete();
-//
-// DataCartridge dataCartridge = new DataCartridge();
-// dataCartridge.setUserName(getUsername());
-// dataCartridge.setPassword(getPassword());
-// dataCartridge.setDataCartridgeType(getType());
-//
-// return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicyName(),
-// getType(), getAlias(), getSubscriber().getTenantId(), getSubscriber().getTenantDomain(),
-// getRepository(), getCluster().getHostName(), getCluster().getClusterDomain(), getCluster().getClusterSubDomain(),
-// getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), dataCartridge, "PENDING",getSubscriptionKey());
-//
-// }
-//
-// public String getHost() {
-// return host;
-// }
-//
-// public void setHost(String host) {
-// this.host = host;
-// }
-//
-// public String getUsername() {
-// return username;
-// }
-//
-// public void setUsername(String username) {
-// this.username = username;
-// }
-//
-// public String getPassword() {
-// return password;
-// }
-//
-// public void setPassword(String password) {
-// this.password = password;
-// }
-//}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/FrameworkCartridgeSubscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/FrameworkCartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/FrameworkCartridgeSubscription.java
deleted file mode 100644
index d469952..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/FrameworkCartridgeSubscription.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.adc.mgt.subscription;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.subscription.tenancy.SubscriptionTenancyBehaviour;
-import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
-
-
-public class FrameworkCartridgeSubscription extends CartridgeSubscription {
-
- private static Log log = LogFactory.getLog(FrameworkCartridgeSubscription.class);
- private static final long serialVersionUID = 1633832232416272756L;
-
- /**
- * Constructor
- *
- * @param cartridgeInfo CartridgeInfo instance
- * @param subscriptionTenancyBehaviour SubscriptionTenancyBehaviour instance
- */
- public FrameworkCartridgeSubscription(CartridgeInfo cartridgeInfo, SubscriptionTenancyBehaviour
- subscriptionTenancyBehaviour) {
- super(cartridgeInfo, subscriptionTenancyBehaviour);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/LBCartridgeSubscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/LBCartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/LBCartridgeSubscription.java
deleted file mode 100644
index 48121de..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/LBCartridgeSubscription.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.adc.mgt.subscription;
-
-import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo;
-import org.apache.stratos.adc.mgt.exception.ADCException;
-import org.apache.stratos.adc.mgt.exception.NotSubscribedException;
-import org.apache.stratos.adc.mgt.exception.UnregisteredCartridgeException;
-import org.apache.stratos.adc.mgt.subscription.tenancy.SubscriptionTenancyBehaviour;
-import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
-import org.apache.stratos.cloud.controller.pojo.Properties;
-
-public class LBCartridgeSubscription extends CartridgeSubscription {
-
- /**
- * Constructor
- *
- * @param cartridgeInfo CartridgeInfo instance
- * @param subscriptionTenancyBehaviour SubscriptionTenancyBehaviour instance
- */
- public LBCartridgeSubscription(CartridgeInfo cartridgeInfo, SubscriptionTenancyBehaviour
- subscriptionTenancyBehaviour) {
- super(cartridgeInfo, subscriptionTenancyBehaviour);
- }
-
- @Override
- public void removeSubscription() throws ADCException, NotSubscribedException {
- //TODO
- }
-
- @Override
- public CartridgeSubscriptionInfo registerSubscription(Properties properties) throws ADCException, UnregisteredCartridgeException {
- //TODO
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java
deleted file mode 100644
index ca20235..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java
+++ /dev/null
@@ -1,134 +0,0 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one
-// * or more contributor license agreements. See the NOTICE file
-// * distributed with this work for additional information
-// * regarding copyright ownership. The ASF licenses this file
-// * to you under the Apache License, Version 2.0 (the
-// * "License"); you may not use this file except in compliance
-// * with the License. You may obtain a copy of the License at
-// *
-// * http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing,
-// * software distributed under the License is distributed on an
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// * KIND, either express or implied. See the License for the
-// * specific language governing permissions and limitations
-// * under the License.
-// */
-//
-//package org.apache.stratos.adc.mgt.subscription;
-//
-//import org.apache.commons.logging.Log;
-//import org.apache.commons.logging.LogFactory;
-//import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo;
-//import org.apache.stratos.adc.mgt.dto.Policy;
-//import org.apache.stratos.adc.mgt.exception.*;
-//import org.apache.stratos.adc.mgt.internal.DataHolder;
-//import org.apache.stratos.adc.mgt.payload.PayloadArg;
-//import org.apache.stratos.adc.mgt.repository.Repository;
-//import org.apache.stratos.adc.mgt.subscriber.Subscriber;
-//import org.apache.stratos.adc.mgt.utils.ApplicationManagementUtil;
-//import org.apache.stratos.adc.mgt.utils.CartridgeConstants;
-//import org.apache.stratos.adc.mgt.utils.PersistenceManager;
-//import org.apache.stratos.adc.topology.mgt.service.TopologyManagementService;
-//import org.apache.stratos.adc.topology.mgt.serviceobjects.DomainContext;
-//import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
-//
-//import java.util.Properties;
-//
-//public class MultiTenantCartridgeSubscription extends CartridgeSubscription {
-//
-// private static Log log = LogFactory.getLog(MultiTenantCartridgeSubscription.class);
-//
-// public MultiTenantCartridgeSubscription(CartridgeInfo cartridgeInfo) {
-// super(cartridgeInfo);
-// }
-//
-// @Override
-// public void createSubscription(Subscriber subscriber, String alias, Policy autoscalingPolicy, Repository repository)
-//
-// throws InvalidCartridgeAliasException,
-// DuplicateCartridgeAliasException, ADCException, AlreadySubscribedException,
-// RepositoryCredentialsRequiredException, RepositoryTransportException, UnregisteredCartridgeException,
-// InvalidRepositoryException, RepositoryRequiredException, PolicyException {
-//
-// super.createSubscription(subscriber, alias, autoscalingPolicy, repository);
-//
-// boolean allowMultipleSubscription = Boolean.
-// valueOf(System.getProperty(CartridgeConstants.FEATURE_MULTI_TENANT_MULTIPLE_SUBSCRIPTION_ENABLED));
-//
-// if (!allowMultipleSubscription) {
-// // If the cartridge is multi-tenant. We should not let users createSubscription twice.
-// boolean subscribed;
-// try {
-// subscribed = PersistenceManager.isAlreadySubscribed(getType(), subscriber.getTenantId());
-// } catch (Exception e) {
-// String msg = "Error checking whether the cartridge type " + getType()
-// + " is already subscribed";
-// log.error(msg, e);
-// throw new ADCException(msg, e);
-// }
-//
-// if (subscribed) {
-// String msg = "Already subscribed to " + getType()
-// + ". This multi-tenant cartridge will not be available to createSubscription";
-// if (log.isDebugEnabled()) {
-// log.debug(msg);
-// }
-// throw new AlreadySubscribedException(msg, getType());
-// }
-// }
-//
-// TopologyManagementService topologyService = DataHolder.getTopologyMgtService();
-// DomainContext[] domainContexts = topologyService.getDomainsAndSubdomains(getType(), subscriber.getTenantId());
-// log.info("Retrieved " + domainContexts.length + " domain and corresponding subdomain pairs");
-//
-// if (domainContexts.length > 0) {
-// if(domainContexts.length > 2) {
-// if(log.isDebugEnabled())
-// log.debug("Too many domain sub domain pairs");
-// }
-//
-// for (DomainContext domainContext : domainContexts) {
-// if (domainContext.getSubDomain().equalsIgnoreCase("mgt")) {
-// getCluster().setMgtClusterDomain(domainContext.getDomain());
-// getCluster().setMgtClusterSubDomain(domainContext.getSubDomain());
-// } else {
-// getCluster().setClusterDomain(domainContext.getDomain());
-// getCluster().setClusterSubDomain(domainContext.getSubDomain());
-// }
-// }
-// } else {
-// String msg = "Domain contexts not found for " + getType() + " and tenant id " + subscriber.getTenantId();
-// log.warn(msg);
-// throw new ADCException(msg);
-// }
-// }
-//
-// @Override
-// public void removeSubscription() throws ADCException, NotSubscribedException {
-//
-// log.info("Cartridge with alias " + getAlias() + ", and type " + getType() +
-// " is a multi-tenant cartridge and therefore will not terminate all instances and " +
-// "unregister services");
-//
-// super.cleanupSubscription();
-// }
-//
-// @Override
-// public CartridgeSubscriptionInfo registerSubscription(Properties properties) {
-//
-// return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicyName(),
-// getType(), getAlias(), getSubscriber().getTenantId(), getSubscriber().getTenantDomain(),
-// getRepository(), getCluster().getHostName(), getCluster().getClusterDomain(), getCluster().getClusterSubDomain(),
-// getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), null, "PENDING",getSubscriptionKey());
-// }
-//
-// @Override
-// public PayloadArg createPayloadParameters() {
-//
-// return null;
-// }
-//
-//}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java
deleted file mode 100644
index 027fe1e..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java
+++ /dev/null
@@ -1,136 +0,0 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one
-// * or more contributor license agreements. See the NOTICE file
-// * distributed with this work for additional information
-// * regarding copyright ownership. The ASF licenses this file
-// * to you under the Apache License, Version 2.0 (the
-// * "License"); you may not use this file except in compliance
-// * with the License. You may obtain a copy of the License at
-// *
-// * http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing,
-// * software distributed under the License is distributed on an
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// * KIND, either express or implied. See the License for the
-// * specific language governing permissions and limitations
-// * under the License.
-// */
-//
-//package org.apache.stratos.adc.mgt.subscription;
-//
-//import org.apache.axis2.AxisFault;
-//import org.apache.commons.logging.Log;
-//import org.apache.commons.logging.LogFactory;
-//import org.apache.stratos.adc.mgt.client.CloudControllerServiceClient;
-//import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo;
-//import org.apache.stratos.adc.mgt.dto.Policy;
-//import org.apache.stratos.adc.mgt.exception.*;
-//import org.apache.stratos.adc.mgt.payload.PayloadArg;
-//import org.apache.stratos.adc.mgt.repository.Repository;
-//import org.apache.stratos.adc.mgt.subscriber.Subscriber;
-//import org.apache.stratos.adc.mgt.utils.ApplicationManagementUtil;
-//import org.apache.stratos.adc.mgt.utils.CartridgeConstants;
-//import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
-//
-//import java.util.Properties;
-//
-//public class SingleTenantCartridgeSubscription extends CartridgeSubscription {
-//
-// private static Log log = LogFactory.getLog(SingleTenantCartridgeSubscription.class);
-//
-//
-// public SingleTenantCartridgeSubscription(CartridgeInfo cartridgeInfo) {
-// super(cartridgeInfo);
-// }
-//
-// @Override
-// public void createSubscription(Subscriber subscriber, String alias, Policy autoscalingPolicy,
-// Repository repository) throws
-// InvalidCartridgeAliasException, DuplicateCartridgeAliasException, ADCException,
-// RepositoryCredentialsRequiredException, RepositoryTransportException, UnregisteredCartridgeException,
-// AlreadySubscribedException, RepositoryRequiredException, InvalidRepositoryException, PolicyException {
-//
-// super.createSubscription(subscriber, alias, autoscalingPolicy, repository);
-// getCluster().setClusterDomain(alias + "." + getCluster().getHostName() + "." + getType() + ".domain");
-// getCluster().setHostName(alias + "." + getCluster().getHostName());
-// }
-//
-// @Override
-// public CartridgeSubscriptionInfo registerSubscription(Properties payloadProperties)
-// throws ADCException, UnregisteredCartridgeException {
-//
-// ApplicationManagementUtil.registerService(getType(),
-// getCluster().getClusterDomain(),
-// getCluster().getClusterSubDomain(),
-// getPayloadData().createPayload(),
-// getPayloadData().getPayloadArg().getTenantRange(),
-// getCluster().getHostName(),
-// null);
-//
-// getPayloadData().delete();
-//
-// return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicyName(),
-// getType(), getAlias(), getSubscriber().getTenantId(), getSubscriber().getTenantDomain(),
-// getRepository(), getCluster().getHostName(), getCluster().getClusterDomain(), getCluster().getClusterSubDomain(),
-// getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), null, "PENDING",getSubscriptionKey());
-// }
-//
-// @Override
-// public void removeSubscription() throws ADCException, NotSubscribedException {
-//
-// try {
-// CloudControllerServiceClient.getServiceClient().terminateAllInstances(getCluster().getClusterDomain());
-//
-// } catch (AxisFault e) {
-// String errorMsg = "Error in terminating cartridge subscription, alias " + getAlias();
-// log.error(errorMsg);
-// throw new ADCException(errorMsg, e);
-//
-// } catch (Exception e) {
-// String errorMsg = "Error in terminating cartridge subscription, alias " + getAlias();
-// log.error(errorMsg);
-// throw new ADCException(errorMsg, e);
-// }
-//
-// log.info("Terminated all instances of " + getCluster().getClusterDomain() + " " + getCluster().getClusterSubDomain());
-//
-// try {
-// CloudControllerServiceClient.getServiceClient().unregisterService(getCluster().getClusterDomain());
-//
-// } catch (Exception e) {
-// String errorMsg = "Error in unregistering service cluster with domain " + getCluster().getClusterDomain() +
-// ", sub domain " + getCluster().getClusterSubDomain();
-// log.error(errorMsg);
-// throw new ADCException(errorMsg, e);
-// }
-//
-// log.info("Unregistered service cluster, domain " + getCluster().getClusterDomain() + ", sub domain " +
-// getCluster().getClusterSubDomain());
-//
-// super.cleanupSubscription();
-// }
-//
-// @Override
-// public PayloadArg createPayloadParameters()
-// throws ADCException {
-//
-// PayloadArg payloadArg = super.createPayloadParameters();
-// if(getRepository() != null) {
-// payloadArg.setRepoURL(getRepository().getUrl());
-// }
-// payloadArg.setHostName(getCluster().getHostName());
-// payloadArg.setServiceDomain(getCluster().getClusterDomain());
-// payloadArg.setServiceSubDomain(getCluster().getMgtClusterSubDomain());
-// payloadArg.setMgtServiceDomain(getCluster().getMgtClusterDomain());
-// payloadArg.setMgtServiceSubDomain(getCluster().getMgtClusterSubDomain());
-// if(getCartridgeInfo().getProvider().equals(CartridgeConstants.PROVIDER_NAME_WSO2)) {
-// payloadArg.setTenantRange(Integer.toString(getSubscriber().getTenantId()));
-// }
-// else {
-// payloadArg.setTenantRange("*");
-// }
-//
-// return payloadArg;
-// }
-//}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/cache/CartridgeInstanceCache.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/cache/CartridgeInstanceCache.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/cache/CartridgeInstanceCache.java
deleted file mode 100644
index d4db16f..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/cache/CartridgeInstanceCache.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.adc.mgt.subscription.cache;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class CartridgeInstanceCache {
-
- private static final Log log = LogFactory.getLog(CartridgeInstanceCache.class);
-
- private Map<CartridgeInstanceCacheKey, CartridgeSubscription> cartridgeInstanceKeyToCartridgeInstance;
- private final Map<Integer, List<CartridgeSubscription>> tenantIdToCartridgeInstance;
-
- private static CartridgeInstanceCache cartridgeInstanceCache;
-
- private CartridgeInstanceCache() {
- cartridgeInstanceKeyToCartridgeInstance = new ConcurrentHashMap<CartridgeInstanceCacheKey,
- CartridgeSubscription>();
- tenantIdToCartridgeInstance = new ConcurrentHashMap<Integer, List<CartridgeSubscription>>();
- }
-
- public static CartridgeInstanceCache getCartridgeInstanceCache() {
-
- if (cartridgeInstanceCache == null) {
- synchronized(CartridgeInstanceCache.class) {
- if (cartridgeInstanceCache == null) {
- cartridgeInstanceCache = new CartridgeInstanceCache();
- }
- }
- }
- return cartridgeInstanceCache;
- }
-
- public void addCartridgeInstances (int tenantId, List<CartridgeSubscription> cartridgeSubscriptions) {
-
- //tenantIdToCartridgeInstance.putSubscription(tenantId, cartridgeSubscriptions);
- for(CartridgeSubscription cartridgeSubscription : cartridgeSubscriptions) {
- addCartridgeInstance(new CartridgeInstanceCacheKey(tenantId, cartridgeSubscription.getAlias()),
- cartridgeSubscription);
- }
- }
-
- public void addCartridgeInstance(CartridgeInstanceCacheKey cartridgeInstanceCacheKey,
- CartridgeSubscription cartridgeSubscription) {
-
- cartridgeInstanceKeyToCartridgeInstance.put(cartridgeInstanceCacheKey, cartridgeSubscription);
-
- List<CartridgeSubscription> cartridgeSubscriptions = tenantIdToCartridgeInstance.get(cartridgeInstanceCacheKey.
- getTenantId());
- if(cartridgeSubscriptions != null) {
- cartridgeSubscriptions.add(cartridgeSubscription);
- }
- else {
- cartridgeSubscriptions = new Vector<CartridgeSubscription>();
- cartridgeSubscriptions.add(cartridgeSubscription);
- tenantIdToCartridgeInstance.put(cartridgeInstanceCacheKey.getTenantId(), cartridgeSubscriptions);
- }
-
- log.info("Added tenant " + cartridgeInstanceCacheKey.getTenantId() + "'s cartridge subscription with alias " +
- cartridgeInstanceCacheKey.getCartridgeInstanceAlias() + " to the cache");
- }
-
- public CartridgeSubscription getCartridgeInstance (CartridgeInstanceCacheKey cartridgeInstanceCacheKey) {
-
- return cartridgeInstanceKeyToCartridgeInstance.get(cartridgeInstanceCacheKey);
- }
-
- public List<CartridgeSubscription> getCartridgeInstances (int tenantId) {
-
- return tenantIdToCartridgeInstance.get(tenantId);
- }
-
- public boolean alreadyExists (CartridgeInstanceCacheKey cartridgeInstanceCacheKey) {
-
- return cartridgeInstanceKeyToCartridgeInstance.containsKey(cartridgeInstanceCacheKey);
- }
-
- public void removeCartridgeInstances (int tenantId) {
-
- List<CartridgeSubscription> cartridgeSubscriptions = tenantIdToCartridgeInstance.get(tenantId);
- for (CartridgeSubscription cartridgeSubscription : cartridgeSubscriptions) {
- removeCartridgeInstance(new CartridgeInstanceCacheKey(tenantId, cartridgeSubscription.getAlias()));
- }
- }
-
- public void removeCartridgeInstance (CartridgeInstanceCacheKey cartridgeInstanceCacheKey) {
-
- if (cartridgeInstanceKeyToCartridgeInstance.remove(cartridgeInstanceCacheKey) != null &&
- tenantIdToCartridgeInstance.remove(cartridgeInstanceCacheKey.getTenantId()) != null) {
-
- log.info("Removed tenant " + cartridgeInstanceCacheKey.getTenantId() + "'s cartridge subscription with alias " +
- cartridgeInstanceCacheKey.getCartridgeInstanceAlias() + " from the cache");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/cache/CartridgeInstanceCacheKey.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/cache/CartridgeInstanceCacheKey.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/cache/CartridgeInstanceCacheKey.java
deleted file mode 100644
index ca15e13..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/cache/CartridgeInstanceCacheKey.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.adc.mgt.subscription.cache;
-
-public class CartridgeInstanceCacheKey {
-
- private int tenantId;
- private String cartridgeAlias;
-
- public CartridgeInstanceCacheKey (int tenantId, String cartridgeAlias) {
-
- this.tenantId = tenantId;
- this.cartridgeAlias = cartridgeAlias;
- }
-
- public int getTenantId() {
- return tenantId;
- }
-
- public String getCartridgeInstanceAlias() {
- return cartridgeAlias;
- }
-
- public boolean equals (Object object) {
-
- if(object == this) {
- return true;
- }
- else if (object == null || !(object instanceof CartridgeInstanceCacheKey)) {
- return false;
- }
-
- CartridgeInstanceCacheKey subscriptionKey = (CartridgeInstanceCacheKey)object;
- return this.getCartridgeInstanceAlias().equals(subscriptionKey.getCartridgeInstanceAlias()) &&
- this.getTenantId() == subscriptionKey.getTenantId();
- }
-
- public int hashCode () {
-
- return getCartridgeInstanceAlias().hashCode() + Integer.toString(getTenantId()).hashCode();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java
deleted file mode 100644
index 87a6fd5..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.adc.mgt.subscription.factory;
-
-import org.apache.stratos.adc.mgt.exception.ADCException;
-import org.apache.stratos.adc.mgt.subscription.*;
-import org.apache.stratos.adc.mgt.subscription.tenancy.SubscriptionTenancyBehaviour;
-import org.apache.stratos.adc.mgt.utils.CartridgeConstants;
-import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
-
-public class CartridgeSubscriptionFactory {
-
- /**
- * Returns the relevant CartridgeSubscription object for the given criteria
- *
- * @param cartridgeInfo CartridgeInfo subscription
- * @return CartridgeSubscription subscription
- * @throws ADCException if no matching criteria is there to create a CartridgeSubscription object
- */
- /*public static CartridgeSubscription getCartridgeSubscriptionInstance(CartridgeInfo cartridgeInfo)
- throws ADCException {
-
- CartridgeSubscription cartridgeSubscription = null;
- if(cartridgeInfo.getMultiTenant()) {
- cartridgeSubscription = new MultiTenantCartridgeSubscription(cartridgeInfo);
-
- } else {
- if(cartridgeInfo.getProvider().equals(CartridgeConstants.DATA_CARTRIDGE_PROVIDER)) {
- cartridgeSubscription = new DataCartridgeSubscription(cartridgeInfo);
- }
- else {
- cartridgeSubscription = new SingleTenantCartridgeSubscription(cartridgeInfo);
- }
- }
-
-
-
- if(cartridgeSubscription == null) {
- throw new ADCException("Unable to create a CartridgeSubscription subscription for "
- + cartridgeInfo);
- }
-
- return cartridgeSubscription;
- }*/
-
- public static CartridgeSubscription getCartridgeSubscriptionInstance(CartridgeInfo cartridgeInfo,
- SubscriptionTenancyBehaviour subscriptionTenancyBehaviour)
- throws ADCException {
-
- //TODO: fix the logic properly
- CartridgeSubscription cartridgeSubscription = null;
- if(cartridgeInfo.getMultiTenant()) {
- cartridgeSubscription = new FrameworkCartridgeSubscription(cartridgeInfo, subscriptionTenancyBehaviour);
-
- } else {
- if(cartridgeInfo.getProvider().equals(CartridgeConstants.DATA_CARTRIDGE_PROVIDER)) {
- cartridgeSubscription = new DataCartridgeSubscription(cartridgeInfo, subscriptionTenancyBehaviour);
- }
- else {
- //cartridgeSubscription = new SingleTenantCartridgeSubscription(cartridgeInfo);
- cartridgeSubscription = new FrameworkCartridgeSubscription(cartridgeInfo, subscriptionTenancyBehaviour);
- }
- }
-
- if(cartridgeSubscription == null) {
- throw new ADCException("Unable to create a CartridgeSubscription subscription for "
- + cartridgeInfo);
- }
-
- return cartridgeSubscription;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/ServiceDeploymentMultiTenantBehaviour.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/ServiceDeploymentMultiTenantBehaviour.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/ServiceDeploymentMultiTenantBehaviour.java
deleted file mode 100644
index ae1c8f9..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/ServiceDeploymentMultiTenantBehaviour.java
+++ /dev/null
@@ -1,109 +0,0 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one
-// * or more contributor license agreements. See the NOTICE file
-// * distributed with this work for additional information
-// * regarding copyright ownership. The ASF licenses this file
-// * to you under the Apache License, Version 2.0 (the
-// * "License"); you may not use this file except in compliance
-// * with the License. You may obtain a copy of the License at
-// *
-// * http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing,
-// * software distributed under the License is distributed on an
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// * KIND, either express or implied. See the License for the
-// * specific language governing permissions and limitations
-// * under the License.
-// */
-//
-//package org.apache.stratos.adc.mgt.subscription.tenancy;
-//
-//import org.apache.commons.logging.Log;
-//import org.apache.commons.logging.LogFactory;
-//import org.apache.stratos.adc.mgt.exception.ADCException;
-//import org.apache.stratos.adc.mgt.exception.AlreadySubscribedException;
-//import org.apache.stratos.adc.mgt.exception.UnregisteredCartridgeException;
-//import org.apache.stratos.adc.mgt.payload.PayloadArg;
-//import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-//import org.apache.stratos.adc.mgt.utils.ApplicationManagementUtil;
-//import org.apache.stratos.adc.mgt.utils.CartridgeConstants;
-//import org.apache.stratos.adc.mgt.utils.PersistenceManager;
-//import org.apache.stratos.cloud.controller.pojo.Properties;
-//
-//public class ServiceDeploymentMultiTenantBehaviour extends
-// SubscriptionMultiTenantBehaviour {
-//
-// private static Log log = LogFactory.getLog(ServiceDeploymentMultiTenantBehaviour.class);
-//
-// @Override
-// public void createSubscription() throws ADCException,
-// AlreadySubscribedException {
-//
-// log.info(" --- in Service Deployment Multitenant Behaviour create subscription ---- ");
-//
-// boolean allowMultipleSubscription = Boolean.
-// valueOf(System.getProperty(CartridgeConstants.FEATURE_MULTI_TENANT_MULTIPLE_SUBSCRIPTION_ENABLED));
-//
-// if (!allowMultipleSubscription) {
-// // If the cartridge is multi-tenant. We should not let users
-// // createSubscription twice.
-// boolean subscribed;
-// try {
-// subscribed = PersistenceManager.isAlreadySubscribed(
-// cartridgeSubscription.getType(), cartridgeSubscription
-// .getSubscriber().getTenantId());
-// } catch (Exception e) {
-// String msg = "Error checking whether the cartridge type "
-// + cartridgeSubscription.getType()
-// + " is already subscribed";
-// log.error(msg, e);
-// throw new ADCException(msg, e);
-// }
-//
-// if (subscribed) {
-// String msg = "Already subscribed to "
-// + cartridgeSubscription.getType()
-// + ". This multi-tenant cartridge will not be available to createSubscription";
-// if (log.isDebugEnabled()) {
-// log.debug(msg);
-// }
-// throw new AlreadySubscribedException(msg,
-// cartridgeSubscription.getType());
-// }
-// }
-//
-// /*if (domainContext.getSubDomain().equalsIgnoreCase("mgt")) {
-// cartridgeSubscription.getCluster().setMgtClusterDomain(
-// domainContext.getDomain());
-// cartridgeSubscription.getCluster().setMgtClusterSubDomain(
-// domainContext.getSubDomain());
-// } else {
-// cartridgeSubscription.getCluster().setClusterDomain(
-// domainContext.getDomain());
-// cartridgeSubscription.getCluster().setClusterSubDomain(
-// domainContext.getSubDomain());
-// }*/
-//
-// }
-//
-//
-// @Override
-// public void registerSubscription(Properties properties)
-// throws ADCException, UnregisteredCartridgeException {
-//
-// // register subscription to start up the cartridge instances
-// ApplicationManagementUtil.registerService(cartridgeSubscription.getType(),
-// cartridgeSubscription.getCluster().getClusterDomain(),
-// cartridgeSubscription.getCluster().getClusterSubDomain(),
-// cartridgeSubscription.getPayloadData().createPayload(),
-// cartridgeSubscription.getPayloadData().getPayloadArg().getTenantRange(),
-// cartridgeSubscription.getCluster().getHostName(),
-// cartridgeSubscription.getAutoscalingPolicyName(),
-// cartridgeSubscription.getDeploymentPolicyName(),
-// properties);
-//
-// cartridgeSubscription.getPayloadData().delete();
-// }
-//
-//}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionMultiTenantBehaviour.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionMultiTenantBehaviour.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionMultiTenantBehaviour.java
deleted file mode 100644
index 6849189..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionMultiTenantBehaviour.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.adc.mgt.subscription.tenancy;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.exception.ADCException;
-import org.apache.stratos.adc.mgt.exception.AlreadySubscribedException;
-import org.apache.stratos.adc.mgt.exception.NotSubscribedException;
-import org.apache.stratos.adc.mgt.exception.UnregisteredCartridgeException;
-import org.apache.stratos.adc.mgt.retriever.DataInsertionAndRetrievalManager;
-import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-import org.apache.stratos.adc.mgt.utils.CartridgeConstants;
-import org.apache.stratos.cloud.controller.pojo.Properties;
-
-
-public class SubscriptionMultiTenantBehaviour extends SubscriptionTenancyBehaviour {
-
- private static Log log = LogFactory.getLog(SubscriptionMultiTenantBehaviour.class);
-
-
- public void createSubscription(CartridgeSubscription cartridgeSubscription) throws ADCException, AlreadySubscribedException {
-
- boolean allowMultipleSubscription = Boolean.
- valueOf(System.getProperty(CartridgeConstants.FEATURE_MULTI_TENANT_MULTIPLE_SUBSCRIPTION_ENABLED));
-
- if (!allowMultipleSubscription) {
- // If the cartridge is multi-tenant. We should not let users createSubscription twice.
- boolean subscribed;
- try {
- /////////////////////////////////////////////////////////////////////////////////////////////////////////
- //subscribed = PersistenceManager.isAlreadySubscribed(cartridgeSubscription.getType(),
- // cartridgeSubscription.getSubscriber().getTenantId());
- /////////////////////////////////////////////////////////////////////////////////////////////////////////
- subscribed = hasAlreadySubscribed(cartridgeSubscription.getSubscriber().getTenantId(), cartridgeSubscription.getType());
-
- } catch (Exception e) {
- String msg = "Error checking whether the cartridge type " + cartridgeSubscription.getType() +
- " is already subscribed";
- log.error(msg, e);
- throw new ADCException(msg, e);
- }
-
- if (subscribed) {
- String msg = "Already subscribed to " + cartridgeSubscription.getType()
- + ". This multi-tenant cartridge will not be available to createSubscription";
- if (log.isDebugEnabled()) {
- log.debug(msg);
- }
- throw new AlreadySubscribedException(msg, cartridgeSubscription.getType());
- }
- }
-
- //TODO: implement getting cluster Id from DB
- /*TopologyManager.acquireReadLock();
-
- try {
- Service service = TopologyManager.getTopology().getService(cartridgeSubscription.getType());
- if(service == null) {
- TopologyManager.releaseReadLock();
- String errorMsg = "Error in subscribing, no service found with the name " + cartridgeSubscription.getType();
- log.error(errorMsg);
- throw new ADCException(errorMsg);
- }
-
- //cartridgeSubscription.getCluster().setClusterDomain(service.getCluster().);
- //cartridgeSubscription.getCluster().setClusterSubDomain(domainContext.getSubDomain());
-
- } finally {
- TopologyManager.releaseReadLock();
- }*/
- }
-
- public void registerSubscription(CartridgeSubscription cartridgeSubscription, Properties properties)
- throws ADCException, UnregisteredCartridgeException {
-
- //nothing to do
- }
-
- public void removeSubscription(CartridgeSubscription cartridgeSubscription) throws ADCException, NotSubscribedException {
-
- log.info("Cartridge with alias " + cartridgeSubscription.getAlias() + ", and type " + cartridgeSubscription.getType() +
- " is a multi-tenant cartridge and therefore will not terminate all instances and " +
- "unregister services");
- }
-
- private static boolean hasAlreadySubscribed(int tenantId, String cartridgeType) {
-
- DataInsertionAndRetrievalManager dataInsertionAndRetrievalManager = new DataInsertionAndRetrievalManager();
- return ( dataInsertionAndRetrievalManager.getCartridgeSubscriptions(tenantId, cartridgeType) == null ||
- dataInsertionAndRetrievalManager.getCartridgeSubscriptions(tenantId, cartridgeType).isEmpty() ) ? false : true;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java
deleted file mode 100644
index c57c1a9..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.adc.mgt.subscription.tenancy;
-
-import org.apache.axis2.AxisFault;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.client.CloudControllerServiceClient;
-import org.apache.stratos.adc.mgt.exception.ADCException;
-import org.apache.stratos.adc.mgt.exception.AlreadySubscribedException;
-import org.apache.stratos.adc.mgt.exception.NotSubscribedException;
-import org.apache.stratos.adc.mgt.exception.UnregisteredCartridgeException;
-import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-import org.apache.stratos.adc.mgt.utils.ApplicationManagementUtil;
-import org.apache.stratos.cloud.controller.pojo.Properties;
-
-
-public class SubscriptionSingleTenantBehaviour extends SubscriptionTenancyBehaviour {
-
- private static Log log = LogFactory.getLog(SubscriptionSingleTenantBehaviour.class);
-
-
-
- public void createSubscription(CartridgeSubscription cartridgeSubscription) throws ADCException, AlreadySubscribedException {
-
- //set the cluster and hostname
- cartridgeSubscription.getCluster().setClusterDomain(cartridgeSubscription.getAlias() + "." +
- cartridgeSubscription.getCluster().getHostName() + "." + cartridgeSubscription.getType() + ".domain");
- cartridgeSubscription.getCluster().setHostName(cartridgeSubscription.getAlias() + "." +
- cartridgeSubscription.getCluster().getHostName());
- }
-
- public void registerSubscription(CartridgeSubscription cartridgeSubscription, Properties properties) throws ADCException, UnregisteredCartridgeException {
-
- log.info("Payload: " + cartridgeSubscription.getPayloadData().getCompletePayloadData().toString());
-
- ApplicationManagementUtil.registerService(cartridgeSubscription.getType(),
- cartridgeSubscription.getCluster().getClusterDomain(),
- cartridgeSubscription.getCluster().getClusterSubDomain(),
- cartridgeSubscription.getPayloadData().getCompletePayloadData(),
- cartridgeSubscription.getPayloadData().getBasicPayloadData().getTenantRange(),
- cartridgeSubscription.getCluster().getHostName(),
- cartridgeSubscription.getAutoscalingPolicyName(),
- cartridgeSubscription.getDeploymentPolicyName(),
- properties);
- }
-
- public void removeSubscription(CartridgeSubscription cartridgeSubscription) throws ADCException, NotSubscribedException {
-
- try {
- CloudControllerServiceClient.getServiceClient().terminateAllInstances(cartridgeSubscription.getCluster().getClusterDomain());
-
- } catch (AxisFault e) {
- String errorMsg = "Error in terminating cartridge subscription, alias " + cartridgeSubscription.getAlias();
- log.error(errorMsg);
- throw new ADCException(errorMsg, e);
-
- } catch (Exception e) {
- String errorMsg = "Error in terminating cartridge subscription, alias " + cartridgeSubscription.getAlias();
- log.error(errorMsg);
- throw new ADCException(errorMsg, e);
- }
-
- log.info("Terminated all instances of " + cartridgeSubscription.getCluster().getClusterDomain() + " " +
- cartridgeSubscription.getCluster().getClusterSubDomain());
-
- try {
- CloudControllerServiceClient.getServiceClient().unregisterService(cartridgeSubscription.getCluster().getClusterDomain());
-
- } catch (Exception e) {
- String errorMsg = "Error in unregistering service cluster with domain " + cartridgeSubscription.getCluster().getClusterDomain() +
- ", sub domain " + cartridgeSubscription.getCluster().getClusterSubDomain();
- log.error(errorMsg);
- throw new ADCException(errorMsg, e);
- }
-
- log.info("Unregistered service cluster, domain " + cartridgeSubscription.getCluster().getClusterDomain() + ", sub domain " +
- cartridgeSubscription.getCluster().getClusterSubDomain());
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionTenancyBehaviour.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionTenancyBehaviour.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionTenancyBehaviour.java
deleted file mode 100644
index b0766f4..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionTenancyBehaviour.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.adc.mgt.subscription.tenancy;
-
-import org.apache.stratos.adc.mgt.exception.ADCException;
-import org.apache.stratos.adc.mgt.exception.AlreadySubscribedException;
-import org.apache.stratos.adc.mgt.exception.NotSubscribedException;
-import org.apache.stratos.adc.mgt.exception.UnregisteredCartridgeException;
-import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-import org.apache.stratos.cloud.controller.pojo.Properties;
-
-import java.io.Serializable;
-
-public abstract class SubscriptionTenancyBehaviour implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public abstract void createSubscription(CartridgeSubscription cartridgeSubscription)
- throws ADCException, AlreadySubscribedException;
-
- public abstract void registerSubscription(CartridgeSubscription cartridgeSubscription, Properties properties)
- throws ADCException, UnregisteredCartridgeException;
-
- public abstract void removeSubscription(CartridgeSubscription cartridgeSubscription)
- throws ADCException, NotSubscribedException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/utils/CartridgeSubscriptionUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/utils/CartridgeSubscriptionUtils.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/utils/CartridgeSubscriptionUtils.java
deleted file mode 100644
index d9f3477..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/utils/CartridgeSubscriptionUtils.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.adc.mgt.subscription.utils;
-
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.deploy.service.Service;
-import org.apache.stratos.adc.mgt.exception.ADCException;
-import org.apache.stratos.adc.mgt.exception.DuplicateCartridgeAliasException;
-import org.apache.stratos.adc.mgt.exception.InvalidCartridgeAliasException;
-import org.apache.stratos.adc.mgt.payload.BasicPayloadData;
-import org.apache.stratos.adc.mgt.retriever.DataInsertionAndRetrievalManager;
-import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
-import org.apache.stratos.messaging.broker.publish.EventPublisher;
-import org.apache.stratos.messaging.event.tenant.TenantSubscribedEvent;
-import org.apache.stratos.messaging.event.tenant.TenantUnSubscribedEvent;
-import org.apache.stratos.messaging.util.Constants;
-
-import java.util.regex.Pattern;
-
-public class CartridgeSubscriptionUtils {
-
- private static Log log = LogFactory.getLog(CartridgeSubscriptionUtils.class);
-
- public static BasicPayloadData createBasicPayload (CartridgeSubscription cartridgeSubscription) {
-
- BasicPayloadData basicPayloadData = new BasicPayloadData();
- basicPayloadData.setApplicationPath(cartridgeSubscription.getCartridgeInfo().getBaseDir());
- basicPayloadData.setSubscriptionKey(cartridgeSubscription.getSubscriptionKey());
- basicPayloadData.setClusterId(cartridgeSubscription.getClusterDomain());
- basicPayloadData.setDeployment("default");//currently hard coded to default
- if(cartridgeSubscription.getRepository() != null) {
- basicPayloadData.setGitRepositoryUrl(cartridgeSubscription.getRepository().getUrl());
- }
- basicPayloadData.setHostName(cartridgeSubscription.getHostName());
- basicPayloadData.setMultitenant(String.valueOf(cartridgeSubscription.getCartridgeInfo().getMultiTenant()));
- basicPayloadData.setPortMappings(createPortMappingPayloadString(cartridgeSubscription.getCartridgeInfo()));
- basicPayloadData.setServiceName(cartridgeSubscription.getCartridgeInfo().getType());
- basicPayloadData.setSubscriptionAlias(cartridgeSubscription.getAlias());
- basicPayloadData.setTenantId(cartridgeSubscription.getSubscriber().getTenantId());
- //TODO:remove. we do not want to know about the tenant rance in subscription!
- if(cartridgeSubscription.getCartridgeInfo().getMultiTenant() ||
- cartridgeSubscription.getSubscriber().getTenantId() == -1234) { //TODO: fix properly
- basicPayloadData.setTenantRange("*");
- } else {
- basicPayloadData.setTenantRange(String.valueOf(cartridgeSubscription.getSubscriber().getTenantId()));
- }
-
- return basicPayloadData;
- }
-
- public static BasicPayloadData createBasicPayload (Service service) {
-
- BasicPayloadData basicPayloadData = new BasicPayloadData();
- basicPayloadData.setApplicationPath(service.getCartridgeInfo().getBaseDir());
- basicPayloadData.setSubscriptionKey(service.getSubscriptionKey());
- basicPayloadData.setClusterId(service.getClusterId());
- basicPayloadData.setDeployment("default");//currently hard coded to default
- basicPayloadData.setHostName(service.getHostName());
- basicPayloadData.setMultitenant(String.valueOf(service.getCartridgeInfo().getMultiTenant()));
- basicPayloadData.setPortMappings(createPortMappingPayloadString(service.getCartridgeInfo()));
- basicPayloadData.setServiceName(service.getType());
- basicPayloadData.setTenantId(service.getTenantId());
- basicPayloadData.setTenantRange(service.getTenantRange());
-
- return basicPayloadData;
- }
-
- private static String createPortMappingPayloadString (CartridgeInfo cartridgeInfo) {
-
- // port mappings
- StringBuilder portMapBuilder = new StringBuilder();
- org.apache.stratos.cloud.controller.pojo.PortMapping[] portMappings = cartridgeInfo.getPortMappings();
- for (org.apache.stratos.cloud.controller.pojo.PortMapping portMapping : portMappings) {
- String port = portMapping.getPort();
- portMapBuilder.append(port).append("|");
- }
-
- // remove last "|" character
- String portMappingString = portMapBuilder.toString().replaceAll("\\|$", "");
-
- return portMappingString;
- }
-
- public static String generateSubscriptionKey() {
- String key = RandomStringUtils.randomAlphanumeric(16);
- log.info("Generated key : " + key); // TODO -- remove the log
- return key;
- }
-
- public static void publishTenantSubscribedEvent(int tenantId, String serviceName) {
- try {
- if(log.isInfoEnabled()) {
- log.info(String.format("Publishing tenant subscribed event: [tenant-id] %d [service] %s", tenantId, serviceName));
- }
- TenantSubscribedEvent subscribedEvent = new TenantSubscribedEvent(tenantId, serviceName);
- EventPublisher eventPublisher = new EventPublisher(Constants.TENANT_TOPIC);
- eventPublisher.publish(subscribedEvent);
- } catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error(String.format("Could not publish tenant subscribed event: [tenant-id] %d [service] %s", tenantId, serviceName), e);
- }
- }
- }
-
- public static void publishTenantUnSubscribedEvent(int tenantId, String serviceName) {
- try {
- if(log.isInfoEnabled()) {
- log.info(String.format("Publishing tenant un-subscribed event: [tenant-id] %d [service] %s", tenantId, serviceName));
- }
- TenantUnSubscribedEvent event = new TenantUnSubscribedEvent(tenantId, serviceName);
- EventPublisher eventPublisher = new EventPublisher(Constants.TENANT_TOPIC);
- eventPublisher.publish(event);
- } catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error(String.format("Could not publish tenant un-subscribed event: [tenant-id] %d [service] %s", tenantId, serviceName), e);
- }
- }
- }
-
- public static void validateCartridgeAlias (int tenantId, String cartridgeType, String alias) throws InvalidCartridgeAliasException, DuplicateCartridgeAliasException, ADCException {
-
- String patternString = "([a-z0-9]+([-][a-z0-9])*)+";
- Pattern pattern = Pattern.compile(patternString);
-
- if (!pattern.matcher(alias).matches()) {
- String msg = "The alias " + alias + " can contain only alpha-numeric lowercase characters. Please enter a valid alias.";
- log.error(msg);
- throw new InvalidCartridgeAliasException(msg, tenantId, cartridgeType, alias);
- }
-
- boolean isAliasTaken = false;
- try {
- isAliasTaken = isAliasTaken(tenantId, alias);
- } catch (Exception e) {
- String msg = "Exception : " + e.getMessage();
- log.error(msg, e);
- throw new ADCException("Error when checking alias is already taken", e);
- }
-
- if (isAliasTaken) {
- String msg = "The alias " + alias + " is already taken. Please try again with a different alias.";
- log.error(msg);
- throw new DuplicateCartridgeAliasException(msg, cartridgeType, alias);
- }
- }
-
- public static boolean isAliasTaken (int tenantId, String alias) {
-
- DataInsertionAndRetrievalManager dataInsertionAndRetrievalManager = new DataInsertionAndRetrievalManager();
- return (dataInsertionAndRetrievalManager.getCartridgeSubscription(tenantId, alias) == null) ? false : true;
- }
-}