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/08/12 13:32:31 UTC
[08/50] [abbrv] stratos git commit: fixing samples issue
fixing samples issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/955c37a6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/955c37a6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/955c37a6
Branch: refs/heads/data-publisher-integration
Commit: 955c37a6ce6733c03bb0e8e9908f58465aa67099
Parents: 5bdc2f8
Author: reka <rt...@gmail.com>
Authored: Thu Aug 6 19:23:37 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Aug 6 19:33:43 2015 +0530
----------------------------------------------------------------------
.../integration/tests/CartridgeTest.java | 2 +-
.../application-policy-2.json | 18 +++++++++++++++
.../application-policy-3.json | 18 ---------------
.../mock/network-partition-10.json | 24 --------------------
.../mock/network-partition-7.json | 15 ++++++++++++
.../mock/network-partition-8.json | 24 ++++++++++++++++++++
.../mock/network-partition-9.json | 15 ------------
7 files changed, 58 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/955c37a6/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java
index 21171ff..f3456a4 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java
@@ -33,7 +33,7 @@ import static junit.framework.Assert.assertTrue;
*/
public class CartridgeTest extends StratosTestServerManager {
private static final Log log = LogFactory.getLog(CartridgeTest.class);
- private static final String TEST_PATH = "/cartridge-group-test";
+ private static final String TEST_PATH = "/cartridge-test";
@Test
http://git-wip-us.apache.org/repos/asf/stratos/blob/955c37a6/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-2.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-2.json
new file mode 100644
index 0000000..1137942
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-2.json
@@ -0,0 +1,18 @@
+{
+ "id": "application-policy-2",
+ "algorithm": "one-after-another",
+ "networkPartitions": [
+ "network-partition-7",
+ "network-partition-8"
+ ],
+ "properties": [
+ {
+ "name": "networkPartitionGroups",
+ "value": "network-partition-7,network-partition-8"
+ },
+ {
+ "name": "key-2",
+ "value": "value-2"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/955c37a6/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-3.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-3.json
deleted file mode 100644
index 2cecc06..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-3.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "id": "application-policy-3",
- "algorithm": "one-after-another",
- "networkPartitions": [
- "network-partition-9",
- "network-partition-10"
- ],
- "properties": [
- {
- "name": "networkPartitionGroups",
- "value": "network-partition-9|network-partition-10"
- },
- {
- "name": "key-2",
- "value": "value-2"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/955c37a6/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-10.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-10.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-10.json
deleted file mode 100644
index 1e1ec23..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-10.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "id": "network-partition-10",
- "provider": "mock",
- "partitions": [
- {
- "id": "network-partition-10-partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- },
- {
- "id": "network-partition-10-partition-2",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/955c37a6/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-7.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-7.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-7.json
new file mode 100644
index 0000000..6250504
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-7.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-7",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/955c37a6/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-8.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-8.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-8.json
new file mode 100644
index 0000000..354b837
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-8.json
@@ -0,0 +1,24 @@
+{
+ "id": "network-partition-8",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "network-partition-8-partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ },
+ {
+ "id": "network-partition-8-partition-2",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/955c37a6/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-9.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-9.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-9.json
deleted file mode 100644
index 9f12343..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-9.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-9",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}