You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2013/07/02 10:18:56 UTC
[03/12] Refactoring org.wso2.carbon to org.apache.stratos
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6724d973/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/ApplicationManagementUtil.java
----------------------------------------------------------------------
diff --git a/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/ApplicationManagementUtil.java b/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/ApplicationManagementUtil.java
deleted file mode 100644
index 504ca52..0000000
--- a/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/ApplicationManagementUtil.java
+++ /dev/null
@@ -1,1095 +0,0 @@
-package org.wso2.carbon.adc.mgt.utils;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.rmi.RemoteException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.clustering.ClusteringAgent;
-import org.apache.axis2.clustering.Member;
-import org.apache.axis2.clustering.management.GroupManagementAgent;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.LsRemoteCommand;
-import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.api.errors.InvalidRemoteException;
-import org.eclipse.jgit.api.errors.TransportException;
-import org.eclipse.jgit.lib.Ref;
-import org.eclipse.jgit.storage.file.FileRepository;
-import org.eclipse.jgit.transport.CredentialsProvider;
-import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
-import org.wso2.carbon.adc.mgt.client.CloudControllerServiceClient;
-import org.wso2.carbon.adc.mgt.dao.CartridgeSubscription;
-import org.wso2.carbon.adc.mgt.dao.DataCartridge;
-import org.wso2.carbon.adc.mgt.dao.PortMapping;
-import org.wso2.carbon.adc.mgt.dao.Repository;
-import org.wso2.carbon.adc.mgt.dns.DNSManager;
-import org.wso2.carbon.adc.mgt.dto.Cartridge;
-import org.wso2.carbon.adc.mgt.dto.Policy;
-import org.wso2.carbon.adc.mgt.dto.RepositoryInformation;
-import org.wso2.carbon.adc.mgt.dto.SubscriptionInfo;
-import org.wso2.carbon.adc.mgt.exception.ADCException;
-import org.wso2.carbon.adc.mgt.exception.AlreadySubscribedException;
-import org.wso2.carbon.adc.mgt.exception.DuplicateCartridgeAliasException;
-import org.wso2.carbon.adc.mgt.exception.InvalidCartridgeAliasException;
-import org.wso2.carbon.adc.mgt.exception.InvalidRepositoryException;
-import org.wso2.carbon.adc.mgt.exception.NotSubscribedException;
-import org.wso2.carbon.adc.mgt.exception.PolicyException;
-import org.wso2.carbon.adc.mgt.exception.RepositoryCredentialsRequiredException;
-import org.wso2.carbon.adc.mgt.exception.RepositoryRequiredException;
-import org.wso2.carbon.adc.mgt.exception.RepositoryTransportException;
-import org.wso2.carbon.adc.mgt.exception.UnregisteredCartridgeException;
-import org.wso2.carbon.adc.mgt.internal.DataHolder;
-import org.wso2.carbon.adc.mgt.service.RepositoryInfoBean;
-import org.wso2.carbon.adc.topology.mgt.service.TopologyManagementService;
-import org.wso2.carbon.adc.topology.mgt.serviceobjects.DomainContext;
-import org.wso2.carbon.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
-import org.wso2.carbon.stratos.cloud.controller.util.xsd.CartridgeInfo;
-import org.wso2.carbon.stratos.cloud.controller.util.xsd.Properties;
-import org.wso2.carbon.stratos.cloud.controller.util.xsd.Property;
-import org.wso2.carbon.utils.CarbonUtils;
-import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
-
-import com.google.gson.Gson;
-
-/**
- * This class contains utility methods used by ApplicationManagementService.
- */
-public class ApplicationManagementUtil {
-
- private static Log log = LogFactory.getLog(ApplicationManagementUtil.class);
- private static volatile CloudControllerServiceClient serviceClient;
-
- /**
- * Method used to subscribe to cartridges.
- */
- public static SubscriptionInfo doSubscribe(String cartridgeType, String alias, String policy, String repoURL,
- boolean privateRepo, String repoUsername, String repoPassword, String dataCartridgeType,
- String dataCartridgeAlias, String username, int tenantId, String tenantDomain) throws ADCException,
- PolicyException, UnregisteredCartridgeException, InvalidCartridgeAliasException,
- DuplicateCartridgeAliasException, RepositoryRequiredException, AlreadySubscribedException,
- RepositoryCredentialsRequiredException, InvalidRepositoryException, RepositoryTransportException {
-
- String clusterDomain = "";
- String clusterSubDomain = CartridgeConstants.DEFAULT_SUBDOMAIN;
- String mgtClusterDomain = "";
- String mgtClusterSubDomain = CartridgeConstants.DEFAULT_MGT_SUBDOMAIN;
- CartridgeSubscription subscription = null;
- String mysqlPassword = null;
- Repository repository = null;
- DataCartridge dataCartridge = null;
- String cartName = (alias != null && alias.trim().length() > 0) ? alias : cartridgeType;
- String payloadZipFileName = "/tmp/" + UUID.randomUUID().toString() + ".zip";
-
- log.info("Subscribing tenant [" + tenantId + "] with username [" + username + "] Cartridge Alias " + alias
- + ", Cartridge Type: " + cartridgeType + ", Repo URL: " + repoURL + ", Policy: " + policy);
-
- // Assign auto scaling only when necessary.
- // Muti-tenant cartridge may not need a policy.
- Policy autoScalingPolicy = null;
-
- CartridgeInfo cartridgeInfo;
- try {
- cartridgeInfo = getServiceClient().getCartridgeInfo(cartridgeType);
- } catch (UnregisteredCartridgeException e) {
- String message = cartridgeType
- + " is not a valid cartridge type. Please try again with a valid cartridge 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);
- }
-
- validateCartridgeAlias(cartName, cartridgeType);
-
-
- if (cartridgeType.equals(CartridgeConstants.MYSQL_CARTRIDGE_NAME)) {
-
- autoScalingPolicy = PolicyHolder.getInstance().getDefaultPolicy();
-
- if (autoScalingPolicy == null) {
- throw new PolicyException("Could not load default auto-scaling policy.");
- }
- if (log.isDebugEnabled()) {
- log.debug("Selected Policy: " + new Gson().toJson(autoScalingPolicy));
- }
-
- dataCartridge = new DataCartridge();
- mysqlPassword = generatePassword();
- dataCartridge.setPassword(mysqlPassword);
- dataCartridge.setDataCartridgeType(cartridgeType);
- dataCartridge.setUserName(CartridgeConstants.MYSQL_DEFAULT_USER);
- clusterDomain = getDynamicClusterDomain(cartridgeType, cartName, cartridgeInfo);
-
- registerService(cartridgeType,
- clusterDomain,
- clusterSubDomain,
- createPayload(cartridgeInfo, cartName, autoScalingPolicy, repoURL, mysqlPassword, "localhost", payloadZipFileName, tenantId, tenantDomain),
- "*",
- cartName + "." + cartridgeInfo.getHostName(),
- setRegisterServiceProperties(autoScalingPolicy, tenantId,cartName));
- deletePayloadFile(payloadZipFileName);
- } else {
-
- if (!new Boolean(System.getProperty(CartridgeConstants.FEATURE_INTERNAL_REPO_ENABLED))) {
- if (log.isDebugEnabled()) {
- log.debug("Internal repo feature is not enabled.");
- }
-
- if (repoURL == null || repoURL.trim().length() == 0) {
- throw new RepositoryRequiredException("External repository required for subscription");
- }
- }
-
- if (repoURL != null && repoURL.trim().length() > 0) {
- if (log.isDebugEnabled()) {
- log.debug("Repo URL entered: " + repoURL);
- }
- // Validate Remote Repository.
- validateRepository(repoURL, repoUsername, repoPassword, privateRepo,
- new Boolean(System.getProperty(CartridgeConstants.FEATURE_EXTERNAL_REPO_VAIDATION_ENABLED)));
- }
-
- try {
- repository = manageRepository(repoURL, repoUsername, repoPassword, cartName, cartridgeInfo, username,
- tenantDomain);
- } catch (Exception e) {
- log.error(e.getMessage());
- throw new ADCException(e);
- }
-
- // TODO: Check logic here
- if (!cartridgeInfo.getMultiTenant()) {
-
- if (policy != null && policy.trim().length() > 0) {
- autoScalingPolicy = PolicyHolder.getInstance().getPolicy(policy);
- } else {
- autoScalingPolicy = PolicyHolder.getInstance().getDefaultPolicy();
- }
- if (autoScalingPolicy == null) {
- throw new PolicyException("Could not load auto-scaling policy.");
- }
- if (log.isDebugEnabled()) {
- log.debug("Selected Policy: " + new Gson().toJson(autoScalingPolicy));
- }
-
- if (cartridgeInfo.getProvider().equalsIgnoreCase(CartridgeConstants.PROVIDER_NAME_WSO2)) { //carbon cartridge private jet mode
-
- clusterDomain = getDynamicClusterDomain(cartridgeType, cartName, cartridgeInfo);
- registerService(cartridgeType,
- clusterDomain,
- clusterSubDomain,
- createCarbonPayload(cartridgeInfo, cartName, alias, payloadZipFileName, tenantDomain, false),
- Integer.toString(tenantId),
- cartName + "." + cartridgeInfo.getHostName(),
- setRegisterServiceProperties(autoScalingPolicy,tenantId,cartName));
- deletePayloadFile(payloadZipFileName);
-
- } else {
- clusterDomain = getDynamicClusterDomain(cartridgeType, cartName, cartridgeInfo);
-
- String mySQLPassword = null;
- String mySQLHostName = null;
-
- if (dataCartridgeType != null && dataCartridgeType.trim().length() > 0 && dataCartridgeAlias != null
- && dataCartridgeAlias.trim().length() > 0) {
- if (log.isInfoEnabled()) {
- log.info("Retrieving Data Cartridge info for connect ... Alias : " + dataCartridgeAlias
- + ", Type: " + dataCartridgeType);
- }
-
- //TODO: Optimize following logic. Same logic is used in MySQLPasswordConfigurer
- int maxAttempts = Integer.parseInt(System.getProperty(CartridgeConstants.MAX_ATTEMPTS, "50"));
- int i = 0;
-
- while (i < maxAttempts) {
- i++;
- Cartridge c = null;
- try {
- c = getCartridgeInfo(dataCartridgeAlias, tenantDomain);
- } catch (NotSubscribedException e) {
- // This cannot happen here.
- }
- if (c != null) {
- if (!c.getStatus().equals("ACTIVE")) {
- try {
- Thread.sleep(3000);
- } catch (InterruptedException ignore) {
- }
- } else {
- mySQLPassword = c.getPassword();
- mySQLHostName = c.getIp();
- break;
- }
- }
- }
- log.info(" MYSQL Cartridge info retrieved ");
- }
-
- registerService(cartridgeType,
- clusterDomain,
- clusterSubDomain,
- createPayload(cartridgeInfo, cartName, autoScalingPolicy, repoURL, mySQLPassword,
- mySQLHostName, payloadZipFileName, tenantId, tenantDomain), "*",
- cartName + "." + cartridgeInfo.getHostName(),
- setRegisterServiceProperties(autoScalingPolicy,tenantId,cartName));
- deletePayloadFile(payloadZipFileName);
- }
-
- } else {
-
- boolean allowMultipleSubscription = new Boolean(
- System.getProperty(CartridgeConstants.FEATURE_MULTI_TENANT_MULTIPLE_SUBSCRIPTION_ENABLED));
-
- if (!allowMultipleSubscription) {
- // If the cartridge is multi-tenant. We should not let users
- // subscribe twice.
- boolean subscribed;
- try {
- subscribed = PersistenceManager.isAlreadySubscribed(cartridgeType, tenantId);
- } catch (Exception e) {
- String msg = "Error checking whether the cartridge type " + cartridgeType
- + " is already subscribed";
- log.error(msg, e);
- throw new ADCException(msg, e);
- }
-
- if (subscribed) {
- String msg = "Already subscribed to " + cartridgeType
- + ". This multi-tenant cartridge will not be available to subscribe";
- if (log.isDebugEnabled()) {
- log.debug(msg);
- }
- throw new AlreadySubscribedException(msg, cartridgeType);
- }
- }
-
- TopologyManagementService topologyService = DataHolder.getTopologyMgtService();
- DomainContext[] domainContexts = topologyService.getDomainsAndSubdomains(cartridgeType, tenantId);
- log.info("Retrieved " + domainContexts.length + " domain and corresponding subdomain pairs");
-
- if (domainContexts.length > 0) {
- if(domainContexts.length > 2) {
- if(log.isDebugEnabled())
- log.debug("Too many domain sub domain pairs");
- }
-
- for (int i = 0 ; i < domainContexts.length ; i++) {
- if(domainContexts[i].getSubDomain().equalsIgnoreCase("mgt")) {
- mgtClusterDomain = domainContexts[i].getDomain();
- mgtClusterSubDomain = domainContexts[i].getSubDomain();
- }
- else
- {
- clusterDomain = domainContexts[i].getDomain();
- clusterSubDomain = domainContexts[i].getSubDomain();
- }
- }
- } else {
- String msg = "Domain contexts not found for " + cartridgeType + " and tenant id " + tenantId;
- log.warn(msg);
- throw new ADCException(msg);
- }
- }
- }
-
- subscription =
- createCartridgeSubscription(cartridgeInfo, autoScalingPolicy,
- cartridgeType, cartName, tenantId, tenantDomain,
- repository, clusterDomain, clusterSubDomain,
- mgtClusterDomain, mgtClusterSubDomain, dataCartridge);
-
- try {
- PersistenceManager.persistSubscription(subscription);
- } catch (Exception e) {
- throw new ADCException("Error Saving Subscription", e);
- }
- addDNSEntry(alias, cartridgeType);
- return createSubscriptionResponse(subscription, repository);
-
- }
-
- private static File getPayload(CartridgeInfo cartridgeInfo, String cartridgeName, Policy policy, String repoURL,
- String mySQLPassword, String mySQLHost, String payloadZipFileName,
- int tenantId, String tenantDomain) throws Exception {
- String payloadString = "";
-
- payloadString += "TENANT_RANGE=" + "*";
- payloadString += ",TENANT_ID=" + tenantId;
- payloadString +=
- ",REPO_INFO_EPR=" +
- System.getProperty(CartridgeConstants.REPO_INFO_EPR);
- payloadString +=
- ",CARTRIDGE_AGENT_EPR=" +
- System.getProperty(CartridgeConstants.CARTRIDGE_AGENT_EPR);
- payloadString += createPortMappingPayloadString(cartridgeInfo);
- payloadString += ",HOST_NAME=" + cartridgeName + "." + cartridgeInfo.getHostName();
- payloadString += ",MIN=" + policy.getMinAppInstances();
- payloadString += ",MAX=" + policy.getMaxAppInstances();
- payloadString += ",SERVICE=" + cartridgeInfo.getType();
- payloadString += ",TENANT_CONTEXT=" + tenantDomain;
- payloadString += ",CARTRIDGE_ALIAS=" + cartridgeName;
-
- String gitRepoURL = null;
- if (repoURL != null) {
- gitRepoURL = repoURL;
- } else {
- gitRepoURL = "git@" + System.getProperty(CartridgeConstants.GIT_HOST_IP) + ":" + tenantDomain
- + System.getProperty("file.separator") + cartridgeName + ".git";
- }
- payloadString += ",GIT_REPO=" + gitRepoURL;
- payloadString += ",APP_PATH=" + cartridgeInfo.getBaseDir();
- payloadString += ",BAM_IP=" + System.getProperty(CartridgeConstants.BAM_IP);
- payloadString += ",BAM_PORT=" + System.getProperty(CartridgeConstants.BAM_PORT);
-
- // MYSQL params
- payloadString += ",MYSQL_HOST=" + mySQLHost;
- payloadString += ",MYSQL_USER=" + "root";
- payloadString += ",MYSQL_PASSWORD=" + mySQLPassword;
-
- DecimalFormat df = new DecimalFormat("##.##");
- df.setParseBigDecimal(true);
-
- // Autoscaling params
- payloadString += ",ALARMING_LOWER_RATE=" + df.format(policy.getAlarmingLowerRate());
- payloadString += ",ALARMING_UPPER_RATE=" + df.format(policy.getAlarmingUpperRate());
- payloadString += ",MAX_REQUESTS_PER_SEC=" + policy.getMaxRequestsPerSecond();
- payloadString += ",ROUNDS_TO_AVERAGE=" + policy.getRoundsToAverage();
- payloadString += ",SCALE_DOWN_FACTOR=" + df.format(policy.getScaleDownFactor());
-
- log.info("** Payload ** " + payloadString);
-
- String payloadStringTempFile = "launch-params";
-
- FileWriter fstream = new FileWriter(payloadStringTempFile);
- BufferedWriter out = new BufferedWriter(fstream);
- out.write(payloadString);
- out.close();
-
- FileOutputStream fos = new FileOutputStream(payloadZipFileName);
- ZipOutputStream zos = new ZipOutputStream(fos);
-
- addToZipFile(System.getProperty("user.dir"), payloadStringTempFile, zos);
-
- File folder = new File(CarbonUtils.getCarbonHome()+
- File.separator + "repository"
- + File.separator + "resources" + File.separator + "user-data");
- for (File fileEntry : folder.listFiles()) {
- if (!fileEntry.isDirectory()) {
- addToZipFile(folder.getPath(), fileEntry.getName(), zos);
- }
- }
-
- zos.close();
- fos.close();
-
- return new File(payloadZipFileName);
- }
-
- private static File getCarbonPayload (CartridgeInfo cartridgeInfo, String cartridgeName, String cartridgeAlias,
- String payloadZipFileName, String tenantDomain, boolean isMultitenant) throws Exception {
-
- String payloadString = "";
- payloadString += "DEPLOYMENT=" + "default"; //TODO: Currently hard coded but can be either manager, worker or default.
- //payloadString += ",DOMAIN=" + "s2.wso2.com";
- payloadString += ",SERVICE=" + cartridgeInfo.getType();
- //payloadString += ",TENANT_ID=" + tenantId;
- payloadString += ",SC_IP=" + System.getProperty(CartridgeConstants.SC_IP);
- payloadString += ",CARTRIDGE_ALIAS=" + cartridgeAlias;
- payloadString += ",MULTITENANT=" + "false";
-
- if(isMultitenant) { //not used at the moment
- payloadString += ",DOMAIN=" + "wso2." + cartridgeInfo.getType() + ".domain";
- payloadString += ",HOSTNAME=" + cartridgeInfo.getType() + ".s2.wso2.com";
-
- } else {
- payloadString += ",DOMAIN=" + cartridgeName + "." + cartridgeInfo.getHostName() + "." + cartridgeInfo.getType() +
- ".domain";
- payloadString += ",HOSTNAME=" + cartridgeName + "." + cartridgeInfo.getHostName();
- }
-
- log.info("** Payload ** " + payloadString);
-
- String payloadStringTempFile = "launch-params";
-
- FileWriter fstream = new FileWriter(payloadStringTempFile);
- BufferedWriter out = new BufferedWriter(fstream);
- out.write(payloadString);
- out.close();
-
- FileOutputStream fos = new FileOutputStream(payloadZipFileName);
- ZipOutputStream zos = new ZipOutputStream(fos);
-
- addToZipFile(System.getProperty("user.dir"), payloadStringTempFile, zos);
-
- zos.close();
- fos.close();
-
- return new File(payloadZipFileName);
- }
-
- private static String createPortMappingPayloadString(CartridgeInfo cartridgeInfo) {
- // port mappings
- StringBuilder portMapBuilder = new StringBuilder();
- org.wso2.carbon.stratos.cloud.controller.util.xsd.PortMapping[] portMappings = cartridgeInfo.getPortMappings();
- for (org.wso2.carbon.stratos.cloud.controller.util.xsd.PortMapping portMapping : portMappings) {
- String port = portMapping.getPort();
- String protocol = portMapping.getProtocol();
- String proxyPort = portMapping.getProxyPort();
- portMapBuilder.append(protocol).append(":").append(port).append(":").append(proxyPort).append("|");
- }
-
- // remove last "|" character
- String portMappingString = portMapBuilder.toString();
- String portMappingPayloadString = null;
- if (portMappingString.charAt(portMappingString.length() - 1) == '|') {
- portMappingPayloadString = portMappingString.substring(0, portMappingString.length() - 1);
- } else {
- portMappingPayloadString = portMappingString;
- }
-
- return ",PORTS=" + portMappingPayloadString;
- }
-
- private static void addToZipFile(String dir, String fileName, ZipOutputStream zos) throws FileNotFoundException,
- IOException {
-
- log.info("Writing '" + fileName + "' to zip file");
-
- File file = new File(dir+File.separator+fileName);
- FileInputStream fis = new FileInputStream(file);
- ZipEntry zipEntry = new ZipEntry(fileName);
- zos.putNextEntry(zipEntry);
-
- byte[] bytes = new byte[1024];
- int length;
- while ((length = fis.read(bytes)) >= 0) {
- zos.write(bytes, 0, length);
- }
-
- zos.closeEntry();
- fis.close();
- }
-
- private static DataHandler createPayload(CartridgeInfo cartridgeInfo, String cartridgeName, Policy policy, String repoURL, String mySQLPwd, String mySQLHost,
- String payloadZipFileName, int tenantId,
- String tenantDomain)
- throws ADCException {
-
- FileDataSource dataSource = null;
- File payloadFile = null;
- try {
- payloadFile = getPayload(cartridgeInfo, cartridgeName,
- policy, repoURL,
- mySQLPwd, mySQLHost, payloadZipFileName, tenantId, tenantDomain);
- dataSource = new FileDataSource(payloadFile);
- } catch (Exception e) {
- String msg = "Exception : " + e.getMessage();
- log.error(msg, e);
- throw new ADCException("Subscribe failed ", e);
- }
- return new DataHandler(dataSource);
- }
-
- private static DataHandler createCarbonPayload (CartridgeInfo cartridgeInfo, String cartridgeName, String cartridgeAlias, String payloadZipFileName,
- String tenantDomain, boolean isMultitenant) throws ADCException {
-
- FileDataSource dataSource = null;
- File payloadFile = null;
- try {
- payloadFile = getCarbonPayload(cartridgeInfo, cartridgeName, cartridgeAlias, payloadZipFileName,
- tenantDomain, isMultitenant);
- dataSource = new FileDataSource(payloadFile);
-
- } catch (Exception e) {
- String msg = "Exception : " + e.getMessage();
- log.error(msg, e);
- throw new ADCException("Subscribe failed ", e);
- }
-
- return new DataHandler(dataSource);
- }
-
- protected static String getAppDeploymentDirPath(String cartridge, AxisConfiguration axisConfig) {
- return axisConfig.getRepository().getPath() + File.separator + cartridge;
- }
-
- private static CartridgeSubscription createCartridgeSubscription(CartridgeInfo cartridgeInfo,
- Policy policy,
- String cartridgeType,
- String cartridgeName,
- int tenantId,
- String tenantDomain,
- Repository repository,
- String clusterDomain,
- String clusterSubDomain,
- String mgtClusterDomain,
- String mgtClusterSubDomain,
- DataCartridge dataCartridge) {
-
- CartridgeSubscription cartridgeSubscription = new CartridgeSubscription();
- cartridgeSubscription.setCartridge(cartridgeType);
- cartridgeSubscription.setAlias(cartridgeName);
- cartridgeSubscription.setClusterDomain(clusterDomain);
- cartridgeSubscription.setClusterSubdomain(clusterSubDomain);
- cartridgeSubscription.setMgtClusterDomain(mgtClusterDomain);
- cartridgeSubscription.setMgtClusterSubDomain(mgtClusterSubDomain);
- String hostName = null;
- if (cartridgeInfo.getMultiTenant()) {
- hostName = cartridgeInfo.getHostName();
- } else {
- hostName = cartridgeName + "." + cartridgeInfo.getHostName();
- }
- cartridgeSubscription.setHostName(hostName);
- if (policy != null) {
- // Policy can be null for multi-tenant cartridge
- cartridgeSubscription.setPolicy(policy.getName());
- }
- cartridgeSubscription.setRepository(repository);
- cartridgeSubscription.setPortMappings(createPortMappings(cartridgeInfo));
- cartridgeSubscription.setProvider(cartridgeInfo.getProvider());
- cartridgeSubscription.setDataCartridge(dataCartridge);
- cartridgeSubscription.setTenantId(tenantId);
- cartridgeSubscription.setTenantDomain(tenantDomain);
- cartridgeSubscription.setBaseDirectory(cartridgeInfo.getBaseDir());
- cartridgeSubscription.setState("PENDING");
- return cartridgeSubscription;
- }
-
-
- private static List<PortMapping> createPortMappings(CartridgeInfo cartridgeInfo) {
- List<PortMapping> portMappings = new ArrayList<PortMapping>();
-
- if (cartridgeInfo.getPortMappings() != null) {
- for (org.wso2.carbon.stratos.cloud.controller.util.xsd.PortMapping portMapping : cartridgeInfo.getPortMappings()) {
- PortMapping portMap = new PortMapping();
- portMap.setPrimaryPort(portMapping.getPort());
- portMap.setProxyPort(portMapping.getProxyPort());
- portMap.setType(portMapping.getProtocol());
- portMappings.add(portMap);
- }
- }
- return portMappings;
- }
-
- public static CloudControllerServiceClient getServiceClient() throws AxisFault {
- if (serviceClient == null) {
- synchronized (CloudControllerServiceClient.class) {
- if (serviceClient == null) {
- serviceClient = new CloudControllerServiceClient(
- System.getProperty(CartridgeConstants.AUTOSCALER_SERVICE_URL));
- }
- }
- }
- return serviceClient;
- }
-
- public static int getTenantId(ConfigurationContext configurationContext) {
- int tenantId = MultitenantUtils.getTenantId(configurationContext);
- if(log.isDebugEnabled()) {
- log.debug("Returning tenant ID : " + tenantId);
- }
- return tenantId;
- }
-
- private static void validateCartridgeAlias(String alias, String cartridgeType) throws InvalidCartridgeAliasException, DuplicateCartridgeAliasException, ADCException {
- // Do not use quotes in messages, current UI JavaScript does not work if there are quotes
- // TODO: Fix message display in UI
- String patternString = "([a-z0-9]+([-][a-z0-9])*)+";
- Pattern pattern = Pattern.compile(patternString);
-
- if (!pattern.matcher(alias).matches()) {
- String msg = "The alias " + alias + " can contain only alpha-numeric lowercase characters. Please enter a valid alias.";
- log.error(msg);
- throw new InvalidCartridgeAliasException(msg, cartridgeType, alias);
- }
-
- boolean isAliasTaken = false;
- try {
- isAliasTaken = PersistenceManager.isAliasAlreadyTaken(alias, cartridgeType);
- } catch (Exception e) {
- String msg = "Exception : " + e.getMessage();
- log.error(msg, e);
- throw new ADCException("Error when checking alias is already taken", e);
- }
-
- if (isAliasTaken) {
- String msg = "The alias " + alias + " is already taken. Please try again with a different alias.";
- log.error(msg);
- throw new DuplicateCartridgeAliasException(msg, cartridgeType, alias);
- }
- }
-
- public static RepositoryInformation validateRepository(String repoURL, String repoUsername, String repoPassword,
- boolean privateRepo, boolean testConnection) throws RepositoryRequiredException, ADCException,
- RepositoryCredentialsRequiredException, InvalidRepositoryException, RepositoryTransportException {
- RepositoryInformation repositoryInformation = new RepositoryInformation();
- repositoryInformation.setRepoURL(repoURL);
- if (log.isDebugEnabled()) {
- log.debug("Validating Git Repository");
- }
-
- if (repoURL != null && repoURL.trim().length() > 0 && privateRepo) {
- if (log.isDebugEnabled()) {
- log.debug("External repo validation is a private repo: " + repoURL);
- }
- if (repoUsername == null || repoUsername.trim().length() == 0 || repoPassword == null
- || repoPassword.trim().length() == 0) {
- throw new RepositoryCredentialsRequiredException(
- "Username and Password are required for private repository");
- }
- }
-
- if (!testConnection) {
- if (log.isDebugEnabled()) {
- log.debug("External repo validation is not enabled");
- }
- return repositoryInformation;
- }
-
- if (repoURL == null || repoURL.trim().length() == 0) {
- // This means, no repo to validate.
- return repositoryInformation;
- }
-
- if (log.isDebugEnabled()) {
- log.debug("External repo validation enabled");
- }
-
- // This assumes running on Linux.
- String parentDirName = "/tmp/" + UUID.randomUUID().toString();
- CredentialsProvider credentialsProvider = null;
- if (repoUsername != null && repoUsername.trim().length() > 0 && repoPassword != null
- && repoPassword.trim().length() > 0) {
- if (log.isDebugEnabled()) {
- log.debug("External repo credentails are passed: " + repoUsername);
- }
- credentialsProvider = new UsernamePasswordCredentialsProvider(repoUsername, repoPassword.toCharArray());
- }
-
- // Initialize temp local file repo
- FileRepository localRepo = null;
- try {
- File f = new File(parentDirName + "/.git");
- localRepo = new FileRepository(f);
- if (log.isDebugEnabled()) {
- log.debug("Local File Repo: " + f.getAbsoluteFile());
- }
- } catch (IOException e) {
- throw new ADCException("Error creating local file repo", e);
- }
-
- Git git = new Git(localRepo);
- LsRemoteCommand cmd = git.lsRemote().setRemote(repoURL);
- if (credentialsProvider != null) {
- cmd.setCredentialsProvider(credentialsProvider);
- }
- try {
- Collection<Ref> collection = cmd.call();
- List<String> refNames = new ArrayList<String>();
- if (collection != null) {
- for (Ref ref : collection) {
- if (log.isDebugEnabled()) {
- log.debug(repoURL + ": " + ref.getName());
- }
- refNames.add(ref.getName());
- }
- }
- repositoryInformation.setRefName(refNames.toArray(new String[refNames.size()]));
- } catch (InvalidRemoteException e) {
- throw new InvalidRepositoryException("Provided repository url is not valid", e);
- } catch (TransportException e) {
- throw new RepositoryTransportException("Transport error when checking remote repository", e);
- } catch (GitAPIException e) {
- throw new ADCException("Git API error when checking remote repository", e);
- }
- return repositoryInformation;
- }
-
- private static String generatePassword() {
-
- final int PASSWORD_LENGTH = 8;
- StringBuffer sb = new StringBuffer();
- for (int x = 0; x < PASSWORD_LENGTH; x++) {
- sb.append((char) ((int) (Math.random() * 26) + 97));
- }
- return sb.toString();
-
- }
-
- private static void deletePayloadFile(String payloadZipFileName) {
- File payloadFile = new File(payloadZipFileName);
- payloadFile.delete();
- log.info(" Payload file is deleted. ");
- }
-
- private static Properties setRegisterServiceProperties(Policy policy, int tenantId, String alias) {
-
- DecimalFormat df = new DecimalFormat("##.##");
- df.setParseBigDecimal(true);
-
- Properties properties = new Properties();
- List<Property> allProperties = new ArrayList<Property>();
- // min_app_instances
- Property property = new Property();
- property.setName("min_app_instances");
- property.setValue(df.format(policy.getMinAppInstances()));
- allProperties.add(property);
-
-
- // max_app_instances
- property = new Property();
- property.setName("max_app_instances");
- property.setValue(df.format(policy.getMaxAppInstances()));
- allProperties.add(property);
-
- // max_requests_per_second
- property = new Property();
- property.setName("max_requests_per_second");
- property.setValue(df.format(policy.getMaxRequestsPerSecond()));
- allProperties.add(property);
-
- // alarming_upper_rate
- property = new Property();
- property.setName("alarming_upper_rate");
- property.setValue(df.format(policy.getAlarmingUpperRate()));
- allProperties.add(property);
-
- // alarming_lower_rate
- property = new Property();
- property.setName("alarming_lower_rate");
- property.setValue(df.format(policy.getAlarmingLowerRate()));
- allProperties.add(property);
-
- // scale_down_factor
- property = new Property();
- property.setName("scale_down_factor");
- property.setValue(df.format(policy.getScaleDownFactor()));
- allProperties.add(property);
-
- // rounds_to_average
- property = new Property();
- property.setName("rounds_to_average");
- property.setValue(df.format(policy.getRoundsToAverage()));
- allProperties.add(property);
-
- // tenant id
- property = new Property();
- property.setName("tenant_id");
- property.setValue(String.valueOf(tenantId));
- allProperties.add(property);
-
- // alias
- property = new Property();
- property.setName("alias");
- property.setValue(String.valueOf(alias));
- allProperties.add(property);
-
- properties.setProperties(allProperties.toArray(new Property[allProperties.size()]));
- return properties;
- }
-
- private static String convertRepoURL(String gitURL) {
- String convertedHttpURL = null;
- if (gitURL != null && gitURL.startsWith("git@")) {
- StringBuilder httpRepoUrl = new StringBuilder();
- httpRepoUrl.append("http://");
- String[] urls = gitURL.split(":");
- String[] hostNameArray = urls[0].split("@");
- String hostName = hostNameArray[1];
- httpRepoUrl.append(hostName).append("/").append(urls[1]);
- convertedHttpURL = httpRepoUrl.toString();
- } else if (gitURL != null && gitURL.startsWith("http")) {
- convertedHttpURL = gitURL;
- }
- return convertedHttpURL;
- }
-
- private static void addDNSEntry(String alias, String cartridgeType) {
- new DNSManager().addNewSubDomain(alias + "." + cartridgeType, System.getProperty(CartridgeConstants.ELB_IP));
- }
-
- private static SubscriptionInfo createSubscriptionResponse(CartridgeSubscription cartridgeSubscription, Repository repository) {
- SubscriptionInfo subscriptionInfo = new SubscriptionInfo();
-
- if (repository != null && repository.getRepoName() != null) {
- subscriptionInfo.setRepositoryURL(convertRepoURL(repository.getRepoName()));
- }
-
- subscriptionInfo.setHostname(cartridgeSubscription.getHostName());
-
- return subscriptionInfo;
- }
-
- private static String getDynamicClusterDomain(String cartridgeType, String cartName,
- CartridgeInfo cartridgeInfo) {
- return cartName + "." + cartridgeInfo.getHostName() + "." + cartridgeType +
- ".domain";
- }
-
- private static Repository manageRepository(String repoURL, String repoUserName, String repoUserPassword,
- String cartName, CartridgeInfo cartridgeInfo, String username,
- String tenantDomain)
- throws Exception {
-
- Repository repository = new Repository();
- if (repoURL != null && repoURL.trim().length() > 0) {
- log.info("External REPO URL is provided as [" + repoURL +
- "]. Therefore not creating a new repo.");
- //repository.setRepoName(repoURL.substring(0, repoURL.length()-4)); // remove .git part
- repository.setRepoName(repoURL);
- repository.setRepoUserName(repoUserName);
- repository.setRepoUserPassword(repoUserPassword);
- } else {
-
- //log.info("External REPO URL is not provided. Therefore creating a new repo. Adding to Executor");
- log.info("External git repo url not provided for tenant "
- + tenantDomain + ", creating an git internal repository");
-
- // for internal repos internal git server username and password is used.
- repository.setRepoUserName(System.getProperty(CartridgeConstants.INTERNAL_GIT_USERNAME));
- repository.setRepoUserPassword(System.getProperty(CartridgeConstants.INTERNAL_GIT_PASSWORD));
- /*repoCreationExecutor.execute(new RepositoryCreator(new RepositoryInfoBean(repoURL,
- cartName,
- tenantDomain,
- repository.getRepoUserName(),
- repository.getRepoUserPassword(),
- cartridgeInfo.getDeploymentDirs(),
- cartridgeInfo)));*/
- new RepositoryCreator(new RepositoryInfoBean(repoURL,
- cartName,
- tenantDomain,
- repository.getRepoUserName(),
- repository.getRepoUserPassword(),
- cartridgeInfo.getDeploymentDirs(),
- cartridgeInfo)).createInternalRepository();
- String repoName = tenantDomain + "/" + cartName;
- repository.setRepoName("https://" + System.getProperty(CartridgeConstants.GIT_HOST_NAME) + ":8443/git/" + repoName);
-
- }
- return repository;
- }
-
- public static Cartridge getCartridgeInfo(String alias, String tenantDomain) throws ADCException, NotSubscribedException {
- log.info("Alias: " + alias);
- if (alias == null) {
- String msg = "Provided alias is empty";
- log.error(msg);
- throw new ADCException("Alias you provided is empty.");
- }
-
- CartridgeSubscription sub;
- try {
- sub = PersistenceManager.getSubscription(tenantDomain, alias);
- } catch (Exception e) {
- String message = "Cannot get subscription info for " + tenantDomain + " and alias " + alias;
- log.error(message, e);
- throw new ADCException(message, e);
- }
- if (sub == null) {
- String msg = "Info request for not subscribed cartridge";
- log.error(msg);
- throw new NotSubscribedException("You have not subscribed for " + alias, alias);
- }
-
- log.info("Cluster domain : " + sub.getClusterDomain() + " cartridge: " + sub.getCartridge());
-
- CartridgeInfo cartridgeInfo = null;
- try {
- cartridgeInfo = getServiceClient().getCartridgeInfo(sub.getCartridge());
- } catch (Exception e) {
- throw new ADCException("Cannot get cartridge info: " + sub.getCartridge(), e);
- }
-
- TopologyManagementService topologyMgtService = DataHolder.getTopologyMgtService();
-
- String[] ips =
- topologyMgtService.getActiveIPs(sub.getCartridge(),
- sub.getClusterDomain(),
- sub.getClusterSubdomain());
- return populateCartridgeInfo(cartridgeInfo, sub, ips, tenantDomain);
- }
-
- private static void registerService(String cartridgeType, String domain, String subDomain,
- DataHandler payload, String tenantRange, String hostName, Properties properties)
- throws ADCException, UnregisteredCartridgeException {
- log.info("Register service..");
- try {
- getServiceClient().register(domain, subDomain, cartridgeType, payload, tenantRange,
- hostName, properties);
- } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
- String msg = "Exception is occurred in register service operation. Reason :" + e.getMessage();
- log.error(msg, e);
- throw new UnregisteredCartridgeException("Not a registered cartridge " + cartridgeType, cartridgeType, e);
- } catch (RemoteException e) {
- log.error("Remote Error", e);
- throw new ADCException("An error occurred in subscribing process");
- }
- }
-
- public static Cartridge populateCartridgeInfo(CartridgeInfo cartridgeInfo, CartridgeSubscription sub, String[] ips, String tenantDomain) throws ADCException {
- Cartridge cartridge = new Cartridge();
- if (ips != null && ips.length > 0) {
- if (log.isDebugEnabled()) {
- log.debug("Found IPs: " + Arrays.toString(ips) + " for " + cartridgeInfo.getType() + ", "
- + sub.getAlias());
- }
- if (CartridgeConstants.DATA_CARTRIDGE_PROVIDER.equals(sub.getProvider())) {
- // FIXME Temporary fix for SPI-301
- cartridge.setIp(ips[ips.length - 1]);
- if (sub.getDataCartridge() != null) {
- if (log.isDebugEnabled()) {
- log.debug("Data Cartridge Info: " + sub.getDataCartridge().getUserName());
- }
- cartridge.setPassword(sub.getDataCartridge().getPassword());
- cartridge.setDbUserName(sub.getDataCartridge().getUserName());
- }
- }
- if (cartridgeInfo.getMultiTenant()) { // TODO refactor logic for carbon cartridges.
- cartridge.setStatus(CartridgeConstants.ACTIVE);
- cartridge.setActiveInstances(ips.length);
- } else {
- Map<String, String> instanceIpMap;
- try {
- instanceIpMap = PersistenceManager.getCartridgeInstanceInfo(ips, sub.getClusterDomain(),
- sub.getClusterSubdomain());
- cartridge.setActiveInstances(Collections.frequency(instanceIpMap.values(),
- CartridgeConstants.ACTIVE));
- cartridge.setStatus(checkCartridgeStatus(instanceIpMap));
- } catch (Exception e) {
- throw new ADCException("Error checking cartridge status");
- }
-
- if(cartridgeInfo.getProvider().equalsIgnoreCase(CartridgeConstants.PROVIDER_NAME_WSO2)) {
-
- List<Member> members = getMemberInstances(sub.getClusterDomain(), sub.getClusterSubdomain());
- if(members != null) {
- int activeInstancesCount = 0;
- for (Member member : members) {
- if (member != null && member.isActive() && member.getDomain().equals(sub.getClusterDomain())) {
- cartridge.setStatus(CartridgeConstants.ACTIVE);
- activeInstancesCount ++;
- }
- }
- cartridge.setActiveInstances(activeInstancesCount);
- }
- }
- }
- } else {
- log.warn("IPs have not returned through Topology Management for " + sub.getAlias());
- cartridge.setStatus(CartridgeConstants.SUBSCRIBED);
- }
- cartridge.setDisplayName(cartridgeInfo.getDisplayName());
- cartridge.setDescription(cartridgeInfo.getDescription());
- cartridge.setVersion(cartridgeInfo.getVersion());
- cartridge.setMultiTenant(cartridgeInfo.getMultiTenant());
-
- List<String> accessURLs = new ArrayList<String>();
-
- if (cartridgeInfo.getPortMappings() != null) {
- for (org.wso2.carbon.stratos.cloud.controller.util.xsd.PortMapping portMapping : cartridgeInfo
- .getPortMappings()) {
- if (portMapping != null) {
- try {
- int port = Integer.parseInt(portMapping.getProxyPort());
- String protocol = portMapping.getProtocol();
-
- if ("http".equals(protocol) && port == 80) {
- port = -1;
- } else if ("https".equals(protocol) && port == 443) {
- port = -1;
- }
-
- String file = "";
- if (CartridgeConstants.PROVIDER_NAME_WSO2.equals(cartridgeInfo.getProvider()) && !cartridgeInfo.getMultiTenant()) {
- // Carbon Private Jet Cartridges
- file = "/t/" + tenantDomain;
- }
-
- URL serverURL = new URL(protocol, sub.getHostName(), port, file);
- accessURLs.add(serverURL.toExternalForm());
- } catch (MalformedURLException e) {
- if (log.isErrorEnabled()) {
- log.error("Error getting access URL for " + cartridgeInfo.getType(), e);
- }
- } catch (NumberFormatException e) {
- if (log.isErrorEnabled()) {
- log.error("Error getting port of access URL for " + cartridgeInfo.getType(), e);
- }
- }
- }
- }
- }
-
- cartridge.setAccessURLs(accessURLs.toArray(new String[accessURLs.size()]));
-
- cartridge.setCartridgeAlias(sub.getAlias());
- cartridge.setCartridgeType(sub.getCartridge());
- cartridge.setHostName(sub.getHostName());
- cartridge.setPolicy(sub.getPolicy());
- Policy policy = PolicyHolder.getInstance().getPolicy(sub.getPolicy());
- if (policy != null) {
- cartridge.setPolicyDescription(policy.getDescription());
- }
- cartridge.setProvider(sub.getProvider());
- cartridge.setMappedDomain(sub.getMappedDomain());
-
- if (sub.getRepository() != null) {
- cartridge.setRepoURL(convertRepoURL(sub.getRepository().getRepoName()));
- }
- return cartridge;
- }
-
- private static List<Member> getMemberInstances(String domain, String subDomain) {
-
- ClusteringAgent clusteringAgent = DataHolder.getServerConfigContext()
- .getAxisConfiguration().getClusteringAgent();
- GroupManagementAgent groupMgtAgent = clusteringAgent.getGroupManagementAgent(domain, subDomain);
-
- if (groupMgtAgent == null) {
- log.warn("Group Management Agent not found for domain : " + domain +
- ", sub domain : " + subDomain);
- return null;
- }
-
- List<Member> members = groupMgtAgent.getMembers();
- if (members == null || members.isEmpty()) {
- return null;
- }
-
- return members;
- }
-
- private static String checkCartridgeStatus(Map<String, String> instanceIpMap) {
- if (instanceIpMap.values().contains(CartridgeConstants.ACTIVE)) {
- return CartridgeConstants.ACTIVE;
- } else
- return CartridgeConstants.NOT_READY;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6724d973/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeAppType.java
----------------------------------------------------------------------
diff --git a/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeAppType.java b/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeAppType.java
deleted file mode 100644
index 0406cb2..0000000
--- a/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeAppType.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright WSO2, Inc. (http://wso2.com)
- *
- * Licensed 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.wso2.carbon.adc.mgt.utils;
-
-/**
- *
- */
-public class CartridgeAppType {
- private String appType;
- private boolean appSpecificMapping;
-
- public String getAppType() {
- return appType;
- }
-
- public void setAppType(String appType) {
- this.appType = appType;
- }
-
- public boolean isAppSpecificMapping() {
- return appSpecificMapping;
- }
-
- public void setAppSpecificMapping(boolean appSpecificMapping) {
- this.appSpecificMapping = appSpecificMapping;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6724d973/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeConfigFileReader.java
----------------------------------------------------------------------
diff --git a/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeConfigFileReader.java b/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeConfigFileReader.java
deleted file mode 100644
index 55d6810..0000000
--- a/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeConfigFileReader.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright WSO2, Inc. (http://wso2.com)
- *
- * Licensed 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.wso2.carbon.adc.mgt.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.Properties;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.utils.CarbonUtils;
-
-public class CartridgeConfigFileReader {
-
- private static String carbonHome = CarbonUtils.getCarbonHome();
-
- private static final Log log = LogFactory.getLog(CartridgeConfigFileReader.class);
-
- /**
- *
- * Reads cartridge-config.properties file and assign properties to system
- * properties
- *
- */
- public static void readProperties() {
-
- Properties properties = new Properties();
- try {
- properties.load(new FileInputStream(carbonHome + File.separator + "repository" +
- File.separator + "conf" + File.separator +
- "cartridge-config.properties"));
- } catch (Exception e) {
- log.error("Exception is occurred in reading properties file. Reason:" + e.getMessage());
- }
- if (log.isInfoEnabled()) {
- log.info("Setting config properties into System properties");
- }
-
- for (String name : properties.stringPropertyNames()) {
- String value = properties.getProperty(name);
- System.setProperty(name, value);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6724d973/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeConstants.java
----------------------------------------------------------------------
diff --git a/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeConstants.java b/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeConstants.java
deleted file mode 100644
index 90fad61..0000000
--- a/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeConstants.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright WSO2, Inc. (http://wso2.com)
- *
- * Licensed 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.wso2.carbon.adc.mgt.utils;
-
-public class CartridgeConstants {
- public static final String SC_IP = "sc.ip";
- public static final String AUTOSCALER_SERVICE_URL = "autoscalerService.url";
- public static final String ALIAS_NAMESPACE ="http://org.wso2.securevault/configuration";
- public static final String ALIAS_LOCALPART ="secretAlias";
- public static final String ALIAS_PREFIX ="svns";
- public static final String CARTRIDGE_AGENT_EPR = "cartridge.agent.epr";
- public static final String GIT_HOST_NAME = "git.host.name";
- public static final String GIT_HOST_IP = "git.host.ip";
- public static final String SUBSCRIPTION_ACTIVE = "SUBSCRIPTION_ACTIVE";
- public static final String SUBSCRIPTION_INACTIVE = "SUBSCRIPTION_INACTIVE";
- public static final String REPO_NOTIFICATION_URL = "git.repo.notification.url";
- public static final String ACTIVE = "ACTIVE";
- public static final String NOT_READY = "NOT-READY";
- public static final String SUBSCRIBED = "SUBSCRIBED";
-
- public static final String DB_DATASOURCE = "adc.datasource";
- public static final String DB_URL = "adc.jdbc.url";
- public static final String DB_DRIVER = "adc.jdbc.driver";
- public static final String DB_USERNAME = "adc.jdbc.username";
- public static final String DB_PASSWORD = "adc.jdbc.password";
- public static final String BAM_IP = "bam.ip";
- public static final String BAM_PORT = "bam.port";
- public static final String SUDO_SH = "sudo sh";
- public static final String APPEND_SCRIPT = "append.script";
- public static final String REMOVE_SCRIPT = "remove.script";
- public static final String BIND_FILE_PATH = "bind.file.path";
- public static final String ELB_IP = "elb.ip";
- public static final String REPO_KEY_PATH = "repo.key.path";
- public static final String REPO_KEY = "repo.key";
- public static final String MAX_ATTEMPTS = "max.attempts";
- public static final String CARTRIDGE_KEY = "cartridge.key";
-
- public static final String FEATURE_EXTERNAL_REPO_VAIDATION_ENABLED = "feature.externalrepo.validation.enabled";
- public static final String FEATURE_INTERNAL_REPO_ENABLED = "feature.internalrepo.enabled";
- public static final String FEATURE_MULTI_TENANT_MULTIPLE_SUBSCRIPTION_ENABLED = "feature.multitenant.multiplesubscription.enabled";
-
- public static final String MYSQL_CARTRIDGE_NAME = "mysql";
- public static final String DEFAULT_SUBDOMAIN = "__$default";
- public static final String DEFAULT_MGT_SUBDOMAIN = "mgt";
- public static final String MYSQL_DEFAULT_USER = "root";
- public static final String PROVIDER_NAME_WSO2 = "wso2";
- public static final String NOT_SUBSCRIBED = "NOT-SUBSCRIBED";
- public static final String SECURITY_KEY_FILE = "gitRepoKey.xml";
- public static final String SECURITY_KEY = "securityKey";
- public static final String DEFAULT_SECURITY_KEY = "tvnw63ufg9gh5111";
- public static final String DATA_CARTRIDGE_PROVIDER = "data";
- public static final String REPO_INFO_EPR = "repository.info.epr";
- public static final String INTERNAL_GIT_USERNAME = "internal.repo.username";
- public static final String INTERNAL_GIT_PASSWORD = "internal.repo.password";
-
- public static final class DomainMappingInfo {
- public static final String ACTUAL_HOST = "actual.host";
- public static final String HOSTINFO = "hostinfo/";
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6724d973/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeDomain.java
----------------------------------------------------------------------
diff --git a/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeDomain.java b/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeDomain.java
deleted file mode 100644
index b3ac6e0..0000000
--- a/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/CartridgeDomain.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright WSO2, Inc. (http://wso2.com)
- *
- * Licensed 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.wso2.carbon.adc.mgt.utils;
-
-/**
- *
- */
-public class CartridgeDomain {
-
- private String primaryPort;
- private String proxyPort;
- private String type;
- private String tenantId;
- private int min;
- private int max;
- private String cartridgeType;
- private boolean volume;
- private String tenantDomain;
- private String clusterDomain;
- private String clusterSubDomain;
-
- private String hostName;
- private boolean started;
-
- public String getPrimaryPort() {
- return primaryPort;
- }
-
- public String getProxyPort() {
- return proxyPort;
- }
-
- public String getType() {
- return type;
- }
-
- public String getTenantId() {
- return tenantId;
- }
-
- public int getMin() {
- return min;
- }
-
- public int getMax() {
- return max;
- }
-
- public String getCartridgeType() {
- return cartridgeType;
- }
-
- public boolean getVolume() {
- return volume;
- }
-
- public String getTenantDomain() {
- return tenantDomain;
- }
-
- public void setPrimaryPort(String primaryPort) {
- this.primaryPort = primaryPort;
- }
-
- public void setProxyPort(String proxyPort) {
- this.proxyPort = proxyPort;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public void setTenantId(String tenantId) {
- this.tenantId = tenantId;
- }
-
- public void setMin(int min) {
- this.min = min;
- }
-
- public void setMax(int max) {
- this.max = max;
- }
-
- public void setCartridgeType(String cartridgeType) {
- this.cartridgeType = cartridgeType;
- }
-
- public void setVolume(boolean volume) {
- this.volume = volume;
- }
-
- public void setTenantDomain(String tenantDomain) {
- this.tenantDomain = tenantDomain;
- }
-
- public void setStarted(boolean started) {
- this.started = started;
- }
-
- public boolean isStarted() {
- return started;
- }
-
- public String getHostName() {
- return hostName;
- }
-
- public void setHostName(String hostName) {
- this.hostName = hostName;
- }
-
- public String getClusterDomain() {
- return clusterDomain;
- }
-
- public void setClusterDomain(String clusterDomain) {
- this.clusterDomain = clusterDomain;
- }
-
- public String getClusterSubDomain() {
- return clusterSubDomain;
- }
-
- public void setClusterSubDomain(String clusterSubDomain) {
- this.clusterSubDomain = clusterSubDomain;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6724d973/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/DomainInfo.java
----------------------------------------------------------------------
diff --git a/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/DomainInfo.java b/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/DomainInfo.java
deleted file mode 100644
index 82eba2d..0000000
--- a/components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt/2.1.3/src/main/java/org/wso2/carbon/adc/mgt/utils/DomainInfo.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright WSO2, Inc. (http://wso2.com)
- *
- * Licensed 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.wso2.carbon.adc.mgt.utils;
-
-public class DomainInfo {
-
- String domain;
- String subDomain;
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- public String getSubDomain() {
- return subDomain;
- }
-
- public void setSubDomain(String subDomain) {
- this.subDomain = subDomain;
- }
-
-}