You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/09/10 08:34:10 UTC

[1/5] stratos git commit: Adding generic exception catch block to prevent application monitor failing silently

Repository: stratos
Updated Branches:
  refs/heads/stratos-4.1.x 597437184 -> f4e8570e0


Adding generic exception catch block to prevent application monitor failing silently


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/213afdd6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/213afdd6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/213afdd6

Branch: refs/heads/stratos-4.1.x
Commit: 213afdd6a8fc6c50a44a6c3cb77079cc489dfe2e
Parents: ce2a71b
Author: anuruddhal <an...@gmail.com>
Authored: Sat Sep 5 14:56:22 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Sat Sep 5 14:56:22 2015 +0530

----------------------------------------------------------------------
 .../java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java  | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/213afdd6/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index 18a6956..08af34a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -990,6 +990,10 @@ public class AutoscalerUtil {
                     String msg = "Monitor creation failed: [application] " + applicationId;
                     log.warn(msg, e);
                     retries--;
+                } catch (Exception e) {
+                    String msg = "Monitor creation failed: [application] " + applicationId;
+                    log.warn(msg, e);
+                    retries--;
                 }
             }
 


[3/5] stratos git commit: Fixing formatting issues

Posted by la...@apache.org.
Fixing formatting issues


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c19ef373
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c19ef373
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c19ef373

Branch: refs/heads/stratos-4.1.x
Commit: c19ef373631d40aee169b484d8018d744c65980d
Parents: 6be6f79
Author: anuruddhal <an...@gmail.com>
Authored: Mon Sep 7 12:10:34 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Mon Sep 7 12:10:34 2015 +0530

