You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/02/09 14:05:22 UTC
[3/4] git commit: removing unused files
removing unused files
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ade7fa98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ade7fa98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ade7fa98
Branch: refs/heads/master
Commit: ade7fa98b2fe1f558d171d369e529febd366d729
Parents: 80f53db
Author: Isuru <is...@wso2.com>
Authored: Sun Feb 9 18:17:36 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Sun Feb 9 18:17:36 2014 +0530
----------------------------------------------------------------------
.../manager/client/CartridgeAgentClient.java | 44 -
.../stratos/manager/client/RegistryClient.java | 109 --
.../apache/stratos/manager/dns/DNSManager.java | 89 --
.../stratos/manager/domain/RegistryManager.java | 109 --
.../org/apache/stratos/manager/dto/AppRepo.java | 88 --
.../stratos/manager/dto/CartridgeDetail.java | 22 -
.../manager/dto/CartridgeInformation.java | 22 -
.../manager/internal/HostingConstants.java | 40 -
.../internal/HostingManagementActivator.java | 63 -
.../stratos/manager/payload/CarbonPayload.java | 43 -
.../stratos/manager/payload/DataPayload.java | 40 -
.../manager/payload/NonCarbonPayload.java | 125 --
.../apache/stratos/manager/payload/Payload.java | 224 ---
.../stratos/manager/payload/PayloadArg.java | 194 ---
.../DatabaseBasedPersistenceManager.java | 1408 ------------------
.../subscription/CartridgeSubscription_old.java | 431 ------
.../DataCartridgeSubscription_old.java | 127 --
.../MultiTenantCartridgeSubscription.java | 134 --
.../SingleTenantCartridgeSubscription.java | 136 --
.../stratos/manager/utils/CartridgeAppType.java | 44 -
.../stratos/manager/utils/CartridgeDomain.java | 146 --
.../stratos/manager/utils/DomainInfo.java | 43 -
22 files changed, 3681 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CartridgeAgentClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CartridgeAgentClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CartridgeAgentClient.java
deleted file mode 100644
index 27728e0..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CartridgeAgentClient.java
+++ /dev/null
@@ -1,44 +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.manager.client;
-//
-//import org.apache.axis2.AxisFault;
-//import org.apache.axis2.context.ConfigurationContext;
-//import org.apache.commons.logging.Log;
-//import org.apache.commons.logging.LogFactory;
-//import org.apache.stratos.manager.internal.DataHolder;
-//import org.apache.stratos.cartridge.agent.stub.CartridgeAgentServiceStub;
-//
-//public class CartridgeAgentClient {
-//
-// private static final Log log = LogFactory.getLog(CartridgeAgentClient.class);
-// CartridgeAgentServiceStub stub = null;
-// public CartridgeAgentClient(String epr) throws AxisFault {
-// ConfigurationContext clientConfigContext = DataHolder.getClientConfigContext();
-// stub = new CartridgeAgentServiceStub(clientConfigContext, epr);
-// }
-//
-// public void unregister(String domain, String subDomain, String hostName) throws Exception {
-// if(log.isInfoEnabled()) {
-// log.info("Unregistering cartridge agent client...");
-// }
-// stub.unregister(domain, subDomain, hostName);
-// }
-//}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/RegistryClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/RegistryClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/RegistryClient.java
deleted file mode 100644
index 6a5b401..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/RegistryClient.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.manager.client;
-//
-//import org.apache.axis2.context.ConfigurationContext;
-//import org.apache.axis2.context.ConfigurationContextFactory;
-//import org.wso2.carbon.registry.core.Collection;
-//import org.wso2.carbon.registry.core.Registry;
-//import org.wso2.carbon.registry.core.Resource;
-//import org.wso2.carbon.registry.core.exceptions.RegistryException;
-//import org.wso2.carbon.registry.ws.client.registry.WSRegistryServiceClient;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//public class RegistryClient {
-//
-// // url where the repository is running its services interface
-// private static String backendURL = "http://localhost:9763/services/";
-// private static ConfigurationContext configContext = null;
-//
-// // configuration locations used to bootstrap axis2
-// private static String axis2Repo =
-// "/home/wso2/Desktop/HP-demo-packs-with-video/cartridge/wso2stratos-cartridge-1.0.0-SNAPSHOT/repository/conf/axis2";
-// private static String axis2Conf =
-// "/home/wso2/Desktop/HP-demo-packs-with-video/cartridge/wso2stratos-cartridge-1.0.0-SNAPSHOT/repository/conf/axis2/axis2_client.xml";
-// private static String serverURL = "https://localhost:9443/services/";
-//
-// public RegistryClient() {
-// // TODO Auto-generated constructor stub
-// }
-//
-// private static WSRegistryServiceClient initialize() throws Exception {
-// // set these properties, this is used for authentication over https to
-// // the registry
-// // if you have a newer version, you can update the keystore by copying
-// // it from
-// // the security directory of the repository
-// System.setProperty("javax.net.ssl.trustStore", "wso2carbon.jks");
-// System.setProperty("javax.net.ssl.trustStorePassword", "wso2carbon");
-// System.setProperty("javax.net.ssl.trustStoreType", "JKS");
-//
-// configContext =
-// ConfigurationContextFactory.createConfigurationContextFromFileSystem(axis2Repo,
-// axis2Conf);
-// return new WSRegistryServiceClient(serverURL, "admin", "admin", backendURL, configContext);
-// }
-//
-// public static void addKey(String keyName, String content) throws Exception {
-// Registry registry = initialize();
-//
-// // get the governance folder
-// Resource governanceFolder = registry.get("/_system/governance");
-// System.out.println("Folder description: " + governanceFolder.getDescription());
-// Resource r1 = registry.newResource();
-// String path = "/_system/governance/" + keyName;
-// r1.setContent(content);
-// registry.put(path, r1);
-//
-// /*
-// * List<Resource> paths = getServicePath(registry,
-// * "/_system/governance/trunk/services");
-// *
-// * for (Resource service : paths) { // we've got all the services here
-// *
-// * Properties props = service.getProperties(); for (Object prop :
-// * props.keySet()) { System.out.println(prop + " - " + props.get(prop));
-// * }
-// *
-// * Association[] associations =
-// * registry.getAssociations(service.getPath(), "Documentation"); for
-// * (Association association : associations) {
-// * System.out.println(association.getAssociationType()); } }
-// */
-// }
-//
-// private static List<Resource> getServicePath(Registry registry, String servicesResource)
-// throws RegistryException {
-// List<Resource> result = new ArrayList<Resource>();
-// Resource resource = registry.get(servicesResource);
-//
-// if (resource instanceof Collection) {
-// Object content = resource.getContent();
-// for (Object path : (Object[]) content) {
-// result.addAll(getServicePath(registry, (String) path));
-// }
-// } else if (resource instanceof Resource) {
-// result.add(resource);
-// }
-// return result;
-// }
-//}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dns/DNSManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dns/DNSManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dns/DNSManager.java
deleted file mode 100644
index d97d4f8..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dns/DNSManager.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.manager.dns;
-//
-//import org.apache.commons.logging.Log;
-//import org.apache.commons.logging.LogFactory;
-//import org.apache.stratos.manager.utils.CartridgeConstants;
-//
-///**
-// * This class is for handling dns entries.
-// */
-//public class DNSManager {
-// private static final Log log = LogFactory.getLog(DNSManager.class);
-//
-// /**
-// * This is get called when there is a need of adding new sub domain to
-// * exciting domain.
-// * It will append required text to bind9 zone file and reload bind9 server.
-// * Note: make sure the user who run ADC has got rights to run sudo scripts
-// * without password
-// *
-// * @param subDomain
-// * will be added in front of domain
-// */
-// public void addNewSubDomain(String subDomain, String ip) {
-// try {
-// Runtime.getRuntime()
-// .exec(CartridgeConstants.SUDO_SH + " " +
-// // script script file that will be used to edit
-// // required files
-// System.getProperty(CartridgeConstants.APPEND_SCRIPT) + " " +
-// subDomain + " " +
-// // machineIp ip of the machine DNS bind service
-// // is running
-// ip + " " +
-// // bindFile the file which we edit to append
-// // the DNS entry
-// System.getProperty(CartridgeConstants.BIND_FILE_PATH));
-// log.info("New sub domain is added to zone file");
-// } catch (Exception e) {
-// log.error(e.getMessage());
-// throw new RuntimeException(e);
-// }
-// }
-// /**
-// * This is get called when there is a need of remove a sub domain.
-// * It will remove required text from bind9 zone file and reload bind9 server.
-// * Note: make sure the user who run ADC has got rights to run sudo scripts
-// * without password
-// *
-// * @param subDomain
-// * will be used to delete the entry related to this
-// */
-// public void removeSubDomain(String subDomain) {
-// try {
-// Runtime.getRuntime()
-// .exec(CartridgeConstants.SUDO_SH + " " +
-// // script script file that will be used to edit
-// // required files
-// System.getProperty(CartridgeConstants.REMOVE_SCRIPT) + " " +
-// subDomain + " " +
-// // bindFile the file which we edit to remove
-// // the DNS entry
-// System.getProperty(CartridgeConstants.BIND_FILE_PATH));
-// log.info("Sub domain is removed from zone file");
-// } catch (Exception e) {
-// log.error(e.getMessage());
-// throw new RuntimeException(e);
-// }
-// }
-//
-//}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/domain/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/domain/RegistryManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/domain/RegistryManager.java
deleted file mode 100644
index f7842bb..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/domain/RegistryManager.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.manager.domain;
-//
-//import org.apache.commons.logging.Log;
-//import org.apache.commons.logging.LogFactory;
-//import org.apache.stratos.manager.exception.ADCException;
-//import org.apache.stratos.manager.exception.DomainMappingExistsException;
-//import org.apache.stratos.manager.internal.DataHolder;
-//import org.apache.stratos.manager.utils.CartridgeConstants;
-//import org.wso2.carbon.registry.core.Collection;
-//import org.wso2.carbon.registry.core.Registry;
-//import org.wso2.carbon.registry.core.Resource;
-//import org.wso2.carbon.registry.core.exceptions.RegistryException;
-//
-//public class RegistryManager {
-// private static Log log = LogFactory.getLog(RegistryManager.class);
-// private static Registry registry = DataHolder.getRegistryService();
-//
-// public RegistryManager() {
-// try {
-// if (!registry.resourceExists(CartridgeConstants.DomainMappingInfo.HOSTINFO)) {
-// registry.put(CartridgeConstants.DomainMappingInfo.HOSTINFO,
-// registry.newCollection());
-// }
-// } catch (RegistryException e) {
-// String msg =
-// "Error while accessing registry or initializing domain mapping registry path\n";
-// log.error(msg + e.getMessage());
-// }
-// }
-//
-// /**
-// *
-// */
-// public void addDomainMappingToRegistry(String hostName, String actualHost)
-// throws ADCException, RegistryException, DomainMappingExistsException {
-// try {
-// registry.beginTransaction();
-// Resource hostResource = registry.newResource();
-// hostResource.addProperty(CartridgeConstants.DomainMappingInfo.ACTUAL_HOST, actualHost);
-// if (!registry.resourceExists(CartridgeConstants.DomainMappingInfo.HOSTINFO +
-// hostName)) {
-// registry.put(CartridgeConstants.DomainMappingInfo.HOSTINFO + hostName,
-// hostResource);
-// } else {
-// registry.rollbackTransaction();
-// String msg = "Requested domain is already taken!";
-// log.error(msg);
-// throw new DomainMappingExistsException(msg, hostName);
-// }
-// registry.commitTransaction();
-// } catch (RegistryException e) {
-// registry.rollbackTransaction();
-// throw e;
-// }
-// }
-//
-//
-// /**
-// *
-// */
-// public void removeDomainMappingFromRegistry(String actualHost) throws Exception {
-// try {
-// registry.beginTransaction();
-// String hostResourcePath = CartridgeConstants.DomainMappingInfo.HOSTINFO;
-// if (registry.resourceExists(hostResourcePath)) {
-// Resource hostResource = registry.get(hostResourcePath);
-// Collection hostInfoCollection;
-// if(hostResource instanceof Collection){
-// hostInfoCollection = (Collection) hostResource;
-// } else {
-// throw new Exception("Resource is not a collection " + hostResourcePath );
-// }
-// String[] paths = hostInfoCollection.getChildren();
-// for (String path: paths){
-// Resource domainMapping = registry.get(path);
-// String actualHostInRegistry = domainMapping.getProperty(CartridgeConstants.DomainMappingInfo.ACTUAL_HOST);
-// if(actualHostInRegistry != null && actualHost.equalsIgnoreCase(actualHostInRegistry)){
-// registry.delete(path);
-// }
-// }
-// }
-// registry.commitTransaction();
-// } catch (RegistryException e) {
-// registry.rollbackTransaction();
-// log.error("Unable to remove the mapping", e);
-// throw e;
-// }
-// }
-//
-//}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/AppRepo.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/AppRepo.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/AppRepo.java
deleted file mode 100644
index 13df2cc..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/AppRepo.java
+++ /dev/null
@@ -1,88 +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.manager.dto;
-//
-//public class AppRepo {
-//
-// private int tenantId;
-// private String repoName;
-// private String cartridge;
-// private String appName;
-// private boolean isWebRoot;
-// private String tenantPubKey;
-// private String tenantCartridgePubKey;
-//
-// public int getTenantId() {
-// return tenantId;
-// }
-//
-// public void setTenantId(int tenantId) {
-// this.tenantId = tenantId;
-// }
-//
-// public String getRepoName() {
-// return repoName;
-// }
-//
-// public void setRepoName(String repoName) {
-// this.repoName = repoName;
-// }
-//
-// public String getCartridge() {
-// return cartridge;
-// }
-//
-// public void setCartridge(String cartridge) {
-// this.cartridge = cartridge;
-// }
-//
-// public String getAppName() {
-// return appName;
-// }
-//
-// public void setAppName(String appName) {
-// this.appName = appName;
-// }
-//
-// public boolean isWebRoot() {
-// return isWebRoot;
-// }
-//
-// public void setWebRoot(boolean isWebRoot) {
-// this.isWebRoot = isWebRoot;
-// }
-//
-// public String getTenantPubKey() {
-// return tenantPubKey;
-// }
-//
-// public void setTenantPubKey(String tenantPubKey) {
-// this.tenantPubKey = tenantPubKey;
-// }
-//
-// public String getTenantCartridgePubKey() {
-// return tenantCartridgePubKey;
-// }
-//
-// public void setTenantCartridgePubKey(String tenantCartridgePubKey) {
-// this.tenantCartridgePubKey = tenantCartridgePubKey;
-// }
-//
-//}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/CartridgeDetail.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/CartridgeDetail.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/CartridgeDetail.java
deleted file mode 100644
index 6e2b601..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/CartridgeDetail.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.apache.stratos.manager.dto;
-/*
- *
- * 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.
- *
-*/
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/CartridgeInformation.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/CartridgeInformation.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/CartridgeInformation.java
deleted file mode 100644
index 6e2b601..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/CartridgeInformation.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.apache.stratos.manager.dto;
-/*
- *
- * 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.
- *
-*/
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/HostingConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/HostingConstants.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/HostingConstants.java
deleted file mode 100644
index 849c610..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/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.manager.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/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/HostingManagementActivator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/HostingManagementActivator.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/HostingManagementActivator.java
deleted file mode 100644
index 7f5b9c8..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/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.manager.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/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/CarbonPayload.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/CarbonPayload.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/CarbonPayload.java
deleted file mode 100644
index 8e2c970..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/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.manager.payload;
-//
-//import org.apache.stratos.manager.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/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/DataPayload.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/DataPayload.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/DataPayload.java
deleted file mode 100644
index f96edb7..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/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.manager.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/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/NonCarbonPayload.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/NonCarbonPayload.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/NonCarbonPayload.java
deleted file mode 100644
index bcd7bfd..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/NonCarbonPayload.java
+++ /dev/null
@@ -1,125 +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.manager.payload;
-//
-//import org.apache.stratos.manager.utils.CartridgeConstants;
-//import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
-//
-//public class NonCarbonPayload extends Payload {
-//
-// public NonCarbonPayload(String payloadFilePath) {
-// super(payloadFilePath);
-// }
-//
-// public void populatePayload(PayloadArg payloadArg) {
-//
-// super.populatePayload(payloadArg);
-// payloadBuilder.append(",");
-//
-// //general
-// payloadBuilder.append("REPO_INFO_EPR=" + System.getProperty(CartridgeConstants.REPO_INFO_EPR));
-// payloadBuilder.append(",");
-// payloadBuilder.append("CARTRIDGE_AGENT_EPR=" + System.getProperty(CartridgeConstants.CARTRIDGE_AGENT_EPR));
-// payloadBuilder.append(",");
-// payloadBuilder.append("APP_PATH=" + payloadArg.getCartridgeInfo().getBaseDir());
-//
-// //port mapping specific
-// if(payloadArg.getCartridgeInfo() != null) {
-// payloadBuilder.append(",");
-// payloadBuilder.append(createPortMappingPayloadString(payloadArg.getCartridgeInfo()));
-// }
-//
-// //git repository specific
-// payloadBuilder.append(",");
-// payloadBuilder.append("GIT_REPO=" + getRepositoryUrlParam(payloadArg));
-//
-// //BAM specific
-// payloadBuilder.append(",");
-// payloadBuilder.append("BAM_IP=" + System.getProperty(CartridgeConstants.BAM_IP));
-// payloadBuilder.append(",");
-// payloadBuilder.append("BAM_PORT=" + System.getProperty(CartridgeConstants.BAM_PORT));
-//
-// //TODO: remove
-// //Autoscale policy specific
-// /*if(payloadArg.getPolicy() != null) {
-// payloadBuilder.append(getAutoscalingParams(payloadArg.getPolicy()));
-// }*/
-//
-// }
-//
-// private 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("\\|$", "");
-// /*String portMappingPayloadString = null;
-// if (portMappingString.charAt(portMappingString.length() - 1) == '|') {
-// portMappingPayloadString = portMappingString.substring(0, portMappingString.length() - 1);
-// } else {
-// portMappingPayloadString = portMappingString;
-// }*/
-//
-// return "PORTS=" + portMappingString;
-// }
-//
-// private String getRepositoryUrlParam (PayloadArg arg) {
-//
-// String gitRepoURL = null;
-// if (arg.getRepoURL() != null) {
-// gitRepoURL = arg.getRepoURL();
-// } else {
-// gitRepoURL = "git@" + System.getProperty(CartridgeConstants.GIT_HOST_IP) + ":" + arg.getTenantDomain()
-// + System.getProperty("file.separator") + arg.getCartridgeAlias() + ".git";
-// }
-// return gitRepoURL;
-// }
-//
-// //TODO: remove
-// /*private String getAutoscalingParams (Policy policy) {
-//
-// DecimalFormat df = new DecimalFormat("##.##");
-// df.setParseBigDecimal(true);
-//
-// StringBuilder autoscalingPayloadBuilder = new StringBuilder();
-//
-// autoscalingPayloadBuilder.append(",");
-// autoscalingPayloadBuilder.append("MIN=" + policy.getMinAppInstances());
-// autoscalingPayloadBuilder.append(",");
-// autoscalingPayloadBuilder.append("MAX=" + policy.getMaxAppInstances());
-// autoscalingPayloadBuilder.append(",");
-// autoscalingPayloadBuilder.append("ALARMING_LOWER_RATE=" + policy.getAlarmingLowerRate());
-// autoscalingPayloadBuilder.append(",");
-// autoscalingPayloadBuilder.append("ALARMING_UPPER_RATE=" + policy.getAlarmingUpperRate());
-// autoscalingPayloadBuilder.append(",");
-// autoscalingPayloadBuilder.append("MAX_REQUESTS_PER_SEC=" + policy.getMaxRequestsPerSecond());
-// autoscalingPayloadBuilder.append(",");
-// autoscalingPayloadBuilder.append("ROUNDS_TO_AVERAGE=" + policy.getRoundsToAverage());
-// autoscalingPayloadBuilder.append(",");
-// autoscalingPayloadBuilder.append("SCALE_DOWN_FACTOR=" + policy.getScaleDownFactor());
-//
-// return autoscalingPayloadBuilder.toString();
-// }*/
-//}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/Payload.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/Payload.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/Payload.java
deleted file mode 100644
index 551979e..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/Payload.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.manager.payload;
-//
-//import org.apache.commons.logging.Log;
-//import org.apache.commons.logging.LogFactory;
-//import org.apache.stratos.manager.exception.ADCException;
-//import org.apache.stratos.manager.utils.CartridgeConstants;
-//
-//import java.io.*;
-//import java.util.zip.ZipEntry;
-//import java.util.zip.ZipOutputStream;
-//
-//public abstract class Payload implements Serializable {
-//
-// private static Log log = LogFactory.getLog(Payload.class);
-//
-// protected StringBuilder payloadBuilder;
-// protected String payloadFilePath;
-// protected PayloadArg payloadArg;
-//
-// /**
-// * Constructor
-// *
-// * @param payloadFilePath Full path at which the payload file is created
-// */
-// public Payload(String payloadFilePath) {
-// this.payloadFilePath = payloadFilePath;
-// payloadBuilder = new StringBuilder();
-// }
-//
-// /**
-// * Pupulates the Payload subscription with relevant parameters and values given in PayloadArg subscription
-// *
-// * @param payloadArg PayloadArg subscription with relevant values
-// */
-// public void populatePayload(PayloadArg payloadArg) {
-//
-// this.payloadArg = payloadArg;
-// payloadBuilder.append("HOST_NAME=" + payloadArg.getHostName());
-// payloadBuilder.append(",");
-// payloadBuilder.append("TENANT_ID=" + payloadArg.getTenantId());
-// payloadBuilder.append(",");
-// payloadBuilder.append("TENANT_RANGE=" + payloadArg.getTenantRange());
-// payloadBuilder.append(",");
-// payloadBuilder.append("TENANT_CONTEXT=" + payloadArg.getTenantDomain()); // No need to send those now
-// payloadBuilder.append(",");
-// payloadBuilder.append("CARTRIDGE_ALIAS=" + payloadArg.getCartridgeAlias());
-// payloadBuilder.append(",");
-// payloadBuilder.append("MB_IP=" + System.getProperty(CartridgeConstants.MB_IP)); // No need to send those now, will get from Puppet
-// payloadBuilder.append(",");
-// payloadBuilder.append("MB_PORT=" + System.getProperty(CartridgeConstants.MB_PORT)); // No need to send those now, will get from Puppet
-// payloadBuilder.append(",");
-// payloadBuilder.append("CEP_IP=" + System.getProperty(CartridgeConstants.CEP_IP)); // No need to send those now, will get from Puppet
-// payloadBuilder.append(",");
-// payloadBuilder.append("CEP_PORT=" + System.getProperty(CartridgeConstants.CEP_PORT)); // No need to send those now, will get from Puppet
-// payloadBuilder.append(",");
-// payloadBuilder.append("CLUSTER_ID=" + payloadArg.getServiceDomain());
-// payloadBuilder.append(",");
-// payloadBuilder.append("CARTRIDGE_KEY=" + payloadArg.getSubscriptionKey());
-// payloadBuilder.append(",");
-// payloadBuilder.append("DEPLOYMENT=" + "default"); // hard coded to default
-// payloadBuilder.append(",");
-// payloadBuilder.append("PUPPET_IP=" + System.getProperty(CartridgeConstants.PUPPET_IP));
-//
-//
-// if(payloadArg.getCartridgeInfo() != null) {
-// payloadBuilder.append(",");
-// payloadBuilder.append("SERVICE_NAME=" + payloadArg.getCartridgeInfo().getType());
-// }
-//
-// //add the user defined payload String (if any)
-// //this should be of the format <key_1>=<value_1>,<key_2>=<value_2>,....<key_n>=<value_n>
-// if (payloadArg.getUserDefinedPayload() != null && !payloadArg.getUserDefinedPayload().trim().isEmpty()) {
-//
-// if(!payloadBuilder.toString().endsWith(",")) {
-// payloadBuilder.append(",");
-// }
-// payloadBuilder.append(payloadArg.getUserDefinedPayload());
-// }
-// }
-//
-// /**
-// * Add the user defined payload String (if any). This should be of the format
-// * <key_1>=<value_1>,<key_2>=<value_2>,....<key_n>=<value_n>
-// *
-// * @param payloadString String object with payload information
-// */
-// public void populatePayload (String payloadString) {
-//
-// if(payloadBuilder.toString().isEmpty()) {
-// if(payloadString.startsWith(",")) {
-// payloadBuilder.append(payloadString.substring(1));
-// }
-// else {
-// payloadBuilder.append(payloadString);
-// }
-// } else {
-// if(!payloadBuilder.toString().endsWith(",") && !payloadString.startsWith(",")) {
-// payloadBuilder.append(",");
-// payloadBuilder.append(payloadString);
-// }
-// else if (payloadBuilder.toString().endsWith(",") && payloadString.startsWith(",")) {
-// payloadBuilder.append(payloadString.substring(1));
-// }
-// else {
-// payloadBuilder.append(payloadString);
-// }
-// }
-// }
-//
-// /**
-// * Create the actual payload in the file system
-// *
-// * @return DataHandler subscription with payload
-// * @throws ADCException in case of an error
-// */
-// public StringBuilder createPayload () throws ADCException {
-//
-// if(payloadBuilder.length() == 0) {
-// log.warn("Payload string length is zero. Create payload failed");
-// return null;
-// }
-//
-// File payloadFile = new File(getPayloadFilePath());
-// if(payloadFile.exists()) {
-// payloadFile.delete();
-// }
-//
-// log.info("** Payload ** " + payloadBuilder.toString());
-//
-// return payloadBuilder;
-// }
-//
-// /**
-// * Adds content to a zip file
-// *
-// * @param dir Name of directory
-// * @param fileName Name of file to add
-// * @param zos ZipOutputStream subscription to write
-// * @throws ADCException in an error
-// */
-// private void addToZipFile(String dir, String fileName, ZipOutputStream zos) throws ADCException {
-//
-// log.info("Writing '" + fileName + "' to zip file");
-//
-// File file = new File(dir + File.separator + fileName);
-// FileInputStream fis;
-// try {
-// fis = new FileInputStream(file);
-//
-// } catch (FileNotFoundException e) {
-// log.error(e.getMessage());
-// throw new ADCException(e.getMessage(), e);
-// }
-//
-// ZipEntry zipEntry = new ZipEntry(fileName);
-// try {
-// zos.putNextEntry(zipEntry);
-//
-// } catch (IOException e) {
-// log.error(e.getMessage());
-// throw new ADCException(e.getMessage(), e);
-// }
-//
-// byte[] bytes = new byte[1024];
-// int length;
-//
-// try {
-// while ((length = fis.read(bytes)) >= 0) {
-// zos.write(bytes, 0, length);
-// }
-// } catch (IOException e) {
-// log.error(e.getMessage());
-// throw new ADCException(e.getMessage(), e);
-// }
-//
-// try {
-// zos.closeEntry();
-// fis.close();
-//
-// } catch (IOException e) {
-// log.error(e.getMessage());
-// throw new ADCException(e.getMessage(), e);
-// }
-// }
-//
-// public String getPayloadFilePath() {
-// return payloadFilePath;
-// }
-//
-// public void setPayloadFilePath(String payloadFilePath) {
-// this.payloadFilePath = payloadFilePath;
-// }
-//
-// public boolean delete () {
-// return new File(payloadFilePath).delete();
-// }
-//
-// public PayloadArg getPayloadArg() {
-// return payloadArg;
-// }
-//
-// public void setPayloadArg(PayloadArg payloadArg) {
-// this.payloadArg = payloadArg;
-// }
-//}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ade7fa98/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadArg.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadArg.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadArg.java
deleted file mode 100755
index f22da5c..0000000
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadArg.java
+++ /dev/null
@@ -1,194 +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.manager.payload;
-//
-//import org.apache.stratos.manager.dto.Policy;
-//import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
-//
-//public class PayloadArg {
-//
-// //basic
-// private String hostName;
-// private String tenantRange;
-// private int tenantId;
-// private String serviceName;
-// private String cartridgeAlias;
-// private String tenantDomain;
-// private CartridgeInfo cartridgeInfo;
-// private Policy policy;
-// private String repoURL;
-// private boolean multitenant;
-//
-// //other
-// private String userDefinedPayload;
-// private String serviceDomain;
-// private String serviceSubDomain;
-// private String mgtServiceDomain;
-// private String mgtServiceSubDomain;
-// private String deployment;
-// private String subscriptionKey;
-//
-// //data cartridge specific
-// private String dataCartridgeHost;
-// private String dataCartridgeAdminUser;
-// private String dataCartridgeAdminPassword;
-//
-//
-// public CartridgeInfo getCartridgeInfo() {
-// return cartridgeInfo;
-// }
-// public void setCartridgeInfo(CartridgeInfo cartridgeInfo) {
-// this.cartridgeInfo = cartridgeInfo;
-// }
-// public Policy getPolicy() {
-// return policy;
-// }
-// public void setPolicy(Policy policy) {
-// this.policy = policy;
-// }
-// public String getRepoURL() {
-// return repoURL;
-// }
-// public void setRepoURL(String repoURL) {
-// this.repoURL = repoURL;
-// }
-// public String getDataCartridgeAdminPassword() {
-// return dataCartridgeAdminPassword;
-// }
-// public void setDataCartridgeAdminPassword(String dataCartridgeAdminPassword) {
-// this.dataCartridgeAdminPassword = dataCartridgeAdminPassword;
-// }
-// public String getDataCartridgeHost() {
-// return dataCartridgeHost;
-// }
-// public void setDataCartridgeHost(String dataCartridgeHost) {
-// this.dataCartridgeHost = dataCartridgeHost;
-// }
-// public int getTenantId() {
-// return tenantId;
-// }
-// public void setTenantId(int tenantId) {
-// this.tenantId = tenantId;
-// }
-// public String getTenantDomain() {
-// return tenantDomain;
-// }
-// public void setTenantDomain(String tenantDomain) {
-// this.tenantDomain = tenantDomain;
-// }
-// public String getUserDefinedPayload() {
-// return userDefinedPayload;
-// }
-// public void setUserDefinedPayload(String userDefinedPayload) {
-// this.userDefinedPayload = userDefinedPayload;
-// }
-// public boolean isMultitenant() {
-// return multitenant;
-// }
-// public void setMultitenant(boolean multitenant) {
-// this.multitenant = multitenant;
-// }
-// public String getCartridgeAlias() {
-// return cartridgeAlias;
-// }
-// public void setCartridgeAlias(String cartridgeAlias) {
-// this.cartridgeAlias = cartridgeAlias;
-// }
-//
-// public String getTenantRange() {
-// return tenantRange;
-// }
-//
-// public void setTenantRange(String tenantRange) {
-// this.tenantRange = tenantRange;
-// }
-//
-// public String getHostName() {
-// return hostName;
-// }
-//
-// public void setHostName(String hostName) {
-// this.hostName = hostName;
-// }
-//
-// public String getServiceDomain() {
-// return serviceDomain;
-// }
-//
-// public void setServiceDomain(String serviceDomain) {
-// this.serviceDomain = serviceDomain;
-// }
-//
-// public String getServiceSubDomain() {
-// return serviceSubDomain;
-// }
-//
-// public void setServiceSubDomain(String serviceSubDomain) {
-// this.serviceSubDomain = serviceSubDomain;
-// }
-//
-// public String getMgtServiceDomain() {
-// return mgtServiceDomain;
-// }
-//
-// public void setMgtServiceDomain(String mgtServiceDomain) {
-// this.mgtServiceDomain = mgtServiceDomain;
-// }
-//
-// public String getMgtServiceSubDomain() {
-// return mgtServiceSubDomain;
-// }
-//
-// public void setMgtServiceSubDomain(String mgtServiceSubDomain) {
-// this.mgtServiceSubDomain = mgtServiceSubDomain;
-// }
-//
-// public String getDataCartridgeAdminUser() {
-// return dataCartridgeAdminUser;
-// }
-//
-// public void setDataCartridgeAdminUser(String dataCartridgeAdminUser) {
-// this.dataCartridgeAdminUser = dataCartridgeAdminUser;
-// }
-//
-// public String getDeployment() {
-// return deployment;
-// }
-//
-// public void setDeployment(String deployment) {
-// this.deployment = deployment;
-// }
-//
-// public String getServiceName() {
-// return serviceName;
-// }
-//
-// public void setServiceName(String serviceName) {
-// this.serviceName = serviceName;
-// }
-// public String getSubscriptionKey() {
-// return subscriptionKey;
-// }
-// public void setSubscriptionKey(String subscriptionKey) {
-// this.subscriptionKey = subscriptionKey;
-// }
-//
-//
-//}