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:30 UTC
[19/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/internal/DataHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/internal/DataHolder.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/internal/DataHolder.java
deleted file mode 100644
index 11a1b4a..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/internal/DataHolder.java
+++ /dev/null
@@ -1,91 +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.internal;
-
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.stratos.adc.topology.mgt.service.TopologyManagementService;
-import org.apache.stratos.messaging.broker.publish.EventPublisher;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.utils.CarbonUtils;
-
-/**
- * Holds the some of the data required by the webapps component
- */
-public class DataHolder {
- private static ConfigurationContext clientConfigContext;
- private static ConfigurationContext serverConfigContext;
-
- private static RealmService realmService;
- private static RegistryService registryService;
- private static TopologyManagementService topologyMgtService;
- private static EventPublisher eventPublisher;
-
- public static RealmService getRealmService() {
- return realmService;
- }
-
- public static void setRealmService(RealmService realmService) {
- DataHolder.realmService = realmService;
- }
-
- public static RegistryService getRegistryService() {
- return registryService;
- }
-
- public static ConfigurationContext getClientConfigContext() {
- CarbonUtils.checkSecurity();
- return clientConfigContext;
- }
-
- public static void setClientConfigContext(ConfigurationContext clientConfigContext) {
- DataHolder.clientConfigContext = clientConfigContext;
- }
-
- public static ConfigurationContext getServerConfigContext() {
- CarbonUtils.checkSecurity();
- return serverConfigContext;
- }
-
- public static void setServerConfigContext(ConfigurationContext serverConfigContext) {
- DataHolder.serverConfigContext = serverConfigContext;
- }
-
- public static void setRegistryService(RegistryService registryService) {
- DataHolder.registryService = registryService;
- }
-
- public static TopologyManagementService getTopologyMgtService() {
- return topologyMgtService;
- }
-
- public static void setTopologyMgtService(TopologyManagementService topologyMgtService) {
- DataHolder.topologyMgtService = topologyMgtService;
- }
-
- public static EventPublisher getEventPublisher() {
- return eventPublisher;
- }
-
- public static void setEventPublisher(EventPublisher eventPublisher) {
- DataHolder.eventPublisher = eventPublisher;
- }
-
-}
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/internal/HostingConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/internal/HostingConstants.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/internal/HostingConstants.java
deleted file mode 100644
index 8be99b5..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/internal/HostingConstants.java
+++ /dev/null
@@ -1,40 +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.internal;
-//
-///**
-// * Web Application Constants
-// */
-//public final class HostingConstants {
-// public static final String WEBAPP_PREFIX = "webapps";
-// public static final String WEBAPP_DEPLOYMENT_FOLDER = "webapps";
-// public static final String WEBAPP_EXTENSION = "war";
-//
-// public static final class WebappState {
-// public static final String STARTED = "started";
-// public static final String STOPPED = "stopped";
-//
-// private WebappState() {
-// }
-// }
-//
-// private HostingConstants() {
-// }
-//}
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/internal/HostingManagementActivator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/internal/HostingManagementActivator.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/internal/HostingManagementActivator.java
deleted file mode 100644
index a136ba5..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/internal/HostingManagementActivator.java
+++ /dev/null
@@ -1,63 +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.internal;
-//
-//import org.apache.commons.logging.Log;
-//import org.apache.commons.logging.LogFactory;
-//import org.osgi.framework.BundleActivator;
-//import org.osgi.framework.BundleContext;
-//import org.wso2.carbon.utils.CarbonUtils;
-//
-///**
-// * Activator for the Webapp Management Bundle
-// */
-//public class HostingManagementActivator implements BundleActivator {
-// private static final Log log = LogFactory.getLog(HostingManagementActivator.class);
-//
-// @Override
-// public void start(final BundleContext bundleContext) {
-//
-// // If Carbon is running as a webapp within some other servlet container,
-// // then we should
-// // uninstall this component
-// if (!CarbonUtils.isRunningInStandaloneMode()) {
-// Thread th = new Thread() {
-// @Override
-// public void run() {
-// try {
-// bundleContext.getBundle().uninstall();
-// } catch (Throwable e) {
-// log.warn("Error occurred while uninstalling hosting.mgt UI bundle", e);
-// }
-// }
-// };
-// try {
-// th.join();
-// } catch (InterruptedException ignored) {
-// }
-// th.start();
-// }
-// }
-//
-// @Override
-// public void stop(BundleContext bundleContext) {
-// // No implementation required for this method
-// }
-//}
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/internal/ServiceReferenceHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/internal/ServiceReferenceHolder.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/internal/ServiceReferenceHolder.java
deleted file mode 100644
index bbf6999..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/internal/ServiceReferenceHolder.java
+++ /dev/null
@@ -1,51 +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.internal;
-
-import org.wso2.carbon.ntask.core.service.TaskService;
-
-/**
- * Service reference holder.
- */
-public class ServiceReferenceHolder {
- private static volatile ServiceReferenceHolder instance = null;
- private TaskService taskService;
-
- private ServiceReferenceHolder() { }
-
- public static ServiceReferenceHolder getInstance() {
- if (instance == null) {
- synchronized (ServiceReferenceHolder .class){
- if (instance == null) {
- instance = new ServiceReferenceHolder();
- }
- }
- }
- return instance;
- }
-
- public void setTaskService(TaskService taskService) {
- this.taskService = taskService;
- }
-
- public TaskService getTaskService() {
- return taskService;
- }
-}
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/listener/InstanceStatusListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java
deleted file mode 100644
index 8fad7d9..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java
+++ /dev/null
@@ -1,92 +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.listener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.publisher.ArtifactUpdatePublisher;
-import org.apache.stratos.adc.mgt.retriever.DataInsertionAndRetrievalManager;
-import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-import org.apache.stratos.messaging.event.instance.status.InstanceStartedEvent;
-import org.apache.stratos.messaging.util.Constants;
-import org.apache.stratos.messaging.util.Util;
-
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-
-public class InstanceStatusListener implements MessageListener {
-
- private static final Log log = LogFactory
- .getLog(InstanceStatusListener.class);
-
- @Override
- public void onMessage(Message message) {
- TextMessage receivedMessage = (TextMessage) message;
- if(log.isInfoEnabled()) {
- log.info("Instance status message received");
- }
-
- try {
- String type = message.getStringProperty(Constants.EVENT_CLASS_NAME);
- if(log.isInfoEnabled()) {
- log.info(String.format("Event class name: %s ", type));
- }
- // If member started event is received publish artifact update message
- // To do a git clone
- if (InstanceStartedEvent.class.getName().equals(type)) {
- String json = receivedMessage.getText();
- InstanceStartedEvent event = (InstanceStartedEvent) Util.jsonToObject(json, InstanceStartedEvent.class);
- String clusterId = event.getClusterId();
- if(log.isInfoEnabled()) {
- log.info("Cluster id: " + clusterId);
- }
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /*CartridgeSubscriptionInfo subscription = PersistenceManager.getSubscriptionFromClusterId(clusterId);
-
- if (subscription.getRepository() != null) {
- ArtifactUpdatePublisher publisher = new ArtifactUpdatePublisher(subscription.getRepository(), clusterId, String.valueOf(subscription.getTenantId()));
- publisher.publish();
- }
- else {
- //TODO: make this log debug
- log.info("No repository found for subscription with alias: " + subscription.getAlias() + ", type: " + subscription.getCartridge() +
- ". Not sending the Depsync event");
- }*/
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- CartridgeSubscription cartridgeSubscription = new DataInsertionAndRetrievalManager().getCartridgeSubscription(clusterId);
- if (cartridgeSubscription.getRepository() != null) {
- ArtifactUpdatePublisher publisher = new ArtifactUpdatePublisher(cartridgeSubscription.getRepository(), clusterId,
- String.valueOf(cartridgeSubscription.getSubscriber().getTenantId()));
- publisher.publish();
- } else {
- //TODO: make this log debug
- log.info("No repository found for subscription with alias: " + cartridgeSubscription.getAlias() + ", type: " + cartridgeSubscription.getType()+
- ". Not sending the Depsync event");
- }
-
- }
- } catch (Exception e) {
- if(log.isErrorEnabled()) {
- log.error("Could not process instance status message", e);
- }
- }
- }
-
-}
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/listener/TenantStatusListner.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/TenantStatusListner.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/TenantStatusListner.java
deleted file mode 100644
index 959cf85..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/TenantStatusListner.java
+++ /dev/null
@@ -1,42 +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.listener;
-
-import org.apache.axis2.context.ConfigurationContext;
-import org.wso2.carbon.utils.Axis2ConfigurationContextObserver;
-
-public class TenantStatusListner implements Axis2ConfigurationContextObserver {
-
- public void creatingConfigurationContext(int i) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void createdConfigurationContext(ConfigurationContext configurationContext) {
-
- }
-
- public void terminatingConfigurationContext(ConfigurationContext configurationContext) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void terminatedConfigurationContext(ConfigurationContext configurationContext) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-}
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/lookup/ClusterIdToSubscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/lookup/ClusterIdToSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/lookup/ClusterIdToSubscription.java
deleted file mode 100644
index a04ad2f..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/lookup/ClusterIdToSubscription.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.lookup;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-public class ClusterIdToSubscription implements Serializable {
-
- private static final Log log = LogFactory.getLog(ClusterIdToSubscription.class);
-
- // Map: Cluster Id (Domain) -> CartridgeSubscription
- private Map<String, CartridgeSubscription> clusterIdToCartridgeSubscription;
-
- public ClusterIdToSubscription() {
- clusterIdToCartridgeSubscription = new HashMap<String, CartridgeSubscription>();
- }
-
- public void addSubscription (CartridgeSubscription cartridgeSubscription) {
-
- clusterIdToCartridgeSubscription.put(cartridgeSubscription.getClusterDomain(), cartridgeSubscription);
- }
-
- public CartridgeSubscription getSubscription (String clusterId) {
-
- return clusterIdToCartridgeSubscription.get(clusterId);
- }
-
- public void removeSubscription (String clusterId) {
-
- if (clusterIdToCartridgeSubscription.remove(clusterId) != null) {
- if (log.isDebugEnabled()) {
- log.debug("Deleted the subscription for cluster " + clusterId + " from [Cluster Id -> CartridgeSubscription] map");
- }
- }
- }
-}
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/lookup/LookupDataHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/lookup/LookupDataHolder.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/lookup/LookupDataHolder.java
deleted file mode 100644
index 7215354..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/lookup/LookupDataHolder.java
+++ /dev/null
@@ -1,151 +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.lookup;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-public class LookupDataHolder implements Serializable {
-
- private static final Log log = LogFactory.getLog(LookupDataHolder.class);
-
- private ClusterIdToSubscription clusterIdToSubscription;
- private TenantIdToSubscriptionContext tenantIdToSubscriptionContext;
- private static volatile LookupDataHolder lookupDataHolder;
-
- //locks
- private static volatile ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
- private static volatile ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
- private static volatile ReentrantReadWriteLock.ReadLock readLock = lock.readLock();
-
- private LookupDataHolder () {
- clusterIdToSubscription = new ClusterIdToSubscription();
- tenantIdToSubscriptionContext = new TenantIdToSubscriptionContext();
- }
-
- public static LookupDataHolder getInstance () {
-
- if (lookupDataHolder == null) {
- synchronized (LookupDataHolder.class) {
- if (lookupDataHolder == null) {
- lookupDataHolder = new LookupDataHolder();
- }
- }
- }
- return lookupDataHolder;
- }
-
- public void putSubscription (CartridgeSubscription cartridgeSubscription) {
-
- if (clusterIdToSubscription.getSubscription(cartridgeSubscription.getClusterDomain()) != null) {
- if(log.isDebugEnabled()) {
- log.debug("Overwriting the existing CartridgeSubscription for cluster " + cartridgeSubscription.getClusterDomain() +
- " in [Cluster Id -> CartridgeSubscription] map");
- }
- }
- // add or update
- clusterIdToSubscription.addSubscription(cartridgeSubscription);
-
- // check if an existing SubscriptionContext is available
- SubscriptionContext existingSubscriptionCtx = tenantIdToSubscriptionContext.getSubscriptionContext(cartridgeSubscription.getSubscriber().getTenantId());
- if(existingSubscriptionCtx != null) {
- existingSubscriptionCtx.addSubscription(cartridgeSubscription);
-
- } else {
- //create a new subscription context and add the subscription
- SubscriptionContext subscriptionContext = new SubscriptionContext();
- subscriptionContext.addSubscription(cartridgeSubscription);
- tenantIdToSubscriptionContext.addSubscriptionContext(cartridgeSubscription.getSubscriber().getTenantId(), subscriptionContext);
- }
-
- }
-
- public void removeSubscription (int tenantId, String type, String subscriptionAlias, String clusterId) {
-
- tenantIdToSubscriptionContext.removeSubscriptionContext(tenantId, type, subscriptionAlias);
- clusterIdToSubscription.removeSubscription(clusterId);
- }
-
- public Collection<CartridgeSubscription> getSubscriptions (int tenantId) {
-
- SubscriptionContext subscriptionContext = tenantIdToSubscriptionContext.getSubscriptionContext(tenantId);
- if (subscriptionContext == null) {
- // no subscriptions
- return null;
- }
-
- return subscriptionContext.getSubscriptions();
-
- }
-
- public Collection<CartridgeSubscription> getSubscriptionForType (int tenantId, String cartridgeType) {
-
- SubscriptionContext subscriptionContext = tenantIdToSubscriptionContext.getSubscriptionContext(tenantId);
- if (subscriptionContext == null) {
- // no subscriptions
- return null;
- }
-
- return subscriptionContext.getSubscriptionsOfType(cartridgeType);
- }
-
- public CartridgeSubscription getSubscriptionForAlias (int tenantId, String subscriptionAlias) {
-
- SubscriptionContext subscriptionContext = tenantIdToSubscriptionContext.getSubscriptionContext(tenantId);
- if (subscriptionContext == null) {
- // no subscriptions
- return null;
- }
-
- return subscriptionContext.getSubscriptionForAlias(subscriptionAlias);
-
- }
-
- public CartridgeSubscription getSubscription (String clusterId) {
-
- return clusterIdToSubscription.getSubscription(clusterId);
-
- }
-
- public void acquireWriteLock () {
-
- writeLock.lock();
- }
-
- public void releaseWriteLock () {
-
- writeLock.unlock();
- }
-
- public void acquireReadLock () {
-
- readLock.lock();
- }
-
- public void releaseReadLock () {
-
- readLock.unlock();
- }
-}
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/lookup/SubscriptionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/lookup/SubscriptionContext.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/lookup/SubscriptionContext.java
deleted file mode 100644
index 8338558..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/lookup/SubscriptionContext.java
+++ /dev/null
@@ -1,131 +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.lookup;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-
-import java.io.Serializable;
-import java.util.*;
-
-public class SubscriptionContext implements Serializable {
-
- private static final Log log = LogFactory.getLog(SubscriptionContext.class);
-
- // Map: Cartridge Type -> Set<CartridgeSubscription>
- private Map<String, Set<CartridgeSubscription>> cartridgeTypeToSubscriptions;
-
- // Map: Subscription Alias -> CartridgeSubscription
- private Map<String, CartridgeSubscription> aliasToSubscription;
-
- public SubscriptionContext () {
-
- cartridgeTypeToSubscriptions = new HashMap<String, Set<CartridgeSubscription>>();
- aliasToSubscription = new HashMap<String, CartridgeSubscription>();
- }
-
- public void addSubscription (CartridgeSubscription cartridgeSubscription) {
-
- String cartridgeType = cartridgeSubscription.getType();
- if (cartridgeTypeToSubscriptions.containsKey(cartridgeType)) {
- Set<CartridgeSubscription> existingSubscriptions = cartridgeTypeToSubscriptions.get(cartridgeType);
- // if an existing subscription is present, remove it
- if(existingSubscriptions.remove(cartridgeSubscription)){
- if(log.isDebugEnabled()) {
- log.debug("Removed the existing Cartridge Subscription for type " + cartridgeType + ", alias " + cartridgeSubscription.getAlias() +
- " in [Cartridge Type -> Set<CartridgeSubscription>] map");
- }
- }
- // add or update
- existingSubscriptions.add(cartridgeSubscription);
- if(log.isDebugEnabled()) {
- log.debug("Added Cartridge Subscription for type " + cartridgeType + ", alias " + cartridgeSubscription.getAlias() +
- " in [Cartridge Type -> Set<CartridgeSubscription>] map");
- }
-
- } else {
- // create a new set and add it
- Set<CartridgeSubscription> subscriptions = new HashSet<CartridgeSubscription>();
- subscriptions.add(cartridgeSubscription);
- cartridgeTypeToSubscriptions.put(cartridgeType, subscriptions);
- }
-
- // put Subscription to aliasToSubscription map
- if (aliasToSubscription.put(cartridgeSubscription.getAlias(), cartridgeSubscription) != null) {
- if(log.isDebugEnabled()) {
- log.debug("Overwrote the existing Cartridge Subscription for alias " + cartridgeSubscription.getAlias() +
- " in [Subscription Alias -> CartridgeSubscription] map");
- }
- }
- }
-
- public Collection<CartridgeSubscription> getSubscriptions () {
-
- return aliasToSubscription.values();
- }
-
- public Collection<CartridgeSubscription> getSubscriptionsOfType (String cartridgeType) {
-
- return cartridgeTypeToSubscriptions.get(cartridgeType);
- }
-
- public CartridgeSubscription getSubscriptionForAlias (String subscriptionAlias) {
-
- return aliasToSubscription.get(subscriptionAlias);
- }
-
- public void deleteSubscription (String type, String subscriptionAlias) {
-
- // remove Subscription from cartridgeTypeToSubscriptions map
- Set<CartridgeSubscription> existingSubscriptions = cartridgeTypeToSubscriptions.get(type);
- if (existingSubscriptions != null && !existingSubscriptions.isEmpty()) {
- // iterate through the set
- Iterator<CartridgeSubscription> iterator = existingSubscriptions.iterator();
- while (iterator.hasNext()) {
- CartridgeSubscription cartridgeSubscription = iterator.next();
- // if a matching CartridgeSubscription is found, remove
- if (cartridgeSubscription.getAlias().equals(subscriptionAlias)) {
- iterator.remove();
- if (log.isDebugEnabled()) {
- log.debug("Deleted the subscription for alias " + subscriptionAlias + " and type " + type + " from [Type -> Set<CartridgeSubscription>] map");
- }
- break;
- }
- }
- }
-
- // if the Subscriptions set is empty now, remove it from cartridgeTypeToSubscriptions map
- if (existingSubscriptions.isEmpty()) {
- cartridgeTypeToSubscriptions.remove(type);
- if (log.isDebugEnabled()) {
- log.debug("Deleted the subscriptions set for type " + type + " from [Type -> Set<CartridgeSubscription>] map");
- }
- }
-
- // remove from aliasToSubscription map
- if (aliasToSubscription.remove(subscriptionAlias) != null) {
- if (log.isDebugEnabled()) {
- log.debug("Deleted the subscription for alias " + subscriptionAlias + " from [Alias -> CartridgeSubscription] map");
- }
- }
- }
-
-}
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/lookup/TenantIdToSubscriptionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/lookup/TenantIdToSubscriptionContext.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/lookup/TenantIdToSubscriptionContext.java
deleted file mode 100644
index c2d029c..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/lookup/TenantIdToSubscriptionContext.java
+++ /dev/null
@@ -1,64 +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.lookup;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class TenantIdToSubscriptionContext {
-
- private static final Log log = LogFactory.getLog(TenantIdToSubscriptionContext.class);
-
- // Map: tenant Id -> SubscriptionContext
- private Map<Integer, SubscriptionContext> tenantIdToSubscriptionContext;
-
- public TenantIdToSubscriptionContext() {
- tenantIdToSubscriptionContext = new HashMap<Integer, SubscriptionContext>();
- }
-
- public SubscriptionContext getSubscriptionContext (int tenantId) {
-
- return tenantIdToSubscriptionContext.get(tenantId);
- }
-
- public void addSubscriptionContext (int tenantId, SubscriptionContext subscriptionContext) {
-
- tenantIdToSubscriptionContext.put(tenantId, subscriptionContext);
- }
-
- public void removeSubscriptionContext (int tenantId, String type, String subscriptionAlias) {
-
- if (tenantIdToSubscriptionContext.containsKey(tenantId)) {
- SubscriptionContext subscriptionContext = tenantIdToSubscriptionContext.get(tenantId);
- subscriptionContext.deleteSubscription(type, subscriptionAlias);
-
- // delete the SubscriptionContext instance for the tenant if it carries no information
- if (subscriptionContext.getSubscriptionsOfType(type) == null && subscriptionContext.getSubscriptionForAlias(subscriptionAlias) == null) {
- tenantIdToSubscriptionContext.remove(tenantId);
- if (log.isDebugEnabled()) {
- log.debug("Deleted the subscriptionContext instance for tenant " + tenantId);
- }
- }
- }
- }
-}
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/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
deleted file mode 100644
index 0d3be61..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
+++ /dev/null
@@ -1,628 +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.manager;
-
-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.SubscriptionInfo;
-import org.apache.stratos.adc.mgt.exception.*;
-import org.apache.stratos.adc.mgt.payload.BasicPayloadData;
-import org.apache.stratos.adc.mgt.payload.PayloadData;
-import org.apache.stratos.adc.mgt.payload.PayloadFactory;
-import org.apache.stratos.adc.mgt.publisher.ArtifactUpdatePublisher;
-import org.apache.stratos.adc.mgt.repository.Repository;
-import org.apache.stratos.adc.mgt.retriever.DataInsertionAndRetrievalManager;
-import org.apache.stratos.adc.mgt.subscriber.Subscriber;
-import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-import org.apache.stratos.adc.mgt.subscription.factory.CartridgeSubscriptionFactory;
-import org.apache.stratos.adc.mgt.subscription.tenancy.SubscriptionMultiTenantBehaviour;
-import org.apache.stratos.adc.mgt.subscription.tenancy.SubscriptionSingleTenantBehaviour;
-import org.apache.stratos.adc.mgt.subscription.tenancy.SubscriptionTenancyBehaviour;
-import org.apache.stratos.adc.mgt.subscription.utils.CartridgeSubscriptionUtils;
-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 org.apache.stratos.cloud.controller.pojo.Property;
-import org.wso2.carbon.context.CarbonContext;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Manager class for the purpose of managing CartridgeSubscriptionInfo subscriptions, groupings, etc.
- */
-public class CartridgeSubscriptionManager {
-
- private static Log log = LogFactory.getLog(CartridgeSubscriptionManager.class);
- //private static DataInsertionAndRetrievalManager dataInsertionAndRetrievalManager = new DataInsertionAndRetrievalManager();
-
- /**
- * Subscribes to a cartridge
- *
- * @param cartridgeType Cartridge type
- * @param subscriptionAlias Cartridge alias
- * @param autoscalingPolicyName Autoscaling policy name
- * @param deploymentPolicyName Deployment Policy name
- * @param tenantDomain Subscriing tenant's domain
- * @param tenantId Subscribing tenant's Id
- * @param tenantAdminUsername Subscribing tenant's admin user name
- * @param repositoryType Type of repository
- * @param repositoryURL Repository URL
- * @param isPrivateRepository If a private or a public repository
- * @param repositoryUsername Repository username
- * @param repositoryPassword Repository password
- *
- * @return Subscribed CartridgeSubscription object
- * @throws ADCException
- * @throws InvalidCartridgeAliasException
- * @throws DuplicateCartridgeAliasException
- * @throws PolicyException
- * @throws UnregisteredCartridgeException
- * @throws RepositoryRequiredException
- * @throws RepositoryCredentialsRequiredException
- * @throws RepositoryTransportException
- * @throws AlreadySubscribedException
- * @throws InvalidRepositoryException
- */
- public CartridgeSubscription subscribeToCartridge (String cartridgeType, String subscriptionAlias,
- String autoscalingPolicyName, String deploymentPolicyName,
- String tenantDomain, int tenantId,
- String tenantAdminUsername, String repositoryType,
- String repositoryURL, boolean isPrivateRepository,
- String repositoryUsername, String repositoryPassword)
-
- throws ADCException, InvalidCartridgeAliasException, DuplicateCartridgeAliasException, PolicyException,
- UnregisteredCartridgeException, RepositoryRequiredException, RepositoryCredentialsRequiredException,
- RepositoryTransportException, AlreadySubscribedException, InvalidRepositoryException {
-
- return subscribeToCartridgeWithProperties(cartridgeType, subscriptionAlias, autoscalingPolicyName,
- deploymentPolicyName, tenantDomain, tenantId, tenantAdminUsername,
- repositoryType, repositoryURL, isPrivateRepository, repositoryUsername,
- repositoryPassword, null);
- }
-
- public CartridgeSubscription subscribeToCartridgeWithProperties(String cartridgeType, String cartridgeAlias,
- String autoscalingPolicyName, String deploymentPolicyName, String tenantDomain,
- int tenantId, String tenantAdminUsername, String repositoryType, String repositoryURL,
- boolean isPrivateRepository, String repositoryUsername, String repositoryPassword, Property[] props)
-
- throws ADCException,
- InvalidCartridgeAliasException,
- DuplicateCartridgeAliasException,
- PolicyException,
- UnregisteredCartridgeException,
- RepositoryRequiredException,
- RepositoryCredentialsRequiredException,
- RepositoryTransportException,
- AlreadySubscribedException,
- InvalidRepositoryException {
-
- // validate cartridge alias
- CartridgeSubscriptionUtils.validateCartridgeAlias(tenantId, cartridgeType, cartridgeAlias);
-
- CartridgeInfo cartridgeInfo;
- try {
- cartridgeInfo =
- CloudControllerServiceClient.getServiceClient().getCartridgeInfo(cartridgeType);
- if (props != null) {
- cartridgeInfo.setProperties(props);
- }
-
- } catch (UnregisteredCartridgeException e) {
- String message =
- cartridgeType +
- " is not a valid cartridgeSubscription type. Please try again with a valid cartridgeSubscription type.";
- log.error(message);
- throw e;
-
- } catch (Exception e) {
- String message = "Error getting info for " + cartridgeType;
- log.error(message, e);
- throw new ADCException(message, e);
- }
-
- //Decide tenancy behaviour
- SubscriptionTenancyBehaviour tenancyBehaviour;
- if(cartridgeInfo.getMultiTenant()) {
- tenancyBehaviour = new SubscriptionMultiTenantBehaviour();
- } else {
- tenancyBehaviour = new SubscriptionSingleTenantBehaviour();
- }
-
- //Create the CartridgeSubscription instance
- CartridgeSubscription cartridgeSubscription = CartridgeSubscriptionFactory.
- getCartridgeSubscriptionInstance(cartridgeInfo, tenancyBehaviour);
-
- //Create repository
- Repository repository = cartridgeSubscription.manageRepository(repositoryURL,
- repositoryUsername,
- repositoryPassword,
- isPrivateRepository,
- cartridgeAlias,
- cartridgeInfo, tenantDomain);
-
- //Create subscriber
- Subscriber subscriber = new Subscriber(tenantAdminUsername, tenantId, tenantDomain);
-
- //create subscription
- cartridgeSubscription.createSubscription(subscriber, cartridgeAlias, autoscalingPolicyName,
- deploymentPolicyName, repository);
- cartridgeSubscription.setSubscriptionKey(CartridgeSubscriptionUtils.generateSubscriptionKey()); // TODO ---- fix
- // properly
-
- log.info("Tenant [" + tenantId + "] with username [" + tenantAdminUsername +
- " subscribed to " + "] Cartridge Alias " + cartridgeAlias + ", Cartridge Type: " +
- cartridgeType + ", Repo URL: " + repositoryURL + ", Policy: " +
- autoscalingPolicyName);
-
- //Create the payload
- BasicPayloadData basicPayloadData = CartridgeSubscriptionUtils.createBasicPayload(cartridgeSubscription);
- //Populate the basic payload details
- basicPayloadData.populatePayload();
-
- PayloadData payloadData = PayloadFactory.getPayloadDataInstance(cartridgeInfo.getProvider(),
- cartridgeInfo.getType(), basicPayloadData);
-
- // get the payload parameters defined in the cartridge definition file for this cartridge type
- if (cartridgeInfo.getProperties() != null && cartridgeInfo.getProperties().length != 0) {
-
- for (Property property : cartridgeInfo.getProperties()) {
- // check if a property is related to the payload. Currently this is done by checking if the
- // property name starts with 'payload_parameter.' suffix. If so the payload param name will
- // be taken as the substring from the index of '.' to the end of the property name.
- if (property.getName()
- .startsWith(CartridgeConstants.CUSTOM_PAYLOAD_PARAM_NAME_PREFIX)) {
- String payloadParamName = property.getName();
- payloadData.add(payloadParamName.substring(payloadParamName.indexOf(".") + 1), property.getValue());
- }
- }
- }
-
- //check if there are any custom payload entries defined
- if (cartridgeSubscription.getCustomPayloadEntries() != null) {
- //add them to the payload
- Map<String, String> customPayloadEntries = cartridgeSubscription.getCustomPayloadEntries();
- Set<Map.Entry<String,String>> entrySet = customPayloadEntries.entrySet();
- for (Map.Entry<String, String> entry : entrySet) {
- payloadData.add(entry.getKey(), entry.getValue());
- }
- }
-
- cartridgeSubscription.setPayloadData(payloadData);
-
- // Publish tenant subscribed event to message broker
- CartridgeSubscriptionUtils.publishTenantSubscribedEvent(cartridgeSubscription.getSubscriber().getTenantId(),
- cartridgeSubscription.getCartridgeInfo().getType());
-
- if(cartridgeInfo.getMultiTenant()) {
- log.info(" Multitenant --> Publishing Artifact update event -- ");
- log.info(" Values : cluster id - " + cartridgeSubscription.getClusterDomain() + " tenant - " +
- cartridgeSubscription.getSubscriber().getTenantId());
- ArtifactUpdatePublisher publisher = new ArtifactUpdatePublisher(cartridgeSubscription.getRepository(),
- cartridgeSubscription.getClusterDomain(), // clusterId
- String.valueOf(cartridgeSubscription.getSubscriber().getTenantId()));
- publisher.publish();
- }
-
- return cartridgeSubscription;
- }
-
- /**
- * Connects / groups cartridges
- *
- * @param tenantDomain Tenant's domain
- * @param cartridgeSubscription CartridgeSubscription instance to which the CartridgeSubscription denoted by
- * connectingSubscriptionAlias will be connected to
- * @param connectingSubscriptionAlias Alias of the connecting cartridge
- *
- * @throws ADCException
- * @throws NotSubscribedException
- * @throws AxisFault
- */
-// public void connectCartridges (String tenantDomain, CartridgeSubscription cartridgeSubscription,
-// String connectingSubscriptionAlias)
-// throws ADCException, NotSubscribedException, AxisFault {
-//
-// //TODO: retrieve from the cache and connect. For now, new objects are created
-//
-// CartridgeSubscription connectingCartridgeSubscription = getCartridgeSubscription(tenantDomain,
-// connectingSubscriptionAlias);
-//
-// if(cartridgeSubscription == null) {
-// String errorMsg = "No cartridge subscription found in cache for tenant " + tenantDomain + " connecting aborted";
-// log.error(errorMsg);
-// return;
-// }
-//
-// if(connectingCartridgeSubscription == null) {
-// String errorMsg = "No cartridge subscription found in cache for tenant " + tenantDomain + ", alias " +
-// connectingSubscriptionAlias + ", connecting aborted";
-// log.error(errorMsg);
-// return;
-// }
-//
-// CartridgeSubscriptionConnector cartridgeSubscriptionConnector = CartridgeSubscriptionConnectorFactory.
-// getCartridgeInstanceConnector(connectingCartridgeSubscription.getType());
-//
-// cartridgeSubscription.connect(connectingSubscriptionAlias);
-//
-// //PayloadArg payloadArg = cartridgeSubscription.createPayloadParameters();
-//
-// //get additional payload params for connecting cartridges
-// Properties payloadProperties = cartridgeSubscriptionConnector.createConnection(cartridgeSubscription,
-// connectingCartridgeSubscription);
-// StringBuilder connectionParamsBuilder = new StringBuilder();
-// Set<Map.Entry<Object,Object>> payloadParamEntries = payloadProperties.entrySet();
-//
-// for (Map.Entry<Object, Object> payloadParamEntry : payloadParamEntries) {
-// connectionParamsBuilder.append(",");
-// connectionParamsBuilder.append(payloadParamEntry.getKey().toString());
-// connectionParamsBuilder.append("=");
-// connectionParamsBuilder.append(payloadParamEntry.getValue().toString());
-// }
-//
-// //add connection relates parameters to the payload
-// if(cartridgeSubscription.getPayloadData() != null) {
-// //cartridgeSubscription.getPayloadData().populatePayload(connectionParamsBuilder.toString());
-// } else {
-// //no existing payload
-// /*Payload payload = PayloadFactory.getPayloadDataInstance(cartridgeSubscription.getCartridgeInfo().getProvider(),
-// cartridgeSubscription.getType(), "/tmp/" + tenantDomain + "-" + cartridgeSubscription.getAlias() +
-// ".zip");
-// payload.populatePayload(connectionParamsBuilder.toString());
-// cartridgeSubscription.setPayloadData(payload);*/
-// }
-//
-// }
-
- /**
- * Registers the cartridge subscription for the given CartridgeSubscriptionInfo object
- *
- * @param cartridgeSubscription CartridgeSubscription subscription
- *
- * @return SubscriptionInfo object populated with relevant information
- * @throws ADCException
- * @throws UnregisteredCartridgeException
- */
- public SubscriptionInfo registerCartridgeSubscription(CartridgeSubscription cartridgeSubscription)
- throws ADCException, UnregisteredCartridgeException {
-
- CartridgeSubscriptionInfo cartridgeSubscriptionInfo = cartridgeSubscription.registerSubscription(null);
-
- //set status as 'SUBSCRIBED'
- cartridgeSubscription.setSubscriptionStatus(CartridgeConstants.SUBSCRIBED);
-
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /*int subscriptionId;
- try {
- subscriptionId = PersistenceManager.persistSubscription(cartridgeSubscriptionInfo);
-
- } catch (Exception e) {
- String errorMsg = "Error saving subscription for tenant " +
- cartridgeSubscription.getSubscriber().getTenantDomain() + ", alias " + cartridgeSubscription.getType();
- log.error(errorMsg);
- throw new ADCException(errorMsg, e);
- }*/
-
- //cartridgeSubscription.setSubscriptionId(subscriptionId);
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- try {
- new DataInsertionAndRetrievalManager().cacheAndPersistSubcription(cartridgeSubscription);
-
- } catch (PersistenceManagerException e) {
- String errorMsg = "Error saving subscription for tenant " +
- cartridgeSubscription.getSubscriber().getTenantDomain() + ", alias " + cartridgeSubscription.getType();
- log.error(errorMsg);
- throw new ADCException(errorMsg, e);
- }
-
- ApplicationManagementUtil.addDNSEntry(cartridgeSubscriptionInfo.getAlias(), cartridgeSubscription.getType());
-
- log.info("Successful Subscription: " + cartridgeSubscription.toString());
- return ApplicationManagementUtil.
- createSubscriptionResponse(cartridgeSubscriptionInfo, cartridgeSubscription.getRepository());
- }
-
- public Collection<CartridgeSubscription> getCartridgeSubscriptions (int tenantId, String type) throws ADCException {
-
- if (type == null || type.isEmpty()) {
- return new DataInsertionAndRetrievalManager().getCartridgeSubscriptions(tenantId);
-
- } else {
- return new DataInsertionAndRetrievalManager().getCartridgeSubscriptions(tenantId, type);
- }
- }
-
- public CartridgeSubscription getCartridgeSubscription (int tenantId, String subscriptionAlias) {
-
- return new DataInsertionAndRetrievalManager().getCartridgeSubscription(tenantId, subscriptionAlias);
- }
-
- /**
- * Unsubscribe from a Cartridge
- *
- * @param tenantDomain Tenant's domain
- * @param alias Alias given at subscription time
- * @throws ADCException
- * @throws NotSubscribedException
- */
- public void unsubscribeFromCartridge (String tenantDomain, String alias)
- throws ADCException, NotSubscribedException {
-
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /*CartridgeSubscription cartridgeSubscription = getCartridgeSubscription(tenantDomain, alias);
-
- if(cartridgeSubscription != null) {
- cartridgeSubscription.removeSubscription();
-
- // Publish tenant un-subscribed event to message broker
- CartridgeSubscriptionUtils.publishTenantUnSubscribedEvent(cartridgeSubscription.getSubscriber().getTenantId(),
- cartridgeSubscription.getCartridgeInfo().getType());
- }
- else {
- if(log.isDebugEnabled()) {
- log.debug("No cartridge subscription found with alias " + alias + " for tenant " + tenantDomain);
- }
- }*/
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- //fix properly
- DataInsertionAndRetrievalManager dataInsertionAndRetrievalManager = new DataInsertionAndRetrievalManager();
-
- CartridgeSubscription cartridgeSubscription = dataInsertionAndRetrievalManager.getCartridgeSubscription(CarbonContext.getThreadLocalCarbonContext().getTenantId(), alias);
- if(cartridgeSubscription != null) {
- cartridgeSubscription.removeSubscription();
-
- //set status as 'UNSUBSCRIBED'
- //cartridgeSubscription.setSubscriptionStatus(CartridgeConstants.UNSUBSCRIBED);
-
- // remove subscription
- try {
- dataInsertionAndRetrievalManager.removeSubscription(cartridgeSubscription.getSubscriber().getTenantId(), alias);
-
- } catch (PersistenceManagerException e) {
- String errorMsg = "Error removing subscription for tenant " + tenantDomain + ", alias " + cartridgeSubscription.getAlias();
- log.error(errorMsg);
- throw new ADCException(errorMsg, e);
- }
-
- // update with new state
- /*try {
- dataInsertionAndRetrievalManager.cacheAndPersistSubcription(cartridgeSubscription);
-
- } catch (PersistenceManagerException e) {
- String errorMsg = "Error updating subscription for tenant " + tenantDomain + ", alias " + cartridgeSubscription.getAlias();
- log.error(errorMsg);
- throw new ADCException(errorMsg, e);
- }*/
-
- // Publish tenant un-subscribed event to message broker
- CartridgeSubscriptionUtils.publishTenantUnSubscribedEvent(cartridgeSubscription.getSubscriber().getTenantId(),
- cartridgeSubscription.getCartridgeInfo().getType());
- }
- else {
- String errorMsg = "No cartridge subscription found with alias " + alias + " for tenant " + tenantDomain;
- log.error(errorMsg);
- throw new NotSubscribedException(errorMsg, alias);
- }
- }
-
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /*
- /**
- * Creates and returns a CartridgeSubscription object
- *
- * @param tenantDomain Tenant's domain
- * @param alias alias given at subscription
- *
- * @return CartridgeSubscription object populated with relevant information
- * @throws ADCException
- * @throws NotSubscribedException
- */
- /*public CartridgeSubscription getCartridgeSubscription(String tenantDomain, String alias)
- throws ADCException, NotSubscribedException {
-
- CartridgeSubscriptionInfo cartridgeSubscriptionInfo = getCartridgeSubscriptionInfo(tenantDomain, alias);
-
- CartridgeInfo cartridgeInfo;
- try {
- cartridgeInfo = CloudControllerServiceClient.getServiceClient().
- getCartridgeInfo(cartridgeSubscriptionInfo.getCartridge());
- } catch (Exception e) {
- throw new ADCException(e.getMessage(), e);
- }
-
- return populateCartridgeSubscriptionInformation(cartridgeInfo, cartridgeSubscriptionInfo);
- }*/
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- //TODO: remove
- /*public CartridgeSubscription deployMultitenantService(String cartridgeType, String cartridgeAlias,
- String autoscalingPolicyName, String deploymentPolicyName,
- String tenantDomain, int tenantId,
- String tenantAdminUsername,
- String clusterDomain, String clusterSubdomain,
- String repositoryURL, boolean isPrivateRepository,
- String repositoryUsername, String repositoryPassword, String tenantRange) throws ADCException, InvalidCartridgeAliasException, DuplicateCartridgeAliasException, PolicyException,
- UnregisteredCartridgeException, RepositoryRequiredException, RepositoryCredentialsRequiredException,
- RepositoryTransportException, AlreadySubscribedException, InvalidRepositoryException {
-
- log.info(" ---- in deploy multitenant service ---- ");
- //validate cartridge alias
- ApplicationManagementUtil.validateCartridgeAlias(cartridgeAlias, cartridgeType);
-
- CartridgeInfo cartridgeInfo;
- try {
- cartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(cartridgeType);
-
- } catch (UnregisteredCartridgeException e) {
- String message = cartridgeType
- + " is not a valid cartridgeSubscription type. Please try again with a valid cartridgeSubscription type.";
- log.error(message);
- throw e;
-
- } catch (Exception e) {
- String message = "Error getting info for " + cartridgeType;
- log.error(message, e);
- throw new ADCException(message, e);
- }
-
- Subscriber subscriber = new Subscriber(tenantAdminUsername, tenantId, tenantDomain);
-
- CartridgeSubscription cartridgeSubscription = new FrameworkCartridgeSubscription(cartridgeInfo,true);
- log.info("-- Cartridge subscription is created --- ");
- Repository repository = cartridgeSubscription.manageRepository(repositoryURL, repositoryUsername,
- repositoryPassword, isPrivateRepository, cartridgeAlias, cartridgeInfo, tenantDomain);
- log.info("-- Repository creation is done --- ");
- cartridgeSubscription.createSubscription(subscriber, cartridgeAlias, autoscalingPolicyName, deploymentPolicyName, repository);
- cartridgeSubscription.setSubscriptionKey(generateSubscriptionKey());
-
- //cartridgeSubscription.setClusterDomain(clusterDomain);
- //cartridgeSubscription.setClusterSubDomain(clusterDomain);
-
- log.info("-- subscription key is generated --- ");
- log.info("Tenant [" + tenantId + "] with username [" + tenantAdminUsername +
- " subscribed to " + "] Cartridge Alias " + cartridgeAlias + ", Cartridge Type: " + cartridgeType +
- ", Repo URL: " + repositoryURL + ", Policy: " + autoscalingPolicyName);
-
- // TODO -- payload would need some additional params - like Puppet master IP .. etc
-
- Payload payload = PayloadFactory.getPayloadDataInstance(cartridgeInfo.getProvider(), cartridgeType,
- "/tmp/" + tenantDomain + "-" + cartridgeAlias + ".zip");
- PayloadArg payloadArg = cartridgeSubscription.createPayloadParameters();
-
- if (payloadArg != null) {
- //populate the payload
- payload.populatePayload(payloadArg);
-
- // populate payload from UI here
- payloadArg.setTenantRange(tenantRange);
- //payloadArg.setDeployment("default");
- payloadArg.setServiceDomain(cartridgeAlias+"."+cartridgeInfo.getHostName()+".domain"); // This is cluster id
- cartridgeSubscription.setPayloadData(payload);
- }
-
- //get the payload parameters defined in the cartridge definition file for this cartridge type
- if (cartridgeInfo.getProperties() != null && cartridgeInfo.getProperties().length != 0) {
-
- StringBuilder customPayloadParamsBuilder = new StringBuilder();
- for(Property property : cartridgeInfo.getProperties()) {
- //check if a property is related to the payload. Currently this is done by checking if the
- //property name starts with 'payload_parameter.' suffix. If so the payload param name will
- //be taken as the substring from the index of '.' to the end of the property name.
- if(property.getName().startsWith(CartridgeConstants.CUSTOM_PAYLOAD_PARAM_NAME_PREFIX)) {
- String payloadParamName = property.getName();
- customPayloadParamsBuilder.append(",");
- customPayloadParamsBuilder.append(payloadParamName.
- substring(payloadParamName.indexOf(".") + 1));
- customPayloadParamsBuilder.append("=");
- customPayloadParamsBuilder.append(property.getValue());
- }
- }
- //if valid payload related parameters are found in the cartridge definition file, add them to the payload
- String customPayloadParamString = customPayloadParamsBuilder.toString();
- if(!customPayloadParamString.isEmpty()) {
- payload.populatePayload(customPayloadParamString);
- cartridgeSubscription.setPayloadData(payload);
- }
- }
-
- return cartridgeSubscription;
-
- }*/
-
- /*private CartridgeSubscriptionInfo getCartridgeSubscriptionInfo (String tenantDomain, String alias)
- throws ADCException, NotSubscribedException {
-
- CartridgeSubscriptionInfo subscription;
- try {
- subscription = PersistenceManager.getSubscription(tenantDomain, alias);
-
- } catch (Exception e) {
- String msg = "Failed to get subscriptions for " + tenantDomain;
- log.error(msg, e);
- throw new ADCException(msg, e);
- }
-
- if (subscription == null) {
- String msg = "Tenant " + tenantDomain + " has not subscribed for cartridges";
- log.error(msg);
- throw new NotSubscribedException(msg, msg);
- }
-
- return subscription;
-
- }*/
-
- /*private List<CartridgeSubscriptionInfo> getCartridgeSubscriptions (int tenantId) throws ADCException, NotSubscribedException {
-
- List<CartridgeSubscriptionInfo> subscriptions;
- try {
- subscriptions = PersistenceManager.getSubscriptionsForTenant(tenantId);
-
- } catch (Exception e) {
- String msg = "Failed to get subscriptions for " + tenantId;
- log.error(msg, e);
- throw new ADCException(msg, e);
- }
-
- if (subscriptions == null) {
- String msg = "Tenant " + tenantId + " has not subscribed for cartridges";
- log.error(msg);
- throw new NotSubscribedException(msg, msg);
- }
-
- return subscriptions;
- }*/
-
- /*private CartridgeSubscription populateCartridgeSubscriptionInformation(CartridgeInfo cartridgeInfo,
- CartridgeSubscriptionInfo cartridgeSubscriptionInfo)
- throws ADCException {
-
- SubscriptionTenancyBehaviour tenancyBehaviour;
- if(cartridgeInfo.getMultiTenant()) {
- tenancyBehaviour = new SubscriptionMultiTenantBehaviour();
- } else {
- tenancyBehaviour = new SubscriptionSingleTenantBehaviour();
- }
-
- CartridgeSubscription cartridgeSubscription = CartridgeSubscriptionFactory.
- getCartridgeSubscriptionInstance(cartridgeInfo, tenancyBehaviour);
-
- cartridgeSubscription.setSubscriptionId(cartridgeSubscriptionInfo.getSubscriptionId());
- cartridgeSubscription.setAlias(cartridgeSubscriptionInfo.getAlias());
- cartridgeSubscription.setHostName(cartridgeSubscriptionInfo.getHostName());
- cartridgeSubscription.setClusterDomain(cartridgeSubscriptionInfo.getClusterDomain());
- cartridgeSubscription.setClusterSubDomain(cartridgeSubscriptionInfo.getClusterSubdomain());
- cartridgeSubscription.setMgtClusterDomain(cartridgeSubscriptionInfo.getMgtClusterDomain());
- cartridgeSubscription.setMgtClusterSubDomain(cartridgeSubscriptionInfo.getMgtClusterSubDomain());
- cartridgeSubscription.setAutoscalingPolicyName(cartridgeSubscriptionInfo.getPolicy());
- Subscriber subscriber = new Subscriber(CarbonContext.getThreadLocalCarbonContext().getUsername(),
- cartridgeSubscriptionInfo.getTenantId(), cartridgeSubscriptionInfo.getTenantDomain());
- cartridgeSubscription.setSubscriber(subscriber);
- cartridgeSubscription.setRepository(cartridgeSubscriptionInfo.getRepository());
-
- 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/payload/ApplicationCartridgePayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/ApplicationCartridgePayloadData.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/ApplicationCartridgePayloadData.java
deleted file mode 100644
index 88c8449..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/ApplicationCartridgePayloadData.java
+++ /dev/null
@@ -1,27 +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.payload;
-
-public class ApplicationCartridgePayloadData extends PayloadData {
-
- public ApplicationCartridgePayloadData(BasicPayloadData basicPayloadData) {
- super(basicPayloadData);
- }
-}
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/payload/BasicPayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/BasicPayloadData.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/BasicPayloadData.java
deleted file mode 100644
index fc39232..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/BasicPayloadData.java
+++ /dev/null
@@ -1,224 +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.payload;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.utils.CartridgeConstants;
-
-import java.io.Serializable;
-
-/**
- * Contains basic payload data fields
- */
-public class BasicPayloadData implements Serializable {
-
- private static Log log = LogFactory.getLog(BasicPayloadData.class);
-
- private String serviceName;
- private String clusterId;
- private String hostName;
- private int tenantId;
- private String tenantRange;
- private String subscriptionAlias;
- private String deployment;
- private String puppetIp;
- private String subscriptionKey;
- private String applicationPath;
- private String gitRepositoryUrl;
- private String portMappings;
- private String multitenant;
-
- protected StringBuilder payloadBuilder;
-
- public BasicPayloadData() {
-
- }
-
- public void populatePayload () {
-
- payloadBuilder = new StringBuilder();
-
- payloadBuilder.append("SERVICE_NAME=" + getServiceName());
- payloadBuilder.append(",");
- payloadBuilder.append("HOST_NAME=" + getHostName());
- payloadBuilder.append(",");
- payloadBuilder.append("MULTITENANT=" + getMultitenant());
- payloadBuilder.append(",");
- payloadBuilder.append("TENANT_ID=" + getTenantId());
- payloadBuilder.append(",");
- payloadBuilder.append("TENANT_RANGE=" + getTenantRange());
- payloadBuilder.append(",");
- payloadBuilder.append("CARTRIDGE_ALIAS=" + getSubscriptionAlias());
- payloadBuilder.append(",");
- payloadBuilder.append("CLUSTER_ID=" + getClusterId());
- payloadBuilder.append(",");
- payloadBuilder.append("CARTRIDGE_KEY=" + getSubscriptionKey());
- payloadBuilder.append(",");
- payloadBuilder.append("DEPLOYMENT=" + getDeployment());
- payloadBuilder.append(",");
- //payloadBuilder.append("APP_PATH=" + getApplicationPath());
- //payloadBuilder.append(",");
- payloadBuilder.append("GIT_REPO=" + getGitRepositoryUrl());
- payloadBuilder.append(",");
- payloadBuilder.append("PORTS=" + getPortMappings());
-
- //Payload Data exposed as system variables
- payloadBuilder.append(",");
- payloadBuilder.append("PUPPET_IP=" + System.getProperty(CartridgeConstants.PUPPET_IP));
- }
-
- public String getServiceName() {
- return serviceName;
- }
-
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
- }
-
- public String getClusterId() {
- return clusterId;
- }
-
- public void setClusterId(String clusterId) {
- this.clusterId = clusterId;
- }
-
- public String getHostName() {
- return hostName;
- }
-
- public void setHostName(String hostName) {
- this.hostName = hostName;
- }
-
- public int getTenantId() {
- return tenantId;
- }
-
- public void setTenantId(int tenantId) {
- this.tenantId = tenantId;
- }
-
- public String getTenantRange() {
- return tenantRange;
- }
-
- public void setTenantRange(String tenantRange) {
- this.tenantRange = tenantRange;
- }
-
- public String getSubscriptionAlias() {
- return subscriptionAlias;
- }
-
- public void setSubscriptionAlias(String subscriptionAlias) {
- this.subscriptionAlias = subscriptionAlias;
- }
-
- public String getDeployment() {
- return deployment;
- }
-
- public void setDeployment(String deployment) {
- this.deployment = deployment;
- }
-
- public String getPuppetIp() {
- return puppetIp;
- }
-
- public void setPuppetIp(String puppetIp) {
- this.puppetIp = puppetIp;
- }
-
- public String getSubscriptionKey() {
- return subscriptionKey;
- }
-
- public void setSubscriptionKey(String subscriptionKey) {
- this.subscriptionKey = subscriptionKey;
- }
-
- public StringBuilder getPayloadData () {
-
- /*payloadBuilder.append("SERVICE_NAME=" + getServiceName());
- payloadBuilder.append(",");
- payloadBuilder.append("HOST_NAME=" + getHostName());
- payloadBuilder.append(",");
- payloadBuilder.append("MULTITENANT=" + getMultitenant());
- payloadBuilder.append(",");
- payloadBuilder.append("TENANT_ID=" + getTenantId());
- payloadBuilder.append(",");
- payloadBuilder.append("TENANT_RANGE=" + getTenantRange());
- payloadBuilder.append(",");
- payloadBuilder.append("CARTRIDGE_ALIAS=" + getSubscriptionAlias());
- payloadBuilder.append(",");
- payloadBuilder.append("CLUSTER_ID=" + getClusterId());
- payloadBuilder.append(",");
- payloadBuilder.append("CARTRIDGE_KEY=" + getSubscriptionKey());
- payloadBuilder.append(",");
- payloadBuilder.append("DEPLOYMENT=" + getDeployment());
- payloadBuilder.append(",");
- payloadBuilder.append("APP_PATH=" + getApplicationPath());
- payloadBuilder.append(",");
- payloadBuilder.append("GIT_REPO=" + getGitRepositoryUrl());
- payloadBuilder.append(",");
- payloadBuilder.append("PORTS=" + getPortMappings());
-
- //Payload Data exposed as system variables
- payloadBuilder.append(",");
- payloadBuilder.append("PUPPET_IP=" + System.getProperty(CartridgeConstants.PUPPET_IP));*/
-
- return payloadBuilder;
- }
-
- public String getApplicationPath() {
- return applicationPath;
- }
-
- public void setApplicationPath(String applicationPath) {
- this.applicationPath = applicationPath;
- }
-
- public String getGitRepositoryUrl() {
- return gitRepositoryUrl;
- }
-
- public void setGitRepositoryUrl(String gitRepositoryUrl) {
- this.gitRepositoryUrl = gitRepositoryUrl;
- }
-
- public String getPortMappings() {
- return portMappings;
- }
-
- public void setPortMappings(String portMappings) {
- this.portMappings = portMappings;
- }
-
- public String getMultitenant() {
- return multitenant;
- }
-
- public void setMultitenant(String multitenant) {
- this.multitenant = multitenant;
- }
-}
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/payload/CarbonPayload.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/CarbonPayload.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/CarbonPayload.java
deleted file mode 100644
index a5e5ef4..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/CarbonPayload.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.payload;
-//
-//import org.apache.stratos.adc.mgt.utils.CartridgeConstants;
-//
-//public class CarbonPayload extends Payload {
-//
-// public CarbonPayload(String payloadFilePath) {
-// super(payloadFilePath);
-// }
-//
-// public void populatePayload(PayloadArg payloadArg) {
-//
-// super.populatePayload(payloadArg);
-// payloadBuilder.append(",");
-//
-// //carbon specific
-// //payloadBuilder.append("DEPLOYMENT=" + payloadArg.getDeployment());
-// //payloadBuilder.append(",");
-// //payloadBuilder.append("PUPPET_IP=" + System.getProperty(CartridgeConstants.PUPPET_IP));
-// //payloadBuilder.append(",");
-// payloadBuilder.append("MULTITENANT=" + payloadArg.getCartridgeInfo().getMultiTenant());
-//
-// }
-//}
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/payload/DataCartridgePayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/DataCartridgePayloadData.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/DataCartridgePayloadData.java
deleted file mode 100644
index ee66375..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/DataCartridgePayloadData.java
+++ /dev/null
@@ -1,27 +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.payload;
-
-public class DataCartridgePayloadData extends PayloadData {
-
- public DataCartridgePayloadData(BasicPayloadData basicPayloadData) {
- super(basicPayloadData);
- }
-}
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/payload/DataPayload.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/DataPayload.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/DataPayload.java
deleted file mode 100644
index 76b5087..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/DataPayload.java
+++ /dev/null
@@ -1,40 +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.payload;
-//
-//public class DataPayload extends NonCarbonPayload {
-//
-// public DataPayload(String payloadFilePath) {
-// super(payloadFilePath);
-// }
-//
-// public void populatePayload(PayloadArg payloadArg) {
-//
-// super.populatePayload(payloadArg);
-// payloadBuilder.append(",");
-//
-// //data specific
-// payloadBuilder.append("MYSQL_USER=" + payloadArg.getDataCartridgeAdminUser());
-// payloadBuilder.append(",");
-// payloadBuilder.append("MYSQL_HOST=" + payloadArg.getDataCartridgeHost());
-// payloadBuilder.append(",");
-// payloadBuilder.append("MYSQL_PASSWORD=" + payloadArg.getDataCartridgeAdminPassword());
-// }
-//}
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/payload/FramewrokCartridgePayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/FramewrokCartridgePayloadData.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/FramewrokCartridgePayloadData.java
deleted file mode 100644
index 54a302f..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/FramewrokCartridgePayloadData.java
+++ /dev/null
@@ -1,27 +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.payload;
-
-public class FramewrokCartridgePayloadData extends PayloadData {
-
- public FramewrokCartridgePayloadData(BasicPayloadData basicPayloadData) {
- super(basicPayloadData);
- }
-}