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/09/15 19:41:12 UTC
[1/2] stratos git commit: Fixing log class names
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x 42c388bc4 -> e56266e0c
Fixing log class names
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/482a77cb
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/482a77cb
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/482a77cb
Branch: refs/heads/stratos-4.1.x
Commit: 482a77cbde422b5b527389de4ac76ced62546748
Parents: 42c388b
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Sep 15 21:47:54 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Sep 15 21:47:54 2015 +0530
----------------------------------------------------------------------
.../integration/tests/application/ApplicationBurstingTest.java | 2 +-
.../integration/tests/application/GroupStartupOrderTest.java | 2 +-
.../tests/application/PartitionOneAfterAnotherClusterTest.java | 2 +-
.../tests/application/PartitionRoundRobinClusterTest.java | 2 +-
.../tests/application/SampleApplicationStartupTestCase.java | 2 +-
.../integration/tests/application/SingleClusterScalingTest.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/482a77cb/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java
index 43e3732..2fab10b 100644
--- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java
+++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java
@@ -38,7 +38,7 @@ import static org.testng.AssertJUnit.assertTrue;
* This will handle the application bursting test cases
*/
public class ApplicationBurstingTest extends StratosIntegrationTest {
- private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
+ private static final Log log = LogFactory.getLog(ApplicationBurstingTest.class);
private static final String RESOURCES_PATH = "/application-bursting-test";
http://git-wip-us.apache.org/repos/asf/stratos/blob/482a77cb/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java
index 031c4ea..300ad9a 100644
--- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java
+++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java
@@ -38,7 +38,7 @@ import static org.testng.AssertJUnit.assertTrue;
* Handling the startup order of the group
*/
public class GroupStartupOrderTest extends StratosIntegrationTest {
- private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
+ private static final Log log = LogFactory.getLog(GroupStartupOrderTest.class);
private static final String RESOURCES_PATH = "/group-startup-order-test";
private static final int GROUP_ACTIVE_TIMEOUT = 300000;
private static final int NODES_START_PARALLEL_TIMEOUT = 30000;
http://git-wip-us.apache.org/repos/asf/stratos/blob/482a77cb/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTest.java
index 76bf716..fafdaf4 100644
--- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTest.java
+++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionOneAfterAnotherClusterTest.java
@@ -46,7 +46,7 @@ import static org.testng.AssertJUnit.assertTrue;
* This will handle the scale-up and scale-down of a particular cluster bursting test cases
*/
public class PartitionOneAfterAnotherClusterTest extends StratosIntegrationTest {
- private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
+ private static final Log log = LogFactory.getLog(PartitionOneAfterAnotherClusterTest.class);
private static final String RESOURCES_PATH = "/partition-round-robin-cluster-test";
http://git-wip-us.apache.org/repos/asf/stratos/blob/482a77cb/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java
index 58fb0a3..d107733 100644
--- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java
+++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java
@@ -45,7 +45,7 @@ import static org.testng.AssertJUnit.assertNotNull;
* This will handle the scale-up and scale-down of a particular cluster bursting test cases
*/
public class PartitionRoundRobinClusterTest extends StratosIntegrationTest {
- private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
+ private static final Log log = LogFactory.getLog(PartitionRoundRobinClusterTest.class);
private static final String RESOURCES_PATH = "/partition-round-robin-cluster-test";
@Test(timeOut = APPLICATION_TEST_TIMEOUT, groups = {"stratos.application.deployment"})
http://git-wip-us.apache.org/repos/asf/stratos/blob/482a77cb/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationStartupTestCase.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationStartupTestCase.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationStartupTestCase.java
index 29405a2..a619d97 100644
--- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationStartupTestCase.java
+++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationStartupTestCase.java
@@ -23,7 +23,7 @@ import static org.testng.AssertJUnit.assertTrue;
* are getting activated. Kill the mock instance and check whether
*/
public class SampleApplicationStartupTestCase extends StratosIntegrationTest {
- private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
+ private static final Log log = LogFactory.getLog(SampleApplicationStartupTestCase.class);
private static final String RESOURCES_PATH = "/sample-application-startup-test";
@Test(timeOut = APPLICATION_TEST_TIMEOUT, description = "Application startup, activation and faulty member " +
http://git-wip-us.apache.org/repos/asf/stratos/blob/482a77cb/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java
index 71702f1..a6f842a 100644
--- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java
+++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java
@@ -47,7 +47,7 @@ import static org.testng.AssertJUnit.assertTrue;
* This will handle the scale-up and scale-down of a particular cluster bursting test cases
*/
public class SingleClusterScalingTest extends StratosIntegrationTest {
- private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
+ private static final Log log = LogFactory.getLog(SingleClusterScalingTest.class);
private static final String RESOURCES_PATH = "/single-cluster-scaling-test";
private static final int CLUSTER_SCALE_UP_TIMEOUT = 180000;
private static final int CLUSTER_SCALE_DOWN_TIMEOUT = 360000;
[2/2] stratos git commit: Adding exclude directives to Stratos
distribution descriptor to replace customized artifacts
Posted by ra...@apache.org.
Adding exclude directives to Stratos distribution descriptor to replace customized artifacts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e56266e0
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e56266e0
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e56266e0
Branch: refs/heads/stratos-4.1.x
Commit: e56266e0c0d3a8f1c2bbaf18b393545c3d672a84
Parents: 482a77c
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Sep 15 22:27:07 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Sep 15 22:27:07 2015 +0530
----------------------------------------------------------------------
products/stratos/modules/distribution/src/assembly/bin.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e56266e0/products/stratos/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml
index 09ed4e1..c60bd09 100755
--- a/products/stratos/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos/modules/distribution/src/assembly/bin.xml
@@ -48,8 +48,12 @@
<exclude>**/repository/conf/security/cipher-tool.properties</exclude>
<exclude>**/dbscripts/**</exclude>
<exclude>**/repository/conf/security/cipher-text.properties</exclude>
+ <exclude>**/repository/conf/security/authenticators.xml</exclude>
<exclude>**/repository/conf/axis2/axis2.xml</exclude>
+ <exclude>**/repository/conf/axis2/axis2_client.xml</exclude>
+ <exclude>**/repository/conf/axis2/tenant-axis2.xml</exclude>
<exclude>**/repository/conf/registry.xml</exclude>
+ <exclude>**/repository/conf/user-mgt.xml</exclude>
<exclude>**/repository/conf/log4j.properties</exclude>
<exclude>**/repository/conf/data-bridge/**</exclude>
<exclude>**/repository/resources/security/client-truststore.jks</exclude>