You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/08/31 22:41:15 UTC
[3/4] stratos git commit: Restructuring PCA product pom structure:
move submodules inside modules dir
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonAgentTestManager.java
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonAgentTestManager.java b/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonAgentTestManager.java
deleted file mode 100644
index 2394392..0000000
--- a/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonAgentTestManager.java
+++ /dev/null
@@ -1,497 +0,0 @@
-package org.apache.stratos.python.cartridge.agent.test;/*
- * 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.
- */
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.commons.exec.*;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.threading.StratosThreadPool;
-import org.apache.stratos.messaging.broker.publish.EventPublisher;
-import org.apache.stratos.messaging.broker.publish.EventPublisherPool;
-import org.apache.stratos.messaging.event.Event;
-import org.apache.stratos.messaging.listener.instance.status.InstanceActivatedEventListener;
-import org.apache.stratos.messaging.listener.instance.status.InstanceStartedEventListener;
-import org.apache.stratos.messaging.message.receiver.instance.status.InstanceStatusEventReceiver;
-import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver;
-import org.apache.stratos.messaging.util.MessagingUtil;
-
-import java.io.*;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-public class PythonAgentTestManager {
- protected final Properties integrationProperties = new Properties();
- public static final String PATH_SEP = File.separator;
- private static final Log log = LogFactory.getLog(PythonAgentTestManager.class);
- protected BrokerService broker = new BrokerService();
-
- public final long TIMEOUT = 180000;
- public static final String NEW_LINE = System.getProperty("line.separator");
- public static final String ACTIVEMQ_AMQP_BIND_ADDRESS = "activemq.amqp.bind.address";
- public static final String ACTIVEMQ_MQTT_BIND_ADDRESS = "activemq.mqtt.bind.address";
- public static final String CEP_PORT = "cep.port";
- public static final String CEP_SSL_PORT = "cep.ssl.port";
- public static final String DISTRIBUTION_NAME = "distribution.name";
- protected final UUID PYTHON_AGENT_DIR_NAME = UUID.randomUUID();
-
- protected Map<Integer, ServerSocket> serverSocketMap = new HashMap<>();
- protected Map<String, Executor> executorList = new HashMap<String, Executor>();
-
- protected int cepPort;
- protected int cepSSLPort;
- protected String amqpBindAddress;
- protected String mqttBindAddress;
- protected String distributionName;
-
- protected boolean eventReceiverInitiated = false;
- protected TopologyEventReceiver topologyEventReceiver;
- protected InstanceStatusEventReceiver instanceStatusEventReceiver;
- protected boolean instanceStarted;
- protected boolean instanceActivated;
- protected ByteArrayOutputStreamLocal outputStream;
- private ThriftTestServer thriftTestServer;
-
- /**
- * Setup method for test method testPythonCartridgeAgent
- */
- protected void setup(String resourcePath) {
- try {
- startBroker();
- }
- catch (Exception e) {
- log.error("Error while starting MB", e);
- return;
- }
- if (!this.eventReceiverInitiated) {
- ExecutorService executorService = StratosThreadPool.getExecutorService("TEST_THREAD_POOL", 15);
- topologyEventReceiver = new TopologyEventReceiver();
- topologyEventReceiver.setExecutorService(executorService);
- topologyEventReceiver.execute();
-
- instanceStatusEventReceiver = new InstanceStatusEventReceiver();
- instanceStatusEventReceiver.setExecutorService(executorService);
- instanceStatusEventReceiver.execute();
-
- this.instanceStarted = false;
- instanceStatusEventReceiver.addEventListener(new InstanceStartedEventListener() {
- @Override
- protected void onEvent(Event event) {
- log.info("Instance started event received");
- instanceStarted = true;
- }
- });
-
- this.instanceActivated = false;
- instanceStatusEventReceiver.addEventListener(new InstanceActivatedEventListener() {
- @Override
- protected void onEvent(Event event) {
- log.info("Instance activated event received");
- instanceActivated = true;
- }
- });
-
- this.eventReceiverInitiated = true;
- }
-
- // Start Thrift server to emulate CEP
- thriftTestServer = new ThriftTestServer();
- try {
- File file = new File(getResourcesPath("common") + PATH_SEP + "stratos-health-stream-def.json");
- FileInputStream fis = new FileInputStream(file);
- byte[] data = new byte[(int) file.length()];
- fis.read(data);
- fis.close();
- String str = new String(data, "UTF-8");
- if (str.equals("")) {
- log.warn("Stream definition of health stat stream is empty. Thrift server will not function properly");
- }
- thriftTestServer.addStreamDefinition(str, -1234);
- // start with non-ssl port; test server will automatically bind to ssl port
- thriftTestServer.start(cepPort);
- log.info("Started Thrift server with stream definition: " + str);
- }
- catch (Exception e) {
- log.error("Could not start Thrift test server", e);
- }
-
-
- String agentPath = setupPythonAgent(resourcePath);
- log.info("Python agent working directory name: " + PYTHON_AGENT_DIR_NAME);
- log.info("Starting python cartridge agent...");
- this.outputStream = executeCommand("python " + agentPath + PATH_SEP + "agent.py");
- }
-
-
- protected void tearDown() {
- tearDown(null);
- }
-
- /**
- * TearDown method for test method testPythonCartridgeAgent
- */
- protected void tearDown(String sourcePath) {
- for (Map.Entry<String, Executor> entry : executorList.entrySet()) {
- try {
- String commandText = entry.getKey();
- Executor executor = entry.getValue();
- log.info("Terminating process: " + commandText);
- executor.setExitValue(0);
- executor.getWatchdog().destroyProcess();
- }
- catch (Exception ignore) {
- }
- }
- // wait until everything cleans up to avoid connection errors
- sleep(1000);
- for (ServerSocket serverSocket : serverSocketMap.values()) {
- try {
- log.info("Stopping socket server: " + serverSocket.getLocalSocketAddress());
- serverSocket.close();
- }
- catch (IOException ignore) {
- }
- }
- try {
- if (thriftTestServer != null) {
- thriftTestServer.stop();
- }
- }
- catch (Exception e) {
- log.error("Could not stop Thrift test server", e);
- }
-
- try {
- log.info("Deleting source checkout folder...");
- FileUtils.deleteDirectory(new File(sourcePath));
- }
- catch (Exception ignore) {
- }
- this.instanceStatusEventReceiver.terminate();
- this.topologyEventReceiver.terminate();
-
- this.instanceActivated = false;
- this.instanceStarted = false;
- try {
- broker.stop();
- }
- catch (Exception e) {
- log.error("Error while stopping the broker service", e);
- }
- }
-
- public PythonAgentTestManager() {
- try {
- integrationProperties
- .load(PythonAgentTestManager.class.getResourceAsStream(PATH_SEP + "integration-test.properties"));
- distributionName = integrationProperties.getProperty(DISTRIBUTION_NAME);
- amqpBindAddress = integrationProperties.getProperty(ACTIVEMQ_AMQP_BIND_ADDRESS);
- mqttBindAddress = integrationProperties.getProperty(ACTIVEMQ_MQTT_BIND_ADDRESS);
- cepPort = Integer.parseInt(integrationProperties.getProperty(CEP_PORT));
- cepSSLPort = Integer.parseInt(integrationProperties.getProperty(CEP_SSL_PORT));
- log.info("PCA integration properties: " + integrationProperties.toString());
- }
- catch (IOException e) {
- log.error("Error loading integration-test.properties file from classpath. Please make sure that file " +
- "exists in classpath.", e);
- }
- }
-
- protected void startBroker() throws Exception {
- broker.addConnector(amqpBindAddress);
- broker.addConnector(mqttBindAddress);
- broker.setBrokerName("testBroker");
- broker.setDataDirectory(
- PythonAgentTestManager.class.getResource(PATH_SEP).getPath() + PATH_SEP + ".." + PATH_SEP +
- PYTHON_AGENT_DIR_NAME + PATH_SEP + "activemq-data");
- broker.start();
- log.info("Broker service started!");
- }
-
- protected void startCommunicatorThread() {
- Thread communicatorThread = new Thread(new Runnable() {
- @Override
- public void run() {
- List<String> outputLines = new ArrayList<String>();
- while (!outputStream.isClosed()) {
- List<String> newLines = getNewLines(outputLines, outputStream.toString());
- if (newLines.size() > 0) {
- for (String line : newLines) {
- if (line.contains("Exception in thread") || line.contains("ERROR")) {
- try {
- throw new RuntimeException(line);
- }
- catch (Exception e) {
- log.error("ERROR found in PCA log", e);
- }
- }
- log.info("[PCA] " + line);
- }
- }
- sleep(100);
- }
- }
- });
- communicatorThread.start();
- }
-
- /**
- * Start server socket
- *
- * @param port
- */
- protected void startServerSocket(final int port) {
- Thread socketThread = new Thread(new Runnable() {
- @Override
- public void run() {
- while (true) { // do this infinitely until test is complete
- try {
- ServerSocket serverSocket = new ServerSocket(port);
- serverSocketMap.put(port, serverSocket);
- log.info("Server socket started on port: " + port);
- Socket socket = serverSocket.accept();
- log.info("Client connected to [port] " + port);
-
- InputStream is = socket.getInputStream();
- byte[] buffer = new byte[1024];
- int read;
- while (true) {
- if (socket.isClosed()) {
- log.info("Socket for [port] " + port + " has been closed.");
- break;
- }
- if ((read = is.read(buffer)) != -1) {
- String output = new String(buffer, 0, read);
- log.info("Message received for [port] " + port + ", [message] " + output);
- }
- }
- }
- catch (IOException e) {
- String message = "Could not start server socket: [port] " + port;
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
- }
- }
- });
- socketThread.start();
- }
-
-
- protected static String getResourcesPath() {
- return PythonAgentTestManager.class.getResource(PATH_SEP).getPath() + PATH_SEP + ".." + PATH_SEP +
- ".." + PATH_SEP + "src" + PATH_SEP + "test" + PATH_SEP + "resources";
- }
-
- protected static String getResourcesPath(String resourcesPath) {
- return PythonAgentTestManager.class.getResource(PATH_SEP).getPath() + ".." + PATH_SEP + ".." +
- PATH_SEP + "src" + PATH_SEP + "test" + PATH_SEP + "resources" + PATH_SEP + resourcesPath;
- }
-
- /**
- * Copy python agent distribution to a new folder, extract it and copy sample configuration files
- *
- * @return
- */
- protected String setupPythonAgent(String resourcesPath) {
- try {
- log.info("Setting up python cartridge agent...");
-
-
- String srcAgentPath = PythonAgentTestManager.class.getResource(PATH_SEP).getPath() +
- PATH_SEP + ".." + PATH_SEP + ".." + PATH_SEP + ".." + PATH_SEP + "distribution" + PATH_SEP +
- "target" + PATH_SEP + distributionName + ".zip";
- String unzipDestPath =
- PythonAgentTestManager.class.getResource(PATH_SEP).getPath() + PATH_SEP + ".." + PATH_SEP +
- PYTHON_AGENT_DIR_NAME + PATH_SEP;
- //FileUtils.copyFile(new File(srcAgentPath), new File(destAgentPath));
- unzip(srcAgentPath, unzipDestPath);
- String destAgentPath = PythonAgentTestManager.class.getResource(PATH_SEP).getPath() + PATH_SEP + ".." +
- PATH_SEP + PYTHON_AGENT_DIR_NAME + PATH_SEP + distributionName;
-
- String srcAgentConfPath = getResourcesPath(resourcesPath) + PATH_SEP + "agent.conf";
- String destAgentConfPath = destAgentPath + PATH_SEP + "agent.conf";
- FileUtils.copyFile(new File(srcAgentConfPath), new File(destAgentConfPath));
-
- String srcLoggingIniPath = getResourcesPath(resourcesPath) + PATH_SEP + "logging.ini";
- String destLoggingIniPath = destAgentPath + PATH_SEP + "logging.ini";
- FileUtils.copyFile(new File(srcLoggingIniPath), new File(destLoggingIniPath));
-
- String srcPayloadPath = getResourcesPath(resourcesPath) + PATH_SEP + "payload";
- String destPayloadPath = destAgentPath + PATH_SEP + "payload";
- FileUtils.copyDirectory(new File(srcPayloadPath), new File(destPayloadPath));
-
- log.info("Changing extension scripts permissions");
- File extensionsPath = new File(destAgentPath + PATH_SEP + "extensions" + PATH_SEP + "bash");
- File[] extensions = extensionsPath.listFiles();
- for (File extension : extensions) {
- extension.setExecutable(true);
- }
-
- log.info("Python cartridge agent setup completed");
-
- return destAgentPath;
- }
- catch (Exception e) {
- String message = "Could not copy cartridge agent distribution";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
- }
-
- private void unzip(String zipFilePath, String destDirectory) throws IOException {
- File destDir = new File(destDirectory);
- if (!destDir.exists()) {
- destDir.mkdir();
- }
- ZipInputStream zipIn = new ZipInputStream(new FileInputStream(zipFilePath));
- ZipEntry entry = zipIn.getNextEntry();
- // iterates over entries in the zip file
- while (entry != null) {
- String filePath = destDirectory + File.separator + entry.getName();
- if (!entry.isDirectory()) {
- // if the entry is a file, extracts it
- extractFile(zipIn, filePath);
- } else {
- // if the entry is a directory, make the directory
- File dir = new File(filePath);
- dir.mkdir();
- }
- zipIn.closeEntry();
- entry = zipIn.getNextEntry();
- }
- zipIn.close();
- }
-
- private void extractFile(ZipInputStream zipIn, String filePath) throws IOException {
- BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(filePath));
- byte[] bytesIn = new byte[4096];
- int read = 0;
- while ((read = zipIn.read(bytesIn)) != -1) {
- bos.write(bytesIn, 0, read);
- }
- bos.close();
- }
-
- /**
- * Execute shell command
- *
- * @param commandText
- */
- protected ByteArrayOutputStreamLocal executeCommand(final String commandText) {
- final ByteArrayOutputStreamLocal outputStream = new ByteArrayOutputStreamLocal();
- try {
- CommandLine commandline = CommandLine.parse(commandText);
- DefaultExecutor exec = new DefaultExecutor();
- PumpStreamHandler streamHandler = new PumpStreamHandler(outputStream);
- exec.setWorkingDirectory(new File(
- PythonAgentTestManager.class.getResource(PATH_SEP).getPath() + PATH_SEP + ".." + PATH_SEP +
- PYTHON_AGENT_DIR_NAME));
- exec.setStreamHandler(streamHandler);
- ExecuteWatchdog watchdog = new ExecuteWatchdog(TIMEOUT);
- exec.setWatchdog(watchdog);
- exec.execute(commandline, new ExecuteResultHandler() {
- @Override
- public void onProcessComplete(int i) {
- log.info(commandText + " process completed");
- }
-
- @Override
- public void onProcessFailed(ExecuteException e) {
- log.error(commandText + " process failed", e);
- }
- });
- executorList.put(commandText, exec);
- return outputStream;
- }
- catch (Exception e) {
- log.error(outputStream.toString(), e);
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Sleep current thread
- *
- * @param time
- */
- protected void sleep(long time) {
- try {
- Thread.sleep(time);
- }
- catch (InterruptedException ignore) {
- }
- }
-
- /**
- * Return new lines found in the output
- *
- * @param currentOutputLines current output lines
- * @param output output
- * @return
- */
- protected List<String> getNewLines(List<String> currentOutputLines, String output) {
- List<String> newLines = new ArrayList<String>();
-
- if (StringUtils.isNotBlank(output)) {
- String[] lines = output.split(NEW_LINE);
- for (String line : lines) {
- if (!currentOutputLines.contains(line)) {
- currentOutputLines.add(line);
- newLines.add(line);
- }
- }
- }
- return newLines;
- }
-
- /**
- * Publish messaging event
- *
- * @param event
- */
- protected void publishEvent(Event event) {
- String topicName = MessagingUtil.getMessageTopicName(event);
- EventPublisher eventPublisher = EventPublisherPool.getPublisher(topicName);
- eventPublisher.publish(event);
- }
-
-
- /**
- * Implements ByteArrayOutputStream.isClosed() method
- */
- protected class ByteArrayOutputStreamLocal extends org.apache.commons.io.output.ByteArrayOutputStream {
- private boolean closed;
-
- @Override
- public void close() throws IOException {
- super.close();
- closed = true;
- }
-
- public boolean isClosed() {
- return closed;
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/ThriftTestServer.java
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/ThriftTestServer.java b/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/ThriftTestServer.java
deleted file mode 100644
index aaa9ba0..0000000
--- a/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/ThriftTestServer.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package org.apache.stratos.python.cartridge.agent.test;/*
- * 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.
- */
-
-import org.apache.log4j.Logger;
-import org.wso2.carbon.databridge.commons.Credentials;
-import org.wso2.carbon.databridge.commons.Event;
-import org.wso2.carbon.databridge.commons.StreamDefinition;
-import org.wso2.carbon.databridge.commons.exception.MalformedStreamDefinitionException;
-import org.wso2.carbon.databridge.commons.utils.EventDefinitionConverterUtils;
-import org.wso2.carbon.databridge.core.AgentCallback;
-import org.wso2.carbon.databridge.core.DataBridge;
-import org.wso2.carbon.databridge.core.Utils.AgentSession;
-import org.wso2.carbon.databridge.core.definitionstore.InMemoryStreamDefinitionStore;
-import org.wso2.carbon.databridge.core.exception.DataBridgeException;
-import org.wso2.carbon.databridge.core.exception.StreamDefinitionStoreException;
-import org.wso2.carbon.databridge.core.internal.authentication.AuthenticationHandler;
-import org.wso2.carbon.databridge.receiver.thrift.ThriftDataReceiver;
-import org.wso2.carbon.user.api.UserStoreException;
-
-import java.net.SocketException;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class ThriftTestServer {
- Logger log = Logger.getLogger(ThriftTestServer.class);
- ThriftDataReceiver thriftDataReceiver;
- InMemoryStreamDefinitionStore streamDefinitionStore;
- AtomicInteger numberOfEventsReceived;
- RestarterThread restarterThread;
-
- public void startTestServer() throws DataBridgeException, InterruptedException {
- ThriftTestServer thriftTestServer = new ThriftTestServer();
- thriftTestServer.start(7611);
- Thread.sleep(100000000);
- thriftTestServer.stop();
- }
-
-
- public void addStreamDefinition(StreamDefinition streamDefinition, int tenantId)
- throws StreamDefinitionStoreException {
- streamDefinitionStore.saveStreamDefinitionToStore(streamDefinition, tenantId);
- }
-
- public void addStreamDefinition(String streamDefinitionStr, int tenantId)
- throws StreamDefinitionStoreException, MalformedStreamDefinitionException {
- StreamDefinition streamDefinition = EventDefinitionConverterUtils.convertFromJson(streamDefinitionStr);
- getStreamDefinitionStore().saveStreamDefinitionToStore(streamDefinition, tenantId);
- }
-
- private InMemoryStreamDefinitionStore getStreamDefinitionStore() {
- if (streamDefinitionStore == null) {
- streamDefinitionStore = new InMemoryStreamDefinitionStore();
- }
- return streamDefinitionStore;
- }
-
- public void start(int receiverPort) throws DataBridgeException {
- DataPublisherTestUtil.setKeyStoreParams();
- streamDefinitionStore = getStreamDefinitionStore();
- numberOfEventsReceived = new AtomicInteger(0);
- DataBridge databridge = new DataBridge(new AuthenticationHandler() {
- @Override
- public boolean authenticate(String userName,
- String password) {
- log.info("Thrift authentication returning true");
- return true;// allays authenticate to true
-
- }
-
- @Override
- public String getTenantDomain(String userName) {
- return "admin";
- }
-
- @Override
- public int getTenantId(String tenantDomain) throws UserStoreException {
- return -1234;
- }
-
- @Override
- public void initContext(AgentSession agentSession) {
- //To change body of implemented methods use File | Settings | File Templates.
- log.info("Initializing Thrift agent context");
- }
-
- @Override
- public void destroyContext(AgentSession agentSession) {
-
- }
- }, streamDefinitionStore, DataPublisherTestUtil.getDataBridgeConfigPath());
-
- thriftDataReceiver = new ThriftDataReceiver(receiverPort, databridge);
-
- databridge.subscribe(new AgentCallback() {
- int totalSize = 0;
-
- public void definedStream(StreamDefinition streamDefinition,
- int tenantId) {
- log.info("StreamDefinition " + streamDefinition);
- }
-
- @Override
- public void removeStream(StreamDefinition streamDefinition, int tenantId) {
- log.info("StreamDefinition remove " + streamDefinition);
- }
-
- @Override
- public void receive(List<Event> eventList, Credentials credentials) {
- numberOfEventsReceived.addAndGet(eventList.size());
- log.info("Received events : " + numberOfEventsReceived);
-// log.info("eventListSize=" + eventList.size() + " eventList " + eventList + " for username " + credentials.getUsername());
- }
-
- });
-
- String address = "localhost";
- log.info("Test Server starting on " + address);
- thriftDataReceiver.start(address);
- log.info("Test Server Started");
- }
-
- public int getNumberOfEventsReceived() {
- if (numberOfEventsReceived != null) {
- return numberOfEventsReceived.get();
- } else {
- return 0;
- }
- }
-
- public void resetReceivedEvents() {
- numberOfEventsReceived.set(0);
- }
-
- public void stop() {
- thriftDataReceiver.stop();
- log.info("Test Server Stopped");
- }
-
- public void stopAndStartDuration(int port, long stopAfterTimeMilliSeconds, long startAfterTimeMS)
- throws SocketException, DataBridgeException {
- restarterThread = new RestarterThread(port, stopAfterTimeMilliSeconds, startAfterTimeMS);
- Thread thread = new Thread(restarterThread);
- thread.start();
- }
-
- public int getEventsReceivedBeforeLastRestart() {
- return restarterThread.eventReceived;
- }
-
-
- class RestarterThread implements Runnable {
- int eventReceived;
- int port;
-
- long stopAfterTimeMilliSeconds;
- long startAfterTimeMS;
-
- RestarterThread(int port, long stopAfterTime, long startAfterTime) {
- this.port = port;
- stopAfterTimeMilliSeconds = stopAfterTime;
- startAfterTimeMS = startAfterTime;
- }
-
- @Override
- public void run() {
- try {
- Thread.sleep(stopAfterTimeMilliSeconds);
- }
- catch (InterruptedException e) {
- }
- if (thriftDataReceiver != null) {
- thriftDataReceiver.stop();
- }
-
- eventReceived = getNumberOfEventsReceived();
-
- log.info("Number of events received in server shutdown :" + eventReceived);
- try {
- Thread.sleep(startAfterTimeMS);
- }
- catch (InterruptedException e) {
- }
-
- try {
- if (thriftDataReceiver != null) {
- thriftDataReceiver.start(DataPublisherTestUtil.LOCAL_HOST);
- } else {
- start(port);
- }
- }
- catch (DataBridgeException e) {
- log.error(e);
- }
-
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/common/client-truststore.jks
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/common/client-truststore.jks b/products/python-cartridge-agent/integration/src/test/resources/common/client-truststore.jks
deleted file mode 100644
index 2d22c24..0000000
Binary files a/products/python-cartridge-agent/integration/src/test/resources/common/client-truststore.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/common/data-bridge-config.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/common/data-bridge-config.xml b/products/python-cartridge-agent/integration/src/test/resources/common/data-bridge-config.xml
deleted file mode 100644
index 13ca54c..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/common/data-bridge-config.xml
+++ /dev/null
@@ -1,75 +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.
- -->
-
-<dataBridgeConfiguration>
-
- <workerThreads>10</workerThreads>
- <eventBufferCapacity>10000</eventBufferCapacity>
- <clientTimeoutMin>30</clientTimeoutMin>
-
- <dataReceiver name="Thrift">
- <config name="tcpPort">7611</config>
- <config name="sslPort">7711</config>
- </dataReceiver>
-
- <dataReceiver name="Binary">
- <config name="tcpPort">9611</config>
- <config name="sslPort">9711</config>
- <config name="sslReceiverThreadPoolSize">100</config>
- <config name="tcpReceiverThreadPoolSize">100</config>
- </dataReceiver>
-
- <!--<streamDefinitions>
- <streamDefinition>
- {
- 'name':'org.wso2.esb.MediatorStatistics',
- 'version':'1.3.0',
- 'nickName': 'Stock Quote Information',
- 'description': 'Some Desc',
- 'metaData':[
- {'name':'ipAdd','type':'STRING'}
- ],
- 'payloadData':[
- {'name':'symbol','type':'STRING'},
- {'name':'price','type':'DOUBLE'},
- {'name':'volume','type':'INT'},
- {'name':'max','type':'DOUBLE'},
- {'name':'min','type':'Double'}
- ]
- }
- </streamDefinition>
- <streamDefinition domainName="wso2">
- {
- 'name':'org.wso2.esb.MediatorStatistics',
- 'version':'1.3.4',
- 'nickName': 'Stock Quote Information',
- 'description': 'Some Other Desc',
- 'metaData':[
- {'name':'ipAdd','type':'STRING'}
- ],
- 'payloadData':[
- {'name':'symbol','type':'STRING'},
- {'name':'price','type':'DOUBLE'},
- {'name':'volume','type':'INT'}
- ]
- }
- </streamDefinition>
- </streamDefinitions>-->
-
-</dataBridgeConfiguration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/common/log4j.properties
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/common/log4j.properties b/products/python-cartridge-agent/integration/src/test/resources/common/log4j.properties
deleted file mode 100755
index c0c6e78..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/common/log4j.properties
+++ /dev/null
@@ -1,41 +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.
-#
-
-# Set root logger level and appenders
-log4j.rootLogger=INFO, CONSOLE_APPENDER, FILE_APPENDER
-
-# CONSOLE_APPENDER is set to be a ConsoleAppender.
-log4j.appender.CONSOLE_APPENDER=org.apache.log4j.ConsoleAppender
-
-# The standard error log where all the warnings, errors and fatal errors will be logged
-log4j.appender.FILE_APPENDER=org.apache.log4j.FileAppender
-log4j.appender.FILE_APPENDER.File=cartridge-agent.log
-log4j.appender.FILE_APPENDER.layout=org.apache.log4j.PatternLayout
-log4j.appender.FILE_APPENDER.layout.ConversionPattern=%d{ISO8601} [%X{ip}-%X{host}] [%t] %5p %c{1} %m%n
-log4j.appender.FILE_APPENDER.threshold=DEBUG
-
-# CONSOLE_APPENDER uses PatternLayout.
-log4j.appender.CONSOLE_APPENDER.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE_APPENDER.layout.ConversionPattern=[%d{ISO8601}] %5p - [%c{1}] %m%n
-
-log4j.logger.org.apache.stratos.cartridge.agent=INFO
-log4j.logger.org.apache.stratos.messaging=INFO
-log4j.logger.org.apache.stratos.common.util=DEBUG
-log4j.logger.org.wso2.andes.client=ERROR
-log4j.logger.org.apache.activemq.jndi.ActiveMQInitialContextFactory=ERROR
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/common/stratos-health-stream-def.json
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/common/stratos-health-stream-def.json b/products/python-cartridge-agent/integration/src/test/resources/common/stratos-health-stream-def.json
deleted file mode 100644
index 4d36c19..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/common/stratos-health-stream-def.json
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"cartridge_agent_health_stats","version":"1.0.0","nickName":"agent health stats","description":"agent health stats","payloadData":[{"name":"cluster_id", "type": "STRING"},{"name":"cluster_instance_id", "type": "STRING"},{"name":"network_partition_id", "type": "STRING"},{"name":"member_id", "type": "STRING"},{"name":"partition_id", "type": "STRING"},{"name":"health_description", "type": "STRING"},{"name":"value", "type": "DOUBLE"}]}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/common/thrift-agent-config.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/common/thrift-agent-config.xml b/products/python-cartridge-agent/integration/src/test/resources/common/thrift-agent-config.xml
deleted file mode 100644
index dbb2ba3..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/common/thrift-agent-config.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<DataAgentsConfiguration>
- <Agent>
- <Name>Thrift</Name>
- <DataEndpointClass>org.wso2.carbon.databridge.agent.endpoint.thrift.ThriftDataEndpoint</DataEndpointClass>
- <!--<TrustSore>src/main/resources/client-truststore.jks</TrustSore>-->
- <!--<TrustSorePassword>wso2carbon</TrustSorePassword>-->
- <QueueSize>32768</QueueSize>
- <BatchSize>200</BatchSize>
- <CorePoolSize>5</CorePoolSize>
- <MaxPoolSize>10</MaxPoolSize>
- <SocketTimeoutMS>30000</SocketTimeoutMS>
- <KeepAliveTimeInPool>20</KeepAliveTimeInPool>
- <ReconnectionInterval>30</ReconnectionInterval>
- <MaxTransportPoolSize>250</MaxTransportPoolSize>
- <MaxIdleConnections>250</MaxIdleConnections>
- <EvictionTimePeriod>5500</EvictionTimePeriod>
- <MinIdleTimeInPool>5000</MinIdleTimeInPool>
- <SecureMaxTransportPoolSize>250</SecureMaxTransportPoolSize>
- <SecureMaxIdleConnections>250</SecureMaxIdleConnections>
- <SecureEvictionTimePeriod>5500</SecureEvictionTimePeriod>
- <SecureMinIdleTimeInPool>5000</SecureMinIdleTimeInPool>
- </Agent>
-
- <Agent>
- <Name>Binary</Name>
- <DataEndpointClass>org.wso2.carbon.databridge.agent.endpoint.binary.BinaryDataEndpoint</DataEndpointClass>
- <!--<TrustSore>src/main/resources/client-truststore.jks</TrustSore>-->
- <!--<TrustSorePassword>wso2carbon</TrustSorePassword>-->
- <QueueSize>32768</QueueSize>
- <BatchSize>200</BatchSize>
- <CorePoolSize>5</CorePoolSize>
- <MaxPoolSize>10</MaxPoolSize>
- <SocketTimeoutMS>30000</SocketTimeoutMS>
- <KeepAliveTimeInPool>20</KeepAliveTimeInPool>
- <ReconnectionInterval>30</ReconnectionInterval>
- <MaxTransportPoolSize>250</MaxTransportPoolSize>
- <MaxIdleConnections>250</MaxIdleConnections>
- <EvictionTimePeriod>5500</EvictionTimePeriod>
- <MinIdleTimeInPool>5000</MinIdleTimeInPool>
- <SecureMaxTransportPoolSize>250</SecureMaxTransportPoolSize>
- <SecureMaxIdleConnections>250</SecureMaxIdleConnections>
- <SecureEvictionTimePeriod>5500</SecureEvictionTimePeriod>
- <SecureMinIdleTimeInPool>5000</SecureMinIdleTimeInPool>
- </Agent>
-</DataAgentsConfiguration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/common/wso2carbon.jks
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/common/wso2carbon.jks b/products/python-cartridge-agent/integration/src/test/resources/common/wso2carbon.jks
deleted file mode 100644
index 7942c53..0000000
Binary files a/products/python-cartridge-agent/integration/src/test/resources/common/wso2carbon.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/pca-testing1.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/pca-testing1.xml b/products/python-cartridge-agent/integration/src/test/resources/pca-testing1.xml
deleted file mode 100755
index c102914..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/pca-testing1.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="PythonCartridgeAgentIntegrationSuite1">
- <test name="PCATest">
- <classes>
- <class name="org.apache.stratos.python.cartridge.agent.test.AgentStartupTest"/>
- </classes>
- </test>
-</suite>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/pca-testing2.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/pca-testing2.xml b/products/python-cartridge-agent/integration/src/test/resources/pca-testing2.xml
deleted file mode 100755
index c292953..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/pca-testing2.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="PythonCartridgeAgentIntegrationSuite2">
- <test name="PCATest">
- <classes>
- <class name="org.apache.stratos.python.cartridge.agent.test.ADCTest"/>
- </classes>
- </test>
-</suite>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/pca-testing3.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/pca-testing3.xml b/products/python-cartridge-agent/integration/src/test/resources/pca-testing3.xml
deleted file mode 100755
index f20cf20..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/pca-testing3.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="PythonCartridgeAgentIntegrationSuite3">
- <test name="PCATest">
- <classes>
- <class name="org.apache.stratos.python.cartridge.agent.test.ADCMTAppTest"/>
- </classes>
- </test>
-</suite>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/pca-testing4.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/pca-testing4.xml b/products/python-cartridge-agent/integration/src/test/resources/pca-testing4.xml
deleted file mode 100755
index 6462774..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/pca-testing4.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="PythonCartridgeAgentIntegrationSuite4">
- <test name="PCATest">
- <classes>
- <class name="org.apache.stratos.python.cartridge.agent.test.ADCMTAppTenantUserTest"/>
- </classes>
- </test>
-</suite>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-1/agent.conf
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-1/agent.conf b/products/python-cartridge-agent/integration/src/test/resources/suite-1/agent.conf
deleted file mode 100755
index eae5003..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-1/agent.conf
+++ /dev/null
@@ -1,45 +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.
-
-[agent]
-mb.ip =localhost
-mb.port =1885
-listen.address =localhost
-thrift.receiver.ip =localhost
-thrift.receiver.port =7712
-thrift.server.admin.username =admin
-thrift.server.admin.password =admin
-cep.stats.publisher.enabled =true
-lb.private.ip =
-lb.public.ip =
-enable.artifact.update =true
-auto.commit =false
-auto.checkout =true
-artifact.update.interval =15
-artifact.clone.retries =5
-artifact.clone.interval =10
-port.check.timeout =600000
-enable.data.publisher =false
-monitoring.server.ip =localhost
-monitoring.server.port =7612
-monitoring.server.secure.port =7712
-monitoring.server.admin.username =admin
-monitoring.server.admin.password =admin
-log.file.paths =/tmp/agent.screen-startup-test.log
-metadata.service.url =https://localhost:9443
-super.tenant.repository.path =/repository/deployment/server/
-tenant.repository.path =/repository/tenants/
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-1/jndi.properties
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-1/jndi.properties b/products/python-cartridge-agent/integration/src/test/resources/suite-1/jndi.properties
deleted file mode 100755
index beefe3c..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-1/jndi.properties
+++ /dev/null
@@ -1,22 +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.
-#
-
-connectionfactoryName=TopicConnectionFactory
-java.naming.provider.url=tcp://localhost:61617
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-1/logging.ini
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-1/logging.ini b/products/python-cartridge-agent/integration/src/test/resources/suite-1/logging.ini
deleted file mode 100755
index 15cad9b..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-1/logging.ini
+++ /dev/null
@@ -1,52 +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.
-
-
-[formatters]
-keys=default
-
-[formatter_default]
-format=[%(asctime)s] %(levelname)s {%(filename)s:%(funcName)s} - %(message)s
-class=logging.Formatter
-
-[handlers]
-keys=console, error_file, log_file
-
-[handler_console]
-class=logging.StreamHandler
-formatter=default
-args=tuple()
-
-[handler_log_file]
-class=logging.FileHandler
-level=DEBUG
-formatter=default
-args=("agent.log", "w")
-
-[handler_error_file]
-class=logging.FileHandler
-level=ERROR
-formatter=default
-args=("error.log", "w")
-
-[loggers]
-keys=root
-
-[logger_root]
-level=DEBUG
-formatter=default
-handlers=console,error_file,log_file
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-1/payload/launch-params
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-1/payload/launch-params b/products/python-cartridge-agent/integration/src/test/resources/suite-1/payload/launch-params
deleted file mode 100755
index 5b98406..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-1/payload/launch-params
+++ /dev/null
@@ -1 +0,0 @@
-APPLICATION_ID=application-1,APPLICATION_PATH=/tmp/pca-test-suite-1,BASH=/bin/bash,BASHOPTS=cmdhist:complete_fullquote:extquote:force_fignore:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath,BASH_ALIASES=(),BASH_ARGC=(),BASH_ARGV=(),BASH_CMDS=(),BASH_LINENO=([0]="0"),BASH_SOURCE=([0]="/usr/local/bin/populate-user-data.sh"),BASH_VERSINFO=([0]="4" [1]="3" [2]="30" [3]="1" [4]="release" [5]="x86_64-pc-linux-gnu"),BASH_VERSION='4.3.30(1)-release',CARTRIDGE_ALIAS=mytomcat,CARTRIDGE_KEY=PUjpXCLujDhYr5A6,CATALINA_HOME=/opt/tomcat,CEP_IP=54.179.197.243,CEP_PORT=7711,CLUSTER_ID=php.php.domain,CLUSTER_INSTANCE_ID=cluster-1-instance-1,DEPENDENCY_CLUSTER_IDS=myphp.php.domain,DEPLOYMENT=default,DIRSTACK=(),EUID=0,GROUPS=(),GROUP_NAME=null,HOME=/root,HOSTNAME=mytomcat-tomcat-domain3bd3cd47-b95d-475a-aa11-3e3ddc089d49,HOSTTYPE=x86_64,HOST_NAME=mytomcat.tomcat.stratos.org,IFS=' ,',INSTANCE_ID=null,INTERNAL=false,JAVA_HOME=/opt/jdk1.7.0_67,KUBERNETES_CLUSTER_ID=kubernetes-cluster-1,
KUBERNETES_PORT=tcp://10.100.0.2:443,KUBERNETES_PORT_443_TCP=tcp://10.100.0.2:443,KUBERNETES_PORT_443_TCP_ADDR=10.100.0.2,KUBERNETES_PORT_443_TCP_PORT=443,KUBERNETES_PORT_443_TCP_PROTO=tcp,KUBERNETES_RO_PORT=tcp://10.100.0.1:80,KUBERNETES_RO_PORT_80_TCP=tcp://10.100.0.1:80,KUBERNETES_RO_PORT_80_TCP_ADDR=10.100.0.1,KUBERNETES_RO_PORT_80_TCP_PORT=80,KUBERNETES_RO_PORT_80_TCP_PROTO=tcp,KUBERNETES_RO_SERVICE_HOST=10.100.0.1,KUBERNETES_RO_SERVICE_PORT=80,KUBERNETES_SERVICE_HOST=10.100.0.2,KUBERNETES_SERVICE_PORT=443,LB_CLUSTER_ID=null,LOG_LEVEL=DEBUG,MACHTYPE=x86_64-pc-linux-gnu,MB_IP=54.179.197.243,MB_PORT=1883,MEMBER_ID=php.member-1,MIN_COUNT=1,MULTITENANT=false,MYPHP_PHP_DOMAIN_1_PORT=tcp://10.100.171.218:4500,MYPHP_PHP_DOMAIN_1_PORT_4500_TCP=tcp://10.100.171.218:4500,MYPHP_PHP_DOMAIN_1_PORT_4500_TCP_ADDR=10.100.171.218,MYPHP_PHP_DOMAIN_1_PORT_4500_TCP_PORT=4500,MYPHP_PHP_DOMAIN_1_PORT_4500_TCP_PROTO=tcp,MYPHP_PHP_DOMAIN_1_SERVICE_HOST=10.100.171.218,MYPHP_PHP_DOMAIN_1_SERVICE_PORT=45
00,MYTOMCAT_TOMCAT_DOMAIN_1_PORT=tcp://10.100.16.250:4500,MYTOMCAT_TOMCAT_DOMAIN_1_PORT_4500_TCP=tcp://10.100.16.250:4500,MYTOMCAT_TOMCAT_DOMAIN_1_PORT_4500_TCP_ADDR=10.100.16.250,MYTOMCAT_TOMCAT_DOMAIN_1_PORT_4500_TCP_PORT=4500,MYTOMCAT_TOMCAT_DOMAIN_1_PORT_4500_TCP_PROTO=tcp,MYTOMCAT_TOMCAT_DOMAIN_1_SERVICE_HOST=10.100.16.250,MYTOMCAT_TOMCAT_DOMAIN_1_SERVICE_PORT=4500,NETWORK_PARTITION_ID=network-partition-1,OPTERR=1,OPTIND=1,OSTYPE=linux-gnu,PARTITION_ID=partition-1,PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin,PIPESTATUS=([0]="0"),PORTS=8080,POSIXLY_CORRECT=y,PPID=14,PRIMARY=false,PROVIDER=apache,PS4='+ ',PUPPET_DNS_AVAILABLE=null,PUPPET_ENV=false,PUPPET_HOSTNAME=puppet.apache.stratos.org,PUPPET_IP=127.0.0.1,PWD=/opt,SERVICE_NAME=php,SHELL=/bin/bash,SHELLOPTS=braceexpand:hashall:interactive-comments:posix,SHLVL=2,TENANT_ID=-1234,TENANT_RANGE='*',TERM=dumb,TOKEN=eyJhbGciOiJSUzI1NiJ9.eyJleHAiOi04NzI0ODEyNDEsInN1YiI6ImFkbWluIiwiYXpwIjoid3I5SllVaDNtTXd6bVhHVllqWm
VIWnhCV2xFYSIsImFwcElkIjoic2luZ2xlX2dyb3VwX3YxIiwiYXVkIjpbIndyOUpZVWgzbU13em1YR1ZZalplSFp4QldsRWEiXSwiaXNzIjoiaHR0cHM6XC9cL2xvY2FsaG9zdDo5NDQzXC9vYXV0aDJlbmRwb2ludHNcL3Rva2VuIiwiaWF0IjotODcyNDgwMjQwfQ.OSa1gIXUT9amhk1YEU02Yc3JtUYqanzrXh5K1YyvRXcpSiY2Ccn2BfJO0hILF5UooRcGBihzfX3979NRcvGwcUDUvOUJ0eaGPmxFZYbu0nr3xD8lhAO3fa1QYsKAvMnMdwyu2uSgSp6R6EUdVleiwlabUoDsuEcKGkIAn_VQvG0,UID=0,_=posix,LVS_VIRTUAL_IP=192.168.0.40|255.255.255.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-2/agent.conf
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-2/agent.conf b/products/python-cartridge-agent/integration/src/test/resources/suite-2/agent.conf
deleted file mode 100755
index fd3e423..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-2/agent.conf
+++ /dev/null
@@ -1,45 +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.
-
-[agent]
-mb.ip =localhost
-mb.port =1885
-listen.address =localhost
-thrift.receiver.ip =localhost
-thrift.receiver.port =7712
-thrift.server.admin.username =admin
-thrift.server.admin.password =admin
-cep.stats.publisher.enabled =true
-lb.private.ip =
-lb.public.ip =
-enable.artifact.update =true
-auto.commit =true
-auto.checkout =true
-artifact.update.interval =15
-artifact.clone.retries =5
-artifact.clone.interval =10
-port.check.timeout =600000
-enable.data.publisher =false
-monitoring.server.ip =localhost
-monitoring.server.port =7612
-monitoring.server.secure.port =7712
-monitoring.server.admin.username =admin
-monitoring.server.admin.password =admin
-log.file.paths =/tmp/agent.screen-adc-test.log
-metadata.service.url =https://localhost:9443
-super.tenant.repository.path =/repository/deployment/server/
-tenant.repository.path =/repository/tenants/
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-2/jndi.properties
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-2/jndi.properties b/products/python-cartridge-agent/integration/src/test/resources/suite-2/jndi.properties
deleted file mode 100755
index beefe3c..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-2/jndi.properties
+++ /dev/null
@@ -1,22 +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.
-#
-
-connectionfactoryName=TopicConnectionFactory
-java.naming.provider.url=tcp://localhost:61617
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-2/logging.ini
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-2/logging.ini b/products/python-cartridge-agent/integration/src/test/resources/suite-2/logging.ini
deleted file mode 100755
index 15cad9b..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-2/logging.ini
+++ /dev/null
@@ -1,52 +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.
-
-
-[formatters]
-keys=default
-
-[formatter_default]
-format=[%(asctime)s] %(levelname)s {%(filename)s:%(funcName)s} - %(message)s
-class=logging.Formatter
-
-[handlers]
-keys=console, error_file, log_file
-
-[handler_console]
-class=logging.StreamHandler
-formatter=default
-args=tuple()
-
-[handler_log_file]
-class=logging.FileHandler
-level=DEBUG
-formatter=default
-args=("agent.log", "w")
-
-[handler_error_file]
-class=logging.FileHandler
-level=ERROR
-formatter=default
-args=("error.log", "w")
-
-[loggers]
-keys=root
-
-[logger_root]
-level=DEBUG
-formatter=default
-handlers=console,error_file,log_file
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-2/payload/launch-params
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-2/payload/launch-params b/products/python-cartridge-agent/integration/src/test/resources/suite-2/payload/launch-params
deleted file mode 100755
index aa4fcc3..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-2/payload/launch-params
+++ /dev/null
@@ -1 +0,0 @@
-APPLICATION_ID=application1,SERVICE_NAME=tomcat,HOST_NAME=tomcat.stratos.org,MULTITENANT=false,TENANT_ID=-1234,TENANT_RANGE=*,CARTRIDGE_ALIAS=tomcat,CLUSTER_ID=tomcat.domain,CLUSTER_INSTANCE_ID=cluster-1-instance-1,CARTRIDGE_KEY=PUjpXCLujDhYr5A6,DEPLOYMENT=default,REPO_URL=https://github.com/imesh/stratos-php-applications.git,PORTS=8080,PUPPET_IP=127.0.0.1,PUPPET_HOSTNAME=puppet.apache.stratos.org,PUPPET_ENV=false,MEMBER_ID=tomcat.member-1,LB_CLUSTER_ID=null,NETWORK_PARTITION_ID=network-p1,PARTITION_ID=p1,APPLICATION_PATH=/tmp/pca-test-suite-2,MIN_COUNT=1,INTERNAL=false,CLUSTERING_PRIMARY_KEY=A,LOG_FILE_PATHS=/tmp/temp.log,PERSISTENCE_MAPPING=null
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-3/agent.conf
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-3/agent.conf b/products/python-cartridge-agent/integration/src/test/resources/suite-3/agent.conf
deleted file mode 100755
index 0ee1dce..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-3/agent.conf
+++ /dev/null
@@ -1,45 +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.
-
-[agent]
-mb.ip =localhost
-mb.port =1885
-listen.address =localhost
-thrift.receiver.ip =localhost
-thrift.receiver.port =7712
-thrift.server.admin.username =admin
-thrift.server.admin.password =admin
-cep.stats.publisher.enabled =true
-lb.private.ip =
-lb.public.ip =
-enable.artifact.update =true
-auto.commit =true
-auto.checkout =true
-artifact.update.interval =15
-artifact.clone.retries =5
-artifact.clone.interval =10
-port.check.timeout =600000
-enable.data.publisher =false
-monitoring.server.ip =localhost
-monitoring.server.port =7612
-monitoring.server.secure.port =7712
-monitoring.server.admin.username =admin
-monitoring.server.admin.password =admin
-log.file.paths =/tmp/agent.screen-adc-mt-test.log
-metadata.service.url =https://localhost:9443
-super.tenant.repository.path =/repository/deployment/server/
-tenant.repository.path =/repository/tenants/
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-3/jndi.properties
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-3/jndi.properties b/products/python-cartridge-agent/integration/src/test/resources/suite-3/jndi.properties
deleted file mode 100755
index beefe3c..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-3/jndi.properties
+++ /dev/null
@@ -1,22 +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.
-#
-
-connectionfactoryName=TopicConnectionFactory
-java.naming.provider.url=tcp://localhost:61617
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-3/logging.ini
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-3/logging.ini b/products/python-cartridge-agent/integration/src/test/resources/suite-3/logging.ini
deleted file mode 100755
index 15cad9b..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-3/logging.ini
+++ /dev/null
@@ -1,52 +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.
-
-
-[formatters]
-keys=default
-
-[formatter_default]
-format=[%(asctime)s] %(levelname)s {%(filename)s:%(funcName)s} - %(message)s
-class=logging.Formatter
-
-[handlers]
-keys=console, error_file, log_file
-
-[handler_console]
-class=logging.StreamHandler
-formatter=default
-args=tuple()
-
-[handler_log_file]
-class=logging.FileHandler
-level=DEBUG
-formatter=default
-args=("agent.log", "w")
-
-[handler_error_file]
-class=logging.FileHandler
-level=ERROR
-formatter=default
-args=("error.log", "w")
-
-[loggers]
-keys=root
-
-[logger_root]
-level=DEBUG
-formatter=default
-handlers=console,error_file,log_file
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-3/payload/launch-params
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-3/payload/launch-params b/products/python-cartridge-agent/integration/src/test/resources/suite-3/payload/launch-params
deleted file mode 100755
index ed8c67f..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-3/payload/launch-params
+++ /dev/null
@@ -1 +0,0 @@
-APPLICATION_ID=application-3,SERVICE_NAME=tomcat-mt,HOST_NAME=tomcat.stratos.org,MULTITENANT=true,TENANT_ID=-1234,TENANT_RANGE=*,CARTRIDGE_ALIAS=tomcat,CLUSTER_ID=tomcat.domain,CLUSTER_INSTANCE_ID=cluster-1-instance-1,CARTRIDGE_KEY=PUjpXCLujDhYr5A6,DEPLOYMENT=default,REPO_URL=https://github.com/imesh/stratos-php-applications.git,PORTS=8080,PUPPET_IP=127.0.0.1,PUPPET_HOSTNAME=puppet.apache.stratos.org,PUPPET_ENV=false,MEMBER_ID=tomcat.member-1,LB_CLUSTER_ID=null,NETWORK_PARTITION_ID=network-p1,PARTITION_ID=p1,APPLICATION_PATH=/tmp/pca-test-suite-3,MIN_COUNT=1,INTERNAL=false,CLUSTERING_PRIMARY_KEY=A,LOG_FILE_PATHS=/tmp/temp.log,PERSISTENCE_MAPPING=null
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-4/agent.conf
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-4/agent.conf b/products/python-cartridge-agent/integration/src/test/resources/suite-4/agent.conf
deleted file mode 100755
index f945968..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-4/agent.conf
+++ /dev/null
@@ -1,45 +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.
-
-[agent]
-mb.ip =localhost
-mb.port =1885
-listen.address =localhost
-thrift.receiver.ip =localhost
-thrift.receiver.port =7712
-thrift.server.admin.username =admin
-thrift.server.admin.password =admin
-cep.stats.publisher.enabled =true
-lb.private.ip =
-lb.public.ip =
-enable.artifact.update =true
-auto.commit =true
-auto.checkout =true
-artifact.update.interval =15
-artifact.clone.retries =5
-artifact.clone.interval =10
-port.check.timeout =600000
-enable.data.publisher =false
-monitoring.server.ip =localhost
-monitoring.server.port =7612
-monitoring.server.secure.port =7712
-monitoring.server.admin.username =admin
-monitoring.server.admin.password =admin
-log.file.paths =/tmp/agent.screen-adc-mt-tenant-user-test.log
-metadata.service.url =https://localhost:9443
-super.tenant.repository.path =/repository/deployment/server/
-tenant.repository.path =/repository/tenants/
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-4/jndi.properties
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-4/jndi.properties b/products/python-cartridge-agent/integration/src/test/resources/suite-4/jndi.properties
deleted file mode 100755
index beefe3c..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-4/jndi.properties
+++ /dev/null
@@ -1,22 +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.
-#
-
-connectionfactoryName=TopicConnectionFactory
-java.naming.provider.url=tcp://localhost:61617
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-4/logging.ini
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-4/logging.ini b/products/python-cartridge-agent/integration/src/test/resources/suite-4/logging.ini
deleted file mode 100755
index 15cad9b..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-4/logging.ini
+++ /dev/null
@@ -1,52 +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.
-
-
-[formatters]
-keys=default
-
-[formatter_default]
-format=[%(asctime)s] %(levelname)s {%(filename)s:%(funcName)s} - %(message)s
-class=logging.Formatter
-
-[handlers]
-keys=console, error_file, log_file
-
-[handler_console]
-class=logging.StreamHandler
-formatter=default
-args=tuple()
-
-[handler_log_file]
-class=logging.FileHandler
-level=DEBUG
-formatter=default
-args=("agent.log", "w")
-
-[handler_error_file]
-class=logging.FileHandler
-level=ERROR
-formatter=default
-args=("error.log", "w")
-
-[loggers]
-keys=root
-
-[logger_root]
-level=DEBUG
-formatter=default
-handlers=console,error_file,log_file
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/suite-4/payload/launch-params
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-4/payload/launch-params b/products/python-cartridge-agent/integration/src/test/resources/suite-4/payload/launch-params
deleted file mode 100755
index b701066..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/suite-4/payload/launch-params
+++ /dev/null
@@ -1 +0,0 @@
-APPLICATION_ID=application-4,SERVICE_NAME=tomcat-mt,HOST_NAME=tomcat.stratos.org,MULTITENANT=true,TENANT_ID=4,TENANT_RANGE=*,CARTRIDGE_ALIAS=tomcat,CLUSTER_ID=tomcat.domain,CLUSTER_INSTANCE_ID=cluster-1-instance-1,CARTRIDGE_KEY=PUjpXCLujDhYr5A6,DEPLOYMENT=default,REPO_URL=https://github.com/imesh/stratos-php-applications.git,PORTS=8080,PUPPET_IP=127.0.0.1,PUPPET_HOSTNAME=puppet.apache.stratos.org,PUPPET_ENV=false,MEMBER_ID=tomcat.member-1,LB_CLUSTER_ID=null,NETWORK_PARTITION_ID=network-p1,PARTITION_ID=p1,APPLICATION_PATH=/tmp/pca-test-suite-4,MIN_COUNT=1,INTERNAL=false,CLUSTERING_PRIMARY_KEY=A,LOG_FILE_PATHS=/tmp/temp.log,PERSISTENCE_MAPPING=null
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/integration/src/test/resources/test-conf/integration-test.properties
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/integration/src/test/resources/test-conf/integration-test.properties b/products/python-cartridge-agent/integration/src/test/resources/test-conf/integration-test.properties
deleted file mode 100755
index 332441a..0000000
--- a/products/python-cartridge-agent/integration/src/test/resources/test-conf/integration-test.properties
+++ /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.
-
-# Stratos distribution properties added via filters during the build
-distribution.version=${project.version}
-distribution.name=${python.cartridge.agent.distribution.name}-${project.version}
-activemq.amqp.bind.address=tcp://localhost:61617
-activemq.mqtt.bind.address=mqtt://localhost:1885
-cep.port=7612
-cep.ssl.port=7712
-stratos.endpoint=http://localhost:9763
-stratos.admin.username=admin
-stratos.admin.password=admin
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5f11fc2/products/python-cartridge-agent/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/modules/distribution/pom.xml b/products/python-cartridge-agent/modules/distribution/pom.xml
new file mode 100644
index 0000000..f4937df
--- /dev/null
+++ b/products/python-cartridge-agent/modules/distribution/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>python-cartridge-agent-parent</artifactId>
+ <version>4.2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>python-cartridge-agent-distribution</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - Python Cartridge Agent</name>
+ <description>Apache Stratos Python Cartridge Agent Distribution</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>1-pre_dist</id>
+ <phase>test</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <finalName>${python.cartridge.agent.distribution.name}-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file