http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/LoadBalancerCartridgePayloadData.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/LoadBalancerCartridgePayloadData.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/LoadBalancerCartridgePayloadData.java deleted file mode 100644 index f544675..0000000 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/LoadBalancerCartridgePayloadData.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.stratos.adc.mgt.payload; - -public class LoadBalancerCartridgePayloadData extends PayloadData { - - public LoadBalancerCartridgePayloadData(BasicPayloadData basicPayloadData) { - super(basicPayloadData); - } -}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java deleted file mode 100644 index 977a000..0000000 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/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.adc.mgt.payload; -// -//import org.apache.stratos.adc.mgt.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/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/Payload.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/Payload.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/Payload.java deleted file mode 100644 index 10427f5..0000000 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/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.adc.mgt.payload; -// -//import org.apache.commons.logging.Log; -//import org.apache.commons.logging.LogFactory; -//import org.apache.stratos.adc.mgt.exception.ADCException; -//import org.apache.stratos.adc.mgt.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/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadArg.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadArg.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadArg.java deleted file mode 100755 index ba4aa83..0000000 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/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.adc.mgt.payload; -// -//import org.apache.stratos.adc.mgt.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; -// } -// -// -//} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java deleted file mode 100644 index 7482ab6..0000000 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.stratos.adc.mgt.payload; - -import java.io.Serializable; - -public abstract class PayloadData implements Serializable { - - //protected StringBuilder additionalPayloadDataBuilder; - //private Map<String, String> payloadDataMap; - private BasicPayloadData basicPayloadData; - private StringBuilder completePayloadDataBuilder; - - public PayloadData(BasicPayloadData basicPayloadData) { - this.setBasicPayloadData(basicPayloadData); - //additionalPayloadDataBuilder = new StringBuilder(); - completePayloadDataBuilder = new StringBuilder(basicPayloadData.getPayloadData()); - //payloadDataMap = new HashMap<String, String>(); - } - - public void add (String payloadDataName, String payloadDataValue) { - - if(completePayloadDataBuilder.length() > 0) { - completePayloadDataBuilder.append(","); - } - - //payloadDataMap.putSubscription(payloadDataName, payloadDataValue); - completePayloadDataBuilder.append(payloadDataName + "=" + payloadDataValue); - } - - /*public String getPayloadDataValue (String payloadDataName) { - return payloadDataMap.get(payloadDataName); - }*/ - - public StringBuilder getCompletePayloadData () { - - /*if(additionalPayloadDataBuilder.length() > 0) { - return getBasicPayloadData().getPayloadData().append(",").append(additionalPayloadDataBuilder); - } else { - return getBasicPayloadData().getPayloadData(); - }*/ - - return completePayloadDataBuilder; - } - - public BasicPayloadData getBasicPayloadData() { - return basicPayloadData; - } - - public void setBasicPayloadData(BasicPayloadData basicPayloadData) { - this.basicPayloadData = basicPayloadData; - } - - public String toString () { - return getCompletePayloadData().toString(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadFactory.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadFactory.java deleted file mode 100755 index e15b6bc..0000000 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadFactory.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - - * http://www.apache.org/licenses/LICENSE-2.0 - - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.stratos.adc.mgt.payload; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.stratos.adc.mgt.exception.ADCException; -import org.apache.stratos.adc.mgt.utils.CartridgeConstants; - -public class PayloadFactory { - - private static Log log = LogFactory.getLog(PayloadFactory.class); - - /** - * Creates and returns a PayloadData instance - * - * @param cartridgeProvider Cartridge provider - * @param cartridgeType Cartridge type - * @param basicPayloadData BasicPayloadData instance - * @return Payload subscription - * @throws ADCException if no matching criteria is found to create a payload - */ - public static PayloadData getPayloadDataInstance(String cartridgeProvider, String cartridgeType, - BasicPayloadData basicPayloadData) - throws ADCException { - - PayloadData payloadData = null; - - //TODO: fix after adding the property Category to Cartridge Definition - if (cartridgeProvider.equals(CartridgeConstants.DATA_CARTRIDGE_PROVIDER)) { - payloadData = new DataCartridgePayloadData(basicPayloadData); - } else { - payloadData = new FramewrokCartridgePayloadData(basicPayloadData); - } - - if(payloadData == null) { - throw new ADCException("Unable to find matching payload for cartridge type " + cartridgeType + - ", provider " + cartridgeProvider); - } - - return payloadData; - } -}