----------------------------------------------------------------------
 .../java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/c19ef373/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index b717853..b8bb00f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -81,7 +81,7 @@ public class AutoscalerUtil {
     }
 
     public static Applications loadApplicationsFromRegistry(Applications applications) {
-        if (applications == null){
+        if (applications == null) {
             throw new RuntimeException("Applications instance is null");
         }
         String[] appResourcePaths = RegistryManager.getInstance().getApplicationResourcePaths();
@@ -970,7 +970,6 @@ public class AutoscalerUtil {
             ApplicationMonitor applicationMonitor = null;
             try {
                 while (!success && retries != 0) {
-
                     try {
                         startTime = System.currentTimeMillis();
                         log.info("Starting monitor: [application] " + applicationId);
@@ -1011,7 +1010,7 @@ public class AutoscalerUtil {
                                     "[startup-time] %d seconds", applicationMonitor.getId(),
                             applicationMonitor.getStartupDependencyTree(), startupTime));
                 }
-            } catch (Exception e){
+            } catch (Exception e) {
                 String msg = "Monitor creation failed: [application] " + applicationId;
                 log.error(msg, e);
             }


[2/5] stratos git commit: Adding general exception catch block

Posted by la...@apache.org.
Adding general exception catch block


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6be6f794
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6be6f794
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6be6f794

Branch: refs/heads/stratos-4.1.x
Commit: 6be6f794a6c364f2bc3c906134e7c6f0feab9591
Parents: 213afdd
Author: anuruddhal <an...@gmail.com>
Authored: Mon Sep 7 11:43:44 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Mon Sep 7 11:43:44 2015 +0530

----------------------------------------------------------------------
 .../stratos/autoscaler/util/AutoscalerUtil.java | 75 ++++++++++----------
 1 file changed, 38 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/6be6f794/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index 08af34a..b717853 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -968,51 +968,52 @@ public class AutoscalerUtil {
             int retries = 5;
             boolean success = false;
             ApplicationMonitor applicationMonitor = null;
-            while (!success && retries != 0) {
+            try {
+                while (!success && retries != 0) {
 
-                try {
-                    startTime = System.currentTimeMillis();
-                    log.info("Starting monitor: [application] " + applicationId);
                     try {
-                        applicationMonitor = MonitorFactory.getApplicationMonitor(applicationId);
-                    } catch (PolicyValidationException e) {
+                        startTime = System.currentTimeMillis();
+                        log.info("Starting monitor: [application] " + applicationId);
+                        try {
+                            applicationMonitor = MonitorFactory.getApplicationMonitor(applicationId);
+                        } catch (PolicyValidationException e) {
+                            String msg = "Monitor creation failed: [application] " + applicationId;
+                            log.warn(msg, e);
+                            retries--;
+                        }
+                        success = true;
+                        endTime = System.currentTimeMillis();
+                    } catch (DependencyBuilderException e) {
+                        String msg = "Monitor creation failed: [application] " + applicationId;
+                        log.warn(msg, e);
+                        retries--;
+                    } catch (TopologyInConsistentException e) {
                         String msg = "Monitor creation failed: [application] " + applicationId;
                         log.warn(msg, e);
                         retries--;
                     }
-                    success = true;
-                    endTime = System.currentTimeMillis();
-                } catch (DependencyBuilderException e) {
-                    String msg = "Monitor creation failed: [application] " + applicationId;
-                    log.warn(msg, e);
-                    retries--;
-                } catch (TopologyInConsistentException e) {
-                    String msg = "Monitor creation failed: [application] " + applicationId;
-                    log.warn(msg, e);
-                    retries--;
-                } catch (Exception e) {
-                    String msg = "Monitor creation failed: [application] " + applicationId;
-                    log.warn(msg, e);
-                    retries--;
                 }
-            }
 
-            if (applicationMonitor == null) {
-                String msg = "Monitor creation failed, even after retrying for 5 times: "
-                        + "[application] " + applicationId;
-                log.error(msg);
-                throw new RuntimeException(msg);
-            }
-            AutoscalerContext autoscalerContext = AutoscalerContext.getInstance();
-            autoscalerContext.removeApplicationPendingMonitor(applicationId);
-            autoscalerContext.removeAppMonitor(applicationId);
-            autoscalerContext.addAppMonitor(applicationMonitor);
-
-            long startupTime = ((endTime - startTime) / 1000);
-            if (log.isInfoEnabled()) {
-                log.info(String.format("Monitor started successfully: [application] %s [dependents] %s " +
-                                "[startup-time] %d seconds", applicationMonitor.getId(),
-                        applicationMonitor.getStartupDependencyTree(), startupTime));
+                if (applicationMonitor == null) {
+                    String msg = "Monitor creation failed, even after retrying for 5 times: "
+                            + "[application] " + applicationId;
+                    log.error(msg);
+                    throw new RuntimeException(msg);
+                }
+                AutoscalerContext autoscalerContext = AutoscalerContext.getInstance();
+                autoscalerContext.removeApplicationPendingMonitor(applicationId);
+                autoscalerContext.removeAppMonitor(applicationId);
+                autoscalerContext.addAppMonitor(applicationMonitor);
+
+                long startupTime = ((endTime - startTime) / 1000);
+                if (log.isInfoEnabled()) {
+                    log.info(String.format("Monitor started successfully: [application] %s [dependents] %s " +
+                                    "[startup-time] %d seconds", applicationMonitor.getId(),
+                            applicationMonitor.getStartupDependencyTree(), startupTime));
+                }
+            } catch (Exception e){
+                String msg = "Monitor creation failed: [application] " + applicationId;
+                log.error(msg, e);
             }
         }
     }


[4/5] stratos git commit: Adding brackets to the condition

Posted by la...@apache.org.
Adding brackets to the condition


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/66e4a31f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/66e4a31f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/66e4a31f

Branch: refs/heads/stratos-4.1.x
Commit: 66e4a31f6e185957ad17cc493094773e608498e5
Parents: c19ef37
Author: anuruddhal <an...@gmail.com>
Authored: Tue Sep 8 19:39:45 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Tue Sep 8 19:39:45 2015 +0530

----------------------------------------------------------------------
 .../java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/66e4a31f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index b8bb00f..3d80094 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -969,7 +969,7 @@ public class AutoscalerUtil {
             boolean success = false;
             ApplicationMonitor applicationMonitor = null;
             try {
-                while (!success && retries != 0) {
+                while ((!success && retries != 0)) {
                     try {
                         startTime = System.currentTimeMillis();
                         log.info("Starting monitor: [application] " + applicationId);


[5/5] stratos git commit: Merge branch 'stratos-4.1.x' of https://git-wip-us.apache.org/repos/asf/stratos into pr-458

Posted by la...@apache.org.
Merge branch 'stratos-4.1.x' of https://git-wip-us.apache.org/repos/asf/stratos into pr-458


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f4e8570e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f4e8570e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f4e8570e

Branch: refs/heads/stratos-4.1.x
Commit: f4e8570e0159179c7c8e700548f2525f94a85fb0
Parents: 66e4a31 5974371
Author: lasinducharith <la...@gmail.com>
Authored: Thu Sep 10 12:03:36 2015 +0530
Committer: lasinducharith <la...@gmail.com>
Committed: Thu Sep 10 12:03:36 2015 +0530

----------------------------------------------------------------------
 .../org.apache.stratos.autoscaler/pom.xml       |   2 +-
 .../org.apache.stratos.cartridge.agent/pom.xml  |   2 +-
 components/org.apache.stratos.cli/pom.xml       |   2 +-
 .../org.apache.stratos.cloud.controller/pom.xml |   2 +-
 .../controller/domain/InstanceMetadata.java     |  12 +-
 .../cloud/controller/iaases/JcloudsIaas.java    |   2 +-
 .../iaases/kubernetes/KubernetesIaas.java       |  14 +-
 components/org.apache.stratos.common/pom.xml    |   2 +-
 .../org.apache.stratos.custom.handlers/pom.xml  |   2 +-
 .../pom.xml                                     |   2 +-
 .../kubernetes/client/KubernetesApiClient.java  |  12 +-
 .../KubernetesAPIClientInterface.java           |   2 +-
 .../client/live/AbstractLiveTest.java           |   7 +-
 .../live/KubernetesApiClientLiveTest.java       |   8 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 .../org.apache.stratos.load.balancer/pom.xml    |   2 +-
 .../org.apache.stratos.manager.styles/pom.xml   |   2 +-
 components/org.apache.stratos.manager/pom.xml   |   2 +-
 components/org.apache.stratos.messaging/pom.xml |   2 +-
 .../org.apache.stratos.metadata.client/pom.xml  |   2 +-
 .../org.apache.stratos.metadata.service/pom.xml |   2 +-
 .../metadata/service/api/MetadataApi.java       |   4 +-
 .../service/registry/CarbonRegistry.java        | 307 ------------
 .../metadata/service/registry/DataStore.java    |   2 -
 .../service/registry/MetadataApiRegistry.java   | 307 ++++++++++++
 .../org.apache.stratos.mock.iaas.api/pom.xml    |   2 +-
 .../org.apache.stratos.mock.iaas.client/pom.xml |   2 +-
 components/org.apache.stratos.mock.iaas/pom.xml |   2 +-
 .../pom.xml                                     |   2 +-
 .../org.apache.stratos.rest.endpoint/pom.xml    |   2 +-
 .../rest/endpoint/api/StratosApiV41Utils.java   |  35 ++
 components/pom.xml                              |   2 +-
 dependencies/fabric8/kubernetes-api/pom.xml     |   2 +-
 dependencies/fabric8/pom.xml                    |   2 +-
 dependencies/guice-assistedinject/pom.xml       |   2 +-
 dependencies/guice-multibindings/pom.xml        |   2 +-
 dependencies/guice/pom.xml                      |   2 +-
 dependencies/jclouds/cloudstack/pom.xml         |   2 +-
 dependencies/jclouds/ec2/pom.xml                |   2 +-
 .../google-cloud-storage/pom.xml                |   2 +-
 .../google-compute-engine/pom.xml               |   2 +-
 .../google-jclouds-labs/googlecloud/pom.xml     |   2 +-
 .../jclouds/google-jclouds-labs/oauth/pom.xml   |   2 +-
 .../jclouds/google-jclouds-labs/pom.xml         |   2 +-
 dependencies/jclouds/jclouds-blobstore/pom.xml  |   2 +-
 .../jclouds/jclouds-bouncycastle/pom.xml        |   2 +-
 dependencies/jclouds/jclouds-compute/pom.xml    |   2 +-
 dependencies/jclouds/jclouds-core/pom.xml       |   2 +-
 dependencies/jclouds/jclouds-enterprise/pom.xml |   2 +-
 dependencies/jclouds/jclouds-joda/pom.xml       |   2 +-
 dependencies/jclouds/jclouds-netty/pom.xml      |   2 +-
 dependencies/jclouds/jclouds-sshj/pom.xml       |   2 +-
 dependencies/jclouds/openstack-common/pom.xml   |   2 +-
 dependencies/jclouds/openstack-keystone/pom.xml |   2 +-
 dependencies/jclouds/openstack-neutron/pom.xml  |   2 +-
 dependencies/jclouds/openstack-nova/pom.xml     |   2 +-
 dependencies/jclouds/pom.xml                    |   2 +-
 dependencies/jclouds/sts/pom.xml                |   2 +-
 dependencies/org.wso2.carbon.ui/pom.xml         |   4 +-
 dependencies/pom.xml                            |   2 +-
 dependencies/rocoto/pom.xml                     |   2 +-
 dependencies/sshj/pom.xml                       |   2 +-
 extensions/cep/modules/distribution/pom.xml     |   2 +-
 .../cep/modules/stratos-cep-extension/pom.xml   |   2 +-
 extensions/cep/pom.xml                          |   2 +-
 .../modules/haproxy-extension/pom.xml           |   2 +-
 .../load-balancer/modules/lvs-extension/pom.xml |   2 +-
 .../modules/nginx-extension/pom.xml             |   2 +-
 .../nginx/extension/NginxConfigWriter.java      | 186 +++++---
 extensions/load-balancer/pom.xml                |   2 +-
 extensions/pom.xml                              |   2 +-
 .../pom.xml                                     |   2 +-
 features/autoscaler/pom.xml                     |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 features/cep/pom.xml                            |   2 +-
 .../pom.xml                                     |   2 +-
 features/cloud-controller/pom.xml               |   2 +-
 .../org.apache.stratos.common.feature/pom.xml   |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 features/common/pom.xml                         |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 features/load-balancer/pom.xml                  |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 features/manager/pom.xml                        |   2 +-
 .../pom.xml                                     |   2 +-
 .../org.apache.stratos.manager.feature/pom.xml  |   2 +-
 .../pom.xml                                     |   2 +-
 features/manager/stratos-mgt/pom.xml            |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 features/messaging/pom.xml                      |   2 +-
 .../pom.xml                                     |   2 +-
 features/mock-iaas/pom.xml                      |   2 +-
 features/pom.xml                                |   2 +-
 pom.xml                                         | 158 +++++--
 .../modules/distribution/pom.xml                |   2 +-
 products/cartridge-agent/pom.xml                |   2 +-
 .../load-balancer/modules/distribution/pom.xml  |   2 +-
 .../modules/p2-profile-gen/pom.xml              |   2 +-
 products/load-balancer/pom.xml                  |   2 +-
 products/pom.xml                                |   2 +-
 .../python-cartridge-agent/distribution/pom.xml |  59 ---
 .../distribution/src/main/assembly/bin.xml      |  57 ---
 .../distribution/src/main/license/LICENSE       | 202 --------
 .../distribution/src/main/notice/NOTICE         |   5 -
 .../distribution/src/main/readme/README         |  32 --
 .../integration/.gitignore                      |   1 -
 .../python-cartridge-agent/integration/pom.xml  | 218 ---------
 .../test/ADCMTAppTenantUserTest.java            | 213 ---------
 .../test/ADCMTAppTest.java                      | 213 ---------
 .../python.cartridge.agent/test/ADCTest.java    | 235 ----------
 .../test/AgentStartupTest.java                  | 154 -------
 .../test/PythonAgentTestManager.java            | 461 -------------------
 .../src/test/resources/log4j.properties         |  41 --
 .../src/test/resources/pca-testing1.xml         |  29 --
 .../src/test/resources/pca-testing2.xml         |  29 --
 .../src/test/resources/pca-testing3.xml         |  29 --
 .../src/test/resources/pca-testing4.xml         |  29 --
 .../src/test/resources/suite-1/agent.conf       |  45 --
 .../src/test/resources/suite-1/jndi.properties  |  22 -
 .../src/test/resources/suite-1/logging.ini      |  52 ---
 .../resources/suite-1/payload/launch-params     |   1 -
 .../src/test/resources/suite-2/agent.conf       |  45 --
 .../src/test/resources/suite-2/jndi.properties  |  22 -
 .../src/test/resources/suite-2/logging.ini      |  52 ---
 .../resources/suite-2/payload/launch-params     |   1 -
 .../src/test/resources/suite-3/agent.conf       |  45 --
 .../src/test/resources/suite-3/jndi.properties  |  22 -
 .../src/test/resources/suite-3/logging.ini      |  52 ---
 .../resources/suite-3/payload/launch-params     |   1 -
 .../src/test/resources/suite-4/agent.conf       |  45 --
 .../src/test/resources/suite-4/jndi.properties  |  22 -
 .../src/test/resources/suite-4/logging.ini      |  52 ---
 .../resources/suite-4/payload/launch-params     |   1 -
 .../test-conf/integration-test.properties       |  26 --
 .../modules/distribution/pom.xml                |  59 +++
 .../distribution/src/main/assembly/bin.xml      |  57 +++
 .../distribution/src/main/license/LICENSE       | 202 ++++++++
 .../modules/distribution/src/main/notice/NOTICE |   5 +
 .../modules/distribution/src/main/readme/README |  32 ++
 .../modules/integration/.gitignore              |   1 +
 .../modules/integration/pom.xml                 | 219 +++++++++
 .../test/ADCMTAppTenantUserTest.java            | 213 +++++++++
 .../test/ADCMTAppTest.java                      | 213 +++++++++
 .../python.cartridge.agent/test/ADCTest.java    | 235 ++++++++++
 .../test/AgentStartupTest.java                  | 154 +++++++
 .../test/PythonAgentTestManager.java            | 461 +++++++++++++++++++
 .../src/test/resources/log4j.properties         |  41 ++
 .../src/test/resources/pca-testing1.xml         |  29 ++
 .../src/test/resources/pca-testing2.xml         |  29 ++
 .../src/test/resources/pca-testing3.xml         |  29 ++
 .../src/test/resources/pca-testing4.xml         |  29 ++
 .../src/test/resources/suite-1/agent.conf       |  45 ++
 .../src/test/resources/suite-1/jndi.properties  |  22 +
 .../src/test/resources/suite-1/logging.ini      |  52 +++
 .../resources/suite-1/payload/launch-params     |   1 +
 .../src/test/resources/suite-2/agent.conf       |  45 ++
 .../src/test/resources/suite-2/jndi.properties  |  22 +
 .../src/test/resources/suite-2/logging.ini      |  52 +++
 .../resources/suite-2/payload/launch-params     |   1 +
 .../src/test/resources/suite-3/agent.conf       |  45 ++
 .../src/test/resources/suite-3/jndi.properties  |  22 +
 .../src/test/resources/suite-3/logging.ini      |  52 +++
 .../resources/suite-3/payload/launch-params     |   1 +
 .../src/test/resources/suite-4/agent.conf       |  45 ++
 .../src/test/resources/suite-4/jndi.properties  |  22 +
 .../src/test/resources/suite-4/logging.ini      |  52 +++
 .../resources/suite-4/payload/launch-params     |   1 +
 .../test-conf/integration-test.properties       |  26 ++
 products/python-cartridge-agent/pom.xml         |   6 +-
 .../stratos-cli/modules/distribution/pom.xml    |   2 +-
 products/stratos-cli/pom.xml                    |   2 +-
 products/stratos/modules/distribution/pom.xml   |   2 +-
 .../modules/distribution/src/assembly/bin.xml   | 141 +++---
 .../distribution/src/bin/add_entry_zone_file.sh |  70 ---
 .../src/bin/git-folder-structure.sh             |  67 ---
 .../distribution/src/bin/manage-git-repo.sh     | 138 ------
 .../src/bin/remove_entry_zone_file.sh           |  75 ---
 .../distribution/src/bin/set-mysql-password.sh  |  65 ---
 .../modules/distribution/src/bin/stratos.bat    | 172 -------
 .../modules/distribution/src/bin/stratos.sh     | 307 ------------
 .../distribution/src/bin/update-instance.sh     |  54 ---
 .../distribution/src/main/bin/stratos.bat       | 172 +++++++
 .../distribution/src/main/bin/stratos.sh        | 307 ++++++++++++
 products/stratos/modules/integration/pom.xml    |   2 +-
 products/stratos/modules/p2-profile-gen/pom.xml |   2 +-
 products/stratos/pom.xml                        |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 service-stubs/pom.xml                           |   2 +-
 196 files changed, 3774 insertions(+), 4089 deletions(-)
----------------------------------------------------------------------