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:24 UTC
[01/50] [abbrv] stratos git commit: Integration test: stop the broker
service before Stratos server shutdown, added mock iaas initialized check
Repository: stratos
Updated Branches:
refs/heads/data-publisher-integration 18e3fe472 -> f704fa3da
Integration test: stop the broker service before Stratos server shutdown, added mock iaas initialized check
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1c7f6358
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1c7f6358
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1c7f6358
Branch: refs/heads/data-publisher-integration
Commit: 1c7f63581102bc80a0a80f860624e82c03d36093
Parents: 4f91f25
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Aug 4 17:54:33 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Aug 4 17:54:33 2015 +0530
----------------------------------------------------------------------
.../tests/StratosTestServerManager.java | 56 ++++++++++++++++----
1 file changed, 45 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1c7f6358/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
index 9373c11..020ce41 100755
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
@@ -54,6 +54,8 @@ public class StratosTestServerManager extends TestServerManager {
private static final String JNDI_PROPERTIES_FILE = "jndi.properties";
private static final String JMS_OUTPUT_ADAPTER_FILE = "JMSOutputAdaptor.xml";
+ private BrokerService broker = new BrokerService();
+ private TestLogAppender testLogAppender = new TestLogAppender();
private ServerUtils serverUtils;
private String carbonHome;
@@ -65,8 +67,6 @@ public class StratosTestServerManager extends TestServerManager {
@Override
@BeforeSuite(timeOut = 600000)
public String startServer() throws IOException {
-
- TestLogAppender testLogAppender = new TestLogAppender();
Logger.getRootLogger().addAppender(testLogAppender);
Logger.getRootLogger().setLevel(Level.INFO);
@@ -74,15 +74,15 @@ public class StratosTestServerManager extends TestServerManager {
// Start ActiveMQ
long time1 = System.currentTimeMillis();
log.info("Starting ActiveMQ...");
- BrokerService broker = new BrokerService();
broker.setDataDirectory(StratosTestServerManager.class.getResource("/").getPath() +
File.separator + ".." + File.separator + "activemq-data");
broker.setBrokerName("testBroker");
broker.addConnector(ACTIVEMQ_BIND_ADDRESS);
broker.start();
long time2 = System.currentTimeMillis();
- log.info(String.format("ActiveMQ started in %d sec", (time2 - time1)/1000));
- } catch (Exception e) {
+ log.info(String.format("ActiveMQ started in %d sec", (time2 - time1) / 1000));
+ }
+ catch (Exception e) {
throw new RuntimeException("Could not start ActiveMQ", e);
}
@@ -106,24 +106,48 @@ public class StratosTestServerManager extends TestServerManager {
this.serverUtils.startServerUsingCarbonHome(carbonHome, carbonHome, "stratos", PORT_OFFSET, null);
FrameworkSettings.init();
- while (!serverStarted(testLogAppender)) {
+ while (!serverStarted()) {
log.info("Waiting for topology to be initialized...");
Thread.sleep(5000);
}
+ while (!mockServiceStarted()) {
+ log.info("Waiting for mock service to be initialized...");
+ Thread.sleep(1000);
+ }
+
long time4 = System.currentTimeMillis();
- log.info(String.format("Stratos server started in %d sec", (time4 - time3)/1000));
+ log.info(String.format("Stratos server started in %d sec", (time4 - time3) / 1000));
return carbonHome;
}
- } catch (Exception e) {
+ }
+ catch (Exception e) {
throw new RuntimeException("Could not start Stratos server", e);
}
}
+ private boolean mockServiceStarted() {
+ for (String message : testLogAppender.getMessages()) {
+ if (message.contains("Mock IaaS service component activated")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
@Override
@AfterSuite(timeOut = 600000)
public void stopServer() throws Exception {
super.stopServer();
+ /*
+ while (!serverStopped()) {
+ log.info("Waiting for server to be shutdown...");
+ Thread.sleep(1000);
+ }
+ log.info("Stopped Apache Stratos server.");
+ */
+ broker.stop();
+ log.info("Stopped ActiveMQ server.");
}
protected void copyArtifacts(String carbonHome) throws IOException {
@@ -146,9 +170,19 @@ public class StratosTestServerManager extends TestServerManager {
log.info(sourceFilePath + " file copied");
}
- private boolean serverStarted(TestLogAppender testLogAppender) {
- for(String message : testLogAppender.getMessages()) {
- if(message.contains("Topology initialized")) {
+ private boolean serverStopped() {
+ for (String message : testLogAppender.getMessages()) {
+ if (message.contains("Halting JVM")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ private boolean serverStarted() {
+ for (String message : testLogAppender.getMessages()) {
+ if (message.contains("Topology initialized")) {
return true;
}
}
[05/50] [abbrv] stratos git commit: This closes PR-416: Chaning UI
for port-mapping
Posted by la...@apache.org.
This closes PR-416: Chaning UI for port-mapping
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3222a126
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3222a126
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3222a126
Branch: refs/heads/data-publisher-integration
Commit: 3222a126624db21f3ce1de18ae220a5374b6befd
Parents: 67a4392 43d8d0e
Author: Akila Perera <ra...@gmail.com>
Authored: Wed Aug 5 12:52:49 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Wed Aug 5 12:52:49 2015 +0530
----------------------------------------------------------------------
.../controller/domain/ClusterPortMapping.java | 3 ++-
.../forms/default/configure/cartridges.json | 8 ++++++--
.../forms/schema/configure/cartridges.json | 13 +++++++++++++
.../org.apache.stratos.rest.endpoint/pom.xml | 6 ++++++
.../rest/endpoint/api/StratosApiV41Utils.java | 19 +++++++++----------
samples/cartridges/kubernetes/c1.json | 3 ++-
samples/cartridges/kubernetes/c2.json | 3 ++-
samples/cartridges/kubernetes/c3.json | 3 ++-
samples/cartridges/kubernetes/c4.json | 3 ++-
samples/cartridges/kubernetes/esb.json | 3 ++-
samples/cartridges/kubernetes/tomcat.json | 3 ++-
samples/cartridges/kubernetes/tomcat1.json | 3 ++-
samples/cartridges/kubernetes/tomcat2.json | 3 ++-
samples/cartridges/kubernetes/tomcat3.json | 3 ++-
samples/cartridges/kubernetes/wso2-is.json | 3 ++-
15 files changed, 56 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
[08/50] [abbrv] stratos git commit: fixing samples issue
Posted by la...@apache.org.
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"
- }
- ]
- }
- ]
-}
[50/50] [abbrv] stratos git commit: Merging master into
data-publisher-integration
Posted by la...@apache.org.
Merging master into data-publisher-integration
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f704fa3d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f704fa3d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f704fa3d
Branch: refs/heads/data-publisher-integration
Commit: f704fa3da58e308cbbf9e05a836ba0cbc9fb471d
Parents: 18e3fe4 8d321a2
Author: Thanuja <th...@wso2.com>
Authored: Tue Aug 11 21:30:36 2015 +0530
Committer: Thanuja <th...@wso2.com>
Committed: Tue Aug 11 21:30:36 2015 +0530
----------------------------------------------------------------------
README.md | 24 +-
.../org.apache.stratos.autoscaler/pom.xml | 2 +-
.../applications/ApplicationUtils.java | 7 +-
.../parser/DefaultApplicationParser.java | 6 +-
.../applications/payload/BasicPayloadData.java | 13 +
.../pojo/SubscribableInfoContext.java | 10 +
.../applications/topic/ApplicationBuilder.java | 11 +-
.../client/AutoscalerCloudControllerClient.java | 8 +-
.../autoscaler/context/InstanceContext.java | 85 +-
.../application/ApplicationInstanceContext.java | 31 -
.../application/ParentInstanceContext.java | 162 +
.../context/cluster/ClusterContext.java | 34 +-
.../context/cluster/ClusterInstanceContext.java | 15 +-
.../context/group/GroupInstanceContext.java | 80 -
.../partition/ClusterLevelPartitionContext.java | 15 +-
.../partition/GroupLevelPartitionContext.java | 738 ---
.../partition/ParentLevelPartitionContext.java | 738 +++
.../ClusterLevelNetworkPartitionContext.java | 92 -
.../network/NetworkPartitionContext.java | 328 +-
.../ParentLevelNetworkPartitionContext.java | 437 --
.../publisher/ClusterStatusEventPublisher.java | 8 +-
.../AutoscalerTopologyEventReceiver.java | 2 +-
.../autoscaler/monitor/MonitorFactory.java | 11 +-
.../monitor/cluster/ClusterMonitor.java | 124 +-
.../monitor/component/ApplicationMonitor.java | 67 +-
.../monitor/component/GroupMonitor.java | 157 +-
.../component/ParentComponentMonitor.java | 31 +-
.../autoscaler/rule/RuleTasksDelegator.java | 15 +-
.../services/impl/AutoscalerServiceImpl.java | 23 +-
.../cluster/ClusterStatusActiveProcessor.java | 4 +-
.../cluster/ClusterStatusInactiveProcessor.java | 4 +-
.../ClusterStatusTerminatedProcessor.java | 4 +-
.../stratos/autoscaler/util/AutoscalerUtil.java | 8 +-
.../org.apache.stratos.cartridge.agent/pom.xml | 2 +-
.../apache/stratos/cartridge/agent/Main.java | 29 +
.../extensions/DefaultExtensionHandler.java | 43 -
.../agent/extensions/ExtensionHandler.java | 7 -
.../agent/test/JavaCartridgeAgentTest.java | 4 +-
components/org.apache.stratos.cli/pom.xml | 6 +-
.../src/test/python/README.md | 2 +-
.../org.apache.stratos.cloud.controller/pom.xml | 4 +-
.../controller/domain/ClusterPortMapping.java | 12 +-
.../cloud/controller/domain/PortMapping.java | 9 +
.../iaases/kubernetes/KubernetesIaas.java | 70 +-
.../status/ClusterStatusTopicReceiver.java | 7 -
.../messaging/topology/TopologyBuilder.java | 72 +-
.../impl/CloudControllerServiceImpl.java | 16 +-
components/org.apache.stratos.common/pom.xml | 2 +-
.../beans/application/SubscribableInfo.java | 9 +
.../common/beans/cartridge/PortMappingBean.java | 15 +-
.../common/constants/StratosConstants.java | 1 +
.../common/listeners/TenantMgtListener.java | 45 -
.../stratos/common/util/CommandUtils.java | 30 +
.../org.apache.stratos.custom.handlers/pom.xml | 2 +-
.../org.apache.stratos.deployment/pom.xml | 2 +-
.../org.apache.stratos.email.sender/pom.xml | 2 +-
.../org.apache.stratos.keystore.mgt/pom.xml | 127 -
.../stratos/keystore/mgt/KeyStoreGenerator.java | 249 -
.../keystore/mgt/KeyStoreMgtException.java | 40 -
.../keystore/mgt/KeystoreTenantMgtListener.java | 86 -
.../internal/KeyStoreMgtServiceComponent.java | 88 -
.../keystore/mgt/util/RealmServiceHolder.java | 34 -
.../mgt/util/RegistryServiceHolder.java | 34 -
.../pom.xml | 7 +-
.../kubernetes/client/KubernetesApiClient.java | 43 +-
.../kubernetes/client/KubernetesConstants.java | 2 +
.../KubernetesAPIClientInterface.java | 19 +-
.../client/live/AbstractLiveTest.java | 15 +-
.../live/KubernetesApiClientLiveTest.java | 3 +-
.../pom.xml | 3 +-
.../pom.xml | 3 +-
.../extension/api/LoadBalancerExtension.java | 2 +-
.../org.apache.stratos.load.balancer/pom.xml | 3 +-
.../org.apache.stratos.logging.view.ui/pom.xml | 2 +-
.../console/README.md | 2 +-
.../forms/default/configure/cartridges.json | 8 +-
.../forms/schema/configure/cartridges.json | 13 +
.../theme0/js/custom/applications-deploy.js | 4 +-
.../theme0/partials/applications_deploy.hbs | 4 +-
.../org.apache.stratos.manager.styles/pom.xml | 2 +-
components/org.apache.stratos.manager/pom.xml | 2 +-
.../manager/context/StratosManagerContext.java | 36 +-
.../internal/ServiceReferenceHolder.java | 28 +-
.../StratosManagerServiceComponent.java | 4 +-
.../publisher/TenantEventPublisher.java | 34 +-
.../manager/registry/RegistryManager.java | 6 +-
.../CartridgeSubscriptionDataPublisher.java | 2 +-
.../management/StratosUserManagerUtils.java | 3 +-
.../user/management/TenantUserRoleManager.java | 31 +-
.../utils/CartridgeConfigFileReader.java | 3 +-
.../manager/utils/PermissionConstants.java | 2 +-
components/org.apache.stratos.messaging/pom.xml | 3 +-
.../domain/topology/KubernetesService.java | 9 +
.../application/GroupReadyToShutdownEvent.java | 52 -
.../ClusterStatusClusterCreatedEvent.java | 85 -
.../event/tenant/TenantSubscribedEvent.java | 53 -
.../event/tenant/TenantUnSubscribedEvent.java | 53 -
.../topology/ClusterInstanceActivatedEvent.java | 21 +-
.../GroupMaintenanceModeEventListener.java | 23 +
...lusterStatusClusterCreatedEventListener.java | 24 -
.../tenant/TenantSubscribedEventListener.java | 28 -
.../tenant/TenantUnSubscribedEventListener.java | 28 -
.../ApplicationsMessageProcessorChain.java | 6 +
.../GroupMaintenanceModeProcessor.java | 82 +
...terStatusClusterCreatedMessageProcessor.java | 58 -
.../ClusterStatusMessageProcessorChain.java | 8 +-
.../ClusterInstanceActivatedProcessor.java | 22 +-
.../org.apache.stratos.metadata.client/pom.xml | 2 +-
.../org.apache.stratos.metadata.service/pom.xml | 2 +-
.../metadata/service/api/MetadataApi.java | 22 +-
.../service/registry/CarbonRegistry.java | 149 +-
.../org.apache.stratos.mock.iaas.api/pom.xml | 3 +-
.../org.apache.stratos.mock.iaas.client/pom.xml | 2 +-
components/org.apache.stratos.mock.iaas/pom.xml | 2 +-
.../.gitignore | 1 +
.../pom.xml | 32 +-
.../cartridge.agent/cartridge.agent/agent.conf | 2 +
.../cartridge.agent/cartridge.agent/agent.py | 39 +-
.../cartridge.agent/cartridge.agent/config.py | 750 +--
.../cartridge.agent/constants.py | 13 +-
.../cartridge.agent/cartridge.agent/entity.py | 636 +++
.../cartridge.agent/exception.py | 11 +-
.../bash/ApplicationSignUpRemovedEvent.sh | 4 +-
.../extensions/bash/ArtifactUpdatedEvent.sh | 5 +-
.../extensions/bash/CompleteTenantEvent.sh | 6 +-
.../extensions/bash/CompleteTopologyEvent.sh | 10 +-
.../extensions/bash/CopyArtifacts.sh | 8 +-
.../extensions/bash/DomainMappingAddedEvent.sh | 17 +-
.../bash/DomainMappingRemovedEvent.sh | 17 +-
.../extensions/bash/InstanceActivatedEvent.sh | 8 +-
.../extensions/bash/InstanceStartedEvent.sh | 7 +-
.../extensions/bash/MemberActivatedEvent.sh | 23 +-
.../extensions/bash/MemberStartedEvent.sh | 23 +-
.../extensions/bash/MemberSuspendedEvent.sh | 23 +-
.../extensions/bash/MemberTerminatedEvent.sh | 23 +-
.../extensions/bash/StartServers.sh | 19 +-
.../extensions/bash/TenantSubscribedEvent.sh | 28 -
.../cartridge.agent/extensions/bash/clean.sh | 4 +-
.../extensions/py/ExtensionExecutor.py | 4 +
.../cartridge.agent/healthstats.py | 241 +
.../cartridge.agent/logpublisher.py | 287 ++
.../cartridge.agent/mdsclient.py | 22 +-
.../modules/artifactmgt/git/agentgithandler.py | 54 +-
.../modules/datapublisher/__init__.py | 18 -
.../modules/datapublisher/logpublisher.py | 309 --
.../modules/event/eventhandler.py | 247 +-
.../modules/event/tenant/events.py | 2 +-
.../modules/event/topology/events.py | 2 +-
.../modules/healthstatspublisher/__init__.py | 16 -
.../abstracthealthstatisticspublisher.py | 63 -
.../modules/healthstatspublisher/healthstats.py | 264 -
.../modules/publisher/__init__.py | 16 -
.../publisher/cartridgeagentpublisher.py | 187 -
.../modules/subscriber/__init__.py | 17 -
.../modules/subscriber/eventsubscriber.py | 117 -
.../cartridge.agent/modules/tenant/__init__.py | 16 -
.../modules/tenant/tenantcontext.py | 185 -
.../modules/topology/__init__.py | 16 -
.../modules/topology/topologycontext.py | 466 --
.../modules/util/cartridgeagentutils.py | 13 +-
.../cartridge.agent/plugins/contracts.py | 15 +
.../cartridge.agent/publisher.py | 215 +
.../cartridge.agent/subscriber.py | 116 +
.../test/PythonCartridgeAgentTest.java | 97 +-
.../src/test/resources/agent.conf | 2 +
.../src/test/resources/jndi.properties | 2 +-
.../src/test/resources/payload/launch-params | 2 +-
.../src/test/resources/payload/launch-params2 | 2 +-
.../org.apache.stratos.rest.endpoint/pom.xml | 8 +-
.../rest/endpoint/api/StratosApiV41.java | 38 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 126 +-
.../util/converter/ObjectConverter.java | 78 +-
.../pom.xml | 2 +-
.../org.apache.stratos.tenant.activity/pom.xml | 2 +-
components/pom.xml | 89 +-
dependencies/fabric8/kubernetes-api/README.md | 10 +-
dependencies/fabric8/kubernetes-api/pom.xml | 70 +-
.../fabric8/kubernetes/api/AbstractWatcher.java | 80 -
.../io/fabric8/kubernetes/api/Controller.java | 850 ----
.../java/io/fabric8/kubernetes/api/Entity.java | 28 -
.../kubernetes/api/ExceptionResponseMapper.java | 88 -
.../io/fabric8/kubernetes/api/Kubernetes.java | 283 --
.../kubernetes/api/KubernetesApiException.java | 30 -
.../kubernetes/api/KubernetesClient.java | 1618 ------
.../kubernetes/api/KubernetesExtensions.java | 226 -
.../kubernetes/api/KubernetesFactory.java | 384 --
.../api/KubernetesGlobalExtensions.java | 56 -
.../kubernetes/api/KubernetesHelper.java | 1724 -------
.../fabric8/kubernetes/api/PodStatusType.java | 25 -
.../io/fabric8/kubernetes/api/ServiceNames.java | 58 -
.../api/UserConfigurationCompare.java | 201 -
.../java/io/fabric8/kubernetes/api/Watcher.java | 32 -
.../api/builders/ListEnvVarBuilder.java | 43 -
.../api/builds/BuildFinishedEvent.java | 64 -
.../kubernetes/api/builds/BuildListener.java | 30 -
.../kubernetes/api/builds/BuildWatcher.java | 121 -
.../fabric8/kubernetes/api/builds/Builds.java | 199 -
.../io/fabric8/kubernetes/api/builds/Links.java | 35 -
.../kubernetes/api/extensions/Configs.java | 117 -
.../kubernetes/api/extensions/Templates.java | 225 -
.../api/support/KindToClassMapping.java | 264 -
.../src/main/kubernetes/api/Dockerfile | 24 -
.../api/examples/controller-list.json | 35 -
.../kubernetes/api/examples/controller.json | 24 -
.../api/examples/external-service.json | 13 -
.../src/main/kubernetes/api/examples/list.json | 98 -
.../api/examples/pod-list-empty-results.json | 19 -
.../main/kubernetes/api/examples/pod-list.json | 93 -
.../src/main/kubernetes/api/examples/pod.json | 34 -
.../kubernetes/api/examples/service-list.json | 28 -
.../main/kubernetes/api/examples/service.json | 33 -
.../main/kubernetes/api/examples/template.json | 146 -
.../src/main/kubernetes/api/kubernetes.html | 1653 ------
.../src/main/kubernetes/api/kubernetes.raml | 204 -
.../src/main/resources/log4j.properties | 27 -
.../java/io/fabric8/kubernetes/api/Apply.java | 48 -
.../kubernetes/api/ConfigComparePodTest.java | 243 -
.../ConfigCompareReplicationControllerTest.java | 530 --
.../api/ConfigCompareServiceTest.java | 235 -
.../kubernetes/api/ConfigFileParseTest.java | 58 -
.../java/io/fabric8/kubernetes/api/Example.java | 134 -
.../api/FindOpenShiftNamespaceTest.java | 41 -
.../kubernetes/api/KubernetesHelperTest.java | 71 -
.../kubernetes/api/ParseDateTimeTest.java | 36 -
.../kubernetes/api/ParseExamplesTest.java | 128 -
.../kubernetes/api/ParseServiceTest.java | 65 -
.../io/fabric8/kubernetes/api/ParseTest.java | 157 -
.../PodIdToReplicationControllerIDExample.java | 42 -
.../api/ProcessTemplateLocallyTest.java | 54 -
.../fabric8/kubernetes/api/TemplatesTest.java | 50 -
.../io/fabric8/kubernetes/api/TriggerBuild.java | 45 -
.../kubernetes/api/UsingBadAddressTest.java | 47 -
.../fabric8/kubernetes/api/ViewEndpoints.java | 88 -
.../io/fabric8/kubernetes/api/ViewNodes.java | 61 -
.../fabric8/kubernetes/api/ViewServiceIPs.java | 45 -
.../io/fabric8/kubernetes/api/WatchBuilds.java | 56 -
.../kubernetes/api/WatchBuildsExample.java | 42 -
.../kubernetes/api/WatchPodsExample.java | 42 -
.../kubernetes/api/WatchServicesExample.java | 42 -
.../src/test/resources/config.yml | 70 -
.../src/test/resources/errorexample.json | 77 -
.../src/test/resources/fmq-service.json | 20 -
.../src/test/resources/glance-api-service.yaml | 25 -
.../src/test/resources/log4j.properties | 25 -
dependencies/fabric8/kubernetes-model/README.md | 7 -
dependencies/fabric8/kubernetes-model/pom.xml | 176 -
.../io/fabric8/config/KubernetesBaseConfig.java | 33 -
.../io/fabric8/config/KubernetesConfig.java | 100 -
.../java/io/fabric8/config/OpenshiftConfig.java | 86 -
.../kubernetes/api/model/HasMetadata.java | 26 -
.../kubernetes/api/model/KubernetesKind.java | 90 -
.../kubernetes/api/model/KubernetesList.java | 68 -
.../api/model/KubernetesResource.java | 27 -
.../kubernetes/api/model/resource/Quantity.java | 153 -
.../kubernetes/api/model/util/IntOrString.java | 213 -
.../internal/HasMetadataComparator.java | 49 -
.../kubernetes/internal/HasMetadataSet.java | 44 -
.../internal/KubernetesDeserializer.java | 52 -
.../openshift/api/model/template/Template.java | 324 --
.../src/main/resources/log4j.properties | 27 -
.../src/main/resources/schema/kube-schema.json | 4692 ------------------
.../kubernetes/api/model/InlineTest.java | 37 -
.../api/model/KubernetesListTest.java | 104 -
.../kubernetes/api/model/UnmarshallTest.java | 85 -
.../src/test/resources/service-list.json | 239 -
.../src/test/resources/simple-list.json | 64 -
.../src/test/resources/simple-template.json | 45 -
.../src/test/resources/valid-pod.json | 22 -
dependencies/fabric8/pom.xml | 3 +-
.../jclouds/apis/gce/1.8.1-stratos/pom.xml | 23 +-
.../openstack-neutron/1.8.1-stratos/pom.xml | 268 +-
.../jclouds/apis/vcloud/1.8.1-stratos/pom.xml | 216 +-
.../provider/aws-ec2/1.8.1-stratos/pom.xml | 2 +-
dependencies/org.wso2.carbon.ui/pom.xml | 6 +-
dependencies/pom.xml | 2 +-
extensions/cep/distribution/pom.xml | 2 +-
extensions/cep/stratos-cep-extension/pom.xml | 7 +-
.../load-balancer/haproxy-extension/README.md | 21 +
.../load-balancer/haproxy-extension/pom.xml | 2 +-
.../haproxy-extension/src/main/license/LICENSE | 8 +-
.../load-balancer/lvs-extension/INSTALL.md | 58 +
.../load-balancer/lvs-extension/README.md | 40 +
extensions/load-balancer/lvs-extension/pom.xml | 110 +
.../lvs-extension/src/main/assembly/bin.xml | 106 +
.../lvs-extension/src/main/bin/lvs-extension.sh | 54 +
.../lvs-extension/src/main/conf/jndi.properties | 22 +
.../src/main/conf/log4j.properties | 40 +
.../src/main/conf/thrift-client-config.xml | 25 +
.../apache/stratos/lvs/extension/Constants.java | 43 +
.../org/apache/stratos/lvs/extension/LVS.java | 158 +
.../stratos/lvs/extension/LVSConfigWriter.java | 237 +
.../stratos/lvs/extension/LVSContext.java | 203 +
.../lvs/extension/LVSStatisticsReader.java | 80 +
.../org/apache/stratos/lvs/extension/Main.java | 85 +
.../lvs-extension/src/main/license/LICENSE | 481 ++
.../lvs-extension/src/main/notice/NOTICE | 395 ++
.../src/main/resources/velocity.properties | 26 +
.../src/main/security/client-truststore.jks | Bin 0 -> 35240 bytes
.../src/main/templates/keepalived.conf.template | 59 +
.../load-balancer/nginx-extension/README.md | 21 +
.../load-balancer/nginx-extension/pom.xml | 2 +-
.../nginx-extension/src/main/license/LICENSE | 8 +-
extensions/load-balancer/pom.xml | 3 +-
extensions/pom.xml | 2 +-
.../pom.xml | 2 +-
features/autoscaler/pom.xml | 2 +-
.../pom.xml | 5 +-
.../pom.xml | 6 +-
features/cep/pom.xml | 2 +-
.../pom.xml | 12 +-
.../main/resources/conf/cloud-controller.xml | 62 +-
features/cloud-controller/pom.xml | 2 +-
.../org.apache.stratos.common.feature/pom.xml | 2 +-
.../pom.xml | 8 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
features/common/pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
features/load-balancer/pom.xml | 2 +-
features/manager/deployment/pom.xml | 2 +-
.../pom.xml | 2 +-
features/manager/logging-mgt/pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
features/manager/pom.xml | 3 +-
.../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/manager/tenant-activity/pom.xml | 2 +-
.../pom.xml | 2 +-
features/messaging/pom.xml | 2 +-
.../pom.xml | 2 +-
features/mock-iaas/pom.xml | 2 +-
features/pom.xml | 35 +-
pom.xml | 26 +-
.../modules/distribution/INSTALL.txt | 2 +-
.../modules/distribution/README.txt | 2 +-
.../modules/distribution/pom.xml | 2 +-
.../conf/templates/jndi.properties.template | 1 -
.../distribution/src/main/license/LICENSE | 14 +-
products/cartridge-agent/pom.xml | 2 +-
.../modules/distribution/INSTALL.txt | 2 +-
.../load-balancer/modules/distribution/pom.xml | 2 +-
.../src/main/assembly/filter.properties | 5 +-
.../distribution/src/main/license/LICENSE | 8 +-
.../load-balancer/modules/p2-profile/pom.xml | 2 +-
products/load-balancer/pom.xml | 4 +-
products/pom.xml | 2 +-
.../python-cartridge-agent/distribution/pom.xml | 2 +-
products/python-cartridge-agent/pom.xml | 2 +-
products/stratos-cli/distribution/README.txt | 2 +-
products/stratos-cli/distribution/pom.xml | 2 +-
.../distribution/src/main/license/LICENSE | 14 +-
products/stratos-cli/pom.xml | 2 +-
.../stratos/conf/application-authenticators.xml | 26 -
products/stratos/conf/axis2.xml | 526 --
products/stratos/conf/bam.xml | 45 -
products/stratos/conf/billing-config.xml | 68 -
products/stratos/conf/cipher-text.properties | 26 -
products/stratos/conf/cloud-services-desc.xml | 205 -
.../conf/data-bridge/data-bridge-config.xml | 74 -
.../conf/data-bridge/thrift-agent-config.xml | 47 -
products/stratos/conf/datasources.properties | 58 -
products/stratos/conf/email-bill-generated.xml | 39 -
.../conf/email-billing-notifications.xml | 50 -
.../conf/email-new-tenant-activation.xml | 47 -
.../conf/email-new-tenant-registration.xml | 47 -
products/stratos/conf/email-password-reset.xml | 43 -
.../conf/email-payment-received-customer.xml | 39 -
.../conf/email-payment-received-wso2.xml | 39 -
.../conf/email-registration-complete.xml | 38 -
.../conf/email-registration-moderation.xml | 47 -
...l-registration-payment-received-customer.xml | 39 -
products/stratos/conf/email-registration.xml | 46 -
products/stratos/conf/email-update.xml | 39 -
products/stratos/conf/embedded-ldap.xml | 165 -
products/stratos/conf/event-broker.xml | 63 -
products/stratos/conf/features-dashboard.xml | 66 -
products/stratos/conf/identity.xml | 108 -
products/stratos/conf/jaas.conf | 30 -
products/stratos/conf/jndi.properties | 22 -
.../conf/metering-config-non-manager.xml | 104 -
products/stratos/conf/mqtttopic.properties | 21 -
products/stratos/conf/nhttp.properties | 42 -
products/stratos/conf/passthru-http.properties | 34 -
products/stratos/conf/registry.xml | 103 -
products/stratos/conf/rule-component.conf | 22 -
products/stratos/conf/samples-desc.xml | 33 -
products/stratos/conf/sso-idp-config.xml | 39 -
products/stratos/conf/status-monitor-config.xml | 53 -
products/stratos/conf/stratos-config.xml | 30 -
products/stratos/conf/stratos-datasources.xml | 69 -
.../conf/synapse-configs/default/registry.xml | 26 -
.../default/sequences/errorHandler.xml | 31 -
.../synapse-configs/default/sequences/fault.xml | 76 -
.../synapse-configs/default/sequences/main.xml | 110 -
.../conf/synapse-configs/default/synapse.xml | 25 -
products/stratos/conf/synapse.properties | 38 -
.../conf/temp-artifacts/carbon/module.xml | 69 -
.../carbon/scripts/registry/artifacts.js | 595 ---
.../carbon/scripts/registry/registry-osgi.js | 466 --
.../carbon/scripts/registry/registry-ws.js | 77 -
.../carbon/scripts/registry/registry.js | 45 -
.../carbon/scripts/server/config.js | 53 -
.../carbon/scripts/server/osgi.js | 31 -
.../carbon/scripts/server/server.js | 115 -
.../carbon/scripts/server/tenant.js | 70 -
.../carbon/scripts/user/registry-space.js | 60 -
.../temp-artifacts/carbon/scripts/user/space.js | 31 -
.../carbon/scripts/user/user-manager.js | 179 -
.../temp-artifacts/carbon/scripts/user/user.js | 99 -
...ryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar | Bin 11856 -> 0 bytes
.../org.wso2.store.sso.common_1.0.0.jar | Bin 13957 -> 0 bytes
...so2.stratos.identity.saml2.sso.mgt_2.2.0.jar | Bin 12276 -> 0 bytes
.../stratos/conf/temp-artifacts/sso/module.xml | 28 -
.../temp-artifacts/sso/scripts/sso.client.js | 193 -
products/stratos/conf/tenant-mgt.xml | 42 -
products/stratos/conf/tenant-reg-agent.xml | 25 -
products/stratos/conf/thrift-client-config.xml | 27 -
products/stratos/conf/throttling-rules.drl | 270 -
products/stratos/conf/user-mgt.xml | 241 -
products/stratos/conf/zoo.cfg | 24 -
.../stratos/modules/distribution/INSTALL.txt | 2 +-
.../stratos/modules/distribution/README.txt | 23 +-
.../modules/distribution/lib/home/faq.html | 413 --
.../distribution/lib/home/images/bottom.gif | Bin 523 -> 0 bytes
.../distribution/lib/home/images/bullet-01.gif | Bin 159 -> 0 bytes
.../distribution/lib/home/images/content-bg.gif | Bin 233 -> 0 bytes
.../distribution/lib/home/images/favicon.ico | Bin 17542 -> 0 bytes
.../lib/home/images/feature-01-icon.gif | Bin 2825 -> 0 bytes
.../lib/home/images/feature-02-icon.gif | Bin 3361 -> 0 bytes
.../lib/home/images/feature-03-icon.gif | Bin 3285 -> 0 bytes
.../lib/home/images/feature-middle-bg.gif | Bin 1139 -> 0 bytes
.../distribution/lib/home/images/intro-bg.gif | Bin 3964 -> 0 bytes
.../distribution/lib/home/images/intro-text.gif | Bin 4082 -> 0 bytes
.../distribution/lib/home/images/left-bg.gif | Bin 1135 -> 0 bytes
.../distribution/lib/home/images/logo.gif | Bin 11127 -> 0 bytes
.../lib/home/images/powered-logo.gif | Bin 1280 -> 0 bytes
.../distribution/lib/home/images/register.gif | Bin 6946 -> 0 bytes
.../distribution/lib/home/images/sign-in.gif | Bin 3150 -> 0 bytes
.../lib/home/images/stratos-products-new.jpg | Bin 25720 -> 0 bytes
.../distribution/lib/home/images/title-bg.gif | Bin 1182 -> 0 bytes
.../distribution/lib/home/images/top.gif | Bin 16149 -> 0 bytes
.../distribution/lib/home/images/webinar.png | Bin 12318 -> 0 bytes
.../lib/home/images/white-paper.png | Bin 15148 -> 0 bytes
.../modules/distribution/lib/home/index.html | 140 -
.../lib/home/js/jquery-1.5.1.min.js | 16 -
.../lib/home/js/jquery.orbit-1.2.3.min.js | 17 -
.../distribution/lib/home/js/orbit-1.2.3.css | 223 -
.../lib/home/js/orbit/left-arrow.png | Bin 860 -> 0 bytes
.../distribution/lib/home/js/orbit/loading.gif | Bin 2608 -> 0 bytes
.../lib/home/js/orbit/mask-black.png | Bin 705 -> 0 bytes
.../lib/home/js/orbit/right-arrow.png | Bin 825 -> 0 bytes
.../lib/home/js/orbit/rotator-black.png | Bin 733 -> 0 bytes
.../lib/home/js/orbit/timer-black.png | Bin 705 -> 0 bytes
.../modules/distribution/lib/home/style.css | 181 -
products/stratos/modules/distribution/pom.xml | 6 +-
.../distribution/qpid-resources/etc/config.xml | 101 -
.../qpid-resources/etc/jmxremote.access | 23 -
.../qpid-resources/etc/virtualhosts.xml | 62 -
.../distribution/qpid-resources/qpid.xml | 25 -
.../modules/distribution/src/assembly/bin.xml | 453 +-
.../distribution/src/assembly/filter.properties | 4 +-
.../main/conf/application-authenticators.xml | 26 +
.../distribution/src/main/conf/autoscaler.xml | 1 +
.../conf/data-bridge/data-bridge-config.xml | 74 +
.../conf/data-bridge/thrift-agent-config.xml | 47 +
.../src/main/conf/drools/dependent-scaling.drl | 11 +-
.../src/main/conf/drools/mincheck.drl | 19 +-
.../src/main/conf/drools/scaling.drl | 16 +-
.../distribution/src/main/conf/etc/launch.ini | 269 +
.../distribution/src/main/conf/event-broker.xml | 63 +
.../distribution/src/main/conf/jndi.properties | 6 +-
.../src/main/conf/mqtttopic.properties | 21 +
.../distribution/src/main/conf/registry.xml | 103 +
.../src/main/conf/sso-idp-config.xml | 39 +
.../distribution/src/main/conf/tenant-mgt.xml | 42 +
.../src/main/conf/thrift-client-config.xml | 27 +
.../distribution/src/main/conf/user-mgt.xml | 343 ++
.../distribution/src/main/license/LICENSE | 35 +-
.../resources/allthemes/Dark/admin/logo.gif | Bin 0 -> 3476 bytes
.../resources/allthemes/Dark/admin/main.css | 253 +
.../allthemes/Dark/admin/powered-stratos.gif | Bin 0 -> 1515 bytes
.../allthemes/Dark/admin/right-logo.gif | Bin 0 -> 2325 bytes
.../allthemes/Dark/admin/theme-header-bg.gif | Bin 0 -> 4245 bytes
.../Dark/admin/theme-header-region-bg.gif | Bin 0 -> 793 bytes
.../allthemes/Dark/admin/theme-menu-header.gif | Bin 0 -> 261 bytes
.../Dark/admin/theme-menu-panel-l-bg.gif | Bin 0 -> 312 bytes
.../Dark/admin/theme-menu-table-bg.gif | Bin 0 -> 5671 bytes
.../Dark/admin/theme-right-links-bg.gif | Bin 0 -> 1005 bytes
.../src/main/resources/allthemes/Dark/thumb.png | Bin 0 -> 19546 bytes
.../allthemes/Default/admin/def-body-bg.gif | Bin 0 -> 419 bytes
.../allthemes/Default/admin/def-header-bg.gif | Bin 0 -> 17875 bytes
.../Default/admin/def-header-region-bg.gif | Bin 0 -> 22784 bytes
.../resources/allthemes/Default/admin/logo.gif | Bin 0 -> 3476 bytes
.../resources/allthemes/Default/admin/main.css | 250 +
.../allthemes/Default/admin/powered-stratos.gif | Bin 0 -> 1515 bytes
.../allthemes/Default/admin/right-logo.gif | Bin 0 -> 3629 bytes
.../main/resources/allthemes/Default/thumb.png | Bin 0 -> 24432 bytes
.../resources/allthemes/Light/admin/logo.gif | Bin 0 -> 3476 bytes
.../resources/allthemes/Light/admin/main.css | 250 +
.../allthemes/Light/admin/menu_header.gif | Bin 0 -> 243 bytes
.../allthemes/Light/admin/powered-stratos.gif | Bin 0 -> 1515 bytes
.../allthemes/Light/admin/right-links-bg.gif | Bin 0 -> 1191 bytes
.../allthemes/Light/admin/right-logo.gif | Bin 0 -> 2325 bytes
.../allthemes/Light/admin/theme-header-bg.gif | Bin 0 -> 3792 bytes
.../Light/admin/theme-header-region-b-bg.gif | Bin 0 -> 121 bytes
.../Light/admin/theme-header-region-bg.gif | Bin 0 -> 534 bytes
.../Light/admin/theme-menu-panel-l-bg.gif | Bin 0 -> 772 bytes
.../Light/admin/theme-menu-table-bg.gif | Bin 0 -> 5991 bytes
.../main/resources/allthemes/Light/thumb.png | Bin 0 -> 18102 bytes
.../distribution/src/main/resources/launch.ini | 269 -
.../powerded-by-logos/appserver-logo.gif | Bin 0 -> 1473 bytes
.../resources/powerded-by-logos/bam-logo.gif | Bin 0 -> 1690 bytes
.../resources/powerded-by-logos/bps-logo.gif | Bin 0 -> 1606 bytes
.../resources/powerded-by-logos/brs-logo.gif | Bin 0 -> 1596 bytes
.../resources/powerded-by-logos/csg-logo.gif | Bin 0 -> 2030 bytes
.../resources/powerded-by-logos/ds-logo.gif | Bin 0 -> 1528 bytes
.../resources/powerded-by-logos/esb-logo.gif | Bin 0 -> 1598 bytes
.../resources/powerded-by-logos/gadget-logo.gif | Bin 0 -> 1368 bytes
.../powerded-by-logos/governance-logo.gif | Bin 0 -> 1525 bytes
.../powerded-by-logos/identity-logo.gif | Bin 0 -> 1398 bytes
.../resources/powerded-by-logos/mashup-logo.gif | Bin 0 -> 1440 bytes
.../src/main/temp-artifacts/carbon/module.xml | 69 +
.../carbon/scripts/registry/artifacts.js | 595 +++
.../carbon/scripts/registry/registry-osgi.js | 466 ++
.../carbon/scripts/registry/registry-ws.js | 77 +
.../carbon/scripts/registry/registry.js | 45 +
.../carbon/scripts/server/config.js | 53 +
.../carbon/scripts/server/osgi.js | 31 +
.../carbon/scripts/server/server.js | 115 +
.../carbon/scripts/server/tenant.js | 70 +
.../carbon/scripts/user/registry-space.js | 60 +
.../temp-artifacts/carbon/scripts/user/space.js | 31 +
.../carbon/scripts/user/user-manager.js | 179 +
.../temp-artifacts/carbon/scripts/user/user.js | 99 +
...ryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar | Bin 0 -> 11856 bytes
.../org.wso2.store.sso.common_1.0.0.jar | Bin 0 -> 13957 bytes
...so2.stratos.identity.saml2.sso.mgt_2.2.0.jar | Bin 0 -> 12276 bytes
.../src/main/temp-artifacts/sso/module.xml | 28 +
.../temp-artifacts/sso/scripts/sso.client.js | 193 +
products/stratos/modules/integration/pom.xml | 17 +-
.../integration/tests/RestConstants.java | 52 +
.../tests/SampleApplicationsTest.java | 155 -
.../tests/StratosTestServerManager.java | 63 +-
.../integration/tests/TopologyHandler.java | 393 ++
.../application/ApplicationBurstingTest.java | 226 +
.../application/SampleApplicationsTest.java | 427 ++
.../application/SingleClusterScalingTest.java | 233 +
.../tests/config/ApplicationBean.java | 25 +
.../tests/config/ApplicationConfigParser.java | 25 +
.../tests/group/CartridgeGroupTest.java | 129 +
.../integration/tests/group/CartridgeTest.java | 130 +
.../tests/policies/ApplicationPolicyTest.java | 133 +
.../tests/policies/AutoscalingPolicyTest.java | 91 +
.../tests/policies/DeploymentPolicyTest.java | 157 +
.../tests/policies/NetworkPartitionTest.java | 92 +
.../integration/tests/rest/ErrorResponse.java | 56 +
.../integration/tests/rest/HttpResponse.java | 59 +
.../tests/rest/HttpResponseHandler.java | 68 +
.../integration/tests/rest/RestClient.java | 357 ++
.../tests/rest/WebClientWrapper.java | 62 +
.../application-policy-3.json | 18 +
.../app-bursting-single-cartriddge-group.json | 70 +
.../autoscaling-policy-2.json | 14 +
.../cartridges-groups/esb-php-group.json | 19 +
.../cartridges/mock/esb.json | 50 +
.../cartridges/mock/php.json | 51 +
.../cartridges/mock/tomcat.json | 53 +
.../deployment-policy-4.json | 32 +
.../mock/network-partition-10.json | 24 +
.../mock/network-partition-9.json | 15 +
.../application-policy-2.json | 18 +
.../mock/network-partition-7.json | 15 +
.../mock/network-partition-8.json | 24 +
.../autoscaling-policy-c0-v1.json | 14 +
.../autoscaling-policy-c0.json | 14 +
.../cartridges-groups/g4-g5-g6-v1.json | 50 +
.../cartridges-groups/g4-g5-g6.json | 50 +
.../cartridges/mock/c4.json | 45 +
.../cartridges/mock/c5.json | 124 +
.../cartridges/mock/c6.json | 45 +
.../cartridge-test/cartridges/mock/c0-v1.json | 124 +
.../cartridge-test/cartridges/mock/c0.json | 124 +
.../deployment-policy-2-v1.json | 36 +
.../deployment-policy-2.json | 32 +
.../mock/network-partition-5-v1.json | 28 +
.../mock/network-partition-5.json | 15 +
.../mock/network-partition-6.json | 24 +
.../mock/network-partition-3-v1.json | 28 +
.../mock/network-partition-3.json | 15 +
.../application-policy-1.json | 18 +
.../applications/g-sc-G123-1-v1.json | 86 +
.../applications/g-sc-G123-1-v2.json | 86 +
.../applications/g-sc-G123-1-v3.json | 86 +
.../applications/g-sc-G123-1.json | 86 +
.../autoscaling-policy-1.json | 14 +
.../cartridges-groups/cartrdige-nested-v1.json | 50 +
.../cartridges-groups/cartrdige-nested.json | 50 +
.../cartridges/mock/c1.json | 45 +
.../cartridges/mock/c2.json | 45 +
.../cartridges/mock/c3.json | 45 +
.../deployment-policy-1-v1.json | 36 +
.../deployment-policy-1.json | 32 +
.../mock/network-partition-1-v1.json | 28 +
.../mock/network-partition-1.json | 15 +
.../mock/network-partition-2.json | 24 +
.../src/test/resources/stratos-testing.xml | 66 +
products/stratos/modules/p2-profile-gen/pom.xml | 73 +-
.../payload/user-data/ssl-cert-snakeoil.key | 16 -
.../payload/user-data/ssl-cert-snakeoil.pem | 14 -
products/stratos/pom.xml | 3 +-
.../resources/allthemes/Dark/admin/logo.gif | Bin 3476 -> 0 bytes
.../resources/allthemes/Dark/admin/main.css | 253 -
.../allthemes/Dark/admin/powered-stratos.gif | Bin 1515 -> 0 bytes
.../allthemes/Dark/admin/right-logo.gif | Bin 2325 -> 0 bytes
.../allthemes/Dark/admin/theme-header-bg.gif | Bin 4245 -> 0 bytes
.../Dark/admin/theme-header-region-bg.gif | Bin 793 -> 0 bytes
.../allthemes/Dark/admin/theme-menu-header.gif | Bin 261 -> 0 bytes
.../Dark/admin/theme-menu-panel-l-bg.gif | Bin 312 -> 0 bytes
.../Dark/admin/theme-menu-table-bg.gif | Bin 5671 -> 0 bytes
.../Dark/admin/theme-right-links-bg.gif | Bin 1005 -> 0 bytes
.../stratos/resources/allthemes/Dark/thumb.png | Bin 19546 -> 0 bytes
.../allthemes/Default/admin/def-body-bg.gif | Bin 419 -> 0 bytes
.../allthemes/Default/admin/def-header-bg.gif | Bin 17875 -> 0 bytes
.../Default/admin/def-header-region-bg.gif | Bin 22784 -> 0 bytes
.../resources/allthemes/Default/admin/logo.gif | Bin 3476 -> 0 bytes
.../resources/allthemes/Default/admin/main.css | 250 -
.../allthemes/Default/admin/powered-stratos.gif | Bin 1515 -> 0 bytes
.../allthemes/Default/admin/right-logo.gif | Bin 3629 -> 0 bytes
.../resources/allthemes/Default/thumb.png | Bin 24432 -> 0 bytes
.../resources/allthemes/Light/admin/logo.gif | Bin 3476 -> 0 bytes
.../resources/allthemes/Light/admin/main.css | 250 -
.../allthemes/Light/admin/menu_header.gif | Bin 243 -> 0 bytes
.../allthemes/Light/admin/powered-stratos.gif | Bin 1515 -> 0 bytes
.../allthemes/Light/admin/right-links-bg.gif | Bin 1191 -> 0 bytes
.../allthemes/Light/admin/right-logo.gif | Bin 2325 -> 0 bytes
.../allthemes/Light/admin/theme-header-bg.gif | Bin 3792 -> 0 bytes
.../Light/admin/theme-header-region-b-bg.gif | Bin 121 -> 0 bytes
.../Light/admin/theme-header-region-bg.gif | Bin 534 -> 0 bytes
.../Light/admin/theme-menu-panel-l-bg.gif | Bin 772 -> 0 bytes
.../Light/admin/theme-menu-table-bg.gif | Bin 5991 -> 0 bytes
.../stratos/resources/allthemes/Light/thumb.png | Bin 18102 -> 0 bytes
.../cloud-services-icons/appserver.gif | Bin 2086 -> 0 bytes
.../resources/cloud-services-icons/bam.gif | Bin 1773 -> 0 bytes
.../resources/cloud-services-icons/bps.gif | Bin 1531 -> 0 bytes
.../resources/cloud-services-icons/brs-old.gif | Bin 1772 -> 0 bytes
.../resources/cloud-services-icons/brs.gif | Bin 2170 -> 0 bytes
.../resources/cloud-services-icons/cep.png | Bin 3218 -> 0 bytes
.../resources/cloud-services-icons/cg.gif | Bin 2385 -> 0 bytes
.../cloud-services-icons/csg-inactive.gif | Bin 3188 -> 0 bytes
.../resources/cloud-services-icons/csg.gif | Bin 3176 -> 0 bytes
.../resources/cloud-services-icons/ds.gif | Bin 2012 -> 0 bytes
.../resources/cloud-services-icons/esb.gif | Bin 1787 -> 0 bytes
.../resources/cloud-services-icons/gadget.gif | Bin 2242 -> 0 bytes
.../cloud-services-icons/governance.gif | Bin 1977 -> 0 bytes
.../resources/cloud-services-icons/identity.gif | Bin 1936 -> 0 bytes
.../cloud-services-icons/inactive-appserver.gif | Bin 1957 -> 0 bytes
.../cloud-services-icons/inactive-bam.gif | Bin 1647 -> 0 bytes
.../cloud-services-icons/inactive-brs.gif | Bin 1874 -> 0 bytes
.../cloud-services-icons/inactive-cep.png | Bin 2959 -> 0 bytes
.../cloud-services-icons/inactive-esb.gif | Bin 1656 -> 0 bytes
.../cloud-services-icons/inactive-gadget.gif | Bin 2087 -> 0 bytes
.../inactive-governance.gif | Bin 1850 -> 0 bytes
.../cloud-services-icons/inactive-identity.gif | Bin 1794 -> 0 bytes
.../cloud-services-icons/inactive-mashup.gif | Bin 1772 -> 0 bytes
.../cloud-services-icons/inactive-mb.png | Bin 2746 -> 0 bytes
.../resources/cloud-services-icons/mashup.gif | Bin 1850 -> 0 bytes
.../resources/cloud-services-icons/mb.png | Bin 3139 -> 0 bytes
.../resources/cloud-services-icons/pom.xml | 58 -
.../resources/cloud-services-icons/ss.gif | Bin 2432 -> 0 bytes
.../resources/cloud-services-icons/ts.gif | Bin 2475 -> 0 bytes
.../powerded-by-logos/appserver-logo.gif | Bin 1473 -> 0 bytes
.../resources/powerded-by-logos/bam-logo.gif | Bin 1690 -> 0 bytes
.../resources/powerded-by-logos/bps-logo.gif | Bin 1606 -> 0 bytes
.../resources/powerded-by-logos/brs-logo.gif | Bin 1596 -> 0 bytes
.../resources/powerded-by-logos/csg-logo.gif | Bin 2030 -> 0 bytes
.../resources/powerded-by-logos/ds-logo.gif | Bin 1528 -> 0 bytes
.../resources/powerded-by-logos/esb-logo.gif | Bin 1598 -> 0 bytes
.../resources/powerded-by-logos/gadget-logo.gif | Bin 1368 -> 0 bytes
.../powerded-by-logos/governance-logo.gif | Bin 1525 -> 0 bytes
.../powerded-by-logos/identity-logo.gif | Bin 1398 -> 0 bytes
.../resources/powerded-by-logos/mashup-logo.gif | Bin 1440 -> 0 bytes
.../artifacts/application.json | 43 +-
.../sample-groups/artifacts/application.json | 1 -
.../single-group-app/artifacts/application.json | 8 +-
samples/cartridges/kubernetes/c1.json | 3 +-
samples/cartridges/kubernetes/c2.json | 3 +-
samples/cartridges/kubernetes/c3.json | 3 +-
samples/cartridges/kubernetes/c4.json | 3 +-
samples/cartridges/kubernetes/esb.json | 5 +-
samples/cartridges/kubernetes/php.json | 5 +-
samples/cartridges/kubernetes/tomcat.json | 5 +-
samples/cartridges/kubernetes/tomcat1.json | 5 +-
samples/cartridges/kubernetes/tomcat2.json | 5 +-
samples/cartridges/kubernetes/tomcat3.json | 3 +-
samples/cartridges/kubernetes/wso2-is.json | 3 +-
samples/cartridges/mock/php.json | 2 +-
samples/cartridges/mock/tomcat.json | 5 +
samples/cartridges/openstack/php.json | 2 +-
samples/cartridges/openstack/tomcat.json | 5 +
.../kubernetes-cluster-1.json | 4 +-
.../kubernetes-cluster-2.json | 4 +-
.../kubernetes-cluster-ec2.json | 4 +-
.../pom.xml | 2 +-
.../src/main/resources/AutoscalerService.wsdl | 503 +-
.../pom.xml | 2 +-
.../main/resources/CloudControllerService.wsdl | 1101 ++--
.../pom.xml | 2 +-
service-stubs/pom.xml | 3 +-
tools/config-scripts/ec2/config.sh | 2 +-
tools/config-scripts/gce/config.sh | 2 +-
tools/config-scripts/openstack/config.sh | 2 +-
.../base-image/Dockerfile | 10 +-
.../base-image/files/run | 14 +-
.../base-image/packs/.gitignore | 4 +
.../cartridge-docker-images/build.sh | 15 +-
.../service-images/php/Dockerfile | 2 +-
.../service-images/tomcat-saml-sso/Dockerfile | 6 +-
.../service-images/tomcat/Dockerfile | 8 +-
.../service-images/wso2is-saml-sso/Dockerfile | 6 +-
.../puppetmaster/docker-build.sh | 4 +-
.../stratos-docker-images/puppetmaster/run | 4 +-
.../stratos-docker-images/run-example.sh | 2 +-
tools/pom.xml | 2 +-
tools/puppet3/manifests/nodes/base.pp | 4 +-
tools/puppet3/modules/agent/files/README.txt | 2 +-
tools/puppet3/modules/agent/manifests/init.pp | 4 +-
tools/puppet3/modules/haproxy/files/README.txt | 2 +-
tools/puppet3/modules/haproxy/manifests/init.pp | 2 +-
.../templates/bin/haproxy-extension.sh.erb | 2 +-
tools/puppet3/modules/lb/files/README.txt | 2 +-
tools/puppet3/modules/lb/manifests/init.pp | 2 +-
.../modules/python_agent/files/README.txt | 2 +-
.../modules/python_agent/manifests/init.pp | 2 +-
.../python_agent/templates/agent.conf.erb | 2 +
.../extensions/instance-activated.sh.erb | 7 +
tools/stratos-installer/README.md | 4 +-
tools/stratos-installer/conf/setup.conf | 2 +-
743 files changed, 17003 insertions(+), 34469 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f704fa3d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java
index c65a5f7,9504d53..d0a2939
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java
@@@ -83,9 -83,8 +83,10 @@@ public class AutoscalerCloudControllerC
public synchronized MemberContext startInstance(PartitionRef partition,
String clusterId, String clusterInstanceId,
- String networkPartitionId, boolean isPrimary,
+ String networkPartitionId,
- int minMemberCount) throws SpawningException {
+ int minMemberCount, String autoscalingReason,
+ long scalingTime) throws SpawningException {
++
try {
if (log.isInfoEnabled()) {
log.info(String.format("Trying to spawn an instance via cloud controller: " +
@@@ -116,18 -111,7 +113,17 @@@
minCountProp.setName(StratosConstants.MIN_COUNT);
minCountProp.setValue(String.valueOf(minMemberCount));
+ Property autoscalingReasonProp = new Property();
+ autoscalingReasonProp.setName(StratosConstants.SCALING_REASON);
+ autoscalingReasonProp.setValue(autoscalingReason);
+
+ Property scalingTimeProp = new Property();
+ scalingTimeProp.setName(StratosConstants.SCALING_TIME);
+ scalingTimeProp.setValue(String.valueOf(scalingTime));
+
- memberContextProps.addProperty(isPrimaryProp);
memberContextProps.addProperty(minCountProp);
+ memberContextProps.addProperty(autoscalingReasonProp);
+ memberContextProps.addProperty(scalingTimeProp);
instanceContext.setProperties(AutoscalerUtil.toStubProperties(memberContextProps));
long startTime = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/stratos/blob/f704fa3d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
index 733ce57,89633f7..87ea7b5
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
@@@ -174,12 -172,9 +173,11 @@@ public class RuleTasksDelegator
* @param clusterMonitorPartitionContext Cluster monitor partition context
* @param clusterId Cluster id
* @param clusterInstanceId Instance id
- * @param isPrimary Is a primary member
+ * @param autoscalingReason scaling reason for member
+ * @param scalingTime scaling time
*/
public void delegateSpawn(ClusterLevelPartitionContext clusterMonitorPartitionContext, String clusterId,
- String clusterInstanceId, boolean isPrimary, String autoscalingReason, long scalingTime) {
- String clusterInstanceId) {
++ String clusterInstanceId, String autoscalingReason, long scalingTime) {
try {
String nwPartitionId = clusterMonitorPartitionContext.getNetworkPartitionId();
@@@ -200,8 -195,7 +198,8 @@@
.startInstance(clusterMonitorPartitionContext.getPartition(),
clusterId,
clusterInstanceId, clusterMonitorPartitionContext.getNetworkPartitionId(),
- isPrimary,
- minimumCountOfNetworkPartition);
+ minimumCountOfNetworkPartition, autoscalingReason, scalingTime);
++
if (memberContext != null) {
ClusterLevelPartitionContext partitionContext = clusterInstanceContext.
getPartitionCtxt(clusterMonitorPartitionContext.getPartitionId());
@@@ -370,7 -361,7 +368,8 @@@
float memberMemoryConsumptionAverage = memberStatsContext.getMemoryConsumption().getAverage();
float memberMemoryConsumptionGredient = memberStatsContext.getMemoryConsumption().getGradient();
-- float memberMemoryConsumptionSecondDerivative = memberStatsContext.getMemoryConsumption().getSecondDerivative();
++ float memberMemoryConsumptionSecondDerivative =
++ memberStatsContext.getMemoryConsumption().getSecondDerivative();
double memberPredictedMemoryConsumption = getPredictedValueForNextMinute(memberMemoryConsumptionAverage,
memberMemoryConsumptionGredient, memberMemoryConsumptionSecondDerivative, 1);
http://git-wip-us.apache.org/repos/asf/stratos/blob/f704fa3d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
index 419c711,a11c5bf..e24fda3
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
@@@ -31,7 -31,7 +31,8 @@@ import org.apache.stratos.cloud.control
import org.apache.stratos.cloud.controller.statistics.publisher.BAMUsageDataPublisher;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
import org.apache.stratos.common.Property;
+import org.apache.stratos.common.constants.StratosConstants;
+ import org.apache.stratos.kubernetes.client.KubernetesConstants;
import org.apache.stratos.messaging.domain.application.ClusterDataHolder;
import org.apache.stratos.messaging.domain.instance.ClusterInstance;
import org.apache.stratos.messaging.domain.topology.*;
http://git-wip-us.apache.org/repos/asf/stratos/blob/f704fa3d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f704fa3d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
index af46cfe,ee0477c..a1f2fa9
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
@@@ -167,9 -164,9 +167,10 @@@ public class StratosConstants
// member expiry timeout constants
public static final String PENDING_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.pendingMemberExpiryTimeout";
+ public static final String SPIN_TERMINATE_PARALLEL = "autoscaler.member.spinAfterTerminate";
public static final String OBSOLETED_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.obsoletedMemberExpiryTimeout";
- public static final String PENDING_TERMINATION_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.pendingTerminationMemberExpiryTimeout";
+ public static final String PENDING_TERMINATION_MEMBER_EXPIRY_TIMEOUT =
+ "autoscaler.member.pendingTerminationMemberExpiryTimeout";
public static final String FILTER_VALUE_SEPARATOR = ",";
public static final String TOPOLOGY_APPLICATION_FILTER = "stratos.topology.application.filter";
http://git-wip-us.apache.org/repos/asf/stratos/blob/f704fa3d/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py
index 0000000,be45294..0cd76af
mode 000000,100644..100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py
@@@ -1,0 -1,238 +1,241 @@@
+ # 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.
+
+ from threading import Thread
+ import multiprocessing
-
++import time
+ import psutil
+
+ from modules.databridge.agent import *
+ from config import Config
+ from modules.util import cartridgeagentutils
+ from exception import ThriftReceiverOfflineException, CEPPublisherException
+ import constants
+
+
+ class HealthStatisticsPublisherManager(Thread):
+ """
+ Read from provided health stat reader plugin or the default health stat reader, the value for memory usage and
+ load average and publishes them as ThriftEvents to a CEP server
+ """
+ STREAM_NAME = "cartridge_agent_health_stats"
+ STREAM_VERSION = "1.0.0"
+ STREAM_NICKNAME = "agent health stats"
+ STREAM_DESCRIPTION = "agent health stats"
+
+ def __init__(self, publish_interval, health_stat_plugin):
+ """
+ Initializes a new HealthStatisticsPublisherManager with a given number of seconds as the interval
+ :param int publish_interval: Number of seconds as the interval
+ :return: void
+ """
+ Thread.__init__(self)
+ self.log = LogFactory().get_log(__name__)
+ self.publish_interval = publish_interval
+ """:type : int"""
+ self.terminated = False
+ self.publisher = HealthStatisticsPublisher()
+ """:type : HealthStatisticsPublisher"""
+ # If there are no health stat reader plugins, create the default reader instance
+ self.stats_reader = health_stat_plugin if health_stat_plugin is not None else DefaultHealthStatisticsReader()
+
+ def run(self):
+ while not self.terminated:
+ time.sleep(self.publish_interval)
+
+ try:
+ ca_health_stat = CartridgeHealthStatistics()
+ cartridge_stats = self.stats_reader.stat_cartridge_health(ca_health_stat)
+ self.log.debug("Publishing memory consumption: %r" % cartridge_stats.memory_usage)
+ self.publisher.publish_memory_usage(cartridge_stats.memory_usage)
+
+ self.log.debug("Publishing load average: %r" % cartridge_stats.load_avg)
+ self.publisher.publish_load_average(cartridge_stats.load_avg)
+ except ThriftReceiverOfflineException:
+ self.log.error("Couldn't publish health statistics to CEP. Thrift Receiver offline. Reconnecting...")
+ self.publisher = HealthStatisticsPublisher()
+
+ self.publisher.publisher.disconnect()
+
+
+ class HealthStatisticsPublisher:
+ """
+ Publishes memory usage and load average to thrift server
+ """
+ log = LogFactory().get_log(__name__)
+
+ @staticmethod
+ def read_config(conf_key):
+ """
+ Read a given key from the cartridge agent configuration
+ :param conf_key: The key to look for in the CA config
+ :return: The value for the key from the CA config
+ :raise: RuntimeError if the given key is not found in the CA config
+ """
+ conf_value = Config.read_property(conf_key, False)
+
+ if conf_value is None or conf_value.strip() == "":
+ raise RuntimeError("System property not found: " + conf_key)
+
+ return conf_value
+
+ def __init__(self):
+ self.ports = []
+ cep_port = HealthStatisticsPublisher.read_config(constants.CEP_RECEIVER_PORT)
+ self.ports.append(cep_port)
+
+ cep_ip = HealthStatisticsPublisher.read_config(constants.CEP_RECEIVER_IP)
+
+ cartridgeagentutils.wait_until_ports_active(
+ cep_ip,
+ self.ports,
+ int(Config.read_property("port.check.timeout", critical=False)))
+
+ cep_active = cartridgeagentutils.check_ports_active(
+ cep_ip,
+ self.ports)
+
+ if not cep_active:
+ raise CEPPublisherException("CEP server not active. Health statistics publishing aborted.")
+
+ cep_admin_username = HealthStatisticsPublisher.read_config(constants.CEP_SERVER_ADMIN_USERNAME)
+ cep_admin_password = HealthStatisticsPublisher.read_config(constants.CEP_SERVER_ADMIN_PASSWORD)
+
+ self.stream_definition = HealthStatisticsPublisher.create_stream_definition()
+ HealthStatisticsPublisher.log.debug("Stream definition created: %r" % str(self.stream_definition))
+
+ self.publisher = ThriftPublisher(
+ cep_ip,
+ cep_port,
+ cep_admin_username,
+ cep_admin_password,
+ self.stream_definition)
+
+ HealthStatisticsPublisher.log.debug("HealthStatisticsPublisher initialized")
+
+ @staticmethod
+ def create_stream_definition():
+ """
+ Create a StreamDefinition for publishing to CEP
+ """
+ stream_def = StreamDefinition()
+ stream_def.name = HealthStatisticsPublisherManager.STREAM_NAME
+ stream_def.version = HealthStatisticsPublisherManager.STREAM_VERSION
+ stream_def.nickname = HealthStatisticsPublisherManager.STREAM_NICKNAME
+ stream_def.description = HealthStatisticsPublisherManager.STREAM_DESCRIPTION
+
+ # stream_def.add_payloaddata_attribute()
++ stream_def.add_payloaddata_attribute("time_stamp", StreamDefinition.LONG)
+ stream_def.add_payloaddata_attribute("cluster_id", StreamDefinition.STRING)
+ stream_def.add_payloaddata_attribute("cluster_instance_id", StreamDefinition.STRING)
+ stream_def.add_payloaddata_attribute("network_partition_id", StreamDefinition.STRING)
+ stream_def.add_payloaddata_attribute("member_id", StreamDefinition.STRING)
+ stream_def.add_payloaddata_attribute("partition_id", StreamDefinition.STRING)
+ stream_def.add_payloaddata_attribute("health_description", StreamDefinition.STRING)
+ stream_def.add_payloaddata_attribute("value", StreamDefinition.DOUBLE)
+
+ return stream_def
+
+ def publish_memory_usage(self, memory_usage):
+ """
+ Publishes the given memory usage value to the thrift server as a ThriftEvent
+ :param float memory_usage: memory usage
+ """
+
+ event = ThriftEvent()
++ event.payloadData.append(int(round(time.time() * 1000)))
+ event.payloadData.append(Config.cluster_id)
+ event.payloadData.append(Config.cluster_instance_id)
+ event.payloadData.append(Config.network_partition_id)
+ event.payloadData.append(Config.member_id)
+ event.payloadData.append(Config.partition_id)
+ event.payloadData.append(constants.MEMORY_CONSUMPTION)
+ event.payloadData.append(float(memory_usage))
+ # event.payloadData.append(str(memory_usage))
+
+ HealthStatisticsPublisher.log.debug("Publishing cep event: [stream] %r [payload_data] %r [version] %r"
+ % (
+ self.stream_definition.name,
+ event.payloadData,
+ self.stream_definition.version))
+
+ self.publisher.publish(event)
+
+ def publish_load_average(self, load_avg):
+ """
+ Publishes the given load average value to the thrift server as a ThriftEvent
+ :param float load_avg: load average value
+ """
+
+ event = ThriftEvent()
++ event.payloadData.append(int(round(time.time() * 1000)))
+ event.payloadData.append(Config.cluster_id)
+ event.payloadData.append(Config.cluster_instance_id)
+ event.payloadData.append(Config.network_partition_id)
+ event.payloadData.append(Config.member_id)
+ event.payloadData.append(Config.partition_id)
+ event.payloadData.append(constants.LOAD_AVERAGE)
+ event.payloadData.append(float(load_avg))
+ # event.payloadData.append(str(load_avg))
+
+ HealthStatisticsPublisher.log.debug("Publishing cep event: [stream] %r [payload_data] %r [version] %r"
+ % (
+ self.stream_definition.name,
+ event.payloadData,
+ self.stream_definition.version))
+
+ self.publisher.publish(event)
+
+
+ class DefaultHealthStatisticsReader:
+ """
+ Default implementation for the health statistics reader. If no Health Statistics Reader plugins are provided,
+ this will be used to read health stats from the instance.
+ """
+
+ def __init__(self):
+ self.log = LogFactory().get_log(__name__)
+
+ def stat_cartridge_health(self, ca_health_stat):
+ ca_health_stat.memory_usage = DefaultHealthStatisticsReader.__read_mem_usage()
+ ca_health_stat.load_avg = DefaultHealthStatisticsReader.__read_load_avg()
+
+ self.log.debug("Memory read: %r, CPU read: %r" % (ca_health_stat.memory_usage, ca_health_stat.load_avg))
+ return ca_health_stat
+
+ @staticmethod
+ def __read_mem_usage():
+ return psutil.virtual_memory().percent
+
+ @staticmethod
+ def __read_load_avg():
+ (one, five, fifteen) = os.getloadavg()
+ cores = multiprocessing.cpu_count()
+
+ return (one/cores) * 100
+
+
+ class CartridgeHealthStatistics:
+ """
+ Holds the memory usage and load average reading
+ """
+
+ def __init__(self):
+ self.memory_usage = None
+ """:type : float"""
+ self.load_avg = None
+ """:type : float"""
http://git-wip-us.apache.org/repos/asf/stratos/blob/f704fa3d/extensions/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f704fa3d/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl
----------------------------------------------------------------------
diff --cc products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl
index a8102da,6e76706..f98983c
--- a/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl
@@@ -84,9 -82,7 +82,11 @@@ dialect "mvel
log.info("[dependency-scale] [scale-up] Partition available, hence trying to spawn an instance to scale up!" );
log.debug("[dependency-scale] [scale-up] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " + clusterId );
- delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId());
++
+ long scalingTime = System.currentTimeMillis();
+ String scalingReason = "Dependency scaling";
- delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId(), isPrimary,scalingReason,scalingTime);
++ delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId(), scalingReason, scalingTime);
++
count++;
} else {
partitionsAvailable = false;
http://git-wip-us.apache.org/repos/asf/stratos/blob/f704fa3d/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl
----------------------------------------------------------------------
diff --cc products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl
index 4eaab2b,06b7fe1..9d6386c
--- a/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl
@@@ -84,10 -75,7 +75,10 @@@ dialect "mvel
log.info("[min-check] Partition available, hence trying to spawn an instance to fulfil minimum count!" + " [cluster] " + clusterId);
log.debug("[min-check] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " + clusterId);
- delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId());
++
+ long scalingTime = System.currentTimeMillis();
+ String scalingReason = "Scaling up to fulfil minimum count, [Cluster Min Members] "+clusterInstanceContext.getMinInstanceCount()+" [Additional instances to be created] " + additionalInstances;
- delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId(), isPrimary,scalingReason,scalingTime);
-
++ delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId(), scalingReason, scalingTime);
count++;
} else {
http://git-wip-us.apache.org/repos/asf/stratos/blob/f704fa3d/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
----------------------------------------------------------------------
diff --cc products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
index 3b4a916,4b55123..77edd2f
--- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
@@@ -186,8 -180,7 +184,10 @@@ dialect "mvel
" [laPredictedValue] " + laPredictedValue + " [laThreshold] " + laThreshold);
log.debug("[scale-up] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " + clusterId );
- delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId());
++
+ long scalingTime = System.currentTimeMillis();
- delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId(), isPrimary,autoscalingReason,scalingTime);
++ delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId(), autoscalingReason, scalingTime);
++
count++;
} else {
[30/50] [abbrv] stratos git commit: Renamed LVS extension artifact
name to a consistent format
Posted by la...@apache.org.
Renamed LVS extension artifact name to a consistent format
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2c052c49
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2c052c49
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2c052c49
Branch: refs/heads/data-publisher-integration
Commit: 2c052c49d7174cc49e99c017f744a5c43d2ea30b
Parents: c98a007
Author: Akila Perera <ra...@gmail.com>
Authored: Fri Aug 7 21:40:20 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Fri Aug 7 21:40:20 2015 +0530
----------------------------------------------------------------------
extensions/load-balancer/lvs-extension/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2c052c49/extensions/load-balancer/lvs-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/lvs-extension/pom.xml b/extensions/load-balancer/lvs-extension/pom.xml
index 1478c04..905db60 100644
--- a/extensions/load-balancer/lvs-extension/pom.xml
+++ b/extensions/load-balancer/lvs-extension/pom.xml
@@ -27,7 +27,7 @@
<version>4.1.1</version>
</parent>
- <artifactId>org.apache.stratos.lvs.extension</artifactId>
+ <artifactId>apache-stratos-lvs-extension</artifactId>
<name>Apache Stratos - LVS Extension</name>
<description>Apache Stratos LVS Extension for Load Balancing</description>
[28/50] [abbrv] stratos git commit: Preparing for 4.1.1-RC1 release
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/load-balancer/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/license/LICENSE b/products/load-balancer/modules/distribution/src/main/license/LICENSE
index 3964448..54e1459 100644
--- a/products/load-balancer/modules/distribution/src/main/license/LICENSE
+++ b/products/load-balancer/modules/distribution/src/main/license/LICENSE
@@ -252,10 +252,10 @@ org.apache.felix.gogo.command_0.8.0.v201108120515.jar,
org.apache.felix.gogo.runtime_0.8.0.v201108120515.jar,
org.apache.felix.gogo.shell_0.8.0.v201110170705.jar,
org.apache.jasper.glassfish_2.2.2.v201205150955.jar,
-org.apache.stratos.common_4.1.0.jar,
-org.apache.stratos.load.balancer.common_4.1.0.jar,
-org.apache.stratos.load.balancer_4.1.0.jar,
-org.apache.stratos.messaging_4.1.0.jar,
+org.apache.stratos.common_4.1.1.jar,
+org.apache.stratos.load.balancer.common_4.1.1.jar,
+org.apache.stratos.load.balancer_4.1.1.jar,
+org.apache.stratos.messaging_4.1.1.jar,
org.wso2.caching_4.0.3.jar,
org.wso2.carbon.addressing_4.2.0.jar,
org.wso2.carbon.apache.jasper.fragment_4.2.0.jar,
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/load-balancer/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/p2-profile/pom.xml b/products/load-balancer/modules/p2-profile/pom.xml
index c1b129a..1705573 100755
--- a/products/load-balancer/modules/p2-profile/pom.xml
+++ b/products/load-balancer/modules/p2-profile/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos.load.balancer</groupId>
<artifactId>load-balancer-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/pom.xml b/products/load-balancer/pom.xml
index a85b551..82441e1 100755
--- a/products/load-balancer/pom.xml
+++ b/products/load-balancer/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -116,8 +116,6 @@
<carbon.version>4.2.0</carbon.version>
<emma.version>2.1.5320</emma.version>
<carbon.kernel.version>4.2.0</carbon.kernel.version>
- <!--carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
- <carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3-->
<carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version>
<stratos.component.version>2.1.0</stratos.component.version>
<stratos.component.patch.version.2.1.1>2.1.1</stratos.component.patch.version.2.1.1>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/pom.xml
----------------------------------------------------------------------
diff --git a/products/pom.xml b/products/pom.xml
index 478bd04..5985a46 100644
--- a/products/pom.xml
+++ b/products/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/python-cartridge-agent/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/distribution/pom.xml b/products/python-cartridge-agent/distribution/pom.xml
index 972359f..5fd93e1 100644
--- a/products/python-cartridge-agent/distribution/pom.xml
+++ b/products/python-cartridge-agent/distribution/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>python-cartridge-agent-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/python-cartridge-agent/pom.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/pom.xml b/products/python-cartridge-agent/pom.xml
index 34da479..85a4d0f 100644
--- a/products/python-cartridge-agent/pom.xml
+++ b/products/python-cartridge-agent/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-products-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/stratos-cli/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-cli/distribution/pom.xml b/products/stratos-cli/distribution/pom.xml
index 4f9dae2..09f32b5 100644
--- a/products/stratos-cli/distribution/pom.xml
+++ b/products/stratos-cli/distribution/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>apache-stratos-cli-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/stratos-cli/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/stratos-cli/distribution/src/main/license/LICENSE b/products/stratos-cli/distribution/src/main/license/LICENSE
index d562d04..cca1e41 100644
--- a/products/stratos-cli/distribution/src/main/license/LICENSE
+++ b/products/stratos-cli/distribution/src/main/license/LICENSE
@@ -267,13 +267,13 @@ neethi-2.0.4.wso2v4.jar,
not-yet-commons-ssl-0.3.9.jar,
opencsv-1.8.wso2v1.jar,
org.apache.log4j-1.2.13.v200706111418.jar,
-org.apache.stratos.autoscaler.service.stub-4.1.0.jar,
-org.apache.stratos.cli-4.1.0.jar,
-org.apache.stratos.cloud.controller.service.stub-4.1.0.jar,
-org.apache.stratos.common-4.1.0.jar,
-org.apache.stratos.manager-4.1.0.jar,
-org.apache.stratos.manager.service.stub-4.1.0.jar,
-org.apache.stratos.messaging-4.1.0.jar,
+org.apache.stratos.autoscaler.service.stub-4.1.1.jar,
+org.apache.stratos.cli-4.1.1.jar,
+org.apache.stratos.cloud.controller.service.stub-4.1.1.jar,
+org.apache.stratos.common-4.1.1.jar,
+org.apache.stratos.manager-4.1.1.jar,
+org.apache.stratos.manager.service.stub-4.1.1.jar,
+org.apache.stratos.messaging-4.1.1.jar,
org.eclipse.equinox.http.helper-1.1.0.wso2v1.jar,
org.eclipse.osgi-3.8.1.v20120830-144521.jar,
org.eclipse.osgi.services-3.3.100.v20120522-1822.jar,
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/stratos-cli/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-cli/pom.xml b/products/stratos-cli/pom.xml
index 677841a..0886240 100644
--- a/products/stratos-cli/pom.xml
+++ b/products/stratos-cli/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-products-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/stratos/modules/distribution/README.txt
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/README.txt b/products/stratos/modules/distribution/README.txt
index 5150545..27ec7f4 100755
--- a/products/stratos/modules/distribution/README.txt
+++ b/products/stratos/modules/distribution/README.txt
@@ -1,3 +1,24 @@
+# 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.
+#
+# This is a generated file and will be overwritten at the next load balancer startup.
+# Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template
+# file for updating other configurations.
+#
================================================================================
Apache Stratos
================================================================================
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/stratos/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml
index eb899a2..af7c9d6 100755
--- a/products/stratos/modules/distribution/pom.xml
+++ b/products/stratos/modules/distribution/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/stratos/modules/distribution/src/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/assembly/filter.properties b/products/stratos/modules/distribution/src/assembly/filter.properties
index 3eb6caa..7748c21 100755
--- a/products/stratos/modules/distribution/src/assembly/filter.properties
+++ b/products/stratos/modules/distribution/src/assembly/filter.properties
@@ -19,7 +19,7 @@
product.name=Apache Stratos
product.key=STRATOS
-product.version=4.1.0
+product.version=4.1.1
hotdeployment=true
hotupdate=false
carbon.version=4.2.0
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/stratos/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/license/LICENSE b/products/stratos/modules/distribution/src/main/license/LICENSE
index f62819a..828e494 100644
--- a/products/stratos/modules/distribution/src/main/license/LICENSE
+++ b/products/stratos/modules/distribution/src/main/license/LICENSE
@@ -357,23 +357,23 @@ org.apache.jasper.glassfish_2.2.2.v201205150955.jar,
org.apache.servicemix.bundles.jsch-agentproxy-jsch_0.0.7.1.jar,
org.apache.servicemix.bundles.jsch-agentproxy-sshj_0.0.7.1.jar,
org.apache.servicemix.bundles.jzlib_1.1.1.1.jar,
-org.apache.stratos.autoscaler.service.stub_4.1.0.jar,
-org.apache.stratos.autoscaler_4.1.0.jar,
-org.apache.stratos.cloud.controller.service.stub_4.1.0.jar,
-org.apache.stratos.cloud.controller_4.1.0.jar,
-org.apache.stratos.common_4.1.0.jar,
-org.apache.stratos.custom.handlers_4.1.0.jar,
-org.apache.stratos.kubernetes.client_4.1.0.jar,
-org.apache.stratos.logging.view.ui_4.1.0.jar,
-org.apache.stratos.manager.service.stub_4.1.0.jar,
-org.apache.stratos.manager.service.stub_4.1.0.jar,
-org.apache.stratos.manager.styles_4.1.0.jar,
-org.apache.stratos.manager_4.1.0.jar,
-org.apache.stratos.messaging_4.1.0.jar,
-org.apache.stratos.metadata.client_4.1.0.jar,
-org.apache.stratos.mock.iaas.client_4.1.0.jar,
-org.apache.stratos.mock.iaas_4.1.0.jar,
-org.apache.stratos.tenant.activity_4.1.0.jar,
+org.apache.stratos.autoscaler.service.stub_4.1.1.jar,
+org.apache.stratos.autoscaler_4.1.1.jar,
+org.apache.stratos.cloud.controller.service.stub_4.1.1.jar,
+org.apache.stratos.cloud.controller_4.1.1.jar,
+org.apache.stratos.common_4.1.1.jar,
+org.apache.stratos.custom.handlers_4.1.1.jar,
+org.apache.stratos.kubernetes.client_4.1.1.jar,
+org.apache.stratos.logging.view.ui_4.1.1.jar,
+org.apache.stratos.manager.service.stub_4.1.1.jar,
+org.apache.stratos.manager.service.stub_4.1.1.jar,
+org.apache.stratos.manager.styles_4.1.1.jar,
+org.apache.stratos.manager_4.1.1.jar,
+org.apache.stratos.messaging_4.1.1.jar,
+org.apache.stratos.metadata.client_4.1.1.jar,
+org.apache.stratos.mock.iaas.client_4.1.1.jar,
+org.apache.stratos.mock.iaas_4.1.1.jar,
+org.apache.stratos.tenant.activity_4.1.1.jar,
org.apache.ws.commons.schema.XmlSchema_1.4.7.wso2v2.jar,
org.jaggeryjs.hostobjects.db_0.9.0.ALPHA4_wso2v3.jar,
org.jaggeryjs.hostobjects.email_0.9.0.ALPHA4_wso2v3.jar,
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/stratos/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/pom.xml b/products/stratos/modules/integration/pom.xml
index ced41a0..ba5aa31 100755
--- a/products/stratos/modules/integration/pom.xml
+++ b/products/stratos/modules/integration/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
index 57fe040..10e47ab 100755
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
@@ -49,7 +49,7 @@ public class StratosTestServerManager extends TestServerManager {
private static final Log log = LogFactory.getLog(StratosTestServerManager.class);
private final static String CARBON_ZIP = SampleApplicationsTest.class.getResource("/").getPath() +
- "/../../../distribution/target/apache-stratos-4.1.1-SNAPSHOT.zip";
+ "/../../../distribution/target/apache-stratos-4.1.1.zip";
private final static int PORT_OFFSET = 0;
private static final String ACTIVEMQ_BIND_ADDRESS = "tcp://localhost:61617";
private static final String MOCK_IAAS_XML_FILE = "mock-iaas.xml";
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index 6f4b0d4..9cfba3e 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/stratos/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/pom.xml b/products/stratos/pom.xml
index 0d872fe..b8658cc 100755
--- a/products/stratos/pom.xml
+++ b/products/stratos/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-products-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/samples/cartridges/kubernetes/esb.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/esb.json b/samples/cartridges/kubernetes/esb.json
index 800f9ff..3d1c1d4 100755
--- a/samples/cartridges/kubernetes/esb.json
+++ b/samples/cartridges/kubernetes/esb.json
@@ -22,7 +22,7 @@
"iaasProvider": [
{
"type": "kubernetes",
- "imageId": "stratos/cartridge:4.1.0-alpha",
+ "imageId": "stratos/cartridge:4.1.1",
"networkInterfaces": [
{
"networkUuid": ""
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/samples/cartridges/kubernetes/php.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/php.json b/samples/cartridges/kubernetes/php.json
index cdb47ab..567982e 100755
--- a/samples/cartridges/kubernetes/php.json
+++ b/samples/cartridges/kubernetes/php.json
@@ -23,7 +23,7 @@
"iaasProvider": [
{
"type": "kubernetes",
- "imageId": "stratos/php:4.1.0",
+ "imageId": "stratos/php:4.1.1",
"networkInterfaces": [
],
"property": [
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/samples/cartridges/kubernetes/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/tomcat.json b/samples/cartridges/kubernetes/tomcat.json
index 773fdbc..29c6966 100755
--- a/samples/cartridges/kubernetes/tomcat.json
+++ b/samples/cartridges/kubernetes/tomcat.json
@@ -23,7 +23,7 @@
"iaasProvider": [
{
"type": "kubernetes",
- "imageId": "stratos/tomcat:4.1.0-beta",
+ "imageId": "stratos/tomcat:4.1.1",
"networkInterfaces": [
],
"property": [
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/samples/cartridges/kubernetes/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/tomcat1.json b/samples/cartridges/kubernetes/tomcat1.json
index 83c517d..1c87993 100755
--- a/samples/cartridges/kubernetes/tomcat1.json
+++ b/samples/cartridges/kubernetes/tomcat1.json
@@ -22,7 +22,7 @@
"iaasProvider": [
{
"type": "kubernetes",
- "imageId": "stratos/cartridge:4.1.0-alpha",
+ "imageId": "stratos/cartridge:4.1.1",
"networkInterfaces": [
{
"networkUuid": ""
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/samples/cartridges/kubernetes/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/tomcat2.json b/samples/cartridges/kubernetes/tomcat2.json
index a062ee3..77a8a19 100755
--- a/samples/cartridges/kubernetes/tomcat2.json
+++ b/samples/cartridges/kubernetes/tomcat2.json
@@ -22,7 +22,7 @@
"iaasProvider": [
{
"type": "kubernetes",
- "imageId": "stratos/cartridge:4.1.0-alpha",
+ "imageId": "stratos/cartridge:4.1.1",
"networkInterfaces": [
{
"networkUuid": ""
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
index fa3a2a1..cd58e0c 100644
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-service-stubs-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
index 77a9fb2..6087a80 100644
--- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-service-stubs-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/service-stubs/org.apache.stratos.manager.service.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.manager.service.stub/pom.xml b/service-stubs/org.apache.stratos.manager.service.stub/pom.xml
index b924803..7603876 100644
--- a/service-stubs/org.apache.stratos.manager.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.manager.service.stub/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-service-stubs-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/service-stubs/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml
index fb2c1b6..fa85d9b 100644
--- a/service-stubs/pom.xml
+++ b/service-stubs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/config-scripts/ec2/config.sh
----------------------------------------------------------------------
diff --git a/tools/config-scripts/ec2/config.sh b/tools/config-scripts/ec2/config.sh
index 4b49ea1..77b585d 100755
--- a/tools/config-scripts/ec2/config.sh
+++ b/tools/config-scripts/ec2/config.sh
@@ -33,7 +33,7 @@ CP=`which cp`
MV=`which mv`
HOSTSFILE=/etc/hosts
-LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.1-SNAPSHOT/wso2carbon.lck
+LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.1/wso2carbon.lck
DATE=`date +%d%m%y%S`
RANDOMNUMBER="`${TR} -c -d 0-9 < /dev/urandom | ${HEAD} -c 4`${DATE}"
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/config-scripts/gce/config.sh
----------------------------------------------------------------------
diff --git a/tools/config-scripts/gce/config.sh b/tools/config-scripts/gce/config.sh
index 067ba8e..feedd1f 100644
--- a/tools/config-scripts/gce/config.sh
+++ b/tools/config-scripts/gce/config.sh
@@ -36,7 +36,7 @@ CURL=`which curl`
HOSTSFILE=/etc/hosts
DATE=`date +%d%m%y%S`
RANDOMNUMBER="`${TR} -c -d 0-9 < /dev/urandom | ${HEAD} -c 4`${DATE}"
-LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.1-SNAPSHOT/wso2carbon.lck
+LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.1/wso2carbon.lck
function valid_ip()
{
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/config-scripts/openstack/config.sh
----------------------------------------------------------------------
diff --git a/tools/config-scripts/openstack/config.sh b/tools/config-scripts/openstack/config.sh
index e68029b..4dcd1bc 100755
--- a/tools/config-scripts/openstack/config.sh
+++ b/tools/config-scripts/openstack/config.sh
@@ -33,7 +33,7 @@ CP=`which cp`
MV=`which mv`
HOSTSFILE=/etc/hosts
-LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.1-SNAPSHOT/wso2carbon.lck
+LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.1/wso2carbon.lck
DATE=`date +%d%m%y%S`
RANDOMNUMBER="`${TR} -c -d 0-9 < /dev/urandom | ${HEAD} -c 4`${DATE}"
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/docker-images/cartridge-docker-images/base-image/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/base-image/Dockerfile b/tools/docker-images/cartridge-docker-images/base-image/Dockerfile
index 95debf9..3c5cc28 100644
--- a/tools/docker-images/cartridge-docker-images/base-image/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/base-image/Dockerfile
@@ -48,13 +48,13 @@ RUN pip install yapsy
# -------------------------
WORKDIR /mnt/
-ADD packs/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip
-RUN unzip -q /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip -d /mnt/
-RUN rm /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip
+ADD packs/apache-stratos-python-cartridge-agent-4.1.1.zip /mnt/apache-stratos-python-cartridge-agent-4.1.1.zip
+RUN unzip -q /mnt/apache-stratos-python-cartridge-agent-4.1.1.zip -d /mnt/
+RUN rm /mnt/apache-stratos-python-cartridge-agent-4.1.1.zip
-RUN mkdir -p /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT/payload
+RUN mkdir -p /mnt/apache-stratos-python-cartridge-agent-4.1.1/payload
-RUN chmod +x /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT/extensions/bash/*
+RUN chmod +x /mnt/apache-stratos-python-cartridge-agent-4.1.1/extensions/bash/*
RUN mkdir -p /var/log/apache-stratos/
RUN touch /var/log/apache-stratos/cartridge-agent-extensions.log
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/docker-images/cartridge-docker-images/base-image/files/run
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/base-image/files/run b/tools/docker-images/cartridge-docker-images/base-image/files/run
index f952864..0979b4f 100755
--- a/tools/docker-images/cartridge-docker-images/base-image/files/run
+++ b/tools/docker-images/cartridge-docker-images/base-image/files/run
@@ -26,7 +26,7 @@
source /root/.bashrc
-export STRATOS_VERSION="4.1.1-SNAPSHOT"
+export STRATOS_VERSION="4.1.1"
export PCA_HOME="/mnt/apache-stratos-python-cartridge-agent-${STRATOS_VERSION}"
set -o posix ; set | sed -e ':a;N;$!ba;s/\n/,/g' > ${PCA_HOME}/payload/launch-params
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/docker-images/cartridge-docker-images/build.sh
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/build.sh b/tools/docker-images/cartridge-docker-images/build.sh
index 0f676c0..6ceab94 100755
--- a/tools/docker-images/cartridge-docker-images/build.sh
+++ b/tools/docker-images/cartridge-docker-images/build.sh
@@ -26,7 +26,7 @@ pca_distribution_path=`cd "$script_path/../../../products/python-cartridge-agent
pushd ${pca_distribution_path}
mvn clean install -Dmaven.test.skip=true
-cp -vf target/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip ${script_path}/base-image/packs/
+cp -vf target/apache-stratos-python-cartridge-agent-4.1.1.zip ${script_path}/base-image/packs/
popd
pushd ${script_path}/base-image/
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/docker-images/stratos-docker-images/run-example.sh
----------------------------------------------------------------------
diff --git a/tools/docker-images/stratos-docker-images/run-example.sh b/tools/docker-images/stratos-docker-images/run-example.sh
index c41893d..cc44042 100755
--- a/tools/docker-images/stratos-docker-images/run-example.sh
+++ b/tools/docker-images/stratos-docker-images/run-example.sh
@@ -31,7 +31,7 @@ export DOMAIN=example.com
export IP_ADDR=192.168.56.5
# Set the version of Stratos docker images
-export STRATOS_VERSION=4.1.1-SNAPSHOT
+export STRATOS_VERSION=4.1.1
########
# Bind
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index ecce116..b9bd999 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/puppet3/modules/agent/files/README.txt
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/files/README.txt b/tools/puppet3/modules/agent/files/README.txt
index 4bd05cd..f443d76 100644
--- a/tools/puppet3/modules/agent/files/README.txt
+++ b/tools/puppet3/modules/agent/files/README.txt
@@ -7,6 +7,6 @@ This folder should have following:
eg:
if $mb_type = activemq, folder structure of this folder would be:
>$ls
->activemq apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip
+>activemq apache-stratos-python-cartridge-agent-4.1.1.zip
3. Under $mb_type folder, please add all the client jars, that should be copied to the agent's lib directory.
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/puppet3/modules/agent/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/manifests/init.pp b/tools/puppet3/modules/agent/manifests/init.pp
index bebf5d9..66ec38b 100644
--- a/tools/puppet3/modules/agent/manifests/init.pp
+++ b/tools/puppet3/modules/agent/manifests/init.pp
@@ -16,7 +16,7 @@
# under the License.
class agent(
- $version = '4.1.0',
+ $version = '4.1.1',
$owner = 'root',
$group = 'root',
$target = "/mnt",
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/puppet3/modules/haproxy/files/README.txt
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/haproxy/files/README.txt b/tools/puppet3/modules/haproxy/files/README.txt
index 189007a..e6491ce 100644
--- a/tools/puppet3/modules/haproxy/files/README.txt
+++ b/tools/puppet3/modules/haproxy/files/README.txt
@@ -7,6 +7,6 @@ This folder should have following:
eg:
if $mb_type = activemq, folder structure of this folder would be:
>$ls
->activemq apache-stratos-haproxy-extension-4.1.1-SNAPSHOT.zip
+>activemq apache-stratos-haproxy-extension-4.1.1.zip
3. Under $mb_type folder, please add all the client jars, that should be copied to the haproxy-extension's lib directory.
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/puppet3/modules/haproxy/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/haproxy/manifests/init.pp b/tools/puppet3/modules/haproxy/manifests/init.pp
index 01faeda..2ba14e4 100755
--- a/tools/puppet3/modules/haproxy/manifests/init.pp
+++ b/tools/puppet3/modules/haproxy/manifests/init.pp
@@ -25,7 +25,7 @@ class haproxy(
$cluster_id = $stratos_cluster_id,
$service_name = $stratos_instance_data_service_name,
$lb_service_type = $stratos_instance_data_lb_service_type,
- $version = '4.1.0',
+ $version = '4.1.1',
$owner = 'root',
$group = 'root',
$target = '/mnt',
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/puppet3/modules/lb/files/README.txt
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/lb/files/README.txt b/tools/puppet3/modules/lb/files/README.txt
index 8d1fe23..9eb3d5b 100644
--- a/tools/puppet3/modules/lb/files/README.txt
+++ b/tools/puppet3/modules/lb/files/README.txt
@@ -7,6 +7,6 @@ This folder should have following:
eg:
if $mb_type = activemq, folder structure of this folder would be:
>$ls
->activemq apache-stratos-load-balancer-4.1.1-SNAPSHOT.zip
+>activemq apache-stratos-load-balancer-4.1.1.zip
3. Under $mb_type folder, please add all the client jars, that should be copied to the load balancer's repository/components/lib directory.
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/puppet3/modules/lb/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/lb/manifests/init.pp b/tools/puppet3/modules/lb/manifests/init.pp
index 114428e..3c4c329 100755
--- a/tools/puppet3/modules/lb/manifests/init.pp
+++ b/tools/puppet3/modules/lb/manifests/init.pp
@@ -29,7 +29,7 @@
#
class lb (
- $version = '4.1.0',
+ $version = '4.1.1',
$offset = 0,
$tribes_port = 4000,
$maintenance_mode = true,
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/puppet3/modules/python_agent/files/README.txt
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/python_agent/files/README.txt b/tools/puppet3/modules/python_agent/files/README.txt
index 4bd05cd..f443d76 100644
--- a/tools/puppet3/modules/python_agent/files/README.txt
+++ b/tools/puppet3/modules/python_agent/files/README.txt
@@ -7,6 +7,6 @@ This folder should have following:
eg:
if $mb_type = activemq, folder structure of this folder would be:
>$ls
->activemq apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip
+>activemq apache-stratos-python-cartridge-agent-4.1.1.zip
3. Under $mb_type folder, please add all the client jars, that should be copied to the agent's lib directory.
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/puppet3/modules/python_agent/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/python_agent/manifests/init.pp b/tools/puppet3/modules/python_agent/manifests/init.pp
index 10709a7..a43d6b0 100644
--- a/tools/puppet3/modules/python_agent/manifests/init.pp
+++ b/tools/puppet3/modules/python_agent/manifests/init.pp
@@ -16,7 +16,7 @@
# under the License.
class python_agent(
- $version = '4.1.0',
+ $version = '4.1.1',
$owner = 'root',
$group = 'root',
$target = "/mnt",
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf
index 045052f..484da9a 100644
--- a/tools/stratos-installer/conf/setup.conf
+++ b/tools/stratos-installer/conf/setup.conf
@@ -55,7 +55,7 @@ export mb_ip="127.0.0.1" # Machine ip on which mb run
export mb_port=61616 #default port which the message broker service runs
export stratos_extract_path=$stratos_path/"apache-stratos"
-export stratos_pack_zip_name="apache-stratos-4.1.1-SNAPSHOT.zip"
+export stratos_pack_zip_name="apache-stratos-4.1.1.zip"
export stratos_pack_zip=$stratos_packs/$stratos_pack_zip_name
export activemq_pack=$stratos_packs/"apache-activemq-5.9.1-bin.tar.gz"
[26/50] [abbrv] stratos git commit: Fix stratos test typo
Posted by la...@apache.org.
Fix stratos test typo
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6d1bfc5e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6d1bfc5e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6d1bfc5e
Branch: refs/heads/data-publisher-integration
Commit: 6d1bfc5e998a426c938ba1d97f725605c16babb7
Parents: 2f66da5
Author: Akila Perera <ra...@gmail.com>
Authored: Fri Aug 7 13:52:44 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Fri Aug 7 13:52:44 2015 +0530
----------------------------------------------------------------------
.../jclouds/apis/gce/1.8.1-stratos/pom.xml | 21 +-
.../openstack-neutron/1.8.1-stratos/pom.xml | 268 ++++++++++---------
.../jclouds/apis/vcloud/1.8.1-stratos/pom.xml | 216 ++++++++-------
products/stratos/modules/integration/pom.xml | 2 +-
.../src/test/resources/stratos-testing.xml | 66 +++++
.../src/test/resources/strats-testng.xml | 66 -----
6 files changed, 322 insertions(+), 317 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d1bfc5e/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml b/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
index a6b9868..05af0a5 100644
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
+++ b/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
@@ -17,7 +17,8 @@
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">
+<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.jclouds.labs</groupId>
@@ -40,14 +41,15 @@
<test.google-compute-engine.credential>Private key (PKCS12 file) associated with the Google API client_id
</test.google-compute-engine.credential>
<test.google-compute-engine.api-version>v1</test.google-compute-engine.api-version>
- <test.google-compute-engine.build-version />
- <test.google-compute-engine.template>imageId=debian-7-wheezy-v20131120,locationId=us-central1-a,minRam=2048</test.google-compute-engine.template>
+ <test.google-compute-engine.build-version/>
+ <test.google-compute-engine.template>imageId=debian-7-wheezy-v20131120,locationId=us-central1-a,minRam=2048
+ </test.google-compute-engine.template>
<jclouds.osgi.export>org.jclouds.googlecomputeengine*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>
- org.jclouds.compute.internal;version="${jclouds.version}",
- org.jclouds.rest.internal;version="${jclouds.version}",
- org.jclouds*;version="${jclouds.version}",
- *
+ org.jclouds.compute.internal;version="${jclouds.version}",
+ org.jclouds.rest.internal;version="${jclouds.version}",
+ org.jclouds*;version="${jclouds.version}",
+ *
</jclouds.osgi.import>
</properties>
@@ -128,7 +130,8 @@
<test.google-compute-engine.build-version>
${test.google-compute-engine.build-version}
</test.google-compute-engine.build-version>
- <test.google-compute-engine.template>${test.google-compute-engine.template}</test.google-compute-engine.template>
+ <test.google-compute-engine.template>${test.google-compute-engine.template}
+ </test.google-compute-engine.template>
</systemPropertyVariables>
</configuration>
</execution>
@@ -138,4 +141,4 @@
</build>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d1bfc5e/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
index 559057b..c65ab03 100644
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
+++ b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
@@ -17,141 +17,145 @@
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.jclouds</groupId>
- <artifactId>jclouds-project</artifactId>
- <version>1.8.1</version>
- </parent>
+<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.jclouds</groupId>
+ <artifactId>jclouds-project</artifactId>
+ <version>1.8.1</version>
+ </parent>
- <!-- TODO: when out of labs, switch to org.jclouds.api -->
- <groupId>org.apache.stratos</groupId>
- <artifactId>openstack-neutron</artifactId>
- <version>1.8.1-stratosv1-SNAPSHOT</version>
- <name>jclouds openstack-neutron api</name>
- <description>jclouds components to access an implementation of OpenStack Neutron</description>
- <packaging>bundle</packaging>
+ <!-- TODO: when out of labs, switch to org.jclouds.api -->
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>openstack-neutron</artifactId>
+ <version>1.8.1-stratosv1-SNAPSHOT</version>
+ <name>jclouds openstack-neutron api</name>
+ <description>jclouds components to access an implementation of OpenStack Neutron</description>
+ <packaging>bundle</packaging>
- <properties>
- <jclouds.version>1.8.1</jclouds.version>
- <!-- keystone endpoint -->
- <test.openstack-neutron.endpoint>http://localhost:5000/v2.0/</test.openstack-neutron.endpoint>
- <!-- keystone version -->
- <test.openstack-neutron.api-version>2.0</test.openstack-neutron.api-version>
- <test.openstack-neutron.build-version />
- <test.openstack-neutron.identity>FIXME_IDENTITY</test.openstack-neutron.identity>
- <test.openstack-neutron.credential>FIXME_CREDENTIALS</test.openstack-neutron.credential>
- <test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
- <jclouds.osgi.export>org.jclouds.openstack.neutron.v2*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${jclouds.version}",*</jclouds.osgi.import>
- </properties>
+ <properties>
+ <jclouds.version>1.8.1</jclouds.version>
+ <!-- keystone endpoint -->
+ <test.openstack-neutron.endpoint>http://localhost:5000/v2.0/</test.openstack-neutron.endpoint>
+ <!-- keystone version -->
+ <test.openstack-neutron.api-version>2.0</test.openstack-neutron.api-version>
+ <test.openstack-neutron.build-version/>
+ <test.openstack-neutron.identity>FIXME_IDENTITY</test.openstack-neutron.identity>
+ <test.openstack-neutron.credential>FIXME_CREDENTIALS</test.openstack-neutron.credential>
+ <test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
+ <jclouds.osgi.export>org.jclouds.openstack.neutron.v2*;version="${project.version}"</jclouds.osgi.export>
+ <jclouds.osgi.import>org.jclouds*;version="${jclouds.version}",*</jclouds.osgi.import>
+ </properties>
- <repositories>
- <repository>
- <id>apache-snapshots</id>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>apache-snapshots</id>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
- <!-- For modernizer, which depends on jclouds-resources snapshot. -->
- <pluginRepositories>
- <pluginRepository>
- <id>apache-snapshots</id>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
+ <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache-snapshots</id>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-keystone</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-keystone</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-slf4j</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp</groupId>
- <artifactId>mockwebserver</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>openstack-keystone</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>openstack-keystone</artifactId>
+ <version>${jclouds.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-slf4j</artifactId>
+ <version>${jclouds.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp</groupId>
+ <artifactId>mockwebserver</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <test.openstack-neutron.endpoint>${test.openstack-neutron.endpoint}</test.openstack-neutron.endpoint>
- <test.openstack-neutron.api-version>${test.openstack-neutron.api-version}</test.openstack-neutron.api-version>
- <test.openstack-neutron.build-version>${test.openstack-neutron.build-version}</test.openstack-neutron.build-version>
- <test.openstack-neutron.identity>${test.openstack-neutron.identity}</test.openstack-neutron.identity>
- <test.openstack-neutron.credential>${test.openstack-neutron.credential}</test.openstack-neutron.credential>
- <test.jclouds.keystone.credential-type>${test.jclouds.keystone.credential-type}</test.jclouds.keystone.credential-type>
- </systemPropertyVariables>
- <parallel>classes</parallel>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <scm>
- <tag>jclouds-labs-openstack-1.8.1-rc1</tag>
- </scm>
-</project>
+ <profiles>
+ <profile>
+ <id>live</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <test.openstack-neutron.endpoint>${test.openstack-neutron.endpoint}
+ </test.openstack-neutron.endpoint>
+ <test.openstack-neutron.api-version>${test.openstack-neutron.api-version}
+ </test.openstack-neutron.api-version>
+ <test.openstack-neutron.build-version>${test.openstack-neutron.build-version}
+ </test.openstack-neutron.build-version>
+ <test.openstack-neutron.identity>${test.openstack-neutron.identity}
+ </test.openstack-neutron.identity>
+ <test.openstack-neutron.credential>${test.openstack-neutron.credential}
+ </test.openstack-neutron.credential>
+ <test.jclouds.keystone.credential-type>
+ ${test.jclouds.keystone.credential-type}
+ </test.jclouds.keystone.credential-type>
+ </systemPropertyVariables>
+ <parallel>classes</parallel>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d1bfc5e/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
index 063114d..b7ee83a 100644
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
+++ b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
@@ -17,115 +17,113 @@
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.jclouds</groupId>
- <artifactId>jclouds-project</artifactId>
- <version>1.8.1</version>
- </parent>
- <groupId>org.apache.stratos</groupId>
- <artifactId>vcloud</artifactId>
- <version>1.8.1-stratosv1-SNAPSHOT</version>
- <name>jclouds vcloud api</name>
- <description>jclouds components to access an implementation of VMWare vCloud</description>
- <packaging>bundle</packaging>
+<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.jclouds</groupId>
+ <artifactId>jclouds-project</artifactId>
+ <version>1.8.1</version>
+ </parent>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>vcloud</artifactId>
+ <version>1.8.1-stratosv1-SNAPSHOT</version>
+ <name>jclouds vcloud api</name>
+ <description>jclouds components to access an implementation of VMWare vCloud</description>
+ <packaging>bundle</packaging>
- <properties>
- <jclouds.version>1.8.1</jclouds.version>
- <test.vcloud.endpoint>FIXME_ENDPOINT</test.vcloud.endpoint>
- <test.vcloud.api-version>1.0</test.vcloud.api-version>
- <test.vcloud.build-version />
- <test.vcloud.identity>FIXME_IDENTITY</test.vcloud.identity>
- <test.vcloud.credential>FIXME_CREDENTIAL</test.vcloud.credential>
- <test.vcloud.template />
- <jclouds.osgi.export>org.jclouds.vcloud*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${jclouds.version}",
- org.jclouds.rest.internal;version="${jclouds.version}",
- org.jclouds*;version="${jclouds.version}",
- *
- </jclouds.osgi.import>
- </properties>
+ <properties>
+ <jclouds.version>1.8.1</jclouds.version>
+ <test.vcloud.endpoint>FIXME_ENDPOINT</test.vcloud.endpoint>
+ <test.vcloud.api-version>1.0</test.vcloud.api-version>
+ <test.vcloud.build-version/>
+ <test.vcloud.identity>FIXME_IDENTITY</test.vcloud.identity>
+ <test.vcloud.credential>FIXME_CREDENTIAL</test.vcloud.credential>
+ <test.vcloud.template/>
+ <jclouds.osgi.export>org.jclouds.vcloud*;version="${project.version}"</jclouds.osgi.export>
+ <jclouds.osgi.import>
+ org.jclouds.compute.internal;version="${jclouds.version}",
+ org.jclouds.rest.internal;version="${jclouds.version}",
+ org.jclouds*;version="${jclouds.version}",
+ *
+ </jclouds.osgi.import>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>com.jamesmurty.utils</groupId>
- <artifactId>java-xmlbuilder</artifactId>
- <version>0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>com.jamesmurty.utils</groupId>
+ <artifactId>java-xmlbuilder</artifactId>
+ <version>0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-compute</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-compute</artifactId>
+ <version>${jclouds.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-sshj</artifactId>
+ <version>${jclouds.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-log4j</artifactId>
+ <version>${jclouds.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <test.vcloud.endpoint>${test.vcloud.endpoint}</test.vcloud.endpoint>
- <test.vcloud.api-version>${test.vcloud.api-version}</test.vcloud.api-version>
- <test.vcloud.build-version>${test.vcloud.build-version}</test.vcloud.build-version>
- <test.vcloud.identity>${test.vcloud.identity}</test.vcloud.identity>
- <test.vcloud.credential>${test.vcloud.credential}</test.vcloud.credential>
- <test.vcloud.template>${test.vcloud.template}</test.vcloud.template>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <scm>
- <tag>4.1.1-SNAPSHOT</tag>
- </scm>
-</project>
+ <profiles>
+ <profile>
+ <id>live</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <test.vcloud.endpoint>${test.vcloud.endpoint}</test.vcloud.endpoint>
+ <test.vcloud.api-version>${test.vcloud.api-version}</test.vcloud.api-version>
+ <test.vcloud.build-version>${test.vcloud.build-version}
+ </test.vcloud.build-version>
+ <test.vcloud.identity>${test.vcloud.identity}</test.vcloud.identity>
+ <test.vcloud.credential>${test.vcloud.credential}</test.vcloud.credential>
+ <test.vcloud.template>${test.vcloud.template}</test.vcloud.template>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d1bfc5e/products/stratos/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/pom.xml b/products/stratos/modules/integration/pom.xml
index 1e0d1f5..ced41a0 100755
--- a/products/stratos/modules/integration/pom.xml
+++ b/products/stratos/modules/integration/pom.xml
@@ -118,7 +118,7 @@
<emma.home>${basedir}/target/emma</emma.home>
</systemProperties>
<suiteXmlFiles>
- <suiteXmlFile>src/test/resources/strats-testng.xml</suiteXmlFile>
+ <suiteXmlFile>src/test/resources/stratos-testing.xml</suiteXmlFile>
</suiteXmlFiles>
<workingDirectory>${basedir}/target</workingDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d1bfc5e/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
new file mode 100644
index 0000000..356b5ec
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
@@ -0,0 +1,66 @@
+<?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="StratosIntegrationSuite">
+
+ <test name="CartridgeTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.group.CartridgeTest" />
+ </classes>
+ </test>
+ <test name="CartridgeGroupTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest" />
+ </classes>
+ </test>
+ <test name="NetworkPartitionTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.policies.NetworkPartitionTest" />
+ </classes>
+ </test>
+ <test name="ApplicationPolicyTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.policies.ApplicationPolicyTest" />
+ </classes>
+ </test>
+ <test name="DeploymentPolicyTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.policies.DeploymentPolicyTest" />
+ </classes>
+ </test>
+ <test name="AutoscalingPolicyTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.policies.AutoscalingPolicyTest" />
+ </classes>
+ </test>
+ <test name="SampleApplicationsTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" />
+ </classes>
+ </test>
+ <test name="ApplicationBurstingTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" />
+ </classes>
+ </test>
+
+</suite>
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d1bfc5e/products/stratos/modules/integration/src/test/resources/strats-testng.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/strats-testng.xml b/products/stratos/modules/integration/src/test/resources/strats-testng.xml
deleted file mode 100644
index 356b5ec..0000000
--- a/products/stratos/modules/integration/src/test/resources/strats-testng.xml
+++ /dev/null
@@ -1,66 +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="StratosIntegrationSuite">
-
- <test name="CartridgeTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.group.CartridgeTest" />
- </classes>
- </test>
- <test name="CartridgeGroupTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest" />
- </classes>
- </test>
- <test name="NetworkPartitionTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.policies.NetworkPartitionTest" />
- </classes>
- </test>
- <test name="ApplicationPolicyTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.policies.ApplicationPolicyTest" />
- </classes>
- </test>
- <test name="DeploymentPolicyTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.policies.DeploymentPolicyTest" />
- </classes>
- </test>
- <test name="AutoscalingPolicyTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.policies.AutoscalingPolicyTest" />
- </classes>
- </test>
- <test name="SampleApplicationsTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" />
- </classes>
- </test>
- <test name="ApplicationBurstingTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" />
- </classes>
- </test>
-
-</suite>
[11/50] [abbrv] stratos git commit: Adding assertion of topology
initizlization and refactoring the test classes to use same CRUD operations
from RestClient
Posted by la...@apache.org.
Adding assertion of topology initizlization and refactoring the test classes to use same CRUD operations from RestClient
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f995fb3b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f995fb3b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f995fb3b
Branch: refs/heads/data-publisher-integration
Commit: f995fb3bbd0a2b10b610c90e43369b940b9ce5ca
Parents: d5680aa
Author: reka <rt...@gmail.com>
Authored: Wed Aug 5 14:09:34 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Aug 6 19:33:43 2015 +0530
----------------------------------------------------------------------
.../tests/ApplicationPolicyTest.java | 137 ++--------
.../integration/tests/ApplicationTest.java | 227 +++-------------
.../tests/AutoscalingPolicyTest.java | 136 ++--------
.../integration/tests/CartridgeGroupTest.java | 141 ++--------
.../integration/tests/CartridgeTest.java | 143 ++--------
.../integration/tests/DeploymentPolicyTest.java | 141 ++--------
.../integration/tests/NetworkPartitionTest.java | 137 ++--------
.../tests/SampleApplicationsTest.java | 265 +++++++++++--------
.../tests/StratosArtifactsUtils.java | 53 ----
.../integration/tests/rest/RestClient.java | 208 ++++++++++++++-
10 files changed, 516 insertions(+), 1072 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f995fb3b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
index 05110bb..ec5bf04 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
@@ -19,138 +19,41 @@
package org.apache.stratos.integration.tests;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
-import org.apache.stratos.integration.tests.rest.ErrorResponse;
-import org.apache.stratos.integration.tests.rest.HttpResponse;
import org.apache.stratos.integration.tests.rest.RestClient;
-import java.net.URI;
-
/**
* Test to handle Network partition CRUD operations
*/
-public class ApplicationPolicyTest extends StratosArtifactsUtils {
- private static final Log log = LogFactory.getLog(StratosTestServerManager.class);
- String applicationPolicies = "/application-policies/";
- String applicationPoliciesUpdate = "/application-policies/update/";
-
+public class ApplicationPolicyTest {
+ private static final Log log = LogFactory.getLog(ApplicationPolicyTest.class);
+ private static final String applicationPolicies = "/application-policies/";
+ private static final String applicationPoliciesUpdate = "/application-policies/update/";
+ private static final String entityName = "applicationPolicy";
- public boolean addApplicationPolicy(String networkPartitionId, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(applicationPolicies + networkPartitionId);
- URI uri = new URIBuilder(endpoint + RestConstants.APPLICATION_POLICIES).build();
- HttpResponse response = restClient.doPost(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while adding the application policy";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not add application policy";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean addApplicationPolicy(String applicationPolicyId, RestClient restClient) {
+ return restClient.addEntity(applicationPolicies + "/" + applicationPolicyId,
+ RestConstants.APPLICATION_POLICIES, entityName);
}
- public ApplicationPolicyBean getApplicationPolicy(String networkPartitionId, String endpoint,
- RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.APPLICATION_POLICIES + "/" +
- networkPartitionId).build();
- HttpResponse response = restClient.doGet(uri);
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return gson.fromJson(response.getContent(), ApplicationPolicyBean.class);
- } else if (response.getStatusCode() == 404) {
- return null;
- } else {
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while getting the application policy";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not get application policy";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public ApplicationPolicyBean getApplicationPolicy(String applicationPolicyId, RestClient restClient) {
+
+ ApplicationPolicyBean bean = (ApplicationPolicyBean) restClient.
+ getEntity(RestConstants.APPLICATION_POLICIES, applicationPolicyId,
+ ApplicationPolicyBean.class, entityName);
+ return bean;
}
- public boolean updateApplicationPolicy(String networkPartitionId, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(applicationPoliciesUpdate + networkPartitionId);
- URI uri = new URIBuilder(endpoint + RestConstants.APPLICATION_POLICIES).build();
- HttpResponse response = restClient.doPut(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while updating the application policy";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not update application policy";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean updateApplicationPolicy(String applicationPolicyId, RestClient restClient) {
+ return restClient.updateEntity(applicationPoliciesUpdate + "/" + applicationPolicyId,
+ RestConstants.APPLICATION_POLICIES, entityName);
+
}
- public boolean removeApplicationPolicy(String networkPartitionId, String endpoint, RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.APPLICATION_POLICIES + "/" +
- networkPartitionId).build();
- HttpResponse response = restClient.doDelete(uri);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else if(response.getContent().contains("it is used")) {
- return false;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while removing the application policy";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not remove application policy";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean removeApplicationPolicy(String applicationPolicyId, RestClient restClient) {
+ return restClient.removeEntity(RestConstants.APPLICATION_POLICIES, applicationPolicyId, entityName);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f995fb3b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
index d4f77a6..af18163 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
@@ -19,224 +19,59 @@
package org.apache.stratos.integration.tests;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.stratos.common.beans.application.ApplicationBean;
-import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
-import org.apache.stratos.integration.tests.rest.ErrorResponse;
-import org.apache.stratos.integration.tests.rest.HttpResponse;
import org.apache.stratos.integration.tests.rest.RestClient;
-import java.net.URI;
-
/**
- * Test to handle autoscaling policy CRUD operations
+ * Test to handle application CRUD operations, deploy and undeploy
*/
-public class ApplicationTest extends StratosArtifactsUtils {
- private static final Log log = LogFactory.getLog(StratosTestServerManager.class);
+public class ApplicationTest {
+ private static final Log log = LogFactory.getLog(ApplicationTest.class);
String applications = "/applications/simple/single-cartridge-app/";
String applicationsUpdate = "/applications/simple/single-cartridge-app/update/";
+ private static final String entityName = "application";
-
- public boolean addApplication(String applicationId, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(applications + applicationId);
- URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS).build();
-
- HttpResponse response = restClient.doPost(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while adding the application";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not add application";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean addApplication(String applicationId, RestClient restClient) {
+ return restClient.addEntity(applications + "/" + applicationId,
+ RestConstants.APPLICATIONS, entityName);
}
- public boolean deployApplication(String applicationId, String applicationPolicyId,
- String endpoint, RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS + "/" + applicationId +
- RestConstants.APPLICATIONS_DEPLOY + "/" + applicationPolicyId).build();
-
- HttpResponse response = restClient.doPost(uri, "");
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while deploying the application";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not deploy application";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public ApplicationBean getApplication(String applicationId,
+ RestClient restClient) {
+ ApplicationBean bean = (ApplicationBean) restClient.
+ getEntity(RestConstants.APPLICATIONS, applicationId,
+ ApplicationBean.class, entityName);
+ return bean;
}
- public boolean undeployApplication(String applicationId,
- String endpoint, RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS + "/" + applicationId +
- RestConstants.APPLICATIONS_UNDEPLOY).build();
-
- HttpResponse response = restClient.doPost(uri, "");
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while undeploying the application";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not undeploy application";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean updateApplication(String applicationId, RestClient restClient) {
+ return restClient.updateEntity(applicationsUpdate + "/" + applicationId,
+ RestConstants.APPLICATIONS, entityName);
}
- public boolean forceUndeployApplication(String applicationId,
- String endpoint, RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS + "/" + applicationId +
- RestConstants.APPLICATIONS_UNDEPLOY + "?force=true").build();
+ public boolean removeApplication(String applicationId, RestClient restClient) {
+ return restClient.removeEntity(RestConstants.APPLICATIONS, applicationId, entityName);
- HttpResponse response = restClient.doPost(uri, "");
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while force undeploying the application";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not forcefully undeploy application";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
}
- public ApplicationBean getApplication(String applicationId, String endpoint,
- RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS + "/" +
- applicationId).build();
- HttpResponse response = restClient.doGet(uri);
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return gson.fromJson(response.getContent(), ApplicationBean.class);
- } else if (response.getStatusCode() == 404) {
- return null;
- } else {
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while getting the application";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not get application";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean deployApplication(String applicationId, String applicationPolicyId,
+ RestClient restClient) {
+ return restClient.deployEntity(RestConstants.APPLICATIONS + "/" + applicationId +
+ RestConstants.APPLICATIONS_DEPLOY + "/" + applicationPolicyId, entityName);
}
- public boolean updateApplication(String applicationId, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(applicationsUpdate + applicationId);
- URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS).build();
- HttpResponse response = restClient.doPut(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while updating the application";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not update application";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean undeployApplication(String applicationId,
+ RestClient restClient) {
+ return restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + applicationId +
+ RestConstants.APPLICATIONS_UNDEPLOY, entityName);
}
- public boolean removeApplication(String applicationId, String endpoint, RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS + "/" +
- applicationId).build();
- HttpResponse response = restClient.doDelete(uri);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while removing the application";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not remove application";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean forceUndeployApplication(String applicationId,
+ RestClient restClient) {
+ return restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + applicationId +
+ RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", entityName);
}
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f995fb3b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
index c76c0ef..7c04d92 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
@@ -18,137 +18,41 @@
*/
package org.apache.stratos.integration.tests;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
-import org.apache.stratos.integration.tests.rest.ErrorResponse;
-import org.apache.stratos.integration.tests.rest.HttpResponse;
import org.apache.stratos.integration.tests.rest.RestClient;
-import java.net.URI;
-
/**
* Test to handle autoscaling policy CRUD operations
*/
-public class AutoscalingPolicyTest extends StratosArtifactsUtils {
- private static final Log log = LogFactory.getLog(StratosTestServerManager.class);
- String autoscalingPolicy = "/autoscaling-policies/";
- String autoscalingPolicyUpdate = "/autoscaling-policies/update/";
-
+public class AutoscalingPolicyTest {
+ private static final Log log = LogFactory.getLog(AutoscalingPolicyTest.class);
+ private static final String autoscalingPolicy = "/autoscaling-policies/";
+ private static final String autoscalingPolicyUpdate = "/autoscaling-policies/update/";
+ private static final String entityName = "autoscalingPolicy";
- public boolean addAutoscalingPolicy(String autoscalingPolicyName, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(autoscalingPolicy + autoscalingPolicyName);
- URI uri = new URIBuilder(endpoint + RestConstants.AUTOSCALING_POLICIES).build();
+ public boolean addAutoscalingPolicy(String autoscalingPolicyName, RestClient restClient) {
+ return restClient.addEntity(autoscalingPolicy + "/" + autoscalingPolicyName,
+ RestConstants.AUTOSCALING_POLICIES, entityName);
- HttpResponse response = restClient.doPost(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- log.error("An unknown error occurred while trying to add autoscaling policy....");
- throw new RuntimeException("An unknown error occurred while trying to add autoscaling policy");
- } catch (Exception e) {
- String message = "Could not add Autoscaling policy....";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
}
- public AutoscalePolicyBean getAutoscalingPolicy(String autoscalingPolicyName, String endpoint,
- RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.AUTOSCALING_POLICIES + "/" +
- autoscalingPolicyName).build();
- HttpResponse response = restClient.doGet(uri);
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return gson.fromJson(response.getContent(), AutoscalePolicyBean.class);
- } else if (response.getStatusCode() == 404) {
- return null;
- } else {
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while getting the autosclaing policy";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not get autoscaling policy";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public AutoscalePolicyBean getAutoscalingPolicy(String autoscalingPolicyName, RestClient restClient) {
+ AutoscalePolicyBean bean = (AutoscalePolicyBean) restClient.
+ getEntity(RestConstants.AUTOSCALING_POLICIES, autoscalingPolicyName,
+ AutoscalePolicyBean.class, entityName);
+ return bean;
}
- public boolean updateAutoscalingPolicy(String autoscalingPolicyName, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(autoscalingPolicyUpdate + autoscalingPolicyName);
- URI uri = new URIBuilder(endpoint + RestConstants.AUTOSCALING_POLICIES).build();
- HttpResponse response = restClient.doPut(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while updating the autosclaing policy";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not updating autoscaling policy";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean updateAutoscalingPolicy(String autoscalingPolicyName, RestClient restClient) {
+ return restClient.updateEntity(autoscalingPolicyUpdate + "/" + autoscalingPolicyName,
+ RestConstants.AUTOSCALING_POLICIES, entityName);
+
}
- public boolean removeAutoscalingPolicy(String autoscalingPolicyName, String endpoint, RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.AUTOSCALING_POLICIES + "/" +
- autoscalingPolicyName).build();
- HttpResponse response = restClient.doDelete(uri);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else if(response.getContent().contains("is in use")) {
- return false;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while removing the autosclaing policy";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not remove autoscaling policy";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean removeAutoscalingPolicy(String autoscalingPolicyName, RestClient restClient) {
+ return restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES, autoscalingPolicyName, entityName);
+
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f995fb3b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
index 4da1185..caf2838 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
@@ -19,138 +19,39 @@
package org.apache.stratos.integration.tests;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
-import org.apache.stratos.integration.tests.rest.ErrorResponse;
-import org.apache.stratos.integration.tests.rest.HttpResponse;
import org.apache.stratos.integration.tests.rest.RestClient;
-import java.net.URI;
-
/**
- * Test to handle Network partition CRUD operations
+ * Test to handle Cartridge group CRUD operations
*/
-public class CartridgeGroupTest extends StratosArtifactsUtils {
- private static final Log log = LogFactory.getLog(StratosTestServerManager.class);
- String cartridgeGroups = "/cartridges-groups/";
- String cartridgeGroupsUpdate = "/cartridges-groups/update/";
-
-
- public boolean addCartridgeGroup(String groupName, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(cartridgeGroups + groupName);
- URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGE_GROUPS).build();
-
- HttpResponse response = restClient.doPost(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while adding the cartridge group";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not add cartridge group";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+public class CartridgeGroupTest {
+ private static final Log log = LogFactory.getLog(CartridgeGroupTest.class);
+ private static final String cartridgeGroups = "/cartridges-groups/";
+ private static final String cartridgeGroupsUpdate = "/cartridges-groups/update/";
+ private static final String entityName = "cartridgeGroup";
+
+ public boolean addCartridgeGroup(String groupName, RestClient restClient) {
+ return restClient.addEntity(cartridgeGroups + "/" + groupName,
+ RestConstants.CARTRIDGE_GROUPS, entityName);
}
- public CartridgeGroupBean getCartridgeGroup(String groupName, String endpoint,
- RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGE_GROUPS + "/" +
- groupName).build();
- HttpResponse response = restClient.doGet(uri);
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return gson.fromJson(response.getContent(), CartridgeGroupBean.class);
- } else if (response.getStatusCode() == 404) {
- return null;
- } else {
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while getting the cartridge group";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not get cartridge group";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public CartridgeGroupBean getCartridgeGroup(String groupName, RestClient restClient) {
+ CartridgeGroupBean bean = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, groupName,
+ CartridgeGroupBean.class, entityName);
+ return bean;
}
- public boolean updateCartridgeGroup(String groupName, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(cartridgeGroupsUpdate + groupName);
- URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGE_GROUPS).build();
- HttpResponse response = restClient.doPut(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while updating the cartridge group";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not update cartridge group";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean updateCartridgeGroup(String groupName, RestClient restClient) {
+ return restClient.updateEntity(cartridgeGroupsUpdate + "/" + groupName,
+ RestConstants.CARTRIDGE_GROUPS, entityName);
}
- public boolean removeCartridgeGroup(String groupName, String endpoint, RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGE_GROUPS + "/" +
- groupName).build();
- HttpResponse response = restClient.doDelete(uri);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else if(response.getContent().contains("it is used")) {
- return false;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while removing the cartridge group";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not remove cartridge group";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean removeCartridgeGroup(String groupName, RestClient restClient) {
+ return restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, groupName, entityName);
+
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f995fb3b/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 680d8a7..fc5cfa0 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
@@ -19,138 +19,41 @@
package org.apache.stratos.integration.tests;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.stratos.common.beans.cartridge.CartridgeBean;
-import org.apache.stratos.integration.tests.rest.ErrorResponse;
-import org.apache.stratos.integration.tests.rest.HttpResponse;
+import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
import org.apache.stratos.integration.tests.rest.RestClient;
-import java.net.URI;
-
/**
- * Test to handle Network partition CRUD operations
+ * Test to handle Cartridge CRUD operations
*/
-public class CartridgeTest extends StratosArtifactsUtils {
- private static final Log log = LogFactory.getLog(StratosTestServerManager.class);
- String cartridges = "/cartridges/mock/";
- String cartridgesUpdate = "/cartridges/mock/update/";
-
-
- public boolean addCartridge(String cartridgeType, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(cartridges + cartridgeType);
- URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGES).build();
-
- HttpResponse response = restClient.doPost(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while adding the cartridge";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not add cartridge";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+public class CartridgeTest {
+ private static final Log log = LogFactory.getLog(CartridgeTest.class);
+ private static final String cartridges = "/cartridges/mock/";
+ private static final String cartridgesUpdate = "/cartridges/mock/update/";
+ private static final String entityName = "cartridge";
+
+
+ public boolean addCartridge(String cartridgeType, RestClient restClient) {
+ return restClient.addEntity(cartridges + "/" + cartridgeType,
+ RestConstants.CARTRIDGES, entityName);
}
- public CartridgeBean getCartridge(String cartridgeType, String endpoint,
- RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGES + "/" +
- cartridgeType).build();
- HttpResponse response = restClient.doGet(uri);
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return gson.fromJson(response.getContent(), CartridgeBean.class);
- } else if (response.getStatusCode() == 404) {
- return null;
- } else {
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while getting the cartridge";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not get cartridge";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public CartridgeBean getCartridge(String cartridgeType,
+ RestClient restClient) {
+ CartridgeBean bean = (CartridgeBean) restClient.
+ getEntity(RestConstants.CARTRIDGES, cartridgeType,
+ CartridgeBean.class, entityName);
+ return bean;
}
- public boolean updateCartridge(String cartridgeType, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(cartridgesUpdate + cartridgeType);
- URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGES).build();
- HttpResponse response = restClient.doPut(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while updating the cartridge";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not update cartridge";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean updateCartridge(String cartridgeType, RestClient restClient) {
+ return restClient.updateEntity(cartridgesUpdate + "/" + cartridgeType,
+ RestConstants.CARTRIDGES, entityName);
}
- public boolean removeCartridge(String cartridgeType, String endpoint, RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGES + "/" +
- cartridgeType).build();
- HttpResponse response = restClient.doDelete(uri);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else if (response.getContent().contains("it is used")) {
- return false;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while removing the cartridge";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not remove cartridge";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean removeCartridge(String cartridgeType, RestClient restClient) {
+ return restClient.removeEntity(RestConstants.CARTRIDGES, cartridgeType, entityName);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f995fb3b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
index d7d4dd4..707f750 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
@@ -19,140 +19,39 @@
package org.apache.stratos.integration.tests;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
-import org.apache.stratos.integration.tests.rest.ErrorResponse;
-import org.apache.stratos.integration.tests.rest.HttpResponse;
import org.apache.stratos.integration.tests.rest.RestClient;
-import java.net.URI;
-
/**
- * Test to handle Network partition CRUD operations
+ * Test to handle Deployment policy CRUD operations
*/
-public class DeploymentPolicyTest extends StratosArtifactsUtils {
- private static final Log log = LogFactory.getLog(StratosTestServerManager.class);
- String deploymentPolicies = "/deployment-policies/";
- String deploymentPoliciesUpdate = "/deployment-policies/update/";
-
-
- public boolean addDeploymentPolicy(String deploymentPolicyId, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(deploymentPolicies + deploymentPolicyId);
- URI uri = new URIBuilder(endpoint + RestConstants.DEPLOYMENT_POLICIES).build();
-
- HttpResponse response = restClient.doPost(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while adding the deployment policy";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not add deployment policy";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+public class DeploymentPolicyTest {
+ private static final Log log = LogFactory.getLog(DeploymentPolicyTest.class);
+ private static final String deploymentPolicies = "/deployment-policies/";
+ private static final String deploymentPoliciesUpdate = "/deployment-policies/update/";
+ private static final String entityName = "deploymentPolicy";
+
+ public boolean addDeploymentPolicy(String deploymentPolicyId, RestClient restClient) {
+ return restClient.addEntity(deploymentPolicies + "/" + deploymentPolicyId,
+ RestConstants.DEPLOYMENT_POLICIES, entityName);
}
- public DeploymentPolicyBean getDeploymentPolicy(String deploymentPolicyId, String endpoint,
+ public DeploymentPolicyBean getDeploymentPolicy(String deploymentPolicyId,
RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.DEPLOYMENT_POLICIES + "/" +
- deploymentPolicyId).build();
- HttpResponse response = restClient.doGet(uri);
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return gson.fromJson(response.getContent(), DeploymentPolicyBean.class);
- } else if (response.getStatusCode() == 404) {
- return null;
- } else {
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while getting the deployment policy";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not get deployment policy";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ DeploymentPolicyBean bean = (DeploymentPolicyBean) restClient.
+ getEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId,
+ DeploymentPolicyBean.class, entityName);
+ return bean;
}
- public boolean updateDeploymentPolicy(String deploymentPolicyId, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(deploymentPoliciesUpdate + deploymentPolicyId);
- URI uri = new URIBuilder(endpoint + RestConstants.DEPLOYMENT_POLICIES).build();
- HttpResponse response = restClient.doPut(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else if(response.getContent().contains("it is used")) {
- return false;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while updating the deployment policy";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not update deployment policy";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean updateDeploymentPolicy(String deploymentPolicyId, RestClient restClient) {
+ return restClient.updateEntity(deploymentPoliciesUpdate + "/" + deploymentPolicyId,
+ RestConstants.DEPLOYMENT_POLICIES, entityName);
}
- public boolean removeDeploymentPolicy(String deploymentPolicyId, String endpoint, RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.DEPLOYMENT_POLICIES + "/" +
- deploymentPolicyId).build();
- HttpResponse response = restClient.doDelete(uri);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else if(response.getContent().contains("is in use")) {
- return false;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while removing the deployment policy";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not remove deployment policy";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean removeDeploymentPolicy(String deploymentPolicyId, RestClient restClient) {
+ return restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId, entityName);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f995fb3b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
index 42dff0a..ff27ea6 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
@@ -19,138 +19,39 @@
package org.apache.stratos.integration.tests;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
-import org.apache.stratos.integration.tests.rest.ErrorResponse;
-import org.apache.stratos.integration.tests.rest.HttpResponse;
import org.apache.stratos.integration.tests.rest.RestClient;
-import java.net.URI;
-
/**
* Test to handle Network partition CRUD operations
*/
-public class NetworkPartitionTest extends StratosArtifactsUtils {
- private static final Log log = LogFactory.getLog(StratosTestServerManager.class);
- String networkPartitions = "/network-partitions/mock/";
- String networkPartitionsUpdate = "/network-partitions/mock/update/";
-
-
- public boolean addNetworkPartition(String networkPartitionId, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(networkPartitions + networkPartitionId);
- URI uri = new URIBuilder(endpoint + RestConstants.NETWORK_PARTITIONS).build();
-
- HttpResponse response = restClient.doPost(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while adding the networkpartition";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not add networkpartition";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+public class NetworkPartitionTest {
+ private static final Log log = LogFactory.getLog(NetworkPartitionTest.class);
+ private static final String networkPartitions = "/network-partitions/mock/";
+ private static final String networkPartitionsUpdate = "/network-partitions/mock/update/";
+ private static final String entityName = "networkPartition";
+
+ public boolean addNetworkPartition(String networkPartitionId, RestClient restClient) {
+ return restClient.addEntity(networkPartitions + "/" + networkPartitionId,
+ RestConstants.NETWORK_PARTITIONS, entityName);
}
- public NetworkPartitionBean getNetworkPartition(String networkPartitionId, String endpoint,
+ public NetworkPartitionBean getNetworkPartition(String networkPartitionId,
RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.NETWORK_PARTITIONS + "/" +
- networkPartitionId).build();
- HttpResponse response = restClient.doGet(uri);
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return gson.fromJson(response.getContent(), NetworkPartitionBean.class);
- } else if (response.getStatusCode() == 404) {
- return null;
- } else {
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while getting the networkpartition";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not get networkpartition";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ NetworkPartitionBean bean = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId,
+ NetworkPartitionBean.class, entityName);
+ return bean;
}
- public boolean updateNetworkPartition(String networkPartitionId, String endpoint, RestClient restClient) {
- try {
- String content = getJsonStringFromFile(networkPartitionsUpdate + networkPartitionId);
- URI uri = new URIBuilder(endpoint + RestConstants.NETWORK_PARTITIONS).build();
- HttpResponse response = restClient.doPut(uri, content);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while updating the networkpartition";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not update networkpartition";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean updateNetworkPartition(String networkPartitionId, RestClient restClient) {
+ return restClient.updateEntity(networkPartitionsUpdate + "/" + networkPartitionId,
+ RestConstants.NETWORK_PARTITIONS, entityName);
}
- public boolean removeNetworkPartition(String networkPartitionId, String endpoint, RestClient restClient) {
- try {
- URI uri = new URIBuilder(endpoint + RestConstants.NETWORK_PARTITIONS + "/" +
- networkPartitionId).build();
- HttpResponse response = restClient.doDelete(uri);
- if (response != null) {
- if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
- return true;
- } else if(response.getContent().contains("it is used")) {
- return false;
- } else {
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if (errorResponse != null) {
- throw new RuntimeException(errorResponse.getErrorMessage());
- }
- }
- }
- String msg = "An unknown error occurred while removing the networkpartition";
- log.error(msg);
- throw new RuntimeException(msg);
- } catch (Exception e) {
- String message = "Could not remove networkpartition";
- log.error(message, e);
- throw new RuntimeException(message, e);
- }
+ public boolean removeNetworkPartition(String networkPartitionId, RestClient restClient) {
+ return restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId, entityName);
}
}
[45/50] [abbrv] stratos git commit: Removing unnecessary features,
artifacts and restructuring distribution artifacts
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/jquery-1.5.1.min.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/jquery-1.5.1.min.js b/products/stratos/modules/distribution/lib/home/js/jquery-1.5.1.min.js
deleted file mode 100755
index 14fd647..0000000
--- a/products/stratos/modules/distribution/lib/home/js/jquery-1.5.1.min.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.5.1
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Wed Feb 23 13:55:29 2011 -0500
- */
-(function(a,b){function cg(a){return d.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cd(a){if(!bZ[a]){var b=d("<"+a+">").appendTo("body"),c=b.css("display");b.remove();if(c==="none"||c==="")c="block";bZ[a]=c}return bZ[a]}function cc(a,b){var c={};d.each(cb.concat.apply([],cb.slice(0,b)),function(){c[this]=a});return c}function bY(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function bX(){try{return new a.XMLHttpRequest}catch(b){}}function bW(){d(a).unload(function(){for(var a in bU)bU[a](0,1)})}function bQ(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var e=a.dataTypes,f={},g,h,i=e.length,j,k=e[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h==="string"&&(f[h.toLowerCase()]=a.converters[h]);l=k,k=e[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=f[m]||f["* "+k];if(!n){p=b;for(o in f){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=f[j[1]+" "+k];if(p){o=f[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&d.error("No con
version from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bP(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bO(a,b,c,e){if(d.isArray(b)&&b.length)d.each(b,function(b,f){c||bq.test(a)?e(a,f):bO(a+"["+(typeof f==="object"||d.isArray(f)?b:"")+"]",f,c,e)});else if(c||b==null||typeof b!=="object")e(a,b);else if(d.isArray(b)||d.isEmptyObject(b))e(a,"");else for(var f in b)bO(a+"["+f+"]",b[f],c,e)}function bN(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bH,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l==="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bN(a,c,d,e,l,g)));(k||!l)&&!g["*"
]&&(l=bN(a,c,d,e,"*",g));return l}function bM(a){return function(b,c){typeof b!=="string"&&(c=b,b="*");if(d.isFunction(c)){var e=b.toLowerCase().split(bB),f=0,g=e.length,h,i,j;for(;f<g;f++)h=e[f],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bo(a,b,c){var e=b==="width"?bi:bj,f=b==="width"?a.offsetWidth:a.offsetHeight;if(c==="border")return f;d.each(e,function(){c||(f-=parseFloat(d.css(a,"padding"+this))||0),c==="margin"?f+=parseFloat(d.css(a,"margin"+this))||0:f-=parseFloat(d.css(a,"border"+this+"Width"))||0});return f}function ba(a,b){b.src?d.ajax({url:b.src,async:!1,dataType:"script"}):d.globalEval(b.text||b.textContent||b.innerHTML||""),b.parentNode&&b.parentNode.removeChild(b)}function _(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function $(a,b){if(b.nodeType===1){var c=b.nodeName.toLowerCase();b.clearAttributes(),b.mergeAttributes(a);if(c==="object")b.outerHTML=a
.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(d.expando)}}function Z(a,b){if(b.nodeType===1&&d.hasData(a)){var c=d.expando,e=d.data(a),f=d.data(b,e);if(e=e[c]){var g=e.events;f=f[c]=d.extend({},e);if(g){delete f.handle,f.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)d.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function Y(a,b){return d.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function O(a,b,c){if(d.isFunction(b))return d.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return d.grep(a,function(a,d){return a===b===c});if(typeof b==="string"){var e=d.grep(a,function(a){return a.nodeType===1});if(J.t
est(b))return d.filter(b,e,!c);b=d.filter(b,e)}return d.grep(a,function(a,e){return d.inArray(a,b)>=0===c})}function N(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function F(a,b){return(a&&a!=="*"?a+".":"")+b.replace(r,"`").replace(s,"&")}function E(a){var b,c,e,f,g,h,i,j,k,l,m,n,o,q=[],r=[],s=d._data(this,"events");if(a.liveFired!==this&&s&&s.live&&!a.target.disabled&&(!a.button||a.type!=="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var t=s.live.slice(0);for(i=0;i<t.length;i++)g=t[i],g.origType.replace(p,"")===a.type?r.push(g.selector):t.splice(i--,1);f=d(a.target).closest(r,a.currentTarget);for(j=0,k=f.length;j<k;j++){m=f[j];for(i=0;i<t.length;i++){g=t[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,e=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,e=d(a.relatedTarget).closest(g.selector)[0];(!e||e!==h)&&q.push({elem:h,handleObj:g,
level:m.level})}}}for(j=0,k=q.length;j<k;j++){f=q[j];if(c&&f.level>c)break;a.currentTarget=f.elem,a.data=f.handleObj.data,a.handleObj=f.handleObj,o=f.handleObj.origHandler.apply(f.elem,arguments);if(o===!1||a.isPropagationStopped()){c=f.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function C(a,c,e){var f=d.extend({},e[0]);f.type=a,f.originalEvent={},f.liveFired=b,d.event.handle.call(c,f),f.isDefaultPrevented()&&e[0].preventDefault()}function w(){return!0}function v(){return!1}function g(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function f(a,c,f){if(f===b&&a.nodeType===1){f=a.getAttribute("data-"+c);if(typeof f==="string"){try{f=f==="true"?!0:f==="false"?!1:f==="null"?null:d.isNaN(f)?e.test(f)?d.parseJSON(f):f:parseFloat(f)}catch(g){}d.data(a,c,f)}else f=b}return f}var c=a.document,d=function(){function I(){if(!d.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(I,1);return}d.ready()}}var d=function(a,b){return new d.fn.init(a
,b,g)},e=a.jQuery,f=a.$,g,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,i=/\S/,j=/^\s+/,k=/\s+$/,l=/\d/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=navigator.userAgent,w,x=!1,y,z="then done fail isResolved isRejected promise".split(" "),A,B=Object.prototype.toString,C=Object.prototype.hasOwnProperty,D=Array.prototype.push,E=Array.prototype.slice,F=String.prototype.trim,G=Array.prototype.indexOf,H={};d.fn=d.prototype={constructor:d,init:function(a,e,f){var g,i,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!e&&c.body){this.context=c,this[0]=c.body,this.selector="body",this.length=1;return this}if(typeof a==="string"){g=h.exec(a);if(!g||!g[1]&&e)return!e||e.jquery?(e||f).find(a)
:this.constructor(e).find(a);if(g[1]){e=e instanceof d?e[0]:e,k=e?e.ownerDocument||e:c,j=m.exec(a),j?d.isPlainObject(e)?(a=[c.createElement(j[1])],d.fn.attr.call(a,e,!0)):a=[k.createElement(j[1])]:(j=d.buildFragment([g[1]],[k]),a=(j.cacheable?d.clone(j.fragment):j.fragment).childNodes);return d.merge(this,a)}i=c.getElementById(g[2]);if(i&&i.parentNode){if(i.id!==g[2])return f.find(a);this.length=1,this[0]=i}this.context=c,this.selector=a;return this}if(d.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return d.makeArray(a,this)},selector:"",jquery:"1.5.1",length:0,size:function(){return this.length},toArray:function(){return E.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var e=this.constructor();d.isArray(a)?D.apply(e,a):d.merge(e,a),e.prevObject=this,e.context=this.context,b==="find"?e.selector=this.selector+(this.selector?" ":"")+c:b&&(e.selector=this.selecto
r+"."+b+"("+c+")");return e},each:function(a,b){return d.each(this,a,b)},ready:function(a){d.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(E.apply(this,arguments),"slice",E.call(arguments).join(","))},map:function(a){return this.pushStack(d.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:D,sort:[].sort,splice:[].splice},d.fn.init.prototype=d.fn,d.extend=d.fn.extend=function(){var a,c,e,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i==="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!=="object"&&!d.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){e=i[c],f=a[c];if(i===f)continue;l&&f&&(d.isPlainObject(f)||(g=d.isArray(f)))?(g?(g=!1,h=e&&d.isArray(e)?e:[]):h=e&&d.isPlainObject(e)?e:{},i[c]=d.extend(l,h
,f)):f!==b&&(i[c]=f)}return i},d.extend({noConflict:function(b){a.$=f,b&&(a.jQuery=e);return d},isReady:!1,readyWait:1,ready:function(a){a===!0&&d.readyWait--;if(!d.readyWait||a!==!0&&!d.isReady){if(!c.body)return setTimeout(d.ready,1);d.isReady=!0;if(a!==!0&&--d.readyWait>0)return;y.resolveWith(c,[d]),d.fn.trigger&&d(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!x){x=!0;if(c.readyState==="complete")return setTimeout(d.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",A,!1),a.addEventListener("load",d.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",A),a.attachEvent("onload",d.ready);var b=!1;try{b=a.frameElement==null}catch(e){}c.documentElement.doScroll&&b&&I()}}},isFunction:function(a){return d.type(a)==="function"},isArray:Array.isArray||function(a){return d.type(a)==="array"},isWindow:function(a){return a&&typeof a==="object"&&"setInterval"in a},isNaN:function(a){return a==null||!l.test(a)||isNaN(a)},type:function(a){return
a==null?String(a):H[B.call(a)]||"object"},isPlainObject:function(a){if(!a||d.type(a)!=="object"||a.nodeType||d.isWindow(a))return!1;if(a.constructor&&!C.call(a,"constructor")&&!C.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a){}return c===b||C.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!=="string"||!b)return null;b=d.trim(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return a.JSON&&a.JSON.parse?a.JSON.parse(b):(new Function("return "+b))();d.error("Invalid JSON: "+b)},parseXML:function(b,c,e){a.DOMParser?(e=new DOMParser,c=e.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),e=c.documentElement,(!e||!e.nodeName||e.nodeName==="parsererror")&&d.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(a){if(a&&i.test(a)){var b=c.head||c.getElementsByTagName("head")[0]||c.documentElement,e=c.cre
ateElement("script");d.support.scriptEval()?e.appendChild(c.createTextNode(a)):e.text=a,b.insertBefore(e,b.firstChild),b.removeChild(e)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,e){var f,g=0,h=a.length,i=h===b||d.isFunction(a);if(e){if(i){for(f in a)if(c.apply(a[f],e)===!1)break}else for(;g<h;)if(c.apply(a[g++],e)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(var j=a[0];g<h&&c.call(j,g,j)!==!1;j=a[++g]){}return a},trim:F?function(a){return a==null?"":F.call(a)}:function(a){return a==null?"":(a+"").replace(j,"").replace(k,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var e=d.type(a);a.length==null||e==="string"||e==="function"||e==="regexp"||d.isWindow(a)?D.call(c,a):d.merge(c,a)}return c},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length==="number")for(var f=c.
length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,b,c){var d=[],e;for(var f=0,g=a.length;f<g;f++)e=b(a[f],f,c),e!=null&&(d[d.length]=e);return d.concat.apply([],d)},guid:1,proxy:function(a,c,e){arguments.length===2&&(typeof c==="string"?(e=a,a=e[c],c=b):c&&!d.isFunction(c)&&(e=c,c=b)),!c&&a&&(c=function(){return a.apply(e||this,arguments)}),a&&(c.guid=a.guid=a.guid||c.guid||d.guid++);return c},access:function(a,c,e,f,g,h){var i=a.length;if(typeof c==="object"){for(var j in c)d.access(a,j,c[j],f,g,e);return a}if(e!==b){f=!h&&f&&d.isFunction(e);for(var k=0;k<i;k++)g(a[k],c,f?e.call(a[k],k,g(a[k],c)):e,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},_Deferred:function(){var a=[],b,c,e,f={done:function(){if(!e){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=d.type(i),j==="a
rray"?f.done.apply(f,i):j==="function"&&a.push(i);k&&f.resolveWith(k[0],k[1])}return this},resolveWith:function(d,f){if(!e&&!b&&!c){c=1;try{while(a[0])a.shift().apply(d,f)}catch(g){throw g}finally{b=[d,f],c=0}}return this},resolve:function(){f.resolveWith(d.isFunction(this.promise)?this.promise():this,arguments);return this},isResolved:function(){return c||b},cancel:function(){e=1,a=[];return this}};return f},Deferred:function(a){var b=d._Deferred(),c=d._Deferred(),e;d.extend(b,{then:function(a,c){b.done(a).fail(c);return this},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,promise:function(a){if(a==null){if(e)return e;e=a={}}var c=z.length;while(c--)a[z[c]]=b[z[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){var b=arguments.length,c=b<=1&&a&&d.isFunction(a.promise)?a:d.Deferred(),e=c.promise();if(b>1){var f=E.call(arguments,0),g=b,h=function(a){return function(b){f[a]=arguments.length>1?E.call(
arguments,0):b,--g||c.resolveWith(e,f)}};while(b--)a=f[b],a&&d.isFunction(a.promise)?a.promise().then(h(b),c.reject):--g;g||c.resolveWith(e,f)}else c!==a&&c.resolve(a);return e},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}d.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.subclass=this.subclass,a.fn.init=function b(b,c){c&&c instanceof d&&!(c instanceof a)&&(c=a(c));return d.fn.init.call(this,b,c,e)},a.fn.init.prototype=a.fn;var e=a(c);return a},browser:{}}),y=d._Deferred(),d.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){H["[object "+b+"]"]=b.toLowerCase()}),w=d.uaMatch(v),w.browser&&(d.browser[w.browser]=!0,d.browser.version=w.version),d.browser.webkit&&(d.browser.safari=!0),G&&(d.inArray=function(a,b){return G.call(b,a)}),i.test(" ")&&(
j=/^[\s\xA0]+/,k=/[\s\xA0]+$/),g=d(c),c.addEventListener?A=function(){c.removeEventListener("DOMContentLoaded",A,!1),d.ready()}:c.attachEvent&&(A=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",A),d.ready())});return d}();(function(){d.support={};var b=c.createElement("div");b.style.display="none",b.innerHTML=" <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=b.getElementsByTagName("*"),f=b.getElementsByTagName("a")[0],g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=b.getElementsByTagName("input")[0];if(e&&e.length&&f){d.support={leadingWhitespace:b.firstChild.nodeType===3,tbody:!b.getElementsByTagName("tbody").length,htmlSerialize:!!b.getElementsByTagName("link").length,style:/red/.test(f.getAttribute("style")),hrefNormalized:f.getAttribute("href")==="/a",opacity:/^0.55$/.test(f.style.opacity),cssFloat:!!f.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected
,deleteExpando:!0,optDisabled:!1,checkClone:!1,noCloneEvent:!0,noCloneChecked:!0,boxModel:null,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableHiddenOffsets:!0},i.checked=!0,d.support.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,d.support.optDisabled=!h.disabled;var j=null;d.support.scriptEval=function(){if(j===null){var b=c.documentElement,e=c.createElement("script"),f="script"+d.now();try{e.appendChild(c.createTextNode("window."+f+"=1;"))}catch(g){}b.insertBefore(e,b.firstChild),a[f]?(j=!0,delete a[f]):j=!1,b.removeChild(e),b=e=f=null}return j};try{delete b.test}catch(k){d.support.deleteExpando=!1}!b.addEventListener&&b.attachEvent&&b.fireEvent&&(b.attachEvent("onclick",function l(){d.support.noCloneEvent=!1,b.detachEvent("onclick",l)}),b.cloneNode(!0).fireEvent("onclick")),b=c.createElement("div"),b.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";var m=c.createDocumentFragment();m.appendChild(b.firstChild),d.support.checkClone=m.cloneNode(!0).cl
oneNode(!0).lastChild.checked,d(function(){var a=c.createElement("div"),b=c.getElementsByTagName("body")[0];if(b){a.style.width=a.style.paddingLeft="1px",b.appendChild(a),d.boxModel=d.support.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,d.support.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",d.support.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";var e=a.getElementsByTagName("td");d.support.reliableHiddenOffsets=e[0].offsetHeight===0,e[0].style.display="",e[1].style.display="none",d.support.reliableHiddenOffsets=d.support.reliableHiddenOffsets&&e[0].offsetHeight===0,a.innerHTML="",b.removeChild(a).style.display="none",a=e=null}});var n=function(a){var b=c.createElement("div");a="on"+a;if(!b.attachEvent)return!0;var d=a in b;d||(b.setAttribute(a,"return;"),d=typeof b[a]==="function"),b=null;return d
};d.support.submitBubbles=n("submit"),d.support.changeBubbles=n("change"),b=e=f=null}})();var e=/^(?:\{.*\}|\[.*\])$/;d.extend({cache:{},uuid:0,expando:"jQuery"+(d.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?d.cache[a[d.expando]]:a[d.expando];return!!a&&!g(a)},data:function(a,c,e,f){if(d.acceptData(a)){var g=d.expando,h=typeof c==="string",i,j=a.nodeType,k=j?d.cache:a,l=j?a[d.expando]:a[d.expando]&&d.expando;if((!l||f&&l&&!k[l][g])&&h&&e===b)return;l||(j?a[d.expando]=l=++d.uuid:l=d.expando),k[l]||(k[l]={},j||(k[l].toJSON=d.noop));if(typeof c==="object"||typeof c==="function")f?k[l][g]=d.extend(k[l][g],c):k[l]=d.extend(k[l],c);i=k[l],f&&(i[g]||(i[g]={}),i=i[g]),e!==b&&(i[c]=e);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[c]:i}},removeData:function(b,c,e){if(d.acceptData(b)){var f=d.expando,h=b.nodeType,i=h?d.cache:b,j=h?b[d.expando]:d.expando;if(!i[j])return;i
f(c){var k=e?i[j][f]:i[j];if(k){delete k[c];if(!g(k))return}}if(e){delete i[j][f];if(!g(i[j]))return}var l=i[j][f];d.support.deleteExpando||i!=a?delete i[j]:i[j]=null,l?(i[j]={},h||(i[j].toJSON=d.noop),i[j][f]=l):h&&(d.support.deleteExpando?delete b[d.expando]:b.removeAttribute?b.removeAttribute(d.expando):b[d.expando]=null)}},_data:function(a,b,c){return d.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=d.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),d.fn.extend({data:function(a,c){var e=null;if(typeof a==="undefined"){if(this.length){e=d.data(this[0]);if(this[0].nodeType===1){var g=this[0].attributes,h;for(var i=0,j=g.length;i<j;i++)h=g[i].name,h.indexOf("data-")===0&&(h=h.substr(5),f(this[0],h,e[h]))}}return e}if(typeof a==="object")return this.each(function(){d.data(this,a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(c===b){e=this.triggerHandler("getData"+k[1]+"!",[k[0]]),e===b&&this.length&&(e=d.data(this[0],a),e=f(
this[0],a,e));return e===b&&k[1]?this.data(k[0]):e}return this.each(function(){var b=d(this),e=[k[0],c];b.triggerHandler("setData"+k[1]+"!",e),d.data(this,a,c),b.triggerHandler("changeData"+k[1]+"!",e)})},removeData:function(a){return this.each(function(){d.removeData(this,a)})}}),d.extend({queue:function(a,b,c){if(a){b=(b||"fx")+"queue";var e=d._data(a,b);if(!c)return e||[];!e||d.isArray(c)?e=d._data(a,b,d.makeArray(c)):e.push(c);return e}},dequeue:function(a,b){b=b||"fx";var c=d.queue(a,b),e=c.shift();e==="inprogress"&&(e=c.shift()),e&&(b==="fx"&&c.unshift("inprogress"),e.call(a,function(){d.dequeue(a,b)})),c.length||d.removeData(a,b+"queue",!0)}}),d.fn.extend({queue:function(a,c){typeof a!=="string"&&(c=a,a="fx");if(c===b)return d.queue(this[0],a);return this.each(function(b){var e=d.queue(this,a,c);a==="fx"&&e[0]!=="inprogress"&&d.dequeue(this,a)})},dequeue:function(a){return this.each(function(){d.dequeue(this,a)})},delay:function(a,b){a=d.fx?d.fx.speeds[a]||a:a,b=b||"fx";retur
n this.queue(b,function(){var c=this;setTimeout(function(){d.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var h=/[\n\t\r]/g,i=/\s+/,j=/\r/g,k=/^(?:href|src|style)$/,l=/^(?:button|input)$/i,m=/^(?:button|input|object|select|textarea)$/i,n=/^a(?:rea)?$/i,o=/^(?:radio|checkbox)$/i;d.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"},d.fn.extend({attr:function(a,b){return d.access(this,a,b,!0,d.attr)},removeAttr:function(a,b){return this.each(function(){d.attr(this,a,""),this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.addClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"){var b=(a||"").split(i);for(var c=0,e=this.length;c<e;c++){var f=this[c];if(f.nodeType===1)if(f.className){var g=" "+f.className+" ",h=
f.className;for(var j=0,k=b.length;j<k;j++)g.indexOf(" "+b[j]+" ")<0&&(h+=" "+b[j]);f.className=d.trim(h)}else f.className=a}}return this},removeClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.removeClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"||a===b){var c=(a||"").split(i);for(var e=0,f=this.length;e<f;e++){var g=this[e];if(g.nodeType===1&&g.className)if(a){var j=(" "+g.className+" ").replace(h," ");for(var k=0,l=c.length;k<l;k++)j=j.replace(" "+c[k]+" "," ");g.className=d.trim(j)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,e=typeof b==="boolean";if(d.isFunction(a))return this.each(function(c){var e=d(this);e.toggleClass(a.call(this,c,e.attr("class"),b),b)});return this.each(function(){if(c==="string"){var f,g=0,h=d(this),j=b,k=a.split(i);while(f=k[g++])j=e?j:!h.hasClass(f),h[j?"addClass":"removeClass"](f)}else if(c==="undefined"||c==="boolean")this.className&&d._data(this,"__className__",this.cla
ssName),this.className=this.className||a===!1?"":d._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(h," ").indexOf(b)>-1)return!0;return!1},val:function(a){if(!arguments.length){var c=this[0];if(c){if(d.nodeName(c,"option")){var e=c.attributes.value;return!e||e.specified?c.value:c.text}if(d.nodeName(c,"select")){var f=c.selectedIndex,g=[],h=c.options,i=c.type==="select-one";if(f<0)return null;for(var k=i?f:0,l=i?f+1:h.length;k<l;k++){var m=h[k];if(m.selected&&(d.support.optDisabled?!m.disabled:m.getAttribute("disabled")===null)&&(!m.parentNode.disabled||!d.nodeName(m.parentNode,"optgroup"))){a=d(m).val();if(i)return a;g.push(a)}}if(i&&!g.length&&h.length)return d(h[f]).val();return g}if(o.test(c.type)&&!d.support.checkOn)return c.getAttribute("value")===null?"on":c.value;return(c.value||"").replace(j,"")}return b}var n=d.isFunction(a);return this.each(function(b){var c=d(this),e=a;if(this
.nodeType===1){n&&(e=a.call(this,b,c.val())),e==null?e="":typeof e==="number"?e+="":d.isArray(e)&&(e=d.map(e,function(a){return a==null?"":a+""}));if(d.isArray(e)&&o.test(this.type))this.checked=d.inArray(c.val(),e)>=0;else if(d.nodeName(this,"select")){var f=d.makeArray(e);d("option",this).each(function(){this.selected=d.inArray(d(this).val(),f)>=0}),f.length||(this.selectedIndex=-1)}else this.value=e}})}}),d.extend({attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,e,f){if(!a||a.nodeType===3||a.nodeType===8||a.nodeType===2)return b;if(f&&c in d.attrFn)return d(a)[c](e);var g=a.nodeType!==1||!d.isXMLDoc(a),h=e!==b;c=g&&d.props[c]||c;if(a.nodeType===1){var i=k.test(c);if(c==="selected"&&!d.support.optSelected){var j=a.parentNode;j&&(j.selectedIndex,j.parentNode&&j.parentNode.selectedIndex)}if((c in a||a[c]!==b)&&g&&!i){h&&(c==="type"&&l.test(a.nodeName)&&a.parentNode&&d.error("type property can't be changed"),e===null?a.nodeType===1&&a.rem
oveAttribute(c):a[c]=e);if(d.nodeName(a,"form")&&a.getAttributeNode(c))return a.getAttributeNode(c).nodeValue;if(c==="tabIndex"){var o=a.getAttributeNode("tabIndex");return o&&o.specified?o.value:m.test(a.nodeName)||n.test(a.nodeName)&&a.href?0:b}return a[c]}if(!d.support.style&&g&&c==="style"){h&&(a.style.cssText=""+e);return a.style.cssText}h&&a.setAttribute(c,""+e);if(!a.attributes[c]&&(a.hasAttribute&&!a.hasAttribute(c)))return b;var p=!d.support.hrefNormalized&&g&&i?a.getAttribute(c,2):a.getAttribute(c);return p===null?b:p}h&&(a[c]=e);return a[c]}});var p=/\.(.*)$/,q=/^(?:textarea|input|select)$/i,r=/\./g,s=/ /g,t=/[^\w\s.|`]/g,u=function(a){return a.replace(t,"\\$&")};d.event={add:function(c,e,f,g){if(c.nodeType!==3&&c.nodeType!==8){try{d.isWindow(c)&&(c!==a&&!c.frameElement)&&(c=a)}catch(h){}if(f===!1)f=v;else if(!f)return;var i,j;f.handler&&(i=f,f=i.handler),f.guid||(f.guid=d.guid++);var k=d._data(c);if(!k)return;var l=k.events,m=k.handle;l||(k.events=l={}),m||(k.handle=m=fu
nction(){return typeof d!=="undefined"&&!d.event.triggered?d.event.handle.apply(m.elem,arguments):b}),m.elem=c,e=e.split(" ");var n,o=0,p;while(n=e[o++]){j=i?d.extend({},i):{handler:f,data:g},n.indexOf(".")>-1?(p=n.split("."),n=p.shift(),j.namespace=p.slice(0).sort().join(".")):(p=[],j.namespace=""),j.type=n,j.guid||(j.guid=f.guid);var q=l[n],r=d.event.special[n]||{};if(!q){q=l[n]=[];if(!r.setup||r.setup.call(c,g,p,m)===!1)c.addEventListener?c.addEventListener(n,m,!1):c.attachEvent&&c.attachEvent("on"+n,m)}r.add&&(r.add.call(c,j),j.handler.guid||(j.handler.guid=f.guid)),q.push(j),d.event.global[n]=!0}c=null}},global:{},remove:function(a,c,e,f){if(a.nodeType!==3&&a.nodeType!==8){e===!1&&(e=v);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=d.hasData(a)&&d._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(e=c.handler,c=c.type);if(!c||typeof c==="string"&&c.charAt(0)==="."){c=c||"";for(h in t)d.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split
("."),h=m.shift(),n=new RegExp("(^|\\.)"+d.map(m.slice(0).sort(),u).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!e){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))d.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=d.event.special[h]||{};for(j=f||0;j<p.length;j++){q=p[j];if(e.guid===q.guid){if(l||n.test(q.namespace))f==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(f!=null)break}}if(p.length===0||f!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&d.removeEvent(a,h,s.handle),g=null,delete t[h]}if(d.isEmptyObject(t)){var w=s.handle;w&&(w.elem=null),delete s.events,delete s.handle,d.isEmptyObject(s)&&d.removeData(a,b,!0)}}},trigger:function(a,c,e){var f=a.type||a,g=arguments[3];if(!g){a=typeof a==="object"?a[d.expando]?a:d.extend(d.Event(f),a):d.Event(f),f.indexOf("!")>=0&&(a.type=f=f.slice(0,-1),a.exclusive=!0),e||(a.stopPropagation(),d.event.global[f]&&d.each(d.cache,function(){var b=d.expando,e=this[b];e&&e.events&&e.events[f]&&d.e
vent.trigger(a,c,e.handle.elem)}));if(!e||e.nodeType===3||e.nodeType===8)return b;a.result=b,a.target=e,c=d.makeArray(c),c.unshift(a)}a.currentTarget=e;var h=d._data(e,"handle");h&&h.apply(e,c);var i=e.parentNode||e.ownerDocument;try{e&&e.nodeName&&d.noData[e.nodeName.toLowerCase()]||e["on"+f]&&e["on"+f].apply(e,c)===!1&&(a.result=!1,a.preventDefault())}catch(j){}if(!a.isPropagationStopped()&&i)d.event.trigger(a,c,i,!0);else if(!a.isDefaultPrevented()){var k,l=a.target,m=f.replace(p,""),n=d.nodeName(l,"a")&&m==="click",o=d.event.special[m]||{};if((!o._default||o._default.call(e,a)===!1)&&!n&&!(l&&l.nodeName&&d.noData[l.nodeName.toLowerCase()])){try{l[m]&&(k=l["on"+m],k&&(l["on"+m]=null),d.event.triggered=!0,l[m]())}catch(q){}k&&(l["on"+m]=k),d.event.triggered=!1}}},handle:function(c){var e,f,g,h,i,j=[],k=d.makeArray(arguments);c=k[0]=d.event.fix(c||a.event),c.currentTarget=this,e=c.type.indexOf(".")<0&&!c.exclusive,e||(g=c.type.split("."),c.type=g.shift(),j=g.slice(0).sort(),h=new R
egExp("(^|\\.)"+j.join("\\.(?:.*\\.)?")+"(\\.|$)")),c.namespace=c.namespace||j.join("."),i=d._data(this,"events"),f=(i||{})[c.type];if(i&&f){f=f.slice(0);for(var l=0,m=f.length;l<m;l++){var n=f[l];if(e||h.test(n.namespace)){c.handler=n.handler,c.data=n.data,c.handleObj=n;var o=n.handler.apply(this,k);o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[d.expando])return a;var e=a;a=d.Event(e);for(var f=this.props.length,g;f;)g=this.props[--f],a[g]=e[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.related
Target&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=c.documentElement,i=c.body;a.pageX=a.clientX+(h&&h.scrollLeft||i&&i.scrollLeft||0)-(h&&h.clientLeft||i&&i.clientLeft||0),a.pageY=a.clientY+(h&&h.scrollTop||i&&i.scrollTop||0)-(h&&h.clientTop||i&&i.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:d.proxy,special:{ready:{setup:d.bindReady,teardown:d.noop},live:{add:function(a){d.event.add(this,F(a.origType,a.selector),d.extend({},a,{handler:E,guid:a.handler.guid}))},remove:function(a){d.event.remove(this,F(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){d.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},d.removeE
vent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},d.Event=function(a){if(!this.preventDefault)return new d.Event(a);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?w:v):this.type=a,this.timeStamp=d.now(),this[d.expando]=!0},d.Event.prototype={preventDefault:function(){this.isDefaultPrevented=w;var a=this.originalEvent;a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=w;var a=this.originalEvent;a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=w,this.stopPropagation()},isDefaultPrevented:v,isPropagationStopped:v,isImmediatePropagationStopped:v};var x=function(a){var b=a.relatedTarget;try{if(b!==c&&!b.parentNode)return;while(b&&b!==th
is)b=b.parentNode;b!==this&&(a.type=a.data,d.event.handle.apply(this,arguments))}catch(e){}},y=function(a){a.type=a.data,d.event.handle.apply(this,arguments)};d.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){d.event.special[a]={setup:function(c){d.event.add(this,b,c&&c.selector?y:x,a)},teardown:function(a){d.event.remove(this,b,a&&a.selector?y:x)}}}),d.support.submitBubbles||(d.event.special.submit={setup:function(a,b){if(this.nodeName&&this.nodeName.toLowerCase()!=="form")d.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&d(b).closest("form").length&&C("submit",this,arguments)}),d.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&d(b).closest("form").length&&a.keyCode===13&&C("submit",this,arguments)});else return!1},teardown:function(a){d.event.remove(this,".specialSubmit")}});if(!d.support.changeBubbles){var z,A=function(a){var b=a.type,c=a.value;b==="ra
dio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?d.map(a.options,function(a){return a.selected}).join("-"):"":a.nodeName.toLowerCase()==="select"&&(c=a.selectedIndex);return c},B=function B(a){var c=a.target,e,f;if(q.test(c.nodeName)&&!c.readOnly){e=d._data(c,"_change_data"),f=A(c),(a.type!=="focusout"||c.type!=="radio")&&d._data(c,"_change_data",f);if(e===b||f===e)return;if(e!=null||f)a.type="change",a.liveFired=b,d.event.trigger(a,arguments[1],c)}};d.event.special.change={filters:{focusout:B,beforedeactivate:B,click:function(a){var b=a.target,c=b.type;(c==="radio"||c==="checkbox"||b.nodeName.toLowerCase()==="select")&&B.call(this,a)},keydown:function(a){var b=a.target,c=b.type;(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&B.call(this,a)},beforeactivate:function(a){var b=a.target;d._data(b,"_change_data",A(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in
z)d.event.add(this,c+".specialChange",z[c]);return q.test(this.nodeName)},teardown:function(a){d.event.remove(this,".specialChange");return q.test(this.nodeName)}},z=d.event.special.change.filters,z.focus=z.beforeactivate}c.addEventListener&&d.each({focus:"focusin",blur:"focusout"},function(a,b){function c(a){a=d.event.fix(a),a.type=b;return d.event.handle.call(this,a)}d.event.special[b]={setup:function(){this.addEventListener(a,c,!0)},teardown:function(){this.removeEventListener(a,c,!0)}}}),d.each(["bind","one"],function(a,c){d.fn[c]=function(a,e,f){if(typeof a==="object"){for(var g in a)this[c](g,e,a[g],f);return this}if(d.isFunction(e)||e===!1)f=e,e=b;var h=c==="one"?d.proxy(f,function(a){d(this).unbind(a,h);return f.apply(this,arguments)}):f;if(a==="unload"&&c!=="one")this.one(a,e,f);else for(var i=0,j=this.length;i<j;i++)d.event.add(this[i],a,h,e);return this}}),d.fn.extend({unbind:function(a,b){if(typeof a!=="object"||a.preventDefault)for(var e=0,f=this.length;e<f;e++)d.event.
remove(this[e],a,b);else for(var c in a)this.unbind(c,a[c]);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){d.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var c=d.Event(a);c.preventDefault(),c.stopPropagation(),d.event.trigger(c,b,this[0]);return c.result}},toggle:function(a){var b=arguments,c=1;while(c<b.length)d.proxy(a,b[c++]);return this.click(d.proxy(a,function(e){var f=(d._data(this,"lastToggle"+a.guid)||0)%c;d._data(this,"lastToggle"+a.guid,f+1),e.preventDefault();return b[f].apply(this,arguments)||!1}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var D={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};d.each(["live","die"],function(a,c){d.fn[c]=function(a,e,f,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:d(this.context);if(typeof a==="ob
ject"&&!a.preventDefault){for(var o in a)n[c](o,e,a[o],m);return this}d.isFunction(e)&&(f=e,e=b),a=(a||"").split(" ");while((h=a[i++])!=null){j=p.exec(h),k="",j&&(k=j[0],h=h.replace(p,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,h==="focus"||h==="blur"?(a.push(D[h]+k),h=h+k):h=(D[h]||h)+k;if(c==="live")for(var q=0,r=n.length;q<r;q++)d.event.add(n[q],"live."+F(h,m),{data:e,selector:m,handler:f,origType:h,origHandler:f,preType:l});else n.unbind("live."+F(h,m),f)}return this}}),d.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){d.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},d.attrFn&&(d.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.s
izset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!=="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,e,g){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!=="string")return e;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[
x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(f.call(n)==="[object Array]")if(u)if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&e.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&e.push(j[t]);else e.push.apply(e,n);else p(n,e);o&&(k(o,h,e,g),k.uniqueSort(e));return e};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=fun
ction(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!=="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(f){if(f===!0)continue}else g=o=!0}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");i
f(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b==="string",d=c&&!j.test(b),e=c&&
!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1){}a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b==="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!=="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!=="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute(
"name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!=="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not"
)if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){return"text"===a.getAttribute("type")},radio:function(a){return"radio"===a.type},checkbox:function(a){return"checkbox"===a.type},file:function(a){return"file"===a.type},password:function(a){return"password"===a.type},submit:function(a){return"submit"===a.type},image:function(a){return"image"===a.type
},reset:function(a){return"reset"===a.type},button:function(a){return"button"===a.type||a.nodeName.toLowerCase()==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!
0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};f
or(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(f.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length==="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(a===b){g=!0;return 0}if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i
;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!=="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!=="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!=="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),fu
nction(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!=="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3
]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector,d=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(e){d=!0}b&&(k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(d||!l.match.PSEUDO.test(c)&&!/!=/.test(c))return b.call(a,c)}catch(e){}return k(c,null,null,[a]).length>0})}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test
e'></div><div class='test'></div>";if(a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!=="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};d.find=k,d.expr=k.selectors,d.expr[":"]=d.expr.filters,d.unique=k.uniqueSort,d.text=k.getText,d.isXM
LDoc=k.isXML,d.contains=k.contains}();var G=/Until$/,H=/^(?:parents|prevUntil|prevAll)/,I=/,/,J=/^.[^:#\[\.,]*$/,K=Array.prototype.slice,L=d.expr.match.POS,M={children:!0,contents:!0,next:!0,prev:!0};d.fn.extend({find:function(a){var b=this.pushStack("","find",a),c=0;for(var e=0,f=this.length;e<f;e++){c=b.length,d.find(a,this[e],b);if(e>0)for(var g=c;g<b.length;g++)for(var h=0;h<c;h++)if(b[h]===b[g]){b.splice(g--,1);break}}return b},has:function(a){var b=d(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(d.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(O(this,a,!1),"not",a)},filter:function(a){return this.pushStack(O(this,a,!0),"filter",a)},is:function(a){return!!a&&d.filter(a,this).length>0},closest:function(a,b){var c=[],e,f,g=this[0];if(d.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(e=0,f=a.length;e<f;e++)i=a[e],j[i]||(j[i]=d.expr.match.POS.test(i)?d(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.i
ndex(g)>-1:d(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=L.test(a)?d(a,b||this.context):null;for(e=0,f=this.length;e<f;e++){g=this[e];while(g){if(l?l.index(g)>-1:d.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b)break}}c=c.length>1?d.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a==="string")return d.inArray(this[0],a?d(a):this.parent().children());return d.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a==="string"?d(a,b):d.makeArray(a),e=d.merge(this.get(),c);return this.pushStack(N(c[0])||N(e[0])?e:d.unique(e))},andSelf:function(){return this.add(this.prevObject)}}),d.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return d.dir(a,"parentNode")},parentsUntil:function(a,b,c){return d.dir(a,"parentNode",c)},next:function(a){return d.nth(a,2,"nextSibling")},prev:function(a){return d.nth(a,2,"previousSibling
")},nextAll:function(a){return d.dir(a,"nextSibling")},prevAll:function(a){return d.dir(a,"previousSibling")},nextUntil:function(a,b,c){return d.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return d.dir(a,"previousSibling",c)},siblings:function(a){return d.sibling(a.parentNode.firstChild,a)},children:function(a){return d.sibling(a.firstChild)},contents:function(a){return d.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:d.makeArray(a.childNodes)}},function(a,b){d.fn[a]=function(c,e){var f=d.map(this,b,c),g=K.call(arguments);G.test(a)||(e=c),e&&typeof e==="string"&&(f=d.filter(e,f)),f=this.length>1&&!M[a]?d.unique(f):f,(this.length>1||I.test(e))&&H.test(a)&&(f=f.reverse());return this.pushStack(f,a,g.join(","))}}),d.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?d.find.matchesSelector(b[0],a)?[b[0]]:[]:d.find.matches(a,b)},dir:function(a,c,e){var f=[],g=a[c];while(g&&g.nodeType!==9&&(e===b||g.nodeType!==1||!d(g).is(e)))g.nodeType===1&&f.
push(g),g=g[c];return f},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var P=/ jQuery\d+="(?:\d+|null)"/g,Q=/^\s+/,R=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,S=/<([\w:]+)/,T=/<tbody/i,U=/<|&#?\w+;/,V=/<(?:script|object|embed|option|style)/i,W=/checked\s*(?:[^=]|=\s*.checked.)/i,X={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};X.optgroup=X.option,X.tbody=X.tfoot=X.colgroup=X.caption=X.thead,X.th=X.td,d.support.htmlSerialize||(X._default=[1,"div<div>","</div>"]),d.fn.extend({text:function(a){if(d.isFunction(a))return this.each(fun
ction(b){var c=d(this);c.text(a.call(this,b,c.text()))});if(typeof a!=="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return d.text(this)},wrapAll:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapAll(a.call(this,b))});if(this[0]){var b=d(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapInner(a.call(this,b))});return this.each(function(){var b=d(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){d(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){d.nodeName(this,"body")||d(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1
&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=d(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,d(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,e;(e=this[c])!=null;c++)if(!a||d.filter(a,[e]).length)!b&&e.nodeType===1&&(d.cleanData(e.getElementsByTagName("*")),d.cleanData([e])),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&d.cleanData(b.getElementsByTagName("*"
));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return d.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(P,""):null;if(typeof a!=="string"||V.test(a)||!d.support.leadingWhitespace&&Q.test(a)||X[(S.exec(a)||["",""])[1].toLowerCase()])d.isFunction(a)?this.each(function(b){var c=d(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);else{a=a.replace(R,"<$1></$2>");try{for(var c=0,e=this.length;c<e;c++)this[c].nodeType===1&&(d.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(f){this.empty().append(a)}}return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(d.isFunction(a))return this.each(function(b){var c=d(this),e=c.html();c.replaceWith(a.call(this,b,e))});typeof a!=="string"&&(a=d(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;d(this).remove(),b?d(b).be
fore(a):d(c).append(a)})}return this.pushStack(d(d.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,e){var f,g,h,i,j=a[0],k=[];if(!d.support.checkClone&&arguments.length===3&&typeof j==="string"&&W.test(j))return this.each(function(){d(this).domManip(a,c,e,!0)});if(d.isFunction(j))return this.each(function(f){var g=d(this);a[0]=j.call(this,f,c?g.html():b),g.domManip(a,c,e)});if(this[0]){i=j&&j.parentNode,d.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?f={fragment:i}:f=d.buildFragment(a,this,k),h=f.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&d.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)e.call(c?Y(this[l],g):this[l],f.cacheable||m>1&&l<n?d.clone(h,!0,!0):h)}k.length&&d.each(k,ba)}return this}}),d.buildFragment=function(a,b,e){var f,g,h,i=b&&b[0]?b[0].ownerDocument||b[0]:c;a.length===1&&typeof a[0]==="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!
V.test(a[0])&&(d.support.checkClone||!W.test(a[0]))&&(g=!0,h=d.fragments[a[0]],h&&(h!==1&&(f=h))),f||(f=i.createDocumentFragment(),d.clean(a,i,f,e)),g&&(d.fragments[a[0]]=h?f:1);return{fragment:f,cacheable:g}},d.fragments={},d.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){d.fn[a]=function(c){var e=[],f=d(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&f.length===1){f[b](this[0]);return this}for(var h=0,i=f.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();d(f[h])[b](j),e=e.concat(j)}return this.pushStack(e,a,f.selector)}}),d.extend({clone:function(a,b,c){var e=a.cloneNode(!0),f,g,h;if((!d.support.noCloneEvent||!d.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!d.isXMLDoc(a)){$(a,e),f=_(a),g=_(e);for(h=0;f[h];++h)$(f[h],g[h])}if(b){Z(a,e);if(c){f=_(a),g=_(e);for(h=0;f[h];++h)Z(f[h],g[h])}}return e},clean:function(a,b,e,f){b=b||c,typeof b.createElem
ent==="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var g=[];for(var h=0,i;(i=a[h])!=null;h++){typeof i==="number"&&(i+="");if(!i)continue;if(typeof i!=="string"||U.test(i)){if(typeof i==="string"){i=i.replace(R,"<$1></$2>");var j=(S.exec(i)||["",""])[1].toLowerCase(),k=X[j]||X._default,l=k[0],m=b.createElement("div");m.innerHTML=k[1]+i+k[2];while(l--)m=m.lastChild;if(!d.support.tbody){var n=T.test(i),o=j==="table"&&!n?m.firstChild&&m.firstChild.childNodes:k[1]==="<table>"&&!n?m.childNodes:[];for(var p=o.length-1;p>=0;--p)d.nodeName(o[p],"tbody")&&!o[p].childNodes.length&&o[p].parentNode.removeChild(o[p])}!d.support.leadingWhitespace&&Q.test(i)&&m.insertBefore(b.createTextNode(Q.exec(i)[0]),m.firstChild),i=m.childNodes}}else i=b.createTextNode(i);i.nodeType?g.push(i):g=d.merge(g,i)}if(e)for(h=0;g[h];h++)!f||!d.nodeName(g[h],"script")||g[h].type&&g[h].type.toLowerCase()!=="text/javascript"?(g[h].nodeType===1&&g.splice.apply(g,[h+1,0].concat(d.makeArray(g[h].getElement
sByTagName("script")))),e.appendChild(g[h])):f.push(g[h].parentNode?g[h].parentNode.removeChild(g[h]):g[h]);return g},cleanData:function(a){var b,c,e=d.cache,f=d.expando,g=d.event.special,h=d.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&d.noData[j.nodeName.toLowerCase()])continue;c=j[d.expando];if(c){b=e[c]&&e[c][f];if(b&&b.events){for(var k in b.events)g[k]?d.event.remove(j,k):d.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[d.expando]:j.removeAttribute&&j.removeAttribute(d.expando),delete e[c]}}}});var bb=/alpha\([^)]*\)/i,bc=/opacity=([^)]*)/,bd=/-([a-z])/ig,be=/([A-Z])/g,bf=/^-?\d+(?:px)?$/i,bg=/^-?\d/,bh={position:"absolute",visibility:"hidden",display:"block"},bi=["Left","Right"],bj=["Top","Bottom"],bk,bl,bm,bn=function(a,b){return b.toUpperCase()};d.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return d.access(this,a,c,!0,function(a,c,e){return e!==b?d.style(a,c,e):d.css(a,c)})},d.extend({cssHooks:{opacity:{get:
function(a,b){if(b){var c=bk(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0},cssProps:{"float":d.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,e,f){if(a&&a.nodeType!==3&&a.nodeType!==8&&a.style){var g,h=d.camelCase(c),i=a.style,j=d.cssHooks[h];c=d.cssProps[h]||h;if(e===b){if(j&&"get"in j&&(g=j.get(a,!1,f))!==b)return g;return i[c]}if(typeof e==="number"&&isNaN(e)||e==null)return;typeof e==="number"&&!d.cssNumber[h]&&(e+="px");if(!j||!("set"in j)||(e=j.set(a,e))!==b)try{i[c]=e}catch(k){}}},css:function(a,c,e){var f,g=d.camelCase(c),h=d.cssHooks[g];c=d.cssProps[g]||g;if(h&&"get"in h&&(f=h.get(a,!0,e))!==b)return f;if(bk)return bk(a,c,g)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bd,bn)}}),d.curCSS=d.css,d.each(["height","width"],function(a,b){d.cssHooks[b]={get:function(a
,c,e){var f;if(c){a.offsetWidth!==0?f=bo(a,b,e):d.swap(a,bh,function(){f=bo(a,b,e)});if(f<=0){f=bk(a,b,b),f==="0px"&&bm&&(f=bm(a,b,b));if(f!=null)return f===""||f==="auto"?"0px":f}if(f<0||f==null){f=a.style[b];return f===""||f==="auto"?"0px":f}return typeof f==="string"?f:f+"px"}},set:function(a,b){if(!bf.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),d.support.opacity||(d.cssHooks.opacity={get:function(a,b){return bc.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style;c.zoom=1;var e=d.isNaN(b)?"":"alpha(opacity="+b*100+")",f=c.filter||"";c.filter=bb.test(f)?f.replace(bb,e):c.filter+" "+e}}),c.defaultView&&c.defaultView.getComputedStyle&&(bl=function(a,c,e){var f,g,h;e=e.replace(be,"-$1").toLowerCase();if(!(g=a.ownerDocument.defaultView))return b;if(h=g.getComputedStyle(a,null))f=h.getPropertyValue(e),f===""&&!d.contains(a.ownerDocument.documentElement,a)&&(f=d.style(a,e));return f}),c.
documentElement.currentStyle&&(bm=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bf.test(d)&&bg.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bk=bl||bm,d.expr&&d.expr.filters&&(d.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!d.support.reliableHiddenOffsets&&(a.style.display||d.css(a,"display"))==="none"},d.expr.filters.visible=function(a){return!d.expr.filters.hidden(a)});var bp=/%20/g,bq=/\[\]$/,br=/\r?\n/g,bs=/#.*$/,bt=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bu=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bv=/(?:^file|^widget|\-extension):$/,bw=/^(?:GET|HEAD)$/,bx=/^\/\//,by=/\?/,bz=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bA=/^(?:select|textarea)/i,bB=/\s+/,bC=/([?&])_=[^&]*/,bD=/(^|\-)([a-z]
)/g,bE=function(a,b,c){return b+c.toUpperCase()},bF=/^([\w\+\.\-]+:)\/\/([^\/?#:]*)(?::(\d+))?/,bG=d.fn.load,bH={},bI={},bJ,bK;try{bJ=c.location.href}catch(bL){bJ=c.createElement("a"),bJ.href="",bJ=bJ.href}bK=bF.exec(bJ.toLowerCase()),d.fn.extend({load:function(a,c,e){if(typeof a!=="string"&&bG)return bG.apply(this,arguments);if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var g=a.slice(f,a.length);a=a.slice(0,f)}var h="GET";c&&(d.isFunction(c)?(e=c,c=b):typeof c==="object"&&(c=d.param(c,d.ajaxSettings.traditional),h="POST"));var i=this;d.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?d("<div>").append(c.replace(bz,"")).find(g):c)),e&&i.each(e,[c,b,a])}});return this},serialize:function(){return d.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?d.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(t
his.checked||bA.test(this.nodeName)||bu.test(this.type))}).map(function(a,b){var c=d(this).val();return c==null?null:d.isArray(c)?d.map(c,function(a,c){return{name:b.name,value:a.replace(br,"\r\n")}}):{name:b.name,value:c.replace(br,"\r\n")}}).get()}}),d.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){d.fn[b]=function(a){return this.bind(b,a)}}),d.each(["get","post"],function(a,c){d[c]=function(a,e,f,g){d.isFunction(e)&&(g=g||f,f=e,e=b);return d.ajax({type:c,url:a,data:e,success:f,dataType:g})}}),d.extend({getScript:function(a,c){return d.get(a,b,c,"script")},getJSON:function(a,b,c){return d.get(a,b,c,"json")},ajaxSetup:function(a,b){b?d.extend(!0,a,d.ajaxSettings,b):(b=a,a=d.extend(!0,d.ajaxSettings,b));for(var c in {context:1,url:1})c in b?a[c]=b[c]:c in d.ajaxSettings&&(a[c]=d.ajaxSettings[c]);return a},ajaxSettings:{url:bJ,isLocal:bv.test(bK[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,asyn
c:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":d.parseJSON,"text xml":d.parseXML}},ajaxPrefilter:bM(bH),ajaxTransport:bM(bI),ajax:function(a,c){function v(a,c,l,n){if(r!==2){r=2,p&&clearTimeout(p),o=b,m=n||"",u.readyState=a?4:0;var q,t,v,w=l?bP(e,u,l):b,x,y;if(a>=200&&a<300||a===304){if(e.ifModified){if(x=u.getResponseHeader("Last-Modified"))d.lastModified[k]=x;if(y=u.getResponseHeader("Etag"))d.etag[k]=y}if(a===304)c="notmodified",q=!0;else try{t=bQ(e,w),c="success",q=!0}catch(z){c="parsererror",v=z}}else{v=c;if(!c||a)c="error",a<0&&(a=0)}u.status=a,u.statusText=c,q?h.resolveWith(f,[t,c,u]):h.rejectWith(f,[u,c,v]),u.statusCode(j),j=b,s&&g.trigger("ajax"+(q?"Success":"Error"),[u,e,q?t:v]),i.resolveWith(f,[u,c]),s&&(g.trigger("ajaxComplete",[u,e
]),--d.active||d.event.trigger("ajaxStop"))}}typeof a==="object"&&(c=a,a=b),c=c||{};var e=d.ajaxSetup({},c),f=e.context||e,g=f!==e&&(f.nodeType||f instanceof d)?d(f):d.event,h=d.Deferred(),i=d._Deferred(),j=e.statusCode||{},k,l={},m,n,o,p,q,r=0,s,t,u={readyState:0,setRequestHeader:function(a,b){r||(l[a.toLowerCase().replace(bD,bE)]=b);return this},getAllResponseHeaders:function(){return r===2?m:null},getResponseHeader:function(a){var c;if(r===2){if(!n){n={};while(c=bt.exec(m))n[c[1].toLowerCase()]=c[2]}c=n[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){r||(e.mimeType=a);return this},abort:function(a){a=a||"abort",o&&o.abort(a),v(0,a);return this}};h.promise(u),u.success=u.done,u.error=u.fail,u.complete=i.done,u.statusCode=function(a){if(a){var b;if(r<2)for(b in a)j[b]=[j[b],a[b]];else b=a[u.status],u.then(b,b)}return this},e.url=((a||e.url)+"").replace(bs,"").replace(bx,bK[1]+"//"),e.dataTypes=d.trim(e.dataType||"*").toLowerCase().split(bB),e.crossDomain||(q=bF.e
xec(e.url.toLowerCase()),e.crossDomain=q&&(q[1]!=bK[1]||q[2]!=bK[2]||(q[3]||(q[1]==="http:"?80:443))!=(bK[3]||(bK[1]==="http:"?80:443)))),e.data&&e.processData&&typeof e.data!=="string"&&(e.data=d.param(e.data,e.traditional)),bN(bH,e,c,u);if(r===2)return!1;s=e.global,e.type=e.type.toUpperCase(),e.hasContent=!bw.test(e.type),s&&d.active++===0&&d.event.trigger("ajaxStart");if(!e.hasContent){e.data&&(e.url+=(by.test(e.url)?"&":"?")+e.data),k=e.url;if(e.cache===!1){var w=d.now(),x=e.url.replace(bC,"$1_="+w);e.url=x+(x===e.url?(by.test(e.url)?"&":"?")+"_="+w:"")}}if(e.data&&e.hasContent&&e.contentType!==!1||c.contentType)l["Content-Type"]=e.contentType;e.ifModified&&(k=k||e.url,d.lastModified[k]&&(l["If-Modified-Since"]=d.lastModified[k]),d.etag[k]&&(l["If-None-Match"]=d.etag[k])),l.Accept=e.dataTypes[0]&&e.accepts[e.dataTypes[0]]?e.accepts[e.dataTypes[0]]+(e.dataTypes[0]!=="*"?", */*; q=0.01":""):e.accepts["*"];for(t in e.headers)u.setRequestHeader(t,e.headers[t]);if(e.beforeSend&&(e.be
foreSend.call(f,u,e)===!1||r===2)){u.abort();return!1}for(t in {success:1,error:1,complete:1})u[t](e[t]);o=bN(bI,e,c,u);if(o){u.readyState=1,s&&g.trigger("ajaxSend",[u,e]),e.async&&e.timeout>0&&(p=setTimeout(function(){u.abort("timeout")},e.timeout));try{r=1,o.send(l,v)}catch(y){status<2?v(-1,y):d.error(y)}}else v(-1,"No Transport");return u},param:function(a,c){var e=[],f=function(a,b){b=d.isFunction(b)?b():b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=d.ajaxSettings.traditional);if(d.isArray(a)||a.jquery&&!d.isPlainObject(a))d.each(a,function(){f(this.name,this.value)});else for(var g in a)bO(g,a[g],c,f);return e.join("&").replace(bp,"+")}}),d.extend({active:0,lastModified:{},etag:{}});var bR=d.now(),bS=/(\=)\?(&|$)|()\?\?()/i;d.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return d.expando+"_"+bR++}}),d.ajaxPrefilter("json jsonp",function(b,c,e){var f=typeof b.data==="string";if(b.dataTypes[0]==="jsonp"||c.jsonpCallback||c.jsonp!=null||b.jsonp!==
!1&&(bS.test(b.url)||f&&bS.test(b.data))){var g,h=b.jsonpCallback=d.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2",m=function(){a[h]=i,g&&d.isFunction(i)&&a[h](g[0])};b.jsonp!==!1&&(j=j.replace(bS,l),b.url===j&&(f&&(k=k.replace(bS,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},e.then(m,m),b.converters["script json"]=function(){g||d.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),d.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){d.globalEval(a);return a}}}),d.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),d.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:fu
nction(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var bT=d.now(),bU,bV;d.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&bX()||bY()}:bX,bV=d.ajaxSettings.xhr(),d.support.ajax=!!bV,d.support.cors=bV&&"withCredentials"in bV,bV=b,d.support.ajax&&d.ajaxTransport(function(a){if(!a.crossDomain||d.support.cors){var c;return{send:function(e,f){var g=a.xhr(),h,i;a.username?g.open(a.type,a.url,a.async,a.username,a.password):g.open(a.type,a.url,a.async);if(a.xhrFields)for(i in a.xhrFields)g[i]=a.xhrFields[i];a.mimeType&&g.overrideMimeType&&g.overrideMimeType(a.mimeType),(!a.crossDomain||a.hasContent)&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttp
Request");try{for(i in e)g.setRequestHeader(i,e[i])}catch(j){}g.send(a.hasContent&&a.data||null),c=function(e,i){var j,k,l,m,n;try{if(c&&(i||g.readyState===4)){c=b,h&&(g.onreadystatechange=d.noop,delete bU[h]);if(i)g.readyState!==4&&g.abort();else{j=g.status,l=g.getAllResponseHeaders(),m={},n=g.responseXML,n&&n.documentElement&&(m.xml=n),m.text=g.responseText;try{k=g.statusText}catch(o){k=""}j||!a.isLocal||a.crossDomain?j===1223&&(j=204):j=m.text?200:404}}}catch(p){i||f(-1,p)}m&&f(j,k,m,l)},a.async&&g.readyState!==4?(bU||(bU={},bW()),h=bT++,g.onreadystatechange=bU[h]=c):c()},abort:function(){c&&c(0,1)}}}});var bZ={},b$=/^(?:toggle|show|hide)$/,b_=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,ca,cb=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];d.fn.extend({show:function(a,b,c){var e,f;if(a||a===0)return this.animate(cc("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)e=this[g],f=e.style.displa
y,!d._data(e,"olddisplay")&&f==="none"&&(f=e.style.display=""),f===""&&d.css(e,"display")==="none"&&d._data(e,"olddisplay",cd(e.nodeName));for(g=0;g<h;g++){e=this[g],f=e.style.display;if(f===""||f==="none")e.style.display=d._data(e,"olddisplay")||""}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cc("hide",3),a,b,c);for(var e=0,f=this.length;e<f;e++){var g=d.css(this[e],"display");g!=="none"&&!d._data(this[e],"olddisplay")&&d._data(this[e],"olddisplay",g)}for(e=0;e<f;e++)this[e].style.display="none";return this},_toggle:d.fn.toggle,toggle:function(a,b,c){var e=typeof a==="boolean";d.isFunction(a)&&d.isFunction(b)?this._toggle.apply(this,arguments):a==null||e?this.each(function(){var b=e?a:d(this).is(":hidden");d(this)[b?"show":"hide"]()}):this.animate(cc("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,e){var f=d.speed(b,c,e);if(d.isEmptyObject(a))
return this.each(f.complete);return this[f.queue===!1?"each":"queue"](function(){var b=d.extend({},f),c,e=this.nodeType===1,g=e&&d(this).is(":hidden"),h=this;for(c in a){var i=d.camelCase(c);c!==i&&(a[i]=a[c],delete a[c],c=i);if(a[c]==="hide"&&g||a[c]==="show"&&!g)return b.complete.call(this);if(e&&(c==="height"||c==="width")){b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(d.css(this,"display")==="inline"&&d.css(this,"float")==="none")if(d.support.inlineBlockNeedsLayout){var j=cd(this.nodeName);j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)}else this.style.display="inline-block"}d.isArray(a[c])&&((b.specialEasing=b.specialEasing||{})[c]=a[c][1],a[c]=a[c][0])}b.overflow!=null&&(this.style.overflow="hidden"),b.curAnim=d.extend({},a),d.each(a,function(c,e){var f=new d.fx(h,b,c);if(b$.test(e))f[e==="toggle"?g?"show":"hide":e](a);else{var i=b_.exec(e),j=f.cur();if(i){var k=parseFloat(i[2]),l=i[3]||(d.cssNumber
[c]?"":"px");l!=="px"&&(d.style(h,c,(k||1)+l),j=(k||1)/f.cur()*j,d.style(h,c,j+l)),i[1]&&(k=(i[1]==="-="?-1:1)*k+j),f.custom(j,k,l)}else f.custom(j,e,"")}});return!0})},stop:function(a,b){var c=d.timers;a&&this.queue([]),this.each(function(){for(var a=c.length-1;a>=0;a--)c[a].elem===this&&(b&&c[a](!0),c.splice(a,1))}),b||this.dequeue();return this}}),d.each({slideDown:cc("show",1),slideUp:cc("hide",1),slideToggle:cc("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){d.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),d.extend({speed:function(a,b,c){var e=a&&typeof a==="object"?d.extend({},a):{complete:c||!c&&b||d.isFunction(a)&&a,duration:a,easing:c&&b||b&&!d.isFunction(b)&&b};e.duration=d.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in d.fx.speeds?d.fx.speeds[e.duration]:d.fx.speeds._default,e.old=e.complete,e.complete=function(){e.queue!==!1&&d(this).dequeue(),d.isFunction(e.old)&&e.old.call(this)};return e}
,easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig||(b.orig={})}}),d.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(d.fx.step[this.prop]||d.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=d.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return e.step(a)}var e=this,f=d.fx;this.startTime=d.now(),this.start=a,this.end=b,this.unit=c||this.unit||(d.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&d.timers.push(g)&&!ca&&(ca=setInterval(f.tick,f.interval))},show:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||t
his.prop==="height"?1:0,this.cur()),d(this.elem).show()},hide:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=d.now(),c=!0;if(a||b>=this.options.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0;for(var e in this.options.curAnim)this.options.curAnim[e]!==!0&&(c=!1);if(c){if(this.options.overflow!=null&&!d.support.shrinkWrapBlocks){var f=this.elem,g=this.options;d.each(["","X","Y"],function(a,b){f.style["overflow"+b]=g.overflow[a]})}this.options.hide&&d(this.elem).hide();if(this.options.hide||this.options.show)for(var h in this.options.curAnim)d.style(this.elem,h,this.options.orig[h]);this.options.complete.call(this.elem)}return!1}var i=b-this.startTime;this.state=i/this.options.duration;var j=this.options.specialEasing&&this.options.specialEasing[this.prop],k=this.options.easing||(d.easing.swing?"swing":"linear");this.pos=d.easin
g[j||k](this.state,i,0,1,this.options.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update();return!0}},d.extend(d.fx,{tick:function(){var a=d.timers;for(var b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||d.fx.stop()},interval:13,stop:function(){clearInterval(ca),ca=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){d.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),d.expr&&d.expr.filters&&(d.expr.filters.animated=function(a){return d.grep(d.timers,function(b){return a===b.elem}).length});var ce=/^t(?:able|d|h)$/i,cf=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?d.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);try{c=
b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,g=f.documentElement;if(!c||!d.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=f.body,i=cg(f),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||d.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||d.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:d.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);d.offset.initialize();var c,e=b.offsetParent,f=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(d.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===e&&(l+=b.offsetTop,m+=b.of
fsetLeft,d.offset.doesNotAddBorder&&(!d.offset.doesAddBorderForTableAndCells||!ce.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),f=e,e=b.offsetParent),d.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;d.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},d.offset={initialize:function(){var a=c.body,b=c.createElement("div"),e,f,g,h,i=parseFloat(d.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";d.exte
nd(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),e=b.firstChild,f=e.firstChild,h=e.nextSibling.firstChild.firstChild,this.doesNotAddBorder=f.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,f.style.position="fixed",f.style.top="20px",this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15,f.style.position=f.style.top="",e.style.overflow="hidden",e.style.position="relative",this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),a=b=e=f=g=h=null,d.offset.initialize=d.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;d.offset.initialize(),d.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(d.css(a,"marginTop"))||0,c+=parseFloat(d.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var e=d.css(a,"position");e==="static"&&(a.style.position="relative"
);var f=d(a),g=f.offset(),h=d.css(a,"top"),i=d.css(a,"left"),j=e==="absolute"&&d.inArray("auto",[h,i])>-1,k={},l={},m,n;j&&(l=f.position()),m=j?l.top:parseInt(h,10)||0,n=j?l.left:parseInt(i,10)||0,d.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):f.css(k)}},d.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),e=cf.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(d.css(a,"marginTop"))||0,c.left-=parseFloat(d.css(a,"marginLeft"))||0,e.top+=parseFloat(d.css(b[0],"borderTopWidth"))||0,e.left+=parseFloat(d.css(b[0],"borderLeftWidth"))||0;return{top:c.top-e.top,left:c.left-e.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&(!cf.test(a.nodeName)&&d.css(a,"position")==="static"))a=a.offsetParent;return a})}}),d.each(["Left","Top"],function(a,c){var e="scroll"+c;d.fn[e]=function(c){var
f=this[0],g;if(!f)return null;if(c!==b)return this.each(function(){g=cg(this),g?g.scrollTo(a?d(g).scrollLeft():c,a?c:d(g).scrollTop()):this[e]=c});g=cg(f);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:d.support.boxModel&&g.document.documentElement[e]||g.document.body[e]:f[e]}}),d.each(["Height","Width"],function(a,c){var e=c.toLowerCase();d.fn["inner"+c]=function(){return this[0]?parseFloat(d.css(this[0],e,"padding")):null},d.fn["outer"+c]=function(a){return this[0]?parseFloat(d.css(this[0],e,a?"margin":"border")):null},d.fn[e]=function(a){var f=this[0];if(!f)return a==null?null:this;if(d.isFunction(a))return this.each(function(b){var c=d(this);c[e](a.call(this,b,c[e]()))});if(d.isWindow(f)){var g=f.document.documentElement["client"+c];return f.document.compatMode==="CSS1Compat"&&g||f.document.body["client"+c]||g}if(f.nodeType===9)return Math.max(f.documentElement["client"+c],f.body["scroll"+c],f.documentElement["scroll"+c],f.body["offset"+c],f.documentElement["offset
"+c]);if(a===b){var h=d.css(f,e),i=parseFloat(h);return d.isNaN(i)?h:i}return this.css(e,typeof a==="string"?a:a+"px")}}),a.jQuery=a.$=d})(window);
\ No newline at end of file
[35/50] [abbrv] stratos git commit: Removing deployment policy from
group
Posted by la...@apache.org.
Removing deployment policy from group
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/63060cf5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/63060cf5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/63060cf5
Branch: refs/heads/data-publisher-integration
Commit: 63060cf5a5f78f5abd3345ee9eff845fc1ea0a2c
Parents: 0f24238
Author: Thanuja <th...@wso2.com>
Authored: Mon Aug 10 13:48:04 2015 +0530
Committer: Thanuja <th...@wso2.com>
Committed: Mon Aug 10 13:48:04 2015 +0530
----------------------------------------------------------------------
.../dependent-scaling/sample-groups/artifacts/application.json | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/63060cf5/samples/applications/scaling/dependent-scaling/sample-groups/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/scaling/dependent-scaling/sample-groups/artifacts/application.json b/samples/applications/scaling/dependent-scaling/sample-groups/artifacts/application.json
index 21e5991..d32932c 100644
--- a/samples/applications/scaling/dependent-scaling/sample-groups/artifacts/application.json
+++ b/samples/applications/scaling/dependent-scaling/sample-groups/artifacts/application.json
@@ -8,7 +8,6 @@
"alias": "my-esb-php-group",
"groupMinInstances": 1,
"groupMaxInstances": 2,
- "deploymentPolicy": "deployment-policy-1",
"cartridges": [
{
"type": "esb",
[21/50] [abbrv] stratos git commit: Re-organizing the package
structure
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java
new file mode 100644
index 0000000..e62c4a5
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java
@@ -0,0 +1,226 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.integration.tests.application;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.application.ApplicationBean;
+import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
+import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
+import org.apache.stratos.integration.tests.RestConstants;
+import org.apache.stratos.integration.tests.StratosTestServerManager;
+import org.apache.stratos.integration.tests.TopologyHandler;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
+/**
+ * This will handle the application bursting test cases
+ */
+public class ApplicationBurstingTest extends StratosTestServerManager {
+ private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
+ private static final String TEST_PATH = "/application-bursting-test";
+
+
+ @Test
+ public void testApplicationBusting() {
+ try {
+ log.info("Started application Bursting test case**************************************");
+
+ String autoscalingPolicyId = "autoscaling-policy-2";
+
+ boolean addedScalingPolicy = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH
+ + "/" + autoscalingPolicyId + ".json",
+ RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(addedScalingPolicy, true);
+
+ boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "esb.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC1, true);
+
+ boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "php.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC2, true);
+
+ boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "tomcat.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC3, true);
+
+ boolean addedG1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
+ "/" + "esb-php-group.json", RestConstants.CARTRIDGE_GROUPS,
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(addedG1, true);
+
+ CartridgeGroupBean beanG1 = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group",
+ CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(beanG1.getName(), "esb-php-group");
+
+ boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-9.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN1, true);
+
+ boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-10.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN2, true);
+
+ boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
+ "deployment-policy-4.json",
+ RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(addedDep, true);
+
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" +
+ "app-bursting-single-cartriddge-group.json", RestConstants.APPLICATIONS,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(added, true);
+
+ ApplicationBean bean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "cartridge-group-app", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
+ assertEquals(bean.getApplicationId(), "cartridge-group-app");
+
+ boolean addAppPolicy = restClient.addEntity(TEST_PATH + RestConstants.APPLICATION_POLICIES_PATH + "/" +
+ "application-policy-3.json", RestConstants.APPLICATION_POLICIES,
+ RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(addAppPolicy, true);
+
+ ApplicationPolicyBean policyBean = (ApplicationPolicyBean) restClient.getEntity(
+ RestConstants.APPLICATION_POLICIES,
+ "application-policy-3", ApplicationPolicyBean.class,
+ RestConstants.APPLICATION_POLICIES_NAME);
+
+ //deploy the application
+ String resourcePath = RestConstants.APPLICATIONS + "/" + "cartridge-group-app" +
+ RestConstants.APPLICATIONS_DEPLOY + "/" + "application-policy-3";
+ boolean deployed = restClient.deployEntity(resourcePath,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(deployed, true);
+
+ //Application active handling
+ TopologyHandler.getInstance().assertApplicationActivation(bean.getApplicationId());
+
+ //Group active handling
+ TopologyHandler.getInstance().assertGroupActivation(bean.getApplicationId());
+
+ //Cluster active handling
+ TopologyHandler.getInstance().assertClusterActivation(bean.getApplicationId());
+
+ boolean removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(removedGroup, false);
+
+ boolean removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(removedAuto, false);
+
+ boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-9",
+ RestConstants.NETWORK_PARTITIONS_NAME);
+ //Trying to remove the used network partition
+ assertEquals(removedNet, false);
+
+ boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-4", RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(removedDep, false);
+
+ //Un-deploying the application
+ String resourcePathUndeploy = RestConstants.APPLICATIONS + "/" + "cartridge-group-app" +
+ RestConstants.APPLICATIONS_UNDEPLOY;
+
+ boolean unDeployed = restClient.undeployEntity(resourcePathUndeploy,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(unDeployed, true);
+
+ boolean undeploy = TopologyHandler.getInstance().assertApplicationUndeploy("cartridge-group-app");
+ if (!undeploy) {
+ //Need to forcefully undeploy the application
+ log.info("Force undeployment is going to start for the [application] " + "cartridge-group-app");
+
+ restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + "cartridge-group-app" +
+ RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS);
+
+ boolean forceUndeployed = TopologyHandler.getInstance().assertApplicationUndeploy("cartridge-group-app");
+ assertEquals(String.format("Forceful undeployment failed for the application %s",
+ "cartridge-group-app"), forceUndeployed, true);
+
+ }
+
+ boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "cartridge-group-app",
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(removed, true);
+
+ ApplicationBean beanRemoved = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "cartridge-group-app", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
+ assertEquals(beanRemoved, null);
+
+ removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(removedGroup, true);
+
+ boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "esb",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC1, true);
+
+ boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "php",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC2, true);
+
+ boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "tomcat",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC3, true);
+
+ removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(removedAuto, true);
+
+ removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-4", RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(removedDep, true);
+
+ removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-9", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedNet, false);
+
+ boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-10", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN2, false);
+
+ boolean removeAppPolicy = restClient.removeEntity(RestConstants.APPLICATION_POLICIES,
+ "application-policy-3", RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(removeAppPolicy, true);
+
+ removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-9", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedNet, true);
+
+ removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-10", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN2, true);
+
+ log.info("Ended application bursting test case**************************************");
+
+ } catch (Exception e) {
+ log.error("An error occurred while handling application bursting", e);
+ assertTrue("An error occurred while handling application bursting", false);
+ }
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationsTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationsTest.java
new file mode 100644
index 0000000..2dad064
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/SampleApplicationsTest.java
@@ -0,0 +1,427 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.integration.tests.application;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.application.ApplicationBean;
+import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
+import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
+import org.apache.stratos.integration.tests.RestConstants;
+import org.apache.stratos.integration.tests.StratosTestServerManager;
+import org.apache.stratos.integration.tests.TopologyHandler;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
+/**
+ * Sample application tests with application add, .
+ */
+public class SampleApplicationsTest extends StratosTestServerManager {
+ private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
+ private static final String TEST_PATH = "/sample-applications-test";
+
+ @Test
+ public void testApplication() {
+ log.info("Started application test case**************************************");
+ String autoscalingPolicyId = "autoscaling-policy-1";
+
+ try {
+ boolean addedScalingPolicy = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH
+ + "/" + autoscalingPolicyId + ".json",
+ RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(addedScalingPolicy, true);
+
+ boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c1.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC1, true);
+
+ boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c2.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC2, true);
+
+ boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c3.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC3, true);
+
+ boolean addedG1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
+ "/" + "cartrdige-nested.json", RestConstants.CARTRIDGE_GROUPS,
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(addedG1, true);
+
+ CartridgeGroupBean beanG1 = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
+ CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(beanG1.getName(), "G1");
+
+ boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-1.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN1, true);
+
+ boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-2.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN2, true);
+
+ boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
+ "deployment-policy-1.json",
+ RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(addedDep, true);
+
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" +
+ "g-sc-G123-1.json", RestConstants.APPLICATIONS,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(added, true);
+
+ ApplicationBean bean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
+ assertEquals(bean.getApplicationId(), "g-sc-G123-1");
+
+ assertEquals(bean.getComponents().getGroups().get(0).getName(), "G1");
+ assertEquals(bean.getComponents().getGroups().get(0).getAlias(), "group1");
+ assertEquals(bean.getComponents().getGroups().get(0).getGroupMaxInstances(), 1);
+ assertEquals(bean.getComponents().getGroups().get(0).getGroupMinInstances(), 1);
+
+ assertEquals(bean.getComponents().getGroups().get(0).getCartridges().get(0).getType(), "c1");
+ assertEquals(bean.getComponents().getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 1);
+ assertEquals(bean.getComponents().getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 2);
+
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getAlias(), "group2");
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getName(), "G2");
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroupMaxInstances(), 1);
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroupMinInstances(), 1);
+
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getCartridges().get(0).getType(), "c2");
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 1);
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 2);
+
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getAlias(), "group3");
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getName(), "G3");
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getGroupMaxInstances(), 2);
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getGroupMinInstances(), 1);
+
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getType(), "c3");
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 1);
+ assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 2);
+
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/g-sc-G123-1-v1.json",
+ RestConstants.APPLICATIONS, RestConstants.APPLICATIONS_NAME);
+ assertEquals(updated, true);
+
+ ApplicationBean updatedBean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
+
+ assertEquals(bean.getApplicationId(), "g-sc-G123-1");
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getName(), "G1");
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getAlias(), "group1");
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroupMaxInstances(), 1);
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroupMinInstances(), 1);
+
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getCartridges().get(0).getType(), "c1");
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 2);
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 3);
+
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getAlias(), "group2");
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getName(), "G2");
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroupMaxInstances(), 1);
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroupMinInstances(), 1);
+
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getCartridges().get(0).getType(), "c2");
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 2);
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 4);
+
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getAlias(), "group3");
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getName(), "G3");
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getGroupMaxInstances(), 3);
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getGroupMinInstances(), 2);
+
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getType(), "c3");
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 2);
+ assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 3);
+
+
+ boolean removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(removedGroup, false);
+
+ boolean removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(removedAuto, false);
+
+ boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-1",
+ RestConstants.NETWORK_PARTITIONS_NAME);
+ //Trying to remove the used network partition
+ assertEquals(removedNet, false);
+
+ boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-1", RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(removedDep, false);
+
+ boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "g-sc-G123-1",
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(removed, true);
+
+ ApplicationBean beanRemoved = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
+ assertEquals(beanRemoved, null);
+
+ removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(removedGroup, true);
+
+ boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "c1",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC1, true);
+
+ boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "c2",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC2, true);
+
+ boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "c3",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC3, true);
+
+ removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(removedAuto, true);
+
+ removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-1", RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(removedDep, true);
+
+ removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-1", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedNet, true);
+
+ boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-2", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN2, true);
+
+ log.info("Ended application test case**************************************");
+
+ } catch (Exception e) {
+ log.error("An error occurred while handling application test case", e);
+ assertTrue("An error occurred while handling application test case", false);
+ }
+ }
+
+ @Test(dependsOnMethods = {"testApplication"})
+ public void testDeployApplication() {
+ try {
+ log.info("Started application deploy/undeploy test case**************************************");
+
+ String autoscalingPolicyId = "autoscaling-policy-1";
+
+ boolean addedScalingPolicy = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH
+ + "/" + autoscalingPolicyId + ".json",
+ RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(addedScalingPolicy, true);
+
+ boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c1.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC1, true);
+
+ boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c2.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC2, true);
+
+ boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c3.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC3, true);
+
+ boolean addedG1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
+ "/" + "cartrdige-nested.json", RestConstants.CARTRIDGE_GROUPS,
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(addedG1, true);
+
+ CartridgeGroupBean beanG1 = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
+ CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(beanG1.getName(), "G1");
+
+ boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-1.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN1, true);
+
+ boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-2.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN2, true);
+
+ boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
+ "deployment-policy-1.json",
+ RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(addedDep, true);
+
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" +
+ "g-sc-G123-1.json", RestConstants.APPLICATIONS,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(added, true);
+
+ ApplicationBean bean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
+ assertEquals(bean.getApplicationId(), "g-sc-G123-1");
+
+ boolean addAppPolicy = restClient.addEntity(TEST_PATH + RestConstants.APPLICATION_POLICIES_PATH + "/" +
+ "application-policy-1.json", RestConstants.APPLICATION_POLICIES,
+ RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(addAppPolicy, true);
+
+ ApplicationPolicyBean policyBean = (ApplicationPolicyBean) restClient.getEntity(
+ RestConstants.APPLICATION_POLICIES,
+ "application-policy-1", ApplicationPolicyBean.class,
+ RestConstants.APPLICATION_POLICIES_NAME);
+
+ //deploy the application
+ String resourcePath = RestConstants.APPLICATIONS + "/" + "g-sc-G123-1" +
+ RestConstants.APPLICATIONS_DEPLOY + "/" + "application-policy-1";
+ boolean deployed = restClient.deployEntity(resourcePath,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(deployed, true);
+
+ //Application active handling
+ TopologyHandler.getInstance().assertApplicationActivation(bean.getApplicationId());
+
+ //Group active handling
+ TopologyHandler.getInstance().assertGroupActivation(bean.getApplicationId());
+
+ //Cluster active handling
+ TopologyHandler.getInstance().assertClusterActivation(bean.getApplicationId());
+
+ //Updating application
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" +
+ "g-sc-G123-1-v1.json", RestConstants.APPLICATIONS,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(updated, true);
+
+ TopologyHandler.getInstance().assertGroupInstanceCount(bean.getApplicationId(), "group3", 2);
+
+ TopologyHandler.getInstance().assertClusterMinMemberCount(bean.getApplicationId(), 2);
+
+ ApplicationBean updatedBean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
+ assertEquals(updatedBean.getApplicationId(), "g-sc-G123-1");
+
+ boolean removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(removedGroup, false);
+
+ boolean removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(removedAuto, false);
+
+ boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-1",
+ RestConstants.NETWORK_PARTITIONS_NAME);
+ //Trying to remove the used network partition
+ assertEquals(removedNet, false);
+
+ boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-1", RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(removedDep, false);
+
+ //Un-deploying the application
+ String resourcePathUndeploy = RestConstants.APPLICATIONS + "/" + "g-sc-G123-1" +
+ RestConstants.APPLICATIONS_UNDEPLOY;
+
+ boolean unDeployed = restClient.undeployEntity(resourcePathUndeploy,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(unDeployed, true);
+
+ boolean undeploy = TopologyHandler.getInstance().assertApplicationUndeploy("g-sc-G123-1");
+ if (!undeploy) {
+ //Need to forcefully undeploy the application
+ log.info("Force undeployment is going to start for the [application] " + "g-sc-G123-1");
+
+ restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + "g-sc-G123-1" +
+ RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS);
+
+ boolean forceUndeployed = TopologyHandler.getInstance().assertApplicationUndeploy("g-sc-G123-1");
+ assertEquals(String.format("Forceful undeployment failed for the application %s",
+ "g-sc-G123-1"), forceUndeployed, true);
+
+ }
+
+ boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "g-sc-G123-1",
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(removed, true);
+
+ ApplicationBean beanRemoved = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
+ assertEquals(beanRemoved, null);
+
+ removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(removedGroup, true);
+
+ boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "c1",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC1, true);
+
+ boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "c2",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC2, true);
+
+ boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "c3",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC3, true);
+
+ removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(removedAuto, true);
+
+ removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-1", RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(removedDep, true);
+
+ removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-1", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedNet, false);
+
+ boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-2", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN2, false);
+
+ boolean removeAppPolicy = restClient.removeEntity(RestConstants.APPLICATION_POLICIES,
+ "application-policy-1", RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(removeAppPolicy, true);
+
+ removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-1", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedNet, true);
+
+ removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-2", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN2, true);
+
+ log.info("Ended application deploy/undeploy test case**************************************");
+
+ } catch (Exception e) {
+ log.error("An error occurred while handling application deployment/undeployment", e);
+ assertTrue("An error occurred while handling application deployment/undeployment", false);
+ }
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java
new file mode 100644
index 0000000..2fd4100
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/SingleClusterScalingTest.java
@@ -0,0 +1,233 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.integration.tests.application;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.application.ApplicationBean;
+import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
+import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
+import org.apache.stratos.integration.tests.RestConstants;
+import org.apache.stratos.integration.tests.StratosTestServerManager;
+import org.apache.stratos.integration.tests.TopologyHandler;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
+/**
+ * This will handle the scale-up and scale-down of a particular cluster bursting test cases
+ */
+public class SingleClusterScalingTest extends StratosTestServerManager {
+ private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
+ private static final String TEST_PATH = "/application-bursting-test";
+
+
+ @Test
+ public void testDeployApplication() {
+ try {
+ log.info("Started application Bursting test case**************************************");
+
+ String autoscalingPolicyId = "autoscaling-policy-2";
+
+ boolean addedScalingPolicy = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH
+ + "/" + autoscalingPolicyId + ".json",
+ RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(addedScalingPolicy, true);
+
+ boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "esb.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC1, true);
+
+ boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "php.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC2, true);
+
+ boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "tomcat.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC3, true);
+
+ boolean addedG1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
+ "/" + "esb-php-group.json", RestConstants.CARTRIDGE_GROUPS,
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(addedG1, true);
+
+ CartridgeGroupBean beanG1 = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group",
+ CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(beanG1.getName(), "esb-php-group");
+
+ boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-9.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN1, true);
+
+ boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-10.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN2, true);
+
+ boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
+ "deployment-policy-4.json",
+ RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(addedDep, true);
+
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" +
+ "app-bursting-single-cartriddge-group.json", RestConstants.APPLICATIONS,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(added, true);
+
+ ApplicationBean bean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "cartridge-group-app", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
+ assertEquals(bean.getApplicationId(), "cartridge-group-app");
+
+ boolean addAppPolicy = restClient.addEntity(TEST_PATH + RestConstants.APPLICATION_POLICIES_PATH + "/" +
+ "application-policy-3.json", RestConstants.APPLICATION_POLICIES,
+ RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(addAppPolicy, true);
+
+ ApplicationPolicyBean policyBean = (ApplicationPolicyBean) restClient.getEntity(
+ RestConstants.APPLICATION_POLICIES,
+ "application-policy-3", ApplicationPolicyBean.class,
+ RestConstants.APPLICATION_POLICIES_NAME);
+
+ //deploy the application
+ String resourcePath = RestConstants.APPLICATIONS + "/" + "cartridge-group-app" +
+ RestConstants.APPLICATIONS_DEPLOY + "/" + "application-policy-3";
+ boolean deployed = restClient.deployEntity(resourcePath,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(deployed, true);
+
+ //Application active handling
+ TopologyHandler.getInstance().assertApplicationActivation(bean.getApplicationId());
+
+ //Group active handling
+ TopologyHandler.getInstance().assertGroupActivation(bean.getApplicationId());
+
+ //Cluster active handling
+ TopologyHandler.getInstance().assertClusterActivation(bean.getApplicationId());
+
+ boolean removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(removedGroup, false);
+
+ boolean removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(removedAuto, false);
+
+ boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-9",
+ RestConstants.NETWORK_PARTITIONS_NAME);
+ //Trying to remove the used network partition
+ assertEquals(removedNet, false);
+
+ boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-4", RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(removedDep, false);
+
+ //Un-deploying the application
+ String resourcePathUndeploy = RestConstants.APPLICATIONS + "/" + "cartridge-group-app" +
+ RestConstants.APPLICATIONS_UNDEPLOY;
+
+ boolean unDeployed = restClient.undeployEntity(resourcePathUndeploy,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(unDeployed, true);
+
+ boolean undeploy = TopologyHandler.getInstance().assertApplicationUndeploy("cartridge-group-app");
+ if (!undeploy) {
+ //Need to forcefully undeploy the application
+ log.info("Force undeployment is going to start for the [application] " + "cartridge-group-app");
+
+ restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + "cartridge-group-app" +
+ RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS);
+
+ boolean forceUndeployed = TopologyHandler.getInstance().assertApplicationUndeploy("cartridge-group-app");
+ assertEquals(String.format("Forceful undeployment failed for the application %s",
+ "cartridge-group-app"), forceUndeployed, true);
+
+ }
+
+ boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "cartridge-group-app",
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(removed, true);
+
+ ApplicationBean beanRemoved = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "cartridge-group-app", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
+ assertEquals(beanRemoved, null);
+
+ removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(removedGroup, true);
+
+ boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "esb",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC1, true);
+
+ boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "php",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC2, true);
+
+ boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "tomcat",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC3, true);
+
+ removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(removedAuto, true);
+
+ removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-4", RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(removedDep, true);
+
+ removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-9", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedNet, false);
+
+ boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-10", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN2, false);
+
+ boolean removeAppPolicy = restClient.removeEntity(RestConstants.APPLICATION_POLICIES,
+ "application-policy-3", RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(removeAppPolicy, true);
+
+ removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-9", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedNet, true);
+
+ removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-10", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN2, true);
+
+ log.info("Ended application bursting test case**************************************");
+
+ } catch (Exception e) {
+ log.error("An error occurred while handling application bursting", e);
+ assertTrue("An error occurred while handling application bursting", false);
+ }
+ }
+
+ @Test(dependsOnMethods = {"testApplication"})
+ public void testClusterScalingUp() {
+
+ }
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeGroupTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeGroupTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeGroupTest.java
new file mode 100644
index 0000000..4cd3235
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeGroupTest.java
@@ -0,0 +1,129 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.integration.tests.group;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
+import org.apache.stratos.integration.tests.RestConstants;
+import org.apache.stratos.integration.tests.StratosTestServerManager;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
+/**
+ * Test to handle Cartridge group CRUD operations
+ */
+public class CartridgeGroupTest extends StratosTestServerManager {
+ private static final Log log = LogFactory.getLog(CartridgeGroupTest.class);
+ private static final String TEST_PATH = "/cartridge-group-test";
+
+ @Test
+ public void testCartridgeGroup() {
+ try {
+ log.info("Started Cartridge group test case**************************************");
+
+ boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c4.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c4"), addedC1, true);
+
+ boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c5.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c5"), addedC2, true);
+
+ boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c6.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c6"), addedC3, true);
+
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
+ "/" + "g4-g5-g6.json", RestConstants.CARTRIDGE_GROUPS,
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge Group did not added: [cartridge-group-name] %s",
+ "g4-g5-g6"), added, true);
+ CartridgeGroupBean bean = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, "G4",
+ CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge Group name did not match: [cartridge-group-name] %s",
+ "g4-g5-g6.json"), bean.getName(), "G4");
+
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
+ "/" + "g4-g5-g6-v1.json",
+ RestConstants.CARTRIDGE_GROUPS, RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge Group did not updated: [cartridge-group-name] %s",
+ "g4-g5-g6"), updated, true);
+ CartridgeGroupBean updatedBean = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, "G4",
+ CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Updated Cartridge Group didn't match: [cartridge-group-name] %s",
+ "g4-g5-g6"), updatedBean.getName(), "G4");
+
+ boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "c4",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge can be removed while it is used in " +
+ "cartridge group: [cartridge-name] %s", "c4"), removedC1, false);
+
+ boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "c5",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge can be removed while it is used in " +
+ "cartridge group: [cartridge-name] %s",
+ "c5"), removedC2, false);
+
+ boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "c6",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge can be removed while it is used in " +
+ "cartridge group: [cartridge-name] %s",
+ "c6"), removedC3, false);
+
+ boolean removed = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G4",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge Group did not removed: [cartridge-group-name] %s",
+ "g4-g5-g6"), removed, true);
+
+ CartridgeGroupBean beanRemoved = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, "G4",
+ CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge Group did not removed completely: " +
+ "[cartridge-group-name] %s",
+ "g4-g5-g6"), beanRemoved, null);
+
+ removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "c4",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
+ "c4"), removedC1, true);
+
+ removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "c5",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
+ "c5"), removedC2, true);
+
+ removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "c6",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
+ "c6"), removedC3, true);
+
+ log.info("Ended Cartridge group test case**************************************");
+
+ } catch (Exception e) {
+ log.error("An error occurred while handling Cartridge group test case", e);
+ assertTrue("An error occurred while handling Cartridge group test case", false);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java
new file mode 100644
index 0000000..e861e12
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java
@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.integration.tests.group;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.PropertyBean;
+import org.apache.stratos.common.beans.cartridge.CartridgeBean;
+import org.apache.stratos.integration.tests.RestConstants;
+import org.apache.stratos.integration.tests.StratosTestServerManager;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
+/**
+ * Test to handle Cartridge CRUD operations
+ */
+public class CartridgeTest extends StratosTestServerManager {
+ private static final Log log = LogFactory.getLog(CartridgeTest.class);
+ private static final String TEST_PATH = "/cartridge-test";
+
+
+ @Test
+ public void testCartridge() {
+ log.info("Started Cartridge test case**************************************");
+
+ try {
+ String cartridgeType = "c0";
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" +
+ cartridgeType + ".json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(added, true);
+ CartridgeBean bean = (CartridgeBean) restClient.
+ getEntity(RestConstants.CARTRIDGES, cartridgeType,
+ CartridgeBean.class, RestConstants.CARTRIDGES_NAME);
+ assertEquals(bean.getCategory(), "Application");
+ assertEquals(bean.getHost(), "qmog.cisco.com");
+ for (PropertyBean property : bean.getProperty()) {
+ if (property.getName().equals("payload_parameter.CEP_IP")) {
+ assertEquals(property.getValue(), "octl.qmog.cisco.com");
+ } else if (property.getName().equals("payload_parameter.CEP_ADMIN_PASSWORD")) {
+ assertEquals(property.getValue(), "admin");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_IP")) {
+ assertEquals(property.getValue(), "octl.qmog.cisco.com");
+ } else if (property.getName().equals("payload_parameter.QTCM_NETWORK_COUNT")) {
+ assertEquals(property.getValue(), "1");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD")) {
+ assertEquals(property.getValue(), "admin");
+ } else if (property.getName().equals("payload_parameter.QTCM_DNS_SEGMENT")) {
+ assertEquals(property.getValue(), "test");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_SECURE_PORT")) {
+ assertEquals(property.getValue(), "7711");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_PORT")) {
+ assertEquals(property.getValue(), "7611");
+ } else if (property.getName().equals("payload_parameter.CEP_PORT")) {
+ assertEquals(property.getValue(), "7611");
+ } else if (property.getName().equals("payload_parameter.MB_PORT")) {
+ assertEquals(property.getValue(), "61616");
+ }
+ }
+
+
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" +
+ cartridgeType + "-v1.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(updated, true);
+ CartridgeBean updatedBean = (CartridgeBean) restClient.
+ getEntity(RestConstants.CARTRIDGES, cartridgeType,
+ CartridgeBean.class, RestConstants.CARTRIDGES_NAME);
+ assertEquals(updatedBean.getType(), "c0");
+ assertEquals(updatedBean.getCategory(), "Data");
+ assertEquals(updatedBean.getHost(), "qmog.cisco.com12");
+ for (PropertyBean property : updatedBean.getProperty()) {
+ if (property.getName().equals("payload_parameter.CEP_IP")) {
+ assertEquals(property.getValue(), "octl.qmog.cisco.com123");
+ } else if (property.getName().equals("payload_parameter.CEP_ADMIN_PASSWORD")) {
+ assertEquals(property.getValue(), "admin123");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_IP")) {
+ assertEquals(property.getValue(), "octl.qmog.cisco.com123");
+ } else if (property.getName().equals("payload_parameter.QTCM_NETWORK_COUNT")) {
+ assertEquals(property.getValue(), "3");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD")) {
+ assertEquals(property.getValue(), "admin123");
+ } else if (property.getName().equals("payload_parameter.QTCM_DNS_SEGMENT")) {
+ assertEquals(property.getValue(), "test123");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_SECURE_PORT")) {
+ assertEquals(property.getValue(), "7712");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_PORT")) {
+ assertEquals(property.getValue(), "7612");
+ } else if (property.getName().equals("payload_parameter.CEP_PORT")) {
+ assertEquals(property.getValue(), "7612");
+ } else if (property.getName().equals("payload_parameter.MB_PORT")) {
+ assertEquals(property.getValue(), "61617");
+ }
+ }
+
+ boolean removed = restClient.removeEntity(RestConstants.CARTRIDGES, cartridgeType,
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removed, true);
+
+ CartridgeBean beanRemoved = (CartridgeBean) restClient.
+ getEntity(RestConstants.CARTRIDGES, cartridgeType,
+ CartridgeBean.class, RestConstants.CARTRIDGES_NAME);
+ assertEquals(beanRemoved, null);
+
+ log.info("Ended Cartridge test case**************************************");
+ } catch (Exception e) {
+ log.error("An error occurred while handling RESTConstants.CARTRIDGES_PATH", e);
+ assertTrue("An error occurred while handling RESTConstants.CARTRIDGES_PATH", false);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/ApplicationPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/ApplicationPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/ApplicationPolicyTest.java
new file mode 100644
index 0000000..4ed2a2e
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/ApplicationPolicyTest.java
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.integration.tests.policies;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.PropertyBean;
+import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
+import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
+import org.apache.stratos.integration.tests.RestConstants;
+import org.apache.stratos.integration.tests.StratosTestServerManager;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
+/**
+ * Test to handle Network partition CRUD operations
+ */
+public class ApplicationPolicyTest extends StratosTestServerManager {
+ private static final Log log = LogFactory.getLog(ApplicationPolicyTest.class);
+ private static final String TEST_PATH = "/application-policy-test";
+
+
+ @Test
+ public void testApplicationPolicy() {
+ try {
+ String applicationPolicyId = "application-policy-2";
+ log.info("Started Application policy test case**************************************");
+
+ boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-7" + ".json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN1, true);
+
+ boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-8" + ".json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN2, true);
+
+ boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.APPLICATION_POLICIES_PATH + "/" +
+ applicationPolicyId + ".json",
+ RestConstants.APPLICATION_POLICIES, RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(addedDep, true);
+
+ ApplicationPolicyBean bean = (ApplicationPolicyBean) restClient.
+ getEntity(RestConstants.APPLICATION_POLICIES, applicationPolicyId,
+ ApplicationPolicyBean.class, RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(bean.getId(), applicationPolicyId);
+ assertEquals(String.format("The expected algorithm %s is not found in %s",
+ "one-after-another", applicationPolicyId), bean.getAlgorithm(), "one-after-another");
+ assertEquals(String.format("The expected id %s is not found",
+ applicationPolicyId), bean.getId(), applicationPolicyId);
+ assertEquals(String.format("The expected networkpartitions size %s is not found in %s",
+ 2, applicationPolicyId), bean.getNetworkPartitions().length, 2);
+ assertEquals(String.format("The first network partition is not %s in %s",
+ "network-partition-7", applicationPolicyId), bean.getNetworkPartitions()[0],
+ "network-partition-7");
+ assertEquals(String.format("The Second network partition is not %s in %s",
+ "network-partition-8", applicationPolicyId), bean.getNetworkPartitions()[1],
+ "network-partition-8");
+ boolean algoFound = false;
+ for (PropertyBean propertyBean : bean.getProperties()) {
+ if (propertyBean.getName().equals("networkPartitionGroups")) {
+ assertEquals(String.format("The networkPartitionGroups algorithm %s is not found in %s",
+ "network-partition-7,network-partition-8", applicationPolicyId),
+ propertyBean.getValue(), "network-partition-7,network-partition-8");
+ algoFound = true;
+
+ }
+ }
+ if (!algoFound) {
+ assertTrue(String.format("The networkPartitionGroups property is not found in %s",
+ applicationPolicyId), false);
+ }
+
+ boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-7", RestConstants.NETWORK_PARTITIONS_NAME);
+ //Trying to remove the used network partition
+ assertEquals(removedNet, false);
+
+ boolean removedDep = restClient.removeEntity(RestConstants.APPLICATION_POLICIES,
+ applicationPolicyId, RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(removedDep, true);
+
+ ApplicationPolicyBean beanRemovedDep = (ApplicationPolicyBean) restClient.
+ getEntity(RestConstants.APPLICATION_POLICIES, applicationPolicyId,
+ ApplicationPolicyBean.class, RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(beanRemovedDep, null);
+
+ boolean removedN1 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-7", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN1, true);
+
+ NetworkPartitionBean beanRemovedN1 = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, "network-partition-7",
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(beanRemovedN1, null);
+
+ boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-8", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN2, true);
+
+ NetworkPartitionBean beanRemovedN2 = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, "network-partition-8",
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(beanRemovedN2, null);
+
+ log.info("Ended deployment policy test case**************************************");
+
+ } catch (Exception e) {
+ log.error("An error occurred while handling deployment policy", e);
+ assertTrue("An error occurred while handling deployment policy", false);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/AutoscalingPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/AutoscalingPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/AutoscalingPolicyTest.java
new file mode 100644
index 0000000..96b8a57
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/AutoscalingPolicyTest.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.integration.tests.policies;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
+import org.apache.stratos.integration.tests.RestConstants;
+import org.apache.stratos.integration.tests.StratosTestServerManager;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
+/**
+ * Test to handle autoscaling policy CRUD operations
+ */
+public class AutoscalingPolicyTest extends StratosTestServerManager {
+ private static final Log log = LogFactory.getLog(AutoscalingPolicyTest.class);
+ private static final String TEST_PATH = "/autoscaling-policy-test";
+
+
+ @Test
+ public void testAutoscalingPolicy() {
+ log.info("Started autoscaling policy test case**************************************");
+ String policyId = "autoscaling-policy-c0";
+ try {
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH + "/" + policyId + ".json",
+ RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
+
+ assertEquals(String.format("Autoscaling policy did not added: [autoscaling-policy-id] %s", policyId), added, true);
+ AutoscalePolicyBean bean = (AutoscalePolicyBean) restClient.
+ getEntity(RestConstants.AUTOSCALING_POLICIES, policyId,
+ AutoscalePolicyBean.class, RestConstants.AUTOSCALING_POLICIES_NAME);
+
+ assertEquals(String.format("[autoscaling-policy-id] %s is not correct", bean.getId()),
+ bean.getId(), policyId);
+ assertEquals(String.format("[autoscaling-policy-id] %s RIF is not correct", policyId),
+ bean.getLoadThresholds().getRequestsInFlight().getThreshold(), 35.0, 0.0);
+ assertEquals(String.format("[autoscaling-policy-id] %s Memory is not correct", policyId),
+ bean.getLoadThresholds().getMemoryConsumption().getThreshold(), 45.0, 0.0);
+ assertEquals(String.format("[autoscaling-policy-id] %s Load is not correct", policyId),
+ bean.getLoadThresholds().getLoadAverage().getThreshold(), 25.0, 0.0);
+
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH + "/" + policyId + "-v1.json",
+ RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
+
+ assertEquals(String.format("[autoscaling-policy-id] %s update failed", policyId), updated, true);
+ AutoscalePolicyBean updatedBean = (AutoscalePolicyBean) restClient.getEntity(
+ RestConstants.AUTOSCALING_POLICIES, policyId,
+ AutoscalePolicyBean.class, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(String.format("[autoscaling-policy-id] %s RIF is not correct", policyId),
+ updatedBean.getLoadThresholds().getRequestsInFlight().getThreshold(), 30.0, 0.0);
+ assertEquals(String.format("[autoscaling-policy-id] %s Load is not correct", policyId),
+ updatedBean.getLoadThresholds().getMemoryConsumption().getThreshold(), 40.0, 0.0);
+ assertEquals(String.format("[autoscaling-policy-id] %s Memory is not correct", policyId),
+ updatedBean.getLoadThresholds().getLoadAverage().getThreshold(), 20.0, 0.0);
+
+ boolean removed = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ policyId, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(String.format("[autoscaling-policy-id] %s couldn't be removed", policyId),
+ removed, true);
+
+ AutoscalePolicyBean beanRemoved = (AutoscalePolicyBean) restClient.getEntity(
+ RestConstants.AUTOSCALING_POLICIES, policyId,
+ AutoscalePolicyBean.class, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(String.format("[autoscaling-policy-id] %s didn't get removed successfully",
+ policyId), beanRemoved, null);
+ log.info("Ended autoscaling policy test case**************************************");
+ } catch (Exception e) {
+ log.error("An error occurred while handling [autoscaling policy] " + policyId, e);
+ assertTrue("An error occurred while handling [autoscaling policy] " + policyId, false);
+ }
+ }
+}
[10/50] [abbrv] stratos git commit: Adding assertion of topology
initizlization and refactoring the test classes to use same CRUD operations
from RestClient
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/f995fb3b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
index d1c9163..096dd60 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
@@ -74,7 +74,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
private ApplicationsEventReceiver applicationsEventReceiver;
private TopologyEventReceiver topologyEventReceiver;
- private RestClient restClient = new RestClient();
+ private RestClient restClient;
private AutoscalingPolicyTest autoscalingPolicyTest;
private NetworkPartitionTest networkPartitionTest;
private CartridgeTest cartridgeTest;
@@ -89,6 +89,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
// Set jndi.properties.dir system property for initializing event receivers
System.setProperty("jndi.properties.dir", getResourcesFolderPath());
System.setProperty("autoscaler.service.url", "https://localhost:9443/services/AutoscalerService");
+ restClient = new RestClient(endpoint, "admin", "admin");
autoscalingPolicyTest = new AutoscalingPolicyTest();
networkPartitionTest = new NetworkPartitionTest();
cartridgeTest = new CartridgeTest();
@@ -115,9 +116,9 @@ public class SampleApplicationsTest extends StratosTestServerManager {
String policyId = "autoscaling-policy-c0";
try {
boolean added = autoscalingPolicyTest.addAutoscalingPolicy(policyId + ".json",
- endpoint, restClient);
+ restClient);
assertEquals(String.format("Autoscaling policy did not added: [autoscaling-policy-id] %s", policyId), added, true);
- AutoscalePolicyBean bean = autoscalingPolicyTest.getAutoscalingPolicy(policyId, endpoint,
+ AutoscalePolicyBean bean = autoscalingPolicyTest.getAutoscalingPolicy(policyId,
restClient);
assertEquals(String.format("[autoscaling-policy-id] %s is not correct", bean.getId()),
bean.getId(), policyId);
@@ -129,9 +130,9 @@ public class SampleApplicationsTest extends StratosTestServerManager {
bean.getLoadThresholds().getLoadAverage().getThreshold(), 25.0, 0.0);
boolean updated = autoscalingPolicyTest.updateAutoscalingPolicy(policyId + ".json",
- endpoint, restClient);
+ restClient);
assertEquals(String.format("[autoscaling-policy-id] %s update failed", policyId), updated, true);
- AutoscalePolicyBean updatedBean = autoscalingPolicyTest.getAutoscalingPolicy(policyId, endpoint,
+ AutoscalePolicyBean updatedBean = autoscalingPolicyTest.getAutoscalingPolicy(policyId,
restClient);
assertEquals(String.format("[autoscaling-policy-id] %s RIF is not correct", policyId),
updatedBean.getLoadThresholds().getRequestsInFlight().getThreshold(), 30.0, 0.0);
@@ -140,12 +141,12 @@ public class SampleApplicationsTest extends StratosTestServerManager {
assertEquals(String.format("[autoscaling-policy-id] %s Memory is not correct", policyId),
updatedBean.getLoadThresholds().getLoadAverage().getThreshold(), 20.0, 0.0);
- boolean removed = autoscalingPolicyTest.removeAutoscalingPolicy(policyId, endpoint,
+ boolean removed = autoscalingPolicyTest.removeAutoscalingPolicy(policyId,
restClient);
assertEquals(String.format("[autoscaling-policy-id] %s couldn't be removed", policyId),
removed, true);
- AutoscalePolicyBean beanRemoved = autoscalingPolicyTest.getAutoscalingPolicy(policyId, endpoint,
+ AutoscalePolicyBean beanRemoved = autoscalingPolicyTest.getAutoscalingPolicy(policyId,
restClient);
assertEquals(String.format("[autoscaling-policy-id] %s didn't get removed successfully",
policyId), beanRemoved, null);
@@ -161,69 +162,69 @@ public class SampleApplicationsTest extends StratosTestServerManager {
try {
log.info("Started Cartridge group test case**************************************");
- boolean addedC1 = cartridgeTest.addCartridge("c1.json", endpoint, restClient);
+ boolean addedC1 = cartridgeTest.addCartridge("c1.json", restClient);
assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c1"), addedC1, true);
- boolean addedC2 = cartridgeTest.addCartridge("c2.json", endpoint, restClient);
+ boolean addedC2 = cartridgeTest.addCartridge("c2.json", restClient);
assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c2"), addedC2, true);
- boolean addedC3 = cartridgeTest.addCartridge("c3.json", endpoint, restClient);
+ boolean addedC3 = cartridgeTest.addCartridge("c3.json", restClient);
assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c3"), addedC3, true);
boolean added = cartridgeGroupTest.addCartridgeGroup("cartrdige-nested.json",
- endpoint, restClient);
+ restClient);
assertEquals(String.format("Cartridge Group did not added: [cartridge-group-name] %s",
"cartrdige-nested"), added, true);
- CartridgeGroupBean bean = cartridgeGroupTest.getCartridgeGroup("G1", endpoint,
+ CartridgeGroupBean bean = cartridgeGroupTest.getCartridgeGroup("G1",
restClient);
assertEquals(String.format("Cartridge Group name did not match: [cartridge-group-name] %s",
"cartrdige-nested"), bean.getName(), "G1");
boolean updated = cartridgeGroupTest.updateCartridgeGroup("cartrdige-nested.json",
- endpoint, restClient);
+ restClient);
assertEquals(String.format("Cartridge Group did not updated: [cartridge-group-name] %s",
"cartrdige-nested"), updated, true);
- CartridgeGroupBean updatedBean = cartridgeGroupTest.getCartridgeGroup("G1", endpoint,
+ CartridgeGroupBean updatedBean = cartridgeGroupTest.getCartridgeGroup("G1",
restClient);
assertEquals(String.format("Updated Cartridge Group didn't match: [cartridge-group-name] %s",
"cartrdige-nested"), updatedBean.getName(), "G1");
- boolean removedC1 = cartridgeTest.removeCartridge("c1", endpoint,
+ boolean removedC1 = cartridgeTest.removeCartridge("c1",
restClient);
assertEquals(String.format("Cartridge can be removed while it is used in cartridge group: [cartridge-name] %s",
"c1"), removedC1, false);
- boolean removedC2 = cartridgeTest.removeCartridge("c2", endpoint,
+ boolean removedC2 = cartridgeTest.removeCartridge("c2",
restClient);
assertEquals(String.format("Cartridge can be removed while it is used in cartridge group: [cartridge-name] %s",
"c2"), removedC2, false);
- boolean removedC3 = cartridgeTest.removeCartridge("c3", endpoint,
+ boolean removedC3 = cartridgeTest.removeCartridge("c3",
restClient);
assertEquals(String.format("Cartridge can be removed while it is used in cartridge group: [cartridge-name] %s",
"c2"), removedC3, false);
- boolean removed = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint,
+ boolean removed = cartridgeGroupTest.removeCartridgeGroup("G1",
restClient);
assertEquals(String.format("Cartridge Group did not removed: [cartridge-group-name] %s",
"cartrdige-nested"), removed, true);
- CartridgeGroupBean beanRemoved = cartridgeGroupTest.getCartridgeGroup("G1", endpoint,
+ CartridgeGroupBean beanRemoved = cartridgeGroupTest.getCartridgeGroup("G1",
restClient);
assertEquals(String.format("Cartridge Group did not removed completely: [cartridge-group-name] %s",
"cartrdige-nested"), beanRemoved, null);
- removedC1 = cartridgeTest.removeCartridge("c1", endpoint,
+ removedC1 = cartridgeTest.removeCartridge("c1",
restClient);
assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
"c1"), removedC1, true);
- removedC2 = cartridgeTest.removeCartridge("c2", endpoint,
+ removedC2 = cartridgeTest.removeCartridge("c2",
restClient);
assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
"c2"), removedC2, true);
- removedC3 = cartridgeTest.removeCartridge("c3", endpoint,
+ removedC3 = cartridgeTest.removeCartridge("c3",
restClient);
assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
"c3"), removedC3, true);
@@ -242,41 +243,41 @@ public class SampleApplicationsTest extends StratosTestServerManager {
try {
boolean addedScalingPolicy = autoscalingPolicyTest.addAutoscalingPolicy("autoscaling-policy-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(addedScalingPolicy, true);
- boolean addedC1 = cartridgeTest.addCartridge("c1.json", endpoint, restClient);
+ boolean addedC1 = cartridgeTest.addCartridge("c1.json", restClient);
assertEquals(addedC1, true);
- boolean addedC2 = cartridgeTest.addCartridge("c2.json", endpoint, restClient);
+ boolean addedC2 = cartridgeTest.addCartridge("c2.json", restClient);
assertEquals(addedC2, true);
- boolean addedC3 = cartridgeTest.addCartridge("c3.json", endpoint, restClient);
+ boolean addedC3 = cartridgeTest.addCartridge("c3.json", restClient);
assertEquals(addedC3, true);
boolean addedG1 = cartridgeGroupTest.addCartridgeGroup("cartrdige-nested.json",
- endpoint, restClient);
+ restClient);
assertEquals(addedG1, true);
- CartridgeGroupBean beanG1 = cartridgeGroupTest.getCartridgeGroup("G1", endpoint,
+ CartridgeGroupBean beanG1 = cartridgeGroupTest.getCartridgeGroup("G1",
restClient);
assertEquals(beanG1.getName(), "G1");
boolean addedN1 = networkPartitionTest.addNetworkPartition("network-partition-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(addedN1, true);
boolean addedN2 = networkPartitionTest.addNetworkPartition("network-partition-2.json",
- endpoint, restClient);
+ restClient);
assertEquals(addedN2, true);
boolean addedDep = deploymentPolicyTest.addDeploymentPolicy("deployment-policy-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(addedDep, true);
boolean added = applicationTest.addApplication("g-sc-G123-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(added, true);
- ApplicationBean bean = applicationTest.getApplication("g-sc-G123-1", endpoint,
+ ApplicationBean bean = applicationTest.getApplication("g-sc-G123-1",
restClient);
assertEquals(bean.getApplicationId(), "g-sc-G123-1");
@@ -308,10 +309,10 @@ public class SampleApplicationsTest extends StratosTestServerManager {
assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 2);
boolean updated = applicationTest.updateApplication("g-sc-G123-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(updated, true);
- ApplicationBean updatedBean = applicationTest.getApplication("g-sc-G123-1", endpoint,
+ ApplicationBean updatedBean = applicationTest.getApplication("g-sc-G123-1",
restClient);
assertEquals(bean.getApplicationId(), "g-sc-G123-1");
@@ -343,60 +344,60 @@ public class SampleApplicationsTest extends StratosTestServerManager {
assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 3);
- boolean removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint,
+ boolean removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1",
restClient);
assertEquals(removedGroup, false);
- boolean removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1", endpoint,
+ boolean removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1",
restClient);
assertEquals(removedAuto, false);
- boolean removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1", endpoint,
+ boolean removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1",
restClient);
//Trying to remove the used network partition
assertEquals(removedNet, false);
- boolean removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1", endpoint,
+ boolean removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1",
restClient);
assertEquals(removedDep, false);
- boolean removed = applicationTest.removeApplication("g-sc-G123-1", endpoint,
+ boolean removed = applicationTest.removeApplication("g-sc-G123-1",
restClient);
assertEquals(removed, true);
- ApplicationBean beanRemoved = applicationTest.getApplication("g-sc-G123-1", endpoint,
+ ApplicationBean beanRemoved = applicationTest.getApplication("g-sc-G123-1",
restClient);
assertEquals(beanRemoved, null);
- removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint,
+ removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1",
restClient);
assertEquals(removedGroup, true);
- boolean removedC1 = cartridgeTest.removeCartridge("c1", endpoint,
+ boolean removedC1 = cartridgeTest.removeCartridge("c1",
restClient);
assertEquals(removedC1, true);
- boolean removedC2 = cartridgeTest.removeCartridge("c2", endpoint,
+ boolean removedC2 = cartridgeTest.removeCartridge("c2",
restClient);
assertEquals(removedC2, true);
- boolean removedC3 = cartridgeTest.removeCartridge("c3", endpoint,
+ boolean removedC3 = cartridgeTest.removeCartridge("c3",
restClient);
assertEquals(removedC3, true);
- removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1", endpoint,
+ removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1",
restClient);
assertEquals(removedAuto, true);
- removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1", endpoint,
+ removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1",
restClient);
assertEquals(removedDep, true);
- removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1", endpoint,
+ removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1",
restClient);
assertEquals(removedNet, true);
- boolean removedN2 = networkPartitionTest.removeNetworkPartition("network-partition-2", endpoint,
+ boolean removedN2 = networkPartitionTest.removeNetworkPartition("network-partition-2",
restClient);
assertEquals(removedN2, true);
@@ -417,55 +418,59 @@ public class SampleApplicationsTest extends StratosTestServerManager {
initializeApplicationEventReceiver();
initializeTopologyEventReceiver();
+ //Verifying whether the relevant Topologies are initialized
+ assertApplicationTopologyInitialized();
+ assertTopologyInitialized();
+
boolean addedScalingPolicy = autoscalingPolicyTest.addAutoscalingPolicy("autoscaling-policy-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(addedScalingPolicy, true);
- boolean addedC1 = cartridgeTest.addCartridge("c1.json", endpoint, restClient);
+ boolean addedC1 = cartridgeTest.addCartridge("c1.json", restClient);
assertEquals(addedC1, true);
- boolean addedC2 = cartridgeTest.addCartridge("c2.json", endpoint, restClient);
+ boolean addedC2 = cartridgeTest.addCartridge("c2.json", restClient);
assertEquals(addedC2, true);
- boolean addedC3 = cartridgeTest.addCartridge("c3.json", endpoint, restClient);
+ boolean addedC3 = cartridgeTest.addCartridge("c3.json", restClient);
assertEquals(addedC3, true);
boolean addedG1 = cartridgeGroupTest.addCartridgeGroup("cartrdige-nested.json",
- endpoint, restClient);
+ restClient);
assertEquals(addedG1, true);
- CartridgeGroupBean beanG1 = cartridgeGroupTest.getCartridgeGroup("G1", endpoint,
+ CartridgeGroupBean beanG1 = cartridgeGroupTest.getCartridgeGroup("G1",
restClient);
assertEquals(beanG1.getName(), "G1");
boolean addedN1 = networkPartitionTest.addNetworkPartition("network-partition-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(addedN1, true);
boolean addedN2 = networkPartitionTest.addNetworkPartition("network-partition-2.json",
- endpoint, restClient);
+ restClient);
assertEquals(addedN2, true);
boolean addedDep = deploymentPolicyTest.addDeploymentPolicy("deployment-policy-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(addedDep, true);
boolean added = applicationTest.addApplication("g-sc-G123-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(added, true);
- ApplicationBean bean = applicationTest.getApplication("g-sc-G123-1", endpoint,
+ ApplicationBean bean = applicationTest.getApplication("g-sc-G123-1",
restClient);
assertEquals(bean.getApplicationId(), "g-sc-G123-1");
boolean addAppPolicy = applicationPolicyTest.addApplicationPolicy(
- "application-policy-1.json", endpoint, restClient);
+ "application-policy-1.json", restClient);
assertEquals(addAppPolicy, true);
ApplicationPolicyBean policyBean = applicationPolicyTest.getApplicationPolicy(
- "application-policy-1", endpoint, restClient);
+ "application-policy-1", restClient);
//deploy the application
boolean deployed = applicationTest.deployApplication(bean.getApplicationId(),
- policyBean.getId(), endpoint, restClient);
+ policyBean.getId(), restClient);
assertEquals(deployed, true);
//Application active handling
@@ -479,91 +484,91 @@ public class SampleApplicationsTest extends StratosTestServerManager {
//Updating application
boolean updated = applicationTest.updateApplication("g-sc-G123-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(updated, true);
assertGroupInstanceCount(bean.getApplicationId(), "group3", 2);
assertClusterMinMemberCount(bean.getApplicationId(), 2);
- ApplicationBean updatedBean = applicationTest.getApplication("g-sc-G123-1", endpoint,
+ ApplicationBean updatedBean = applicationTest.getApplication("g-sc-G123-1",
restClient);
assertEquals(updatedBean.getApplicationId(), "g-sc-G123-1");
- boolean removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint,
+ boolean removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1",
restClient);
assertEquals(removedGroup, false);
- boolean removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1", endpoint,
+ boolean removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1",
restClient);
assertEquals(removedAuto, false);
- boolean removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1", endpoint,
+ boolean removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1",
restClient);
//Trying to remove the used network partition
assertEquals(removedNet, false);
- boolean removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1", endpoint,
+ boolean removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1",
restClient);
assertEquals(removedDep, false);
//Un-deploying the application
- boolean unDeployed = applicationTest.undeployApplication("g-sc-G123-1", endpoint,
+ boolean unDeployed = applicationTest.undeployApplication("g-sc-G123-1",
restClient);
assertEquals(unDeployed, true);
assertApplicationUndeploy("g-sc-G123-1");
- boolean removed = applicationTest.removeApplication("g-sc-G123-1", endpoint,
+ boolean removed = applicationTest.removeApplication("g-sc-G123-1",
restClient);
assertEquals(removed, true);
- ApplicationBean beanRemoved = applicationTest.getApplication("g-sc-G123-1", endpoint,
+ ApplicationBean beanRemoved = applicationTest.getApplication("g-sc-G123-1",
restClient);
assertEquals(beanRemoved, null);
- removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint,
+ removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1",
restClient);
assertEquals(removedGroup, true);
- boolean removedC1 = cartridgeTest.removeCartridge("c1", endpoint,
+ boolean removedC1 = cartridgeTest.removeCartridge("c1",
restClient);
assertEquals(removedC1, true);
- boolean removedC2 = cartridgeTest.removeCartridge("c2", endpoint,
+ boolean removedC2 = cartridgeTest.removeCartridge("c2",
restClient);
assertEquals(removedC2, true);
- boolean removedC3 = cartridgeTest.removeCartridge("c3", endpoint,
+ boolean removedC3 = cartridgeTest.removeCartridge("c3",
restClient);
assertEquals(removedC3, true);
- removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1", endpoint,
+ removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1",
restClient);
assertEquals(removedAuto, true);
- removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1", endpoint,
+ removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1",
restClient);
assertEquals(removedDep, true);
//Remove network partition used by application policy
- removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1", endpoint,
+ removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1",
restClient);
assertEquals(removedNet, false);
- boolean removedN2 = networkPartitionTest.removeNetworkPartition("network-partition-2", endpoint,
+ boolean removedN2 = networkPartitionTest.removeNetworkPartition("network-partition-2",
restClient);
assertEquals(removedN2, false);
- boolean removeAppPolicy = applicationPolicyTest.removeApplicationPolicy("application-policy-1", endpoint,
+ boolean removeAppPolicy = applicationPolicyTest.removeApplicationPolicy("application-policy-1",
restClient);
assertEquals(removeAppPolicy, true);
- removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1", endpoint,
+ removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1",
restClient);
assertEquals(removedNet, true);
- removedN2 = networkPartitionTest.removeNetworkPartition("network-partition-2", endpoint,
+ removedN2 = networkPartitionTest.removeNetworkPartition("network-partition-2",
restClient);
assertEquals(removedN2, true);
@@ -581,9 +586,9 @@ public class SampleApplicationsTest extends StratosTestServerManager {
log.info("Started network partition test case**************************************");
boolean added = networkPartitionTest.addNetworkPartition("network-partition-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(added, true);
- NetworkPartitionBean bean = networkPartitionTest.getNetworkPartition("network-partition-1", endpoint,
+ NetworkPartitionBean bean = networkPartitionTest.getNetworkPartition("network-partition-1",
restClient);
assertEquals(bean.getId(), "network-partition-1");
assertEquals(bean.getPartitions().size(), 1);
@@ -592,9 +597,9 @@ public class SampleApplicationsTest extends StratosTestServerManager {
assertEquals(bean.getPartitions().get(0).getProperty().get(0).getValue(), "default");
boolean updated = networkPartitionTest.updateNetworkPartition("network-partition-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(updated, true);
- NetworkPartitionBean updatedBean = networkPartitionTest.getNetworkPartition("network-partition-1", endpoint,
+ NetworkPartitionBean updatedBean = networkPartitionTest.getNetworkPartition("network-partition-1",
restClient);
assertEquals(updatedBean.getId(), "network-partition-1");
assertEquals(updatedBean.getPartitions().size(), 2);
@@ -604,11 +609,11 @@ public class SampleApplicationsTest extends StratosTestServerManager {
assertEquals(updatedBean.getPartitions().get(1).getProperty().get(1).getName(), "zone");
assertEquals(updatedBean.getPartitions().get(1).getProperty().get(1).getValue(), "z1");
- boolean removed = networkPartitionTest.removeNetworkPartition("network-partition-1", endpoint,
+ boolean removed = networkPartitionTest.removeNetworkPartition("network-partition-1",
restClient);
assertEquals(removed, true);
- NetworkPartitionBean beanRemoved = networkPartitionTest.getNetworkPartition("network-partition-1", endpoint,
+ NetworkPartitionBean beanRemoved = networkPartitionTest.getNetworkPartition("network-partition-1",
restClient);
assertEquals(beanRemoved, null);
@@ -625,19 +630,19 @@ public class SampleApplicationsTest extends StratosTestServerManager {
log.info("Started deployment policy test case**************************************");
boolean addedN1 = networkPartitionTest.addNetworkPartition("network-partition-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(addedN1, true);
boolean addedN2 = networkPartitionTest.addNetworkPartition("network-partition-2.json",
- endpoint, restClient);
+ restClient);
assertEquals(addedN2, true);
boolean addedDep = deploymentPolicyTest.addDeploymentPolicy("deployment-policy-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(addedDep, true);
DeploymentPolicyBean bean = deploymentPolicyTest.getDeploymentPolicy(
- "deployment-policy-1", endpoint, restClient);
+ "deployment-policy-1", restClient);
assertEquals(bean.getId(), "deployment-policy-1");
assertEquals(bean.getNetworkPartitions().size(), 2);
assertEquals(bean.getNetworkPartitions().get(0).getId(), "network-partition-1");
@@ -658,16 +663,16 @@ public class SampleApplicationsTest extends StratosTestServerManager {
//update network partition
boolean updated = networkPartitionTest.updateNetworkPartition("network-partition-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(updated, true);
//update deployment policy with new partition and max values
boolean updatedDep = deploymentPolicyTest.updateDeploymentPolicy("deployment-policy-1.json",
- endpoint, restClient);
+ restClient);
assertEquals(updatedDep, true);
DeploymentPolicyBean updatedBean = deploymentPolicyTest.getDeploymentPolicy(
- "deployment-policy-1", endpoint, restClient);
+ "deployment-policy-1", restClient);
assertEquals(updatedBean.getId(), "deployment-policy-1");
assertEquals(updatedBean.getNetworkPartitions().size(), 2);
assertEquals(updatedBean.getNetworkPartitions().get(0).getId(), "network-partition-1");
@@ -688,32 +693,32 @@ public class SampleApplicationsTest extends StratosTestServerManager {
"network-partition-2-partition-2");
assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(1).getPartitionMax(), 5);
- boolean removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1", endpoint,
+ boolean removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1",
restClient);
//Trying to remove the used network partition
assertEquals(removedNet, false);
- boolean removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1", endpoint,
+ boolean removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1",
restClient);
assertEquals(removedDep, true);
- DeploymentPolicyBean beanRemovedDep = deploymentPolicyTest.getDeploymentPolicy("deployment-policy-1", endpoint,
+ DeploymentPolicyBean beanRemovedDep = deploymentPolicyTest.getDeploymentPolicy("deployment-policy-1",
restClient);
assertEquals(beanRemovedDep, null);
- boolean removedN1 = networkPartitionTest.removeNetworkPartition("network-partition-1", endpoint,
+ boolean removedN1 = networkPartitionTest.removeNetworkPartition("network-partition-1",
restClient);
assertEquals(removedN1, true);
- NetworkPartitionBean beanRemovedN1 = networkPartitionTest.getNetworkPartition("network-partition-1", endpoint,
+ NetworkPartitionBean beanRemovedN1 = networkPartitionTest.getNetworkPartition("network-partition-1",
restClient);
assertEquals(beanRemovedN1, null);
- boolean removedN2 = networkPartitionTest.removeNetworkPartition("network-partition-2", endpoint,
+ boolean removedN2 = networkPartitionTest.removeNetworkPartition("network-partition-2",
restClient);
assertEquals(removedN2, true);
- NetworkPartitionBean beanRemovedN2 = networkPartitionTest.getNetworkPartition("network-partition-2", endpoint,
+ NetworkPartitionBean beanRemovedN2 = networkPartitionTest.getNetworkPartition("network-partition-2",
restClient);
assertEquals(beanRemovedN2, null);
@@ -730,9 +735,9 @@ public class SampleApplicationsTest extends StratosTestServerManager {
log.info("Started Cartridge test case**************************************");
try {
- boolean added = cartridgeTest.addCartridge("c0.json", endpoint, restClient);
+ boolean added = cartridgeTest.addCartridge("c0.json", restClient);
assertEquals(added, true);
- CartridgeBean bean = cartridgeTest.getCartridge("c0", endpoint, restClient);
+ CartridgeBean bean = cartridgeTest.getCartridge("c0", restClient);
assertEquals(bean.getType(), "c0");
assertEquals(bean.getCategory(), "Application");
assertEquals(bean.getHost(), "qmog.cisco.com");
@@ -762,9 +767,9 @@ public class SampleApplicationsTest extends StratosTestServerManager {
boolean updated = cartridgeTest.updateCartridge("c0.json",
- endpoint, restClient);
+ restClient);
assertEquals(updated, true);
- CartridgeBean updatedBean = cartridgeTest.getCartridge("c0", endpoint,
+ CartridgeBean updatedBean = cartridgeTest.getCartridge("c0",
restClient);
assertEquals(updatedBean.getType(), "c0");
assertEquals(updatedBean.getCategory(), "Data");
@@ -793,11 +798,11 @@ public class SampleApplicationsTest extends StratosTestServerManager {
}
}
- boolean removed = cartridgeTest.removeCartridge("c0", endpoint,
+ boolean removed = cartridgeTest.removeCartridge("c0",
restClient);
assertEquals(removed, true);
- CartridgeBean beanRemoved = cartridgeTest.getCartridge("c0", endpoint,
+ CartridgeBean beanRemoved = cartridgeTest.getCartridge("c0",
restClient);
assertEquals(beanRemoved, null);
@@ -865,6 +870,46 @@ public class SampleApplicationsTest extends StratosTestServerManager {
}
/**
+ * Assert application Topology initialization
+ *
+ */
+ private void assertApplicationTopologyInitialized() {
+ long startTime = System.currentTimeMillis();
+ boolean applicationTopologyInitialized = ApplicationManager.getApplications().isInitialized();
+ while (!applicationTopologyInitialized) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignore) {
+ }
+ applicationTopologyInitialized = ApplicationManager.getApplications().isInitialized();
+ if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
+ break;
+ }
+ }
+ assertEquals(String.format("Application Topology didn't get initialized "), applicationTopologyInitialized, true);
+ }
+
+ /**
+ * Assert Topology initialization
+ *
+ */
+ private void assertTopologyInitialized() {
+ long startTime = System.currentTimeMillis();
+ boolean topologyInitialized = TopologyManager.getTopology().isInitialized();
+ while (!topologyInitialized) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignore) {
+ }
+ topologyInitialized = TopologyManager.getTopology().isInitialized();
+ if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
+ break;
+ }
+ }
+ assertEquals(String.format("Topology didn't get initialized "), topologyInitialized, true);
+ }
+
+ /**
* Assert application activation
*
* @param applicationName
@@ -1053,7 +1098,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
applicationContext.getStatus().equals(APPLICATION_STATUS_UNDEPLOYING)) {
log.info("Force undeployment is going to start for the [application] " + applicationName);
- applicationTest.forceUndeployApplication(applicationName, endpoint, restClient);
+ applicationTest.forceUndeployApplication(applicationName, restClient);
while (application.getInstanceContextCount() > 0 ||
applicationContext.getStatus().equals(APPLICATION_STATUS_UNDEPLOYING)) {
try {
http://git-wip-us.apache.org/repos/asf/stratos/blob/f995fb3b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosArtifactsUtils.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosArtifactsUtils.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosArtifactsUtils.java
deleted file mode 100644
index 9a81972..0000000
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosArtifactsUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.integration.tests;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonParser;
-import org.apache.commons.lang.StringUtils;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-
-/**
- * Util class
- */
-public class StratosArtifactsUtils {
-
- public String getJsonStringFromFile(String filePath) throws FileNotFoundException {
- JsonParser parser = new JsonParser();
- Object object = parser.parse(new FileReader(getResourcesFolderPath() + filePath));
- GsonBuilder gsonBuilder = new GsonBuilder();
- Gson gson = gsonBuilder.create();
- String content = gson.toJson(object);
- return content;
-
- }
-
- /**
- * Get resources folder path
- * @return
- */
- private String getResourcesFolderPath() {
- String path = getClass().getResource("/").getPath();
- return StringUtils.removeEnd(path, File.separator);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f995fb3b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
index fb5ff51..a1b07e1 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
@@ -19,19 +19,32 @@
package org.apache.stratos.integration.tests.rest;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParser;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.http.client.methods.*;
+import org.apache.http.client.utils.URIBuilder;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
import java.net.URI;
/**
* Rest client to handle rest requests
*/
public class RestClient {
-
+ private static final Log log = LogFactory.getLog(RestClient.class);
private DefaultHttpClient httpClient;
+ private String endPoint;
+ private String userName;
+ private String password;
public RestClient() {
PoolingClientConnectionManager cm = new PoolingClientConnectionManager();
@@ -44,6 +57,13 @@ public class RestClient {
httpClient = (DefaultHttpClient) WebClientWrapper.wrapClient(httpClient);
}
+ public RestClient(String endPoint, String userName, String password) {
+ this();
+ this.endPoint = endPoint;
+ this.userName = userName;
+ this.password = password;
+ }
+
/**
* Handle http post request. Return String
*
@@ -130,4 +150,190 @@ public class RestClient {
request.releaseConnection();
}
}
+
+ public boolean addEntity(String filePath, String resourcePath, String entityName) {
+ try {
+ String content = getJsonStringFromFile(filePath);
+ URI uri = new URIBuilder(this.endPoint + resourcePath).build();
+
+ HttpResponse response = doPost(uri, content);
+ if (response != null) {
+ if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
+ return true;
+ } else {
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ Gson gson = gsonBuilder.create();
+ ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
+ if (errorResponse != null) {
+ throw new RuntimeException(errorResponse.getErrorMessage());
+ }
+ }
+ }
+ log.error("An unknown error occurred while trying to add " + entityName);
+ throw new RuntimeException("An unknown error occurred while trying to add" + entityName);
+ } catch (Exception e) {
+ String message = "Could not add " + entityName;
+ log.error(message, e);
+ throw new RuntimeException(message, e);
+ }
+ }
+
+ public boolean deployEntity(String resourcePath, String entityName) {
+ try {
+ URI uri = new URIBuilder(this.endPoint + resourcePath).build();
+
+ HttpResponse response = doPost(uri, "");
+ if (response != null) {
+ if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
+ return true;
+ } else {
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ Gson gson = gsonBuilder.create();
+ ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
+ if (errorResponse != null) {
+ throw new RuntimeException(errorResponse.getErrorMessage());
+ }
+ }
+ }
+ log.error("An unknown error occurred while trying to deploy " + entityName);
+ throw new RuntimeException("An unknown error occurred while trying to deploy " + entityName);
+ } catch (Exception e) {
+ String message = "Could not deploy " + entityName;
+ log.error(message, e);
+ throw new RuntimeException(message, e);
+ }
+ }
+
+ public boolean undeployEntity(String resourcePath, String entityName) {
+ try {
+ URI uri = new URIBuilder(this.endPoint + resourcePath).build();
+
+ HttpResponse response = doPost(uri, "");
+ if (response != null) {
+ if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
+ return true;
+ } else {
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ Gson gson = gsonBuilder.create();
+ ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
+ if (errorResponse != null) {
+ throw new RuntimeException(errorResponse.getErrorMessage());
+ }
+ }
+ }
+ log.error("An unknown error occurred while trying to deploy " + entityName);
+ throw new RuntimeException("An unknown error occurred while trying to deploy " + entityName);
+ } catch (Exception e) {
+ String message = "Could not deploy " + entityName;
+ log.error(message, e);
+ throw new RuntimeException(message, e);
+ }
+ }
+
+ public Object getEntity(String resourcePath, String identifier, Class responseJsonClass,
+ String entityName) {
+ try {
+ URI uri = new URIBuilder(this.endPoint + resourcePath + "/" + identifier).build();
+ HttpResponse response = doGet(uri);
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ Gson gson = gsonBuilder.create();
+ if (response != null) {
+ if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
+ return gson.fromJson(response.getContent(), responseJsonClass);
+ } else if (response.getStatusCode() == 404) {
+ return null;
+ } else {
+ ErrorResponse errorResponse = gson.fromJson(response.getContent(),
+ ErrorResponse.class);
+ if (errorResponse != null) {
+ throw new RuntimeException(errorResponse.getErrorMessage());
+ }
+ }
+ }
+ String msg = "An unknown error occurred while getting the " + entityName;
+ log.error(msg);
+ throw new RuntimeException(msg);
+ } catch (Exception e) {
+ String message = "Could not get " + entityName;
+ log.error(message, e);
+ throw new RuntimeException(message, e);
+ }
+ }
+
+ public boolean removeEntity(String resourcePath, String identifier, String entityName) {
+ try {
+ URI uri = new URIBuilder(this.endPoint + "/" + resourcePath + "/" + identifier).build();
+ HttpResponse response = doDelete(uri);
+ if (response != null) {
+ if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
+ return true;
+ } else if (response.getContent().contains("it is used") || response.getContent().contains("in use")) {
+ return false;
+ } else {
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ Gson gson = gsonBuilder.create();
+ ErrorResponse errorResponse = gson.fromJson(response.getContent(),
+ ErrorResponse.class);
+ if (errorResponse != null) {
+ throw new RuntimeException(errorResponse.getErrorMessage());
+ }
+ }
+ }
+ String msg = "An unknown error occurred while removing the " + entityName;
+ log.error(msg);
+ throw new RuntimeException(msg);
+ } catch (Exception e) {
+ String message = "Could not remove " + entityName;
+ log.error(message, e);
+ throw new RuntimeException(message, e);
+ }
+ }
+
+ public boolean updateEntity(String filePath, String resourcePath, String entityName) {
+ try {
+ String content = getJsonStringFromFile(filePath);
+ URI uri = new URIBuilder(this.endPoint + resourcePath).build();
+
+ HttpResponse response = doPut(uri, content);
+ if (response != null) {
+ if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
+ return true;
+ } else {
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ Gson gson = gsonBuilder.create();
+ ErrorResponse errorResponse = gson.fromJson(response.getContent(),
+ ErrorResponse.class);
+ if (errorResponse != null) {
+ throw new RuntimeException(errorResponse.getErrorMessage());
+ }
+ }
+ }
+ log.error("An unknown error occurred while trying to update " + entityName);
+ throw new RuntimeException("An unknown error occurred while trying to update" + entityName);
+ } catch (Exception e) {
+ String message = "Could not add " + entityName;
+ log.error(message, e);
+ throw new RuntimeException(message, e);
+ }
+ }
+
+ public String getJsonStringFromFile(String filePath) throws FileNotFoundException {
+ JsonParser parser = new JsonParser();
+ Object object = parser.parse(new FileReader(getResourcesFolderPath() + filePath));
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ Gson gson = gsonBuilder.create();
+ String content = gson.toJson(object);
+ return content;
+
+ }
+
+ /**
+ * Get resources folder path
+ *
+ * @return
+ */
+ private String getResourcesFolderPath() {
+ String path = getClass().getResource("/").getPath();
+ return StringUtils.removeEnd(path, File.separator);
+ }
}
[06/50] [abbrv] stratos git commit: Removing merge conflicts of few
samples
Posted by la...@apache.org.
Removing merge conflicts of few samples
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/67576a8d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/67576a8d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/67576a8d
Branch: refs/heads/data-publisher-integration
Commit: 67576a8dfd6c3910b141da70cff1906aa0fd7388
Parents: 3222a12
Author: lasinducharith <la...@gmail.com>
Authored: Thu Aug 6 16:04:42 2015 +0530
Committer: lasinducharith <la...@gmail.com>
Committed: Thu Aug 6 16:04:42 2015 +0530
----------------------------------------------------------------------
.../conf/templates/jndi.properties.template | 1 -
samples/cartridges/openstack/php.json | 25 ++++++++------------
samples/cartridges/openstack/tomcat.json | 23 ------------------
3 files changed, 10 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/67576a8d/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template b/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
index 588d47a..e49750e 100644
--- a/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
+++ b/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/stratos/blob/67576a8d/samples/cartridges/openstack/php.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/openstack/php.json b/samples/cartridges/openstack/php.json
index bc07515..75be00d 100755
--- a/samples/cartridges/openstack/php.json
+++ b/samples/cartridges/openstack/php.json
@@ -1,17 +1,17 @@
{
- "type": "php",
- "provider": "apache",
+ "type": "esb",
+ "provider": "wso2",
"category": "framework",
- "host": "php.stratos.org",
- "displayName": "php",
- "description": "php Cartridge",
+ "host": "esb.stratos.org",
+ "displayName": "esb",
+ "description": "esb Cartridge",
"version": "7",
"multiTenant": "false",
"portMapping": [
{
- "name": "http-80",
+ "name": "http-22",
"protocol": "http",
- "port": "8080",
+ "port": "22",
"proxyPort": "8280"
}
],
@@ -20,25 +20,20 @@
"iaasProvider": [
{
"type": "openstack",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "imageId": "RegionOne/a63609be-61df-436f-80bc-d2b6068a4c3a",
"networkInterfaces": [
{
-<<<<<<< HEAD
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-=======
- "name": "network-routable",
- "networkUuid": "512e1f54-1e85-4dac-b2e6-f0b30fc552cf"
->>>>>>> f5bb41e... Update the INSTALL.md file and samples
}
],
"property": [
{
"name": "instanceType",
- "value": "RegionOne/15c3065c-462c-4977-9143-094d63d1c2c7"
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
},
{
"name": "keyPair",
- "value": "gayan-os"
+ "value": "vishanth-key"
},
{
"name": "securityGroups",
http://git-wip-us.apache.org/repos/asf/stratos/blob/67576a8d/samples/cartridges/openstack/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/openstack/tomcat.json b/samples/cartridges/openstack/tomcat.json
index 94928d5..adc56ca 100755
--- a/samples/cartridges/openstack/tomcat.json
+++ b/samples/cartridges/openstack/tomcat.json
@@ -25,7 +25,6 @@
"iaasProvider": [
{
"type": "openstack",
-<<<<<<< HEAD
"imageId": "RegionOne/4c812285-d761-4208-b4b3-d453eace5aff",
"networkInterfaces": [
{
@@ -45,28 +44,6 @@
"name": "securityGroups",
"value": "default"
}
-=======
- "imageId": "RegionOne/4c812285-d761-4208-b4b3-d453eace5aff",
- "networkInterfaces":[
- {
- "name":"network-non-routable",
- "networkUuid":"b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name":"instanceType",
- "value":"RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
- },
- {
- "name":"keyPair",
- "value":"gayan-os"
- },
- {
- "name":"securityGroups",
- "value":"default"
- }
->>>>>>> f5bb41e... Update the INSTALL.md file and samples
]
}
]
[46/50] [abbrv] stratos git commit: Removing unnecessary features,
artifacts and restructuring distribution artifacts
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/throttling-rules.drl
----------------------------------------------------------------------
diff --git a/products/stratos/conf/throttling-rules.drl b/products/stratos/conf/throttling-rules.drl
deleted file mode 100755
index cf62ae4..0000000
--- a/products/stratos/conf/throttling-rules.drl
+++ /dev/null
@@ -1,270 +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.
- */
-
-import org.wso2.carbon.throttling.manager.dataobjects.*;
-import org.wso2.carbon.billing.mgt.dataobjects.*;
-import org.wso2.carbon.stratos.common.constants.*;
-
-// free users restrictions
-
-rule unsetRestrictFreeUsers
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_ADD_USER_ACTION, false, null);
-
-end
-
-
-rule restrictFreeDataVolume
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) > (20 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, true,
- "You have exceeded the maximum allowed disk storage of 20Mb. Please upgrade the subscription.");
-end
-
-
-rule unsetRestrictFreeDataVolume
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) <= (20 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, false, null);
-end
-
-
-rule restrictFreeBandwidth
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
- eval(($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_INCOMING_BANDWIDTH) +
- $dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_OUTGOING_BANDWIDTH)) > (50 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_SERVICE_IN_BANDWIDTH_ACTION, true,
- "You have exceeded the maximum allowed bandwidth of 50Mb. Please upgrade the subscription.");
- validation.setTenantBlocked(StratosConstants.THROTTLING_WEBAPP_IN_BANDWIDTH_ACTION, true,
- "You have exceeded the maximum allowed bandwidth of 50Mb. Please upgrade the subscription.");
- validation.setTenantBlocked(StratosConstants.THROTTLING_OUT_DATA_ACTION, true,
- "You have exceeded the maximum allowed bandwidth of 50Mb. Please upgrade the subscription.");
-end
-
-
-rule unsetRestrictFreeBandwidth
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
- eval(($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_INCOMING_BANDWIDTH) +
- $dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_OUTGOING_BANDWIDTH)) < (50 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_SERVICE_IN_BANDWIDTH_ACTION,false,null);
- validation.setTenantBlocked(StratosConstants.THROTTLING_WEBAPP_IN_BANDWIDTH_ACTION,false,null);
- validation.setTenantBlocked(StratosConstants.THROTTLING_OUT_DATA_ACTION,false,null);
-end
-
-
-//---------------------------------------------------------------------------------
-// small users restrictions
-
-
-
-rule restrictSmallDataVolume
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) > (50 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, true,
- "You have exceeded the maximum allowed disk storage of 50Mb. Please upgrade the subscription.");
-end
-
-
-rule unsetRestrictSmallDataVolume
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) <= (50 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, false, null);
-end
-
-
-rule restrictSmallBandwidth
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
- eval(($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_INCOMING_BANDWIDTH) +
- $dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_OUTGOING_BANDWIDTH)) > (150 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_SERVICE_IN_BANDWIDTH_ACTION, true,
- "You have exceeded the maximum allowed bandwidth of 150Mb. Please upgrade the subscription.");
- validation.setTenantBlocked(StratosConstants.THROTTLING_WEBAPP_IN_BANDWIDTH_ACTION, true,
- "You have exceeded the maximum allowed bandwidth of 150Mb. Please upgrade the subscription.");
- validation.setTenantBlocked(StratosConstants.THROTTLING_OUT_DATA_ACTION, true,
- "You have exceeded the maximum allowed bandwidth of 150Mb. Please upgrade the subscription.");
-end
-
-
-rule unsetRestrictSmallBandwidth
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
- eval(($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_INCOMING_BANDWIDTH) +
- $dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_OUTGOING_BANDWIDTH)) < (150 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_SERVICE_IN_BANDWIDTH_ACTION,false,null);
- validation.setTenantBlocked(StratosConstants.THROTTLING_WEBAPP_IN_BANDWIDTH_ACTION,false,null);
- validation.setTenantBlocked(StratosConstants.THROTTLING_OUT_DATA_ACTION,false,null);
-end
-
-
-rule unsetRestrictSmallUsers
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
-then
-
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_ADD_USER_ACTION, false, null);
-
-end
-
-
-
-
-//-------------------------------------------------------------------------------
-// medium users restrictions
-
-
-
-rule restrictMediumDataVolume
-when
- $package: MultitenancyPackage(name == "Professional")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) > (500 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, true,
- "You have exceeded the maximum allowed disk storage of 500Mb. Please upgrade the subscription.");
-end
-
-
-rule unsetRestrictMediumDataVolume
-when
- $package: MultitenancyPackage(name == "Professional")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) <= (500 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, false, null);
-end
-
-
-rule unsetRestrictMediumUsers
-when
- $package: MultitenancyPackage(name == "Professional")
- $dataContext : ThrottlingDataContext()
-then
-
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_ADD_USER_ACTION, false, null);
-
-end
-
-
-
-//-----------------------------------------------------------------------------------------------
-// large users restrictions
-
-
-rule restrictLargeDataVolume
-when
- $package: MultitenancyPackage(name == "Enterprise")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) > (1500 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, true,
- "You have exceeded the maximum allowed disk storage of 1500Mb.");
-end
-
-
-rule unsetRestrictLargeDataVolume
-when
- $package: MultitenancyPackage(name == "Enterprise")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) <= (1500 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, false, null);
-end
-
-
-rule unsetRestrictLargeUsers
-when
- $package: MultitenancyPackage(name == "Enterprise")
- $dataContext : ThrottlingDataContext()
-then
-
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_ADD_USER_ACTION, false, null);
-
-end
-
-
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/user-mgt.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/user-mgt.xml b/products/stratos/conf/user-mgt.xml
deleted file mode 100644
index c6cdb74..0000000
--- a/products/stratos/conf/user-mgt.xml
+++ /dev/null
@@ -1,241 +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.
- -->
-
-<UserManager>
- <Realm>
- <Configuration>
- <AdminRole>admin</AdminRole>
- <AdminUser>
- <UserName>admin</UserName>
- <Password>admin</Password>
- </AdminUser>
- <EveryOneRoleName>everyone</EveryOneRoleName> <!-- By default users in this role sees the registry root -->
- <Property name="dataSource">jdbc/WSO2CarbonDB</Property>
- <Property name="MultiTenantRealmConfigBuilder">org.wso2.carbon.user.core.config.multitenancy.SimpleRealmConfigBuilder</Property>
- </Configuration>
- <!-- Following is the default user store manager. This user store manager is based on embedded-apacheds LDAP. It reads/writes users and roles into the default apacheds LDAP user store. Descriptions about each of the following properties can be found in user management documentation of the respective product. In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
- Note: Do not comment within UserStoreManager tags. Cause, specific tag names are used as tokens when building configurations for products. -->
- <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
- <Property name="ConnectionURL">ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}</Property>
- <Property name="ConnectionName">uid=admin,ou=system</Property>
- <Property name="ConnectionPassword">admin</Property>
- <Property name="passwordHashMethod">SHA</Property>
- <Property name="UserNameListFilter">(objectClass=person)</Property>
- <Property name="UserEntryObjectClass">wso2Person</Property>
- <Property name="UserSearchBase">ou=Users,dc=wso2,dc=org</Property>
- <Property name="UserNameSearchFilter">(&(objectClass=person)(uid=?))</Property>
- <Property name="UserNameAttribute">uid</Property>
- <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
- <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="UsernameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
- <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
- <Property name="ReadLDAPGroups">true</Property>
- <Property name="WriteLDAPGroups">true</Property>
- <Property name="EmptyRolesAllowed">true</Property>
- <Property name="GroupSearchBase">ou=Groups,dc=wso2,dc=org</Property>
- <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
- <Property name="GroupEntryObjectClass">groupOfNames</Property>
- <Property name="GroupNameSearchFilter">(&(objectClass=groupOfNames)(cn=?))</Property>
- <Property name="GroupNameAttribute">cn</Property>
- <Property name="MembershipAttribute">member</Property>
- <Property name="UserRolesCacheEnabled">true</Property>
- <Property name="UserDNPattern">uid={0},ou=Users,dc=wso2,dc=org</Property>
- </UserStoreManager-->
-
- <!-- Following is the configuration for internal JDBC user store. This user store manager is based on JDBC. In case if application needs to manage passwords externally set property <Property name="PasswordsExternallyManaged">true</Property>. In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>. Furthermore properties, IsEmailUserName and DomainCalculation are readonly properties.
- Note: Do not comment within UserStoreManager tags. Cause, specific tag names are used as tokens when building configurations for products. -->
- <UserStoreManager class="org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager">
- <Property name="ReadOnly">false</Property>
- <Property name="MaxUserNameListLength">100</Property>
- <Property name="IsEmailUserName">false</Property>
- <Property name="DomainCalculation">default</Property>
- <Property name="PasswordDigest">SHA-256</Property>
- <Property name="StoreSaltedPassword">true</Property>
- <Property name="UserNameUniqueAcrossTenants">false</Property>
- <Property name="PasswordJavaRegEx">^[\S]{5,30}$</Property>
- <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
- <Property name="UsernameJavaRegEx">^[^~!#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
- <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
- <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="UserRolesCacheEnabled">true</Property>
- </UserStoreManager>
-
- <!-- If product is using an external LDAP as the user store in READ ONLY mode, use following user manager.
- In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
- -->
- <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadOnlyLDAPUserStoreManager">
- <Property name="ReadOnly">true</Property>
- <Property name="MaxUserNameListLength">100</Property>
- <Property name="ConnectionURL">ldap://localhost:10389</Property>
- <Property name="ConnectionName">uid=admin,ou=system</Property>
- <Property name="ConnectionPassword">admin</Property>
- <Property name="UserSearchBase">ou=system</Property>
- <Property name="UserNameListFilter">(objectClass=person)</Property>
- <Property name="UserNameAttribute">uid</Property>
- <Property name="ReadLDAPGroups">false</Property>
- <Property name="GroupSearchBase">ou=system</Property>
- <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
- <Property name="GroupNameAttribute">cn</Property>
- <Property name="MembershipAttribute">member</Property>
- <Property name="UserRolesCacheEnabled">true</Property>
- <Property name="ReplaceEscapeCharactersAtUserLogin">true</Property>
- </UserStoreManager-->
-
- <!-- Active directory configuration is as follows.
- In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
- There are few special properties for "Active Directory".
- They are :
- 1.Referral - (comment out this property if this feature is not reuired) This enables LDAP referral support.
- 2.BackLinksEnabled - (Do not comment, set to true or false) In some cases LDAP works with BackLinksEnabled. In which role is stored
- at user level. Depending on this value we need to change the Search Base within code.
- 3.isADLDSRole - (Do not comment) Set to true if connecting to an AD LDS instance else set to false.
- -->
- <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ActiveDirectoryUserStoreManager">
- <Property name="defaultRealmName">WSO2.ORG</Property>
- <Property name="kdcEnabled">false</Property>
- <Property name="ConnectionURL">ldaps://10.100.1.100:636</Property>
- <Property name="ConnectionName">CN=admin,CN=Users,DC=WSO2,DC=Com</Property>
- <Property name="ConnectionPassword">A1b2c3d4</Property>
- <Property name="passwordHashMethod">SHA</Property>
- <Property name="UserSearchBase">CN=Users,DC=WSO2,DC=Com</Property>
- <Property name="UserEntryObjectClass">user</Property>
- <Property name="UserNameAttribute">cn</Property>
- <Property name="isADLDSRole">false</Property>
- <Property name="userAccountControl">512</Property>
- <Property name="UserNameListFilter">(objectClass=user)</Property>
- <Property name="UserNameSearchFilter">(&(objectClass=user)(cn=?))</Property>
- <Property name="UsernameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>]{3,30}$</Property>
- <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
- <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>]{3,30}$</Property>
- <Property name="ReadLDAPGroups">true</Property>
- <Property name="WriteLDAPGroups">true</Property>
- <Property name="EmptyRolesAllowed">true</Property>
- <Property name="GroupSearchBase">CN=Users,DC=WSO2,DC=Com</Property>
- <Property name="GroupEntryObjectClass">group</Property>
- <Property name="GroupNameAttribute">cn</Property>
- <Property name="MembershipAttribute">member</Property>
- <Property name="GroupNameListFilter">(objectcategory=group)</Property>
- <Property name="GroupNameSearchFilter">(&(objectClass=group)(cn=?))</Property>
- <Property name="UserRolesCacheEnabled">true</Property>
- <Property name="Referral">follow</Property>
- <Property name="BackLinksEnabled">true</Property>
- </UserStoreManager-->
-
- <!-- If product is using an external LDAP as the user store in read/write mode, use following user manager
- In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
- -->
- <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
- <Property name="ConnectionURL">ldap://localhost:10389</Property>
- <Property name="ConnectionName">uid=admin,ou=system</Property>
- <Property name="ConnectionPassword">secret</Property>
- <Property name="passwordHashMethod">SHA</Property>
- <Property name="UserNameListFilter">(objectClass=person)</Property>
- <Property name="UserEntryObjectClass">inetOrgPerson</Property>
- <Property name="UserSearchBase">ou=system</Property>
- <Property name="UserNameSearchFilter">(&(objectClass=person)(uid=?))</Property>
- <Property name="UserNameAttribute">uid</Property>
- <Property name="UsernameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>]{3,30}$</Property>
- <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>]{3,30}$</Property>
- <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
- <Property name="ReadLDAPGroups">true</Property>
- <Property name="WriteLDAPGroups">true</Property>
- <Property name="EmptyRolesAllowed">false</Property>
- <Property name="GroupSearchBase">ou=system</Property>
- <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
- <Property name="GroupEntryObjectClass">groupOfNames</Property>
- <Property name="GroupNameSearchFilter">(&(objectClass=groupOfNames)(cn=?))</Property>
- <Property name="GroupNameAttribute">cn</Property>
- <Property name="MembershipAttribute">member</Property>
- <Property name="UserRolesCacheEnabled">true</Property>
- <Property name="ReplaceEscapeCharactersAtUserLogin">true</Property>
- </UserStoreManager-->
-
- <!-- Following user manager is used by Identity Server (IS) as its default user manager.
- IS will do token replacement when building the product. Therefore do not change the syntax.
- If "kdcEnabled" parameter is true, IS will allow service principle management. Thus "ServicePasswordJavaRegEx", "ServiceNameJavaRegEx"
- properties control the service name format and service password formats.
- In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
- -->
- <!--ISUserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
- <Property name="defaultRealmName">WSO2.ORG</Property>
- <Property name="kdcEnabled">false</Property>
- <Property name="ConnectionURL">ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}</Property>
- <Property name="ConnectionName">uid=admin,ou=system</Property>
- <Property name="ConnectionPassword">admin</Property>
- <Property name="passwordHashMethod">SHA</Property>
- <Property name="UserNameListFilter">(objectClass=person)</Property>
- <Property name="UserEntryObjectClass">scimPerson</Property>
- <Property name="UserSearchBase">ou=Users,dc=wso2,dc=org</Property>
- <Property name="UserNameSearchFilter">(&(objectClass=person)(uid=?))</Property>
- <Property name="UserNameAttribute">uid</Property>
- <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
- <Property name="ServicePasswordJavaRegEx">^[\\S]{5,30}$</Property>
- <Property name="ServiceNameJavaRegEx">^[\\S]{2,30}/[\\S]{2,30}$</Property>
- <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="UsernameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
- <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
- <Property name="ReadLDAPGroups">true</Property>
- <Property name="WriteLDAPGroups">true</Property>
- <Property name="EmptyRolesAllowed">true</Property>
- <Property name="GroupSearchBase">ou=Groups,dc=wso2,dc=org</Property>
- <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
- <Property name="GroupEntryObjectClass">groupOfNames</Property>
- <Property name="GroupNameSearchFilter">(&(objectClass=groupOfNames)(cn=?))</Property>
- <Property name="GroupNameAttribute">cn</Property>
- <Property name="MembershipAttribute">member</Property>
- <Property name="UserRolesCacheEnabled">true</Property>
- <Property name="UserDNPattern">uid={0},ou=Users,dc=wso2,dc=org</Property>
- <Property name="SCIMEnabled">true</Property>
- </ISUserStoreManager-->
-
- <AuthorizationManager
- class="org.wso2.carbon.user.core.authorization.JDBCAuthorizationManager">
- <Property name="AdminRoleManagementPermissions">/permission</Property>
- <Property name="AuthorizationCacheEnabled">true</Property>
- </AuthorizationManager>
- </Realm>
-</UserManager>
-
-<!--*******Description of some of the configuration properties used in user-mgt.xml*********************************
-UserRolesCacheEnabled - This is to indicate whether to cache role list of a user. By default it is set to true.
- You may need to disable it if user-roles are changed by external means and need to reflect
- those changes in the carbon product immediately.
-
-ReplaceEscapeCharactersAtUserLogin - This is to configure whether escape characters in user name needs to be replaced at user login.
- Currently the identified escape characters that needs to be replaced are '\' & '\\'
-
-UserDNPattern - This property will be used when authenticating users. During authentication we do a bind. But if the user is login with
- email address or some other property we need to first lookup LDAP and retreive DN for the user. This involves an additional step.
- If UserDNPattern is specified the DN will be contructed using the pattern specified in this property. Performance of this is much better than looking
- up DN and binding user.
-
-passwordHashMethod - This says how the password should be stored. Allowed values are as follows,
- SHA - Uses SHA digest method
- MD5 - Uses MD 5 digest method
- PLAIN_TEXT - Plain text passwords
- In addition to above this supports all digest methods supported by http://docs.oracle.com/javase/6/docs/api/java/security/MessageDigest.html.
-
--->
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/zoo.cfg
----------------------------------------------------------------------
diff --git a/products/stratos/conf/zoo.cfg b/products/stratos/conf/zoo.cfg
deleted file mode 100644
index 5c54037..0000000
--- a/products/stratos/conf/zoo.cfg
+++ /dev/null
@@ -1,24 +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.
-#
-
-tickTime=2000
-dataDir=repository/data/zookeeper
-clientPort=2181
-start_zk_server=false
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/faq.html
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/faq.html b/products/stratos/modules/distribution/lib/home/faq.html
deleted file mode 100644
index b8cd476..0000000
--- a/products/stratos/modules/distribution/lib/home/faq.html
+++ /dev/null
@@ -1,413 +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.
-
--->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-
-
-
-
-<script src="js/ga.js" async="" type="text/javascript"></script>
-
-
-
-
- <script type="text/javascript" src="../../carbon/googleanalytics/js/jquery.min.js"></script>
- <script type="text/javascript" src="../../carbon/googleanalytics/js/googleAnalyticsProcessor.js"></script>
- <meta http-equiv="content-type" content="text/html;charset=utf-8" />
- <title>WSO2 StratosLive – the most complete open PaaS powered by the multi-tenant WSO2 Stratos cloud middleware platform, and WSO2 Carbon enterprise middleware platform</title>
- <link href="style.css" rel="stylesheet" type="text/css" media="all" />
- <meta name="description" content="WSO2 is the lean enterprise middleware company, delivering the only complete open source enterprise SOA middleware stack available internally and in the cloud." />
- <meta name="keywords" content="cloud, platform-as-a-service, PaaS, multi-tenant, cloud enterprise middleware, SOA, open source PaaS" />
- <link rel="stylesheet" href="js/orbit-1.2.3.css">
- <script type="text/javascript" src="js/jquery-1.5.1.min.js"></script>
- <script type="text/javascript" src="js/jquery.orbit-1.2.3.min.js"></script>
-
-
- <!--[if IE]>
- <style type="text/css">
- .timer { display: none !important; }
- div.caption { background:transparent; filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000,endColorstr=#99000000);zoom: 1; }
- </style>
- <![endif]-->
-
- <script type="text/javascript">
- $(window).load(function() {
- $('#featured').orbit({
- timer: false
- });
- });
- </script>
- <style type="text/css" charset="utf-8">/* See license.txt for terms of usage */
-</style></head><body dir="LTR" lang="en-US" text="#000000">
- <div id="main-content">
- <div id="header">
- <div class="top-nav">
- <ul>
- <li><a href="http://stratoslive.wso2.com/" target="_blank">Stratoslive</a></li>
- <li><a target="_blank" href="http://wso2.com/cloud/stratoslive/">Stratoslive home</a></li>
- <li><a href="http://wso2.com/cloud/stratoslive/pricing/" target="_blank">Pricing</a></li>
- <li class="right"><a href="http://www.wso2.com/cloud/services/support" target="_blank">Support</a></li>
- </ul>
- </div>
-<div class="logo"><img src="images/logo.gif"></div>
-
-
- </div>
-<p style="text-decoration: none;" align="JUSTIFY">
-<b><a name="faqs"></a>StratosLive Frequently Asked Questions</b>
-</p>
-
-
- <div id="content">
-
-
-
-
- <div class="banner">
-
- </div>
-
-
-
-
-
-
-
- <style type="text/css">
- <!--
- P { color: #000000; font-family: "Arial"; font-size: 11pt }
- -->
- </style>
-
-<p style="text-decoration: none;" align="JUSTIFY"><br>
-</p>
-<pre><p align="JUSTIFY"><a href="#startup"><strong> StratosLive Start-up Questions</strong></a>
- </p><p align="JUSTIFY"><a href="#general"><strong> Using StratosLive - General Questions</strong></a>
- </p><p align="JUSTIFY"><a href="#features"><strong> StratosLive Features</strong></a>
- </p><p align="JUSTIFY"><a href="#private"><strong> Stratos Private Set up</strong></a>
-</p></pre>
-<br><br>
-<p style="font-style: normal; font-weight: normal;" align="JUSTIFY"><a name="startup"></a><u><strong>StratosLive
-Start-up Questions</strong></u></p>
-<ol>
- <li><p align="JUSTIFY"><strong>I have registered an account just now. Why am I
- unable to log in yet?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Please make sure that you have validated the
-registration, by clicking the validation link in the email sent to
-you. Also make sure that you have entered the username (in the form
-of adminname@domainname) and password correct.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="2">
- <li><p align="JUSTIFY"><strong>Why should I validate my domain?</strong></p>
-</li></ol>
-<p align="JUSTIFY">While domain validation is optional, you can prove
-the ownership of the domain by validating the domain. Otherwise, you
-may have to lose your account, if the legitimate owner of the domain
-claims it. You might skip this step at the time of registration, and
-validate the domain at a later time from your account.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="3">
- <li><p align="JUSTIFY"><strong>I have registered for a particular Stratos
- Service. Now do I have to register for the other services?</strong></p>
-</li></ol>
-<p align="JUSTIFY">No, you don't have to. Stratos tenants are centrally
-managed. That means, if you have registered from a service, you will
-be able to use all the Stratos services. However, as the tenant
-admin, you will be able to activate and deactivate the Stratos
-services, from Stratos Manager.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="4">
- <li><p align="JUSTIFY"><strong>I didn't get any email after registering or
- after resetting my password?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Please check your spam folder, in case if the mail
-had been treated as a spam by your mail server. If it is still not
-there, you may need to contact WSO2 Support on sorting this out. We
-are glad to help from our end.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="5">
- <li><p align="JUSTIFY"><strong>How do I get any further assistance on using
- Stratos/StratosLive?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Please contact WSO2 using <a href="http://wso2.com/contact/">http://wso2.com/contact/</a>, if
-you need further assistance. StratosLive forum can be found at
-<a href="http://wso2.org/forum/1241">http://wso2.org/forum/1241</a>.
-You also can send your queries to the stratos-dev mailing list (stratos-dev@wso2.org) regarding
-StratosLive PaaS or Stratos Cloud Middleware Platform.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="6">
- <li><p align="JUSTIFY"><strong>I have registered for a 'Demo/Free'
- account. Will I be charged, if I exceed the usage limits?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Free/Demo accounts are never charged. Anyway, you
-can upgrade and downgrade your usage plan at any time.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="7">
- <li><p align="JUSTIFY"><strong>Now I have registered for an account. What's
- next?</strong></p>
-</li></ol>
-<p align="JUSTIFY">If you are familiar with the WSO2 Carbon based
-products, there is nothing new to learn for StratosLive. StratosLive
-is simply the WSO2 Carbon Middleware Platform as a Service, with all
-the WSO2 Carbon based products available publicly over the cloud as
-services. For a detailed introduction to the Platform aspect of
-Carbon and StratosLive, refer to the article, <a href="http://wso2.org/library/blog-post/2011/08/wso2-stratoslive-enterprise-ready-java-paas">“WSO2
-StratosLive - An Enterprise Ready Java PaaS</a>.”</p>
- </p><p align="JUSTIFY"><a href="#faqs"><strong> Back To Top</strong></a>
-<p align="JUSTIFY"><br><br>
-</p>
-<p align="JUSTIFY"><a name="general"></a><u><strong>Using StratosLive - General Questions</strong></u></p>
-<ol>
- <li><p align="JUSTIFY"><strong>Does Stratos support multi-tenant model?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Yes, Stratos supports a multi-tenant model. In
-StratosLive PaaS, WSO2 is the super admin, and you have register a
-tenant. You can OEM Stratos, by setting up a private cloud for your
-own. In that case, you would be the super tenant and you can decide
-what level of functionality you want to allow your tenants.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="2">
- <li><p align="JUSTIFY"><strong>How does Stratos overcome the inherent security
- challenges of the cloud?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Tenants are isolated from each other in Stratos.
-Data processing code is protected by java security manager, hence the
-custom code deployed by tenants (such as web applications and web
-services) does not have access to it. Tenants are also prevented from
-executing the priviledged actions, such as opening the ports and
-accessing the file system. For more insights, please refer to the
-article, “<a href="http://wso2.org/library/articles/2011/08/wso2-stratoslive-meets-security-challenges-cloud">How
-WSO2 StratosLive meets Security Challenges in Cloud</a>.”</p>
-<p align="JUSTIFY">
-</p>
-<ol start="3">
- <li><p align="JUSTIFY"><strong>How is multi-tenancy achieved in Stratos? Is it
- at the Database level or the application level?</strong></p>
-</li></ol>
-<p align="JUSTIFY">It is multi-tenanted at the database level, as far
-as the data stored by Stratos is concerned. For user data, we are
-currently working on a polyglot data architecture which will allow a
-range of choices from a share, multi-tenant NoSQL feature (based on
-Cassandra) to a per-tenant database model.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="4">
- <li><p align="JUSTIFY"><strong>Do we have the opportunity to customize or
- extend Stratos as appropriate?</strong></p>
-</li></ol>
-<p align="JUSTIFY">StratosLive is a publicly hosted Stratos Cloud
-Middleware Platform-as-a-Service, where you are using the services as
-a tenant. Tenants have limited access due to the security and the
-other concerns. But if you host Stratos in your own data center and
-OEM Stratos, as super tenant you will be able to extend Stratos and
-customize it more, as you prefer.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="5">
- <li><p align="JUSTIFY"><strong>What are the developer frameworks supported by
- Stratos/StratosLive?</strong></p>
-</li></ol>
-<p align="JUSTIFY">StratosLive is a Java Platform as a Service. We
-currently support any Java developer framework as we are currently
-only supporting deploying Java webapps (WAR files).
-</p>
-<p align="JUSTIFY">
-</p>
-<ol start="6">
- <li><p align="JUSTIFY"><strong>Does Stratos support secure tunneling?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Yes, Stratos supports secure tunneling via the <a href="http://wso2.com/cloud/connectors/services-gateway/">Cloud
-Services Gateway</a>. Cloud Services Gateway is used to create a
-managed, secured channel for business processes and other tasks
-running in a public cloud to get access to enterprise data and
-services. It allows the service and data owners inside the enterprise
-to selectively publish services and data to the cloud. The resulting
-services can be fully protected – authentication, authorization,
-confidentiality, integrity and more. Here only the approved messages
-are delivered to access the services.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="7">
- <li><p align="JUSTIFY"><strong>Does Stratos support elasticity?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Yes, we do support elasticity with the cloud
-provider. In StratosLive, the services are fronted by WSO2 Load
-Balancer, which balances the load across the service instances and
-scales the services automatically according to the load. Stratos
-services also can scale with the other load balancers including the
-hardware loadbalancers.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="8">
- <li><p align="JUSTIFY"><strong>Does Stratos support single sign-on?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Yes, single sign-on and single sign-out are
-supported by design. Once you have logged into any of the Stratos
-services, you will not need to sign in to the other services.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="9">
- <li><p align="JUSTIFY"><strong>Does Stratos support integration with
- customer's on-premise Identity Management?</strong>
- </p>
-</li></ol>
-<p align="JUSTIFY">Yes. It is possible, and we will need to work with
-the customer to do this.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="10">
- <li><p align="JUSTIFY"><strong>What lag times can we expect in different
- parts of the globe?</strong>
- </p>
-</li></ol>
-<p align="JUSTIFY">This depends on the clients' deployment
-infrastructure, and where they decide to host it. We are currently
-working on support for Amazon's availability zones, so that we can
-isolate tenants to specific data centers.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="11">
- <li><p align="JUSTIFY"><strong>Is there any speed issues reported with any
- specific data types or streams?</strong>
- </p>
-</li></ol>
-<p align="JUSTIFY">No issues yet. Our architecture is 100% streaming,
-so we do not expect any issues either. EBay uses WSO2 Eneterprise
-Service Bus for 600 million messages/day and has flat line memory for
-messages ranging from 1kB to 100MB.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="12">
- <li><p align="JUSTIFY"><strong>What are the supported cloud-providers?
- </strong></p>
-</li></ol>
-<p align="JUSTIFY">StratosLive is deployed on our co-lo servers over the
- native hardware. We also have had the public cloud deployed on top of
-Amazon’s EC2. We also have a private cloud setup that is deployed on
-Eucalyptus. Stratos follows the open standards, and is not coded for any
- particular cloud provider. Hence it is expected to work on any
-Infrastructure as a Service.</p>
- </p><p align="JUSTIFY"><a href="#faqs"><strong> Back To Top</strong></a>
-<p align="JUSTIFY"><br><br>
-</p>
-<p align="JUSTIFY"><a name="features"></a><u><strong>StratosLive Features</strong></u></p>
-<ol>
- <li><p align="JUSTIFY"><strong>Does Stratos support encrypted communications?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Yes, it does. Data communication from the browser to
-back-end Admin Services happens over https (encrypted), which
-provides transport-level protection.
-</p>
-<p align="JUSTIFY">
-</p>
-<ol start="2">
- <li><p align="JUSTIFY"><strong>Does StratosLive support metering?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Yes, it does. Tenants are metered and billed for
-their usage. Tenants can view their usage information from Stratos
-Manager. For more insights on the metering, throttling, and billing,
-refer to the article “<a href="http://wso2.org/library/articles/2011/08/metering-throttling-billing-stratoslive">Metering,
-Throttling and Billing in StratosLive</a>”.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="3">
- <li><p align="JUSTIFY"><strong>Do you support Memcache?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Yes, we have a scalable distributed cache using
-EHCache that we expose via the Java caching API.</p>
- </p><p align="JUSTIFY"><a href="#faqs"><strong> Back To Top</strong></a>
-<p align="JUSTIFY"><br><br>
-</p>
-<p align="JUSTIFY"><a name="private"></a><u><strong>Stratos Private Set up</strong></u></p>
-<ol>
- <li><p align="JUSTIFY"><strong>Can we set up our Stratos locally or as a PaaS?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Sure. StratosLive is a publicly hosted PaaS by WSO2.
-Similarly, you can deploy Stratos publicly over the cloud for your
-organization or for the public. In this case, you will be the super
-tenant. You can also deploy Stratos as a private cloud for your
-organization. Hybrid cloud set ups too are possible.</p>
-<p align="JUSTIFY">
-</p>
-<ol start="2">
- <li><p align="JUSTIFY"><strong>Is it possible to migrate our services and data
- from our tenant in StratosLive to our private Stratos cloud setup?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Migrating from StratosLive to your private Stratos
-cloud setup is possible, since StratosLive is the same Stratos Cloud
-Middleware platform hosted as StratosLive Platform as a Service.
-</p>
-<p align="JUSTIFY">
-</p>
-<ol start="3">
- <li><p align="JUSTIFY"><strong>Can we isolate specific accounts for throttling
- or increase bandwidth?</strong></p>
-</li></ol>
-<p align="JUSTIFY">Yes, the load balancing logic and throttling logic
-are tenant aware. So if you are deploying Stratos locally, as the
-super tenant, you will be able to throttle the tenants.
-</p>
-<p align="JUSTIFY">
-</p>
-<ol start="4">
- <li><p align="JUSTIFY"><strong>Can we setup Stratos in a personal computer?</strong></p>
-</li></ol>
-<p align="JUSTIFY">You can setup Stratos in a computer with all the
-services, given that the computer has the required memory, processor,
-and disk space. For example, Stratos requires 4 GB memory, and at
-least 8 GB is recommended. You may also find it convenient to run
-only the services that you require at once, if you have limited
-resources.</p>
-
- </p><p align="JUSTIFY"><a href="#faqs"><strong> Back To Top</strong></a>
-<p align="JUSTIFY"><br><br>
-</p>
-<div class="clear"></div>
- <div id="bottom">
-
-
-
- <div class="clear"></div>
- </div>
- </div>
- <div id="footer">
- <div class="footer-links">
- <a target="_blank" href="http://www.wso2.com/cloud/services/terms-of-use">Terms of Use</a> | <a target="_blank" href="http://www.wso2.com/cloud/services/privacy-policy">Privacy Policy</a> | <a target="_blank" href="http://wso2.com/cloud/services/sla/">Service Level Agreement</a> | <a target="_blank" href="http://wso2.com/cloud/stratoslive/pricing/">Pricing</a> | <a target="_blank" href="http://www.wso2.com/cloud/services/support">Support</a>
- </div>
- <div class="powered">
- <span>Powered by</span><img src="images/powered-logo.gif" alt="ESB">
- </div>
- <span class="copyright">©stratoslive.wso2.com copyright 2010-2012 WSO2, Inc. </span>
- </div>
- </div>
-
- </body></html>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/bottom.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/bottom.gif b/products/stratos/modules/distribution/lib/home/images/bottom.gif
deleted file mode 100755
index 5679266..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/bottom.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/bullet-01.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/bullet-01.gif b/products/stratos/modules/distribution/lib/home/images/bullet-01.gif
deleted file mode 100755
index 7148f4d..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/bullet-01.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/content-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/content-bg.gif b/products/stratos/modules/distribution/lib/home/images/content-bg.gif
deleted file mode 100755
index 6d0a579..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/content-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/favicon.ico
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/favicon.ico b/products/stratos/modules/distribution/lib/home/images/favicon.ico
deleted file mode 100755
index f7b2bbf..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/favicon.ico and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/feature-01-icon.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/feature-01-icon.gif b/products/stratos/modules/distribution/lib/home/images/feature-01-icon.gif
deleted file mode 100755
index ff3ba26..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/feature-01-icon.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/feature-02-icon.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/feature-02-icon.gif b/products/stratos/modules/distribution/lib/home/images/feature-02-icon.gif
deleted file mode 100755
index ee4cb66..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/feature-02-icon.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/feature-03-icon.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/feature-03-icon.gif b/products/stratos/modules/distribution/lib/home/images/feature-03-icon.gif
deleted file mode 100755
index 8f3c2a1..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/feature-03-icon.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/feature-middle-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/feature-middle-bg.gif b/products/stratos/modules/distribution/lib/home/images/feature-middle-bg.gif
deleted file mode 100755
index d2fb97e..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/feature-middle-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/intro-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/intro-bg.gif b/products/stratos/modules/distribution/lib/home/images/intro-bg.gif
deleted file mode 100755
index a38a0df..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/intro-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/intro-text.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/intro-text.gif b/products/stratos/modules/distribution/lib/home/images/intro-text.gif
deleted file mode 100755
index 61441a2..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/intro-text.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/left-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/left-bg.gif b/products/stratos/modules/distribution/lib/home/images/left-bg.gif
deleted file mode 100755
index 72dc051..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/left-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/logo.gif b/products/stratos/modules/distribution/lib/home/images/logo.gif
deleted file mode 100755
index 1e7b2ce..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/powered-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/powered-logo.gif b/products/stratos/modules/distribution/lib/home/images/powered-logo.gif
deleted file mode 100755
index fb478bf..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/powered-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/register.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/register.gif b/products/stratos/modules/distribution/lib/home/images/register.gif
deleted file mode 100755
index 3260908..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/register.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/sign-in.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/sign-in.gif b/products/stratos/modules/distribution/lib/home/images/sign-in.gif
deleted file mode 100755
index ae2a4d7..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/sign-in.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/stratos-products-new.jpg
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/stratos-products-new.jpg b/products/stratos/modules/distribution/lib/home/images/stratos-products-new.jpg
deleted file mode 100755
index bbbdb00..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/stratos-products-new.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/title-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/title-bg.gif b/products/stratos/modules/distribution/lib/home/images/title-bg.gif
deleted file mode 100755
index 2d539a7..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/title-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/top.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/top.gif b/products/stratos/modules/distribution/lib/home/images/top.gif
deleted file mode 100755
index 9ed482c..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/top.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/webinar.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/webinar.png b/products/stratos/modules/distribution/lib/home/images/webinar.png
deleted file mode 100755
index 434f660..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/webinar.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/images/white-paper.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/images/white-paper.png b/products/stratos/modules/distribution/lib/home/images/white-paper.png
deleted file mode 100755
index 3fb643e..0000000
Binary files a/products/stratos/modules/distribution/lib/home/images/white-paper.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/index.html
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/index.html b/products/stratos/modules/distribution/lib/home/index.html
deleted file mode 100644
index 8021d22..0000000
--- a/products/stratos/modules/distribution/lib/home/index.html
+++ /dev/null
@@ -1,140 +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.
-
--->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
- <head> <script type="text/javascript" src="../../carbon/googleanalytics/js/jquery.min.js"></script>
- <script type="text/javascript" src="../../carbon/googleanalytics/js/googleAnalyticsProcessor.js"></script>
- <script type="text/javascript" src="../../carbon/googleanalytics/js/jquery.min.js"></script>
- <script type="text/javascript" src="../../carbon/googleanalytics/js/googleAnalyticsProcessor.js"></script>
- <meta http-equiv="content-type" content="text/html;charset=utf-8" />
- <title>WSO2 StratosLive – the most complete open PaaS powered by the multi-tenant WSO2 Stratos cloud middleware platform, and WSO2 Carbon enterprise middleware platform</title>
- <link href="style.css" rel="stylesheet" type="text/css" media="all" />
- <meta name="description" content="WSO2 is the lean enterprise middleware company, delivering the only complete open source enterprise SOA middleware stack available internally and in the cloud." />
- <meta name="keywords" content="cloud, platform-as-a-service, PaaS, multi-tenant, cloud enterprise middleware, SOA, open source PaaS" />
- <link rel="stylesheet" href="js/orbit-1.2.3.css">
- <script type="text/javascript" src="js/jquery-1.5.1.min.js"></script>
- <script type="text/javascript" src="js/jquery.orbit-1.2.3.min.js"></script>
-
- <!--[if IE]>
- <style type="text/css">
- .timer { display: none !important; }
- div.caption { background:transparent; filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000,endColorstr=#99000000);zoom: 1; }
- </style>
- <![endif]-->
-
- <script type="text/javascript">
- $(window).load(function() {
- $('#featured').orbit({
- timer: false
- });
- });
- </script>
- </head>
-
- <body>
- <div id="main-content">
- <div id="header">
- <div class="top-nav">
- <ul>
- <li><a target="_blank" href="http://wso2.com/cloud/stratoslive/">StratosLive Home</a></li>
- <li><a target="_blank" href="http://wso2.com/cloud/stratoslive/pricing/">Pricing</a></li>
- <li><a target="_blank" href="http://docs.wso2.org/display/stratos/Stratos+Frequently+Asked+Questions">FAQ</a></li>
- <li><a target="_blank" href="http://www.wso2.com/cloud/services/support">Support</a></li>
- <li class="right"><a target="_blank" href="mailto:support+stratoslive@wso2.com">Contact</a></li>
- </ul>
- </div>
- <div class="logo"><img src="images/logo.gif"/></div>
- </div>
- <div id="content">
- <div id="left">
- <div class="stratos-products">
- <div class="title">
- <img src="images/intro-text.gif" alt="Get instant access right now to enterprise-grade Middleware Platform-as-a-Service:"/>
- </div>
- <div class="products">
- <a href="http://appserver.stratoslive.wso2.com/" class="as-new"></a>
- <a href="http://data.stratoslive.wso2.com/" class="dss-new"></a>
- <a href="http://identity.stratoslive.wso2.com/" class="is-new"></a>
- <a href="http://governance.stratoslive.wso2.com/" class="greg-new"></a>
- <a href="http://monitor.stratoslive.wso2.com/" class="bam-new"></a>
- <a href="http://process.stratoslive.wso2.com/" class="bps-new"></a>
- <a href="http://rule.stratoslive.wso2.com/" class="brs-new"></a>
- <a href="http://esb.stratoslive.wso2.com/" class="esb-new"></a>
- <a href="http://messaging.stratoslive.wso2.com/" class="mb-new"></a>
- <a href="http://cep.stratoslive.wso2.com/" class="cep-new"></a>
- <a href="http://cg.stratoslive.wso2.com/" class="cg-new"></a>
- <a href="http://ss.stratoslive.wso2.com/" class="ss-new"></a>
- <a href="http://ts.stratoslive.wso2.com/" class="ts-new"></a>
- </div>
- </div>
- </div>
- <div id="right">
- <div class="register">
- <a href="https://stratoslive.wso2.com/carbon/tenant-register/select_domain.jsp"><img src="images/register.gif"/></a>
- <a href="https://stratoslive.wso2.com/carbon/sso-acs/redirect_ajaxprocessor.jsp"><img src="images/sign-in.gif"/></a>
- </div>
-
- <div class="banner">
- <div id="featured">
- <div class="screencast">
- <h2>Introducing WSO2 Stratos</h2>
- <object height="265" width="440"><param value="https://www.youtube.com/v/hF0u6tvDoLQ?fs=1&hl=en_US&fs=1&showinfo=0" name="movie"><param value="true" name="allowFullScreen"><param value="always" name="allowscriptaccess"><embed height="265" width="440" allowfullscreen="true" allowscriptaccess="always" type="application/x-shockwave-flash" src="https://www.youtube.com/v/hF0u6tvDoLQ?fs=1&hl=en_US&fs=1&showinfo=0&rel=0"></object>
- </div>
- <div class="whitepaper">
- <a target="_blank" href="http://wso2.com/casestudies/effective-cloud-enablement-with-wso2-stratos/"><img src="images/white-paper.png"/></a>
- </div>
- <div class="webinar">
- <a target="_blank"href="http://wso2.org/library/webinars/2011/05/lean-cloud-platform"><img src="images/webinar.png"/></a>
- </div>
- </div>
- </div>
- </div>
- <div class="clear"></div>
- <div id="bottom">
- <div class="feature">
- Build composite applications that automatically scale
- </div>
- <div class="feature">
- Pay just for the services you use
- </div>
- <div class="feature">
- Freedom to move applications and data to WSO2 Stratos in your own datacenter
- </div>
- <div class="clear"></div>
- </div>
- </div>
- <div id="footer">
- <div class="footer-links">
- <a target="_blank" href="http://www.wso2.com/cloud/services/terms-of-use">Terms of Use</a> | <a target="_blank" href="http://www.wso2.com/cloud/services/privacy-policy">Privacy Policy</a> | <a target="_blank" href="http://wso2.com/cloud/services/sla/">Service Level Agreement</a> | <a target="_blank" href="http://wso2.com/cloud/stratoslive/pricing/">Pricing</a> | <a target="_blank" href="http://www.wso2.com/cloud/services/support">Support</a>
- </div>
- <div class="powered">
- <span>Powered by</span><img src="images/powered-logo.gif" alt="ESB"/>
- </div>
- <span class="copyright">©stratoslive.wso2.com copyright 2010-2012 WSO2, Inc. </span>
- </div>
- </div>
- </div>
- </body>
-
-</html>
[17/50] [abbrv] stratos git commit: refining the resources to have
the samples with the reference of the test case
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0.json
deleted file mode 100644
index 4bcef26..0000000
--- a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-c0",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 35
- },
- "memoryConsumption": {
- "threshold": 45
- },
- "loadAverage": {
- "threshold": 25
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0-v1.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0-v1.json
new file mode 100644
index 0000000..31c2b84
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0-v1.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-c0",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "threshold": 30
+ },
+ "memoryConsumption": {
+ "threshold": 40
+ },
+ "loadAverage": {
+ "threshold": 20
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0.json
new file mode 100644
index 0000000..4bcef26
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-c0",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "threshold": 35
+ },
+ "memoryConsumption": {
+ "threshold": 45
+ },
+ "loadAverage": {
+ "threshold": 25
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-v1.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-v1.json
new file mode 100644
index 0000000..c0132f0
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-v1.json
@@ -0,0 +1,50 @@
+{
+ "name": "G4",
+ "dependencies": {
+ "terminationBehaviour": "terminate-none",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group2",
+ "cartridge.c1-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c4"
+ ],
+ "groups": [
+ {
+ "name": "G5",
+ "dependencies": {
+ "terminationBehaviour": "terminate-dependents",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group6",
+ "cartridge.c5-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c5"
+ ],
+ "groups": [
+ {
+ "name": "G6",
+ "dependencies": {
+ "terminationBehaviour": "terminate-all",
+ "startupOrders": []
+ },
+ "cartridges": [
+ "c6"
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6.json
new file mode 100644
index 0000000..ef28723
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6.json
@@ -0,0 +1,50 @@
+{
+ "name": "G4",
+ "dependencies": {
+ "terminationBehaviour": "terminate-none",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group5",
+ "cartridge.c4-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c4"
+ ],
+ "groups": [
+ {
+ "name": "G5",
+ "dependencies": {
+ "terminationBehaviour": "terminate-dependents",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group6",
+ "cartridge.c5-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c5"
+ ],
+ "groups": [
+ {
+ "name": "G6",
+ "dependencies": {
+ "terminationBehaviour": "terminate-all",
+ "startupOrders": []
+ },
+ "cartridges": [
+ "c6"
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4.json
new file mode 100755
index 0000000..ec7d8b2
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4.json
@@ -0,0 +1,45 @@
+{
+ "type": "c4",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c4",
+ "description": "c4 Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "vishanth-key"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c5.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c5.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c5.json
new file mode 100755
index 0000000..0e438fd
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c5.json
@@ -0,0 +1,124 @@
+{
+ "category": "Application",
+ "description": "c5 Cartridge",
+ "displayName": "c5",
+ "host": "qmog.cisco.com",
+ "iaasProvider": [
+ {
+ "imageId": "RegionOne/16e7e35b-0c88-4605-90ce-cbef9e9dde0f",
+ "maxInstanceLimit": "4",
+ "networkInterfaces": [
+ {
+ "floatingNetworks": [
+ {
+ "name": "public",
+ "networkUuid": "26b4aa2b-06bc-4e4f-a6eb-c19fbc211af6"
+ }
+ ],
+ "name": "core",
+ "networkUuid": "5e107fbd-4820-47ad-84ea-6f135496f889"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/2cdbd576-8c9b-4c2d-8b1a-0f79dc4fb809"
+ },
+ {
+ "name": "keyPair",
+ "value": "phoenix"
+ },
+ {
+ "name": "autoAssignIp",
+ "value": "false"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ],
+ "type": "mock"
+ }
+ ],
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "port": "22",
+ "protocol": "http",
+ "proxyPort": "8280"
+ }
+ ],
+ "property": [
+ {
+ "name": "payload_parameter.MB_IP",
+ "value": "octl.qmog.cisco.com"
+ },
+ {
+ "name": "payload_parameter.MB_PORT",
+ "value": "61616"
+ },
+ {
+ "name": "payload_parameter.CEP_IP",
+ "value": "octl.qmog.cisco.com"
+ },
+ {
+ "name": "payload_parameter.CEP_PORT",
+ "value": "7611"
+ },
+ {
+ "name": "payload_parameter.CEP_ADMIN_USERNAME",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.CEP_ADMIN_PASSWORD",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.CERT_TRUSTSTORE",
+ "value": "/opt/apache-stratos-cartridge-agent/security/client-truststore.jks"
+ },
+ {
+ "name": "payload_parameter.TRUSTSTORE_PASSWORD",
+ "value": "wso2carbon"
+ },
+ {
+ "name": "payload_parameter.ENABLE_DATA_PUBLISHER",
+ "value": "false"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_IP",
+ "value": "octl.qmog.cisco.com"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_PORT",
+ "value": "7611"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_SECURE_PORT",
+ "value": "7711"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_ADMIN_USERNAME",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.QTCM_DNS_SEGMENT",
+ "value": "test"
+ },
+ {
+ "name": "payload_parameter.QTCM_NETWORK_COUNT",
+ "value": "1"
+ },
+ {
+ "name": "payload_parameter.SIMPLE_PROPERTY",
+ "value": "value"
+ }
+ ],
+ "provider": "cisco",
+ "type": "c5",
+ "version": "1.0"
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c6.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c6.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c6.json
new file mode 100755
index 0000000..8f41441
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c6.json
@@ -0,0 +1,45 @@
+{
+ "type": "c6",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c6",
+ "description": "c6 Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "vishanth-key"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0-v1.json b/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0-v1.json
new file mode 100755
index 0000000..6d922a9
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0-v1.json
@@ -0,0 +1,124 @@
+{
+ "category": "Data",
+ "description": "c0 Cartridge",
+ "displayName": "c0",
+ "host": "qmog.cisco.com12",
+ "iaasProvider": [
+ {
+ "imageId": "RegionOne/16e7e35b-0c88-4605-90ce-cbef9e9d123",
+ "maxInstanceLimit": "4",
+ "networkInterfaces": [
+ {
+ "floatingNetworks": [
+ {
+ "name": "private",
+ "networkUuid": "26b4aa2b-06bc-4e4f-a6eb-c19fbc2112121"
+ }
+ ],
+ "name": "core1",
+ "networkUuid": "5e107fbd-4820-47ad-84ea-6f1354961212"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/2cdbd576-8c9b-4c2d-8b1a-0f79dc4fb812"
+ },
+ {
+ "name": "keyPair",
+ "value": "phoenix12"
+ },
+ {
+ "name": "autoAssignIp",
+ "value": "true"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default123"
+ }
+ ],
+ "type": "mock"
+ }
+ ],
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "port": "22",
+ "protocol": "http",
+ "proxyPort": "8280"
+ }
+ ],
+ "property": [
+ {
+ "name": "payload_parameter.MB_IP",
+ "value": "octl.qmog.cisco.com123"
+ },
+ {
+ "name": "payload_parameter.MB_PORT",
+ "value": "61617"
+ },
+ {
+ "name": "payload_parameter.CEP_IP",
+ "value": "octl.qmog.cisco.com123"
+ },
+ {
+ "name": "payload_parameter.CEP_PORT",
+ "value": "7612"
+ },
+ {
+ "name": "payload_parameter.CEP_ADMIN_USERNAME",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.CEP_ADMIN_PASSWORD",
+ "value": "admin123"
+ },
+ {
+ "name": "payload_parameter.CERT_TRUSTSTORE",
+ "value": "/opt/apache-stratos-cartridge-agent/security/client-truststore.jks"
+ },
+ {
+ "name": "payload_parameter.TRUSTSTORE_PASSWORD",
+ "value": "wso2carbon"
+ },
+ {
+ "name": "payload_parameter.ENABLE_DATA_PUBLISHER",
+ "value": "false"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_IP",
+ "value": "octl.qmog.cisco.com123"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_PORT",
+ "value": "7612"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_SECURE_PORT",
+ "value": "7712"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_ADMIN_USERNAME",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD",
+ "value": "admin123"
+ },
+ {
+ "name": "payload_parameter.QTCM_DNS_SEGMENT",
+ "value": "test123"
+ },
+ {
+ "name": "payload_parameter.QTCM_NETWORK_COUNT",
+ "value": "3"
+ },
+ {
+ "name": "payload_parameter.SIMPLE_PROPERTY",
+ "value": "value"
+ }
+ ],
+ "provider": "apache",
+ "type": "c0",
+ "version": "1.0"
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0.json b/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0.json
new file mode 100755
index 0000000..44066e1
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0.json
@@ -0,0 +1,124 @@
+{
+ "category": "Application",
+ "description": "c0 Cartridge",
+ "displayName": "c0",
+ "host": "qmog.cisco.com",
+ "iaasProvider": [
+ {
+ "imageId": "RegionOne/16e7e35b-0c88-4605-90ce-cbef9e9dde0f",
+ "maxInstanceLimit": "4",
+ "networkInterfaces": [
+ {
+ "floatingNetworks": [
+ {
+ "name": "public",
+ "networkUuid": "26b4aa2b-06bc-4e4f-a6eb-c19fbc211af6"
+ }
+ ],
+ "name": "core",
+ "networkUuid": "5e107fbd-4820-47ad-84ea-6f135496f889"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/2cdbd576-8c9b-4c2d-8b1a-0f79dc4fb809"
+ },
+ {
+ "name": "keyPair",
+ "value": "phoenix"
+ },
+ {
+ "name": "autoAssignIp",
+ "value": "false"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ],
+ "type": "mock"
+ }
+ ],
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "port": "22",
+ "protocol": "http",
+ "proxyPort": "8280"
+ }
+ ],
+ "property": [
+ {
+ "name": "payload_parameter.MB_IP",
+ "value": "octl.qmog.cisco.com"
+ },
+ {
+ "name": "payload_parameter.MB_PORT",
+ "value": "61616"
+ },
+ {
+ "name": "payload_parameter.CEP_IP",
+ "value": "octl.qmog.cisco.com"
+ },
+ {
+ "name": "payload_parameter.CEP_PORT",
+ "value": "7611"
+ },
+ {
+ "name": "payload_parameter.CEP_ADMIN_USERNAME",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.CEP_ADMIN_PASSWORD",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.CERT_TRUSTSTORE",
+ "value": "/opt/apache-stratos-cartridge-agent/security/client-truststore.jks"
+ },
+ {
+ "name": "payload_parameter.TRUSTSTORE_PASSWORD",
+ "value": "wso2carbon"
+ },
+ {
+ "name": "payload_parameter.ENABLE_DATA_PUBLISHER",
+ "value": "false"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_IP",
+ "value": "octl.qmog.cisco.com"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_PORT",
+ "value": "7611"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_SECURE_PORT",
+ "value": "7711"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_ADMIN_USERNAME",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.QTCM_DNS_SEGMENT",
+ "value": "test"
+ },
+ {
+ "name": "payload_parameter.QTCM_NETWORK_COUNT",
+ "value": "1"
+ },
+ {
+ "name": "payload_parameter.SIMPLE_PROPERTY",
+ "value": "value"
+ }
+ ],
+ "provider": "cisco",
+ "type": "c0",
+ "version": "1.0"
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested-v1.json b/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested-v1.json
deleted file mode 100644
index 6020e1e..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested-v1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "name": "G1",
- "dependencies": {
- "terminationBehaviour": "terminate-none",
- "startupOrders": [
- {
- "aliases": [
- "group.group2",
- "cartridge.c1-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c1"
- ],
- "groups": [
- {
- "name": "G2",
- "dependencies": {
- "terminationBehaviour": "terminate-dependents",
- "startupOrders": [
- {
- "aliases": [
- "group.group3",
- "cartridge.c2-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c2"
- ],
- "groups": [
- {
- "name": "G3",
- "dependencies": {
- "terminationBehaviour": "terminate-all",
- "startupOrders": []
- },
- "cartridges": [
- "c3"
- ],
- "groups": []
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested.json b/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested.json
deleted file mode 100644
index 6020e1e..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "name": "G1",
- "dependencies": {
- "terminationBehaviour": "terminate-none",
- "startupOrders": [
- {
- "aliases": [
- "group.group2",
- "cartridge.c1-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c1"
- ],
- "groups": [
- {
- "name": "G2",
- "dependencies": {
- "terminationBehaviour": "terminate-dependents",
- "startupOrders": [
- {
- "aliases": [
- "group.group3",
- "cartridge.c2-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c2"
- ],
- "groups": [
- {
- "name": "G3",
- "dependencies": {
- "terminationBehaviour": "terminate-all",
- "startupOrders": []
- },
- "cartridges": [
- "c3"
- ],
- "groups": []
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6-v1.json b/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6-v1.json
deleted file mode 100644
index c0132f0..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6-v1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "name": "G4",
- "dependencies": {
- "terminationBehaviour": "terminate-none",
- "startupOrders": [
- {
- "aliases": [
- "group.group2",
- "cartridge.c1-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c4"
- ],
- "groups": [
- {
- "name": "G5",
- "dependencies": {
- "terminationBehaviour": "terminate-dependents",
- "startupOrders": [
- {
- "aliases": [
- "group.group6",
- "cartridge.c5-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c5"
- ],
- "groups": [
- {
- "name": "G6",
- "dependencies": {
- "terminationBehaviour": "terminate-all",
- "startupOrders": []
- },
- "cartridges": [
- "c6"
- ],
- "groups": []
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6.json b/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6.json
deleted file mode 100644
index ef28723..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "name": "G4",
- "dependencies": {
- "terminationBehaviour": "terminate-none",
- "startupOrders": [
- {
- "aliases": [
- "group.group5",
- "cartridge.c4-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c4"
- ],
- "groups": [
- {
- "name": "G5",
- "dependencies": {
- "terminationBehaviour": "terminate-dependents",
- "startupOrders": [
- {
- "aliases": [
- "group.group6",
- "cartridge.c5-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c5"
- ],
- "groups": [
- {
- "name": "G6",
- "dependencies": {
- "terminationBehaviour": "terminate-all",
- "startupOrders": []
- },
- "cartridges": [
- "c6"
- ],
- "groups": []
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridges/mock/c0-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c0-v1.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c0-v1.json
deleted file mode 100755
index 6d922a9..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c0-v1.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "category": "Data",
- "description": "c0 Cartridge",
- "displayName": "c0",
- "host": "qmog.cisco.com12",
- "iaasProvider": [
- {
- "imageId": "RegionOne/16e7e35b-0c88-4605-90ce-cbef9e9d123",
- "maxInstanceLimit": "4",
- "networkInterfaces": [
- {
- "floatingNetworks": [
- {
- "name": "private",
- "networkUuid": "26b4aa2b-06bc-4e4f-a6eb-c19fbc2112121"
- }
- ],
- "name": "core1",
- "networkUuid": "5e107fbd-4820-47ad-84ea-6f1354961212"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/2cdbd576-8c9b-4c2d-8b1a-0f79dc4fb812"
- },
- {
- "name": "keyPair",
- "value": "phoenix12"
- },
- {
- "name": "autoAssignIp",
- "value": "true"
- },
- {
- "name": "securityGroups",
- "value": "default123"
- }
- ],
- "type": "mock"
- }
- ],
- "multiTenant": "false",
- "portMapping": [
- {
- "port": "22",
- "protocol": "http",
- "proxyPort": "8280"
- }
- ],
- "property": [
- {
- "name": "payload_parameter.MB_IP",
- "value": "octl.qmog.cisco.com123"
- },
- {
- "name": "payload_parameter.MB_PORT",
- "value": "61617"
- },
- {
- "name": "payload_parameter.CEP_IP",
- "value": "octl.qmog.cisco.com123"
- },
- {
- "name": "payload_parameter.CEP_PORT",
- "value": "7612"
- },
- {
- "name": "payload_parameter.CEP_ADMIN_USERNAME",
- "value": "admin"
- },
- {
- "name": "payload_parameter.CEP_ADMIN_PASSWORD",
- "value": "admin123"
- },
- {
- "name": "payload_parameter.CERT_TRUSTSTORE",
- "value": "/opt/apache-stratos-cartridge-agent/security/client-truststore.jks"
- },
- {
- "name": "payload_parameter.TRUSTSTORE_PASSWORD",
- "value": "wso2carbon"
- },
- {
- "name": "payload_parameter.ENABLE_DATA_PUBLISHER",
- "value": "false"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_IP",
- "value": "octl.qmog.cisco.com123"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_PORT",
- "value": "7612"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_SECURE_PORT",
- "value": "7712"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_ADMIN_USERNAME",
- "value": "admin"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD",
- "value": "admin123"
- },
- {
- "name": "payload_parameter.QTCM_DNS_SEGMENT",
- "value": "test123"
- },
- {
- "name": "payload_parameter.QTCM_NETWORK_COUNT",
- "value": "3"
- },
- {
- "name": "payload_parameter.SIMPLE_PROPERTY",
- "value": "value"
- }
- ],
- "provider": "apache",
- "type": "c0",
- "version": "1.0"
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridges/mock/c0.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c0.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c0.json
deleted file mode 100755
index 44066e1..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c0.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "category": "Application",
- "description": "c0 Cartridge",
- "displayName": "c0",
- "host": "qmog.cisco.com",
- "iaasProvider": [
- {
- "imageId": "RegionOne/16e7e35b-0c88-4605-90ce-cbef9e9dde0f",
- "maxInstanceLimit": "4",
- "networkInterfaces": [
- {
- "floatingNetworks": [
- {
- "name": "public",
- "networkUuid": "26b4aa2b-06bc-4e4f-a6eb-c19fbc211af6"
- }
- ],
- "name": "core",
- "networkUuid": "5e107fbd-4820-47ad-84ea-6f135496f889"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/2cdbd576-8c9b-4c2d-8b1a-0f79dc4fb809"
- },
- {
- "name": "keyPair",
- "value": "phoenix"
- },
- {
- "name": "autoAssignIp",
- "value": "false"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ],
- "type": "mock"
- }
- ],
- "multiTenant": "false",
- "portMapping": [
- {
- "port": "22",
- "protocol": "http",
- "proxyPort": "8280"
- }
- ],
- "property": [
- {
- "name": "payload_parameter.MB_IP",
- "value": "octl.qmog.cisco.com"
- },
- {
- "name": "payload_parameter.MB_PORT",
- "value": "61616"
- },
- {
- "name": "payload_parameter.CEP_IP",
- "value": "octl.qmog.cisco.com"
- },
- {
- "name": "payload_parameter.CEP_PORT",
- "value": "7611"
- },
- {
- "name": "payload_parameter.CEP_ADMIN_USERNAME",
- "value": "admin"
- },
- {
- "name": "payload_parameter.CEP_ADMIN_PASSWORD",
- "value": "admin"
- },
- {
- "name": "payload_parameter.CERT_TRUSTSTORE",
- "value": "/opt/apache-stratos-cartridge-agent/security/client-truststore.jks"
- },
- {
- "name": "payload_parameter.TRUSTSTORE_PASSWORD",
- "value": "wso2carbon"
- },
- {
- "name": "payload_parameter.ENABLE_DATA_PUBLISHER",
- "value": "false"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_IP",
- "value": "octl.qmog.cisco.com"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_PORT",
- "value": "7611"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_SECURE_PORT",
- "value": "7711"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_ADMIN_USERNAME",
- "value": "admin"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD",
- "value": "admin"
- },
- {
- "name": "payload_parameter.QTCM_DNS_SEGMENT",
- "value": "test"
- },
- {
- "name": "payload_parameter.QTCM_NETWORK_COUNT",
- "value": "1"
- },
- {
- "name": "payload_parameter.SIMPLE_PROPERTY",
- "value": "value"
- }
- ],
- "provider": "cisco",
- "type": "c0",
- "version": "1.0"
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridges/mock/c1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c1.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c1.json
deleted file mode 100755
index 145e2ce..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c1.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "type": "c1",
- "provider": "apache",
- "host": "stratos.apache.org",
- "category": "data",
- "displayName": "c1",
- "description": "c1 Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "mock",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
- "networkInterfaces": [
- {
- "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
- },
- {
- "name": "keyPair",
- "value": "vishanth-key"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridges/mock/c2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c2.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c2.json
deleted file mode 100755
index fd85892..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c2.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "type": "c2",
- "provider": "apache",
- "host": "stratos.apache.org",
- "category": "data",
- "displayName": "c2",
- "description": "c2 Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "mock",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
- "networkInterfaces": [
- {
- "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
- },
- {
- "name": "keyPair",
- "value": "vishanth-key"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridges/mock/c3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c3.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c3.json
deleted file mode 100755
index 937e8d3..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c3.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "type": "c3",
- "provider": "apache",
- "host": "stratos.apache.org",
- "category": "data",
- "displayName": "c3",
- "description": "c3 Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "mock",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
- "networkInterfaces": [
- {
- "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
- },
- {
- "name": "keyPair",
- "value": "vishanth-key"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridges/mock/c4.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c4.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c4.json
deleted file mode 100755
index ec7d8b2..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c4.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "type": "c4",
- "provider": "apache",
- "host": "stratos.apache.org",
- "category": "data",
- "displayName": "c4",
- "description": "c4 Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "mock",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
- "networkInterfaces": [
- {
- "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
- },
- {
- "name": "keyPair",
- "value": "vishanth-key"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridges/mock/c5.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c5.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c5.json
deleted file mode 100755
index 0e438fd..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c5.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "category": "Application",
- "description": "c5 Cartridge",
- "displayName": "c5",
- "host": "qmog.cisco.com",
- "iaasProvider": [
- {
- "imageId": "RegionOne/16e7e35b-0c88-4605-90ce-cbef9e9dde0f",
- "maxInstanceLimit": "4",
- "networkInterfaces": [
- {
- "floatingNetworks": [
- {
- "name": "public",
- "networkUuid": "26b4aa2b-06bc-4e4f-a6eb-c19fbc211af6"
- }
- ],
- "name": "core",
- "networkUuid": "5e107fbd-4820-47ad-84ea-6f135496f889"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/2cdbd576-8c9b-4c2d-8b1a-0f79dc4fb809"
- },
- {
- "name": "keyPair",
- "value": "phoenix"
- },
- {
- "name": "autoAssignIp",
- "value": "false"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ],
- "type": "mock"
- }
- ],
- "multiTenant": "false",
- "portMapping": [
- {
- "port": "22",
- "protocol": "http",
- "proxyPort": "8280"
- }
- ],
- "property": [
- {
- "name": "payload_parameter.MB_IP",
- "value": "octl.qmog.cisco.com"
- },
- {
- "name": "payload_parameter.MB_PORT",
- "value": "61616"
- },
- {
- "name": "payload_parameter.CEP_IP",
- "value": "octl.qmog.cisco.com"
- },
- {
- "name": "payload_parameter.CEP_PORT",
- "value": "7611"
- },
- {
- "name": "payload_parameter.CEP_ADMIN_USERNAME",
- "value": "admin"
- },
- {
- "name": "payload_parameter.CEP_ADMIN_PASSWORD",
- "value": "admin"
- },
- {
- "name": "payload_parameter.CERT_TRUSTSTORE",
- "value": "/opt/apache-stratos-cartridge-agent/security/client-truststore.jks"
- },
- {
- "name": "payload_parameter.TRUSTSTORE_PASSWORD",
- "value": "wso2carbon"
- },
- {
- "name": "payload_parameter.ENABLE_DATA_PUBLISHER",
- "value": "false"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_IP",
- "value": "octl.qmog.cisco.com"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_PORT",
- "value": "7611"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_SECURE_PORT",
- "value": "7711"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_ADMIN_USERNAME",
- "value": "admin"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD",
- "value": "admin"
- },
- {
- "name": "payload_parameter.QTCM_DNS_SEGMENT",
- "value": "test"
- },
- {
- "name": "payload_parameter.QTCM_NETWORK_COUNT",
- "value": "1"
- },
- {
- "name": "payload_parameter.SIMPLE_PROPERTY",
- "value": "value"
- }
- ],
- "provider": "cisco",
- "type": "c5",
- "version": "1.0"
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/cartridges/mock/c6.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c6.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c6.json
deleted file mode 100755
index 8f41441..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c6.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "type": "c6",
- "provider": "apache",
- "host": "stratos.apache.org",
- "category": "data",
- "displayName": "c6",
- "description": "c6 Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "mock",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
- "networkInterfaces": [
- {
- "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
- },
- {
- "name": "keyPair",
- "value": "vishanth-key"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-1-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-1-v1.json b/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-1-v1.json
deleted file mode 100644
index 2ba5eb3..0000000
--- a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-1-v1.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "id": "deployment-policy-1",
- "networkPartitions": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "partitionMax": 25
- },
- {
- "id": "partition-2",
- "partitionMax": 20
- }
- ]
- },
- {
- "id": "network-partition-2",
- "partitionAlgo": "round-robin",
- "partitions": [
- {
- "id": "network-partition-2-partition-1",
- "partitionMax": 15
- },
- {
- "id": "network-partition-2-partition-2",
- "partitionMax": 5
- }
- ]
- }
- ]
-}
-
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-1.json b/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-1.json
deleted file mode 100644
index e186690..0000000
--- a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-1.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "id": "deployment-policy-1",
- "networkPartitions": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "partitionMax": 20
- }
- ]
- },
- {
- "id": "network-partition-2",
- "partitionAlgo": "round-robin",
- "partitions": [
- {
- "id": "network-partition-2-partition-1",
- "partitionMax": 10
- },
- {
- "id": "network-partition-2-partition-2",
- "partitionMax": 9
- }
- ]
- }
- ]
-}
-
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2-v1.json b/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2-v1.json
deleted file mode 100644
index b5c305c..0000000
--- a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2-v1.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "id": "deployment-policy-2",
- "networkPartitions": [
- {
- "id": "network-partition-5",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "partitionMax": 25
- },
- {
- "id": "partition-2",
- "partitionMax": 20
- }
- ]
- },
- {
- "id": "network-partition-6",
- "partitionAlgo": "round-robin",
- "partitions": [
- {
- "id": "network-partition-6-partition-1",
- "partitionMax": 15
- },
- {
- "id": "network-partition-6-partition-2",
- "partitionMax": 5
- }
- ]
- }
- ]
-}
-
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2.json b/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2.json
deleted file mode 100644
index 5df3e24..0000000
--- a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "id": "deployment-policy-2",
- "networkPartitions": [
- {
- "id": "network-partition-5",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "partitionMax": 20
- }
- ]
- },
- {
- "id": "network-partition-6",
- "partitionAlgo": "round-robin",
- "partitions": [
- {
- "id": "network-partition-6-partition-1",
- "partitionMax": 10
- },
- {
- "id": "network-partition-6-partition-2",
- "partitionMax": 9
- }
- ]
- }
- ]
-}
-
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-3.json b/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-3.json
deleted file mode 100644
index d024922..0000000
--- a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-3.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "id": "deployment-policy-1",
- "networkPartitions": [
- {
- "id": "network-partition-3",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "partitionMax": 20
- }
- ]
- },
- {
- "id": "network-partition-4",
- "partitionAlgo": "round-robin",
- "partitions": [
- {
- "id": "network-partition-2-partition-1",
- "partitionMax": 10
- },
- {
- "id": "network-partition-2-partition-2",
- "partitionMax": 9
- }
- ]
- }
- ]
-}
-
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2-v1.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2-v1.json
new file mode 100644
index 0000000..b5c305c
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2-v1.json
@@ -0,0 +1,36 @@
+{
+ "id": "deployment-policy-2",
+ "networkPartitions": [
+ {
+ "id": "network-partition-5",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "partitionMax": 25
+ },
+ {
+ "id": "partition-2",
+ "partitionMax": 20
+ }
+ ]
+ },
+ {
+ "id": "network-partition-6",
+ "partitionAlgo": "round-robin",
+ "partitions": [
+ {
+ "id": "network-partition-6-partition-1",
+ "partitionMax": 15
+ },
+ {
+ "id": "network-partition-6-partition-2",
+ "partitionMax": 5
+ }
+ ]
+ }
+ ]
+}
+
+
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2.json
new file mode 100644
index 0000000..5df3e24
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2.json
@@ -0,0 +1,32 @@
+{
+ "id": "deployment-policy-2",
+ "networkPartitions": [
+ {
+ "id": "network-partition-5",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "partitionMax": 20
+ }
+ ]
+ },
+ {
+ "id": "network-partition-6",
+ "partitionAlgo": "round-robin",
+ "partitions": [
+ {
+ "id": "network-partition-6-partition-1",
+ "partitionMax": 10
+ },
+ {
+ "id": "network-partition-6-partition-2",
+ "partitionMax": 9
+ }
+ ]
+ }
+ ]
+}
+
+
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5-v1.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5-v1.json
new file mode 100644
index 0000000..275b536
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5-v1.json
@@ -0,0 +1,28 @@
+{
+ "id": "network-partition-5",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ },
+ {
+ "id": "partition-2",
+ "property": [
+ {
+ "name": "region",
+ "value": "default1"
+ },
+ {
+ "name": "zone",
+ "value": "z1"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5.json
new file mode 100644
index 0000000..5464aa9
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-5",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-6.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-6.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-6.json
new file mode 100644
index 0000000..d200b70
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-6.json
@@ -0,0 +1,24 @@
+{
+ "id": "network-partition-6",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "network-partition-6-partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ },
+ {
+ "id": "network-partition-6-partition-2",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3-v1.json b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3-v1.json
new file mode 100644
index 0000000..c7d4733
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3-v1.json
@@ -0,0 +1,28 @@
+{
+ "id": "network-partition-3",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ },
+ {
+ "id": "partition-2",
+ "property": [
+ {
+ "name": "region",
+ "value": "default1"
+ },
+ {
+ "name": "zone",
+ "value": "z1"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3.json b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3.json
new file mode 100644
index 0000000..1bb7f2a
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-3",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-1-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-1-v1.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-1-v1.json
deleted file mode 100644
index 054265a..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-1-v1.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "id": "network-partition-1",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- },
- {
- "id": "partition-2",
- "property": [
- {
- "name": "region",
- "value": "default1"
- },
- {
- "name": "zone",
- "value": "z1"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-1.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-1.json
deleted file mode 100644
index 466da28..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-1",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-2.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-2.json
deleted file mode 100644
index 23236e2..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-2.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "id": "network-partition-2",
- "provider": "mock",
- "partitions": [
- {
- "id": "network-partition-2-partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- },
- {
- "id": "network-partition-2-partition-2",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-3-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-3-v1.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-3-v1.json
deleted file mode 100644
index c7d4733..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-3-v1.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "id": "network-partition-3",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- },
- {
- "id": "partition-2",
- "property": [
- {
- "name": "region",
- "value": "default1"
- },
- {
- "name": "zone",
- "value": "z1"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-3.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-3.json
deleted file mode 100644
index 1bb7f2a..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-3.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-3",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5-v1.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5-v1.json
deleted file mode 100644
index 275b536..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5-v1.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "id": "network-partition-5",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- },
- {
- "id": "partition-2",
- "property": [
- {
- "name": "region",
- "value": "default1"
- },
- {
- "name": "zone",
- "value": "z1"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5.json
deleted file mode 100644
index 5464aa9..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-5",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-6.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-6.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-6.json
deleted file mode 100644
index d200b70..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-6.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "id": "network-partition-6",
- "provider": "mock",
- "partitions": [
- {
- "id": "network-partition-6-partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- },
- {
- "id": "network-partition-6-partition-2",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-7.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-7.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-7.json
deleted file mode 100644
index 6250504..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-7.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "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/ce00b955/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-8.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-8.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-8.json
deleted file mode 100644
index 354b837..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-8.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "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/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/application-policies/application-policy-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/application-policies/application-policy-1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/application-policies/application-policy-1.json
new file mode 100644
index 0000000..17858bb
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/application-policies/application-policy-1.json
@@ -0,0 +1,18 @@
+{
+ "id": "application-policy-1",
+ "algorithm": "one-after-another",
+ "networkPartitions": [
+ "network-partition-1",
+ "network-partition-2"
+ ],
+ "properties": [
+ {
+ "name": "networkPartitionGroups",
+ "value": "network-partition-1,network-partition-2"
+ },
+ {
+ "name": "key-2",
+ "value": "value-2"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v1.json
new file mode 100644
index 0000000..ff332c0
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v1.json
@@ -0,0 +1,86 @@
+{
+ "alias": "g-sc-G123-1",
+ "applicationId": "g-sc-G123-1",
+ "components": {
+ "cartridges": [],
+ "groups": [
+ {
+ "name": "G1",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group1",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c1",
+ "subscribableInfo": {
+ "alias": "c1-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G2",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group2",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 4,
+ "type": "c2",
+ "subscribableInfo": {
+ "alias": "c2-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G3",
+ "groupMaxInstances": 3,
+ "groupMinInstances": 2,
+ "deploymentPolicy": "static-1",
+ "alias": "group3",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c3",
+ "subscribableInfo": {
+ "alias": "c3-1x0",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+}
[02/50] [abbrv] stratos git commit: Changing UI to have a default
value in kubernetesPortType
Posted by la...@apache.org.
Changing UI to have a default value in kubernetesPortType
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/43d8d0ef
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/43d8d0ef
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/43d8d0ef
Branch: refs/heads/data-publisher-integration
Commit: 43d8d0efaf1924eaf5a5f4db5304bc84194488a7
Parents: 53c9fac
Author: Pubudu Gunatilaka <pu...@gmail.com>
Authored: Wed Aug 5 12:34:22 2015 +0530
Committer: Pubudu Gunatilaka <pu...@gmail.com>
Committed: Wed Aug 5 12:34:22 2015 +0530
----------------------------------------------------------------------
.../console/controllers/forms/default/configure/cartridges.json | 4 ++--
.../console/controllers/forms/schema/configure/cartridges.json | 2 +-
.../org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/43d8d0ef/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
index a9dc9c2..9bd2e6e 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
@@ -15,14 +15,14 @@
"protocol":"http",
"port":"80",
"proxyPort":"8280",
- "kubernetesPortType":"NodePort"
+ "kubernetesPortType":""
},
{
"name":"http-80",
"protocol":"https",
"port":"443",
"proxyPort":"8243",
- "kubernetesPortType":"NodePort"
+ "kubernetesPortType":""
}
],
"iaasProvider":[
http://git-wip-us.apache.org/repos/asf/stratos/blob/43d8d0ef/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
index c750620..6033c78 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
@@ -159,7 +159,7 @@
"id": "root/portMapping/0/kubernetesPortType",
"title": "Kubernetes Port Type",
"default": "NodePort",
- "enum": ["NodePort","ClusterIP"]
+ "enum": ["","NodePort","ClusterIP"]
}
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/43d8d0ef/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 0a3970c..716076d 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -151,7 +151,7 @@ public class StratosApiV41Utils {
String type = portMapping.getKubernetesPortType();
if (isKubernetesIaasProviderAvailable) {
- if (type == null) {
+ if (type == null || type.equals("")) {
portMapping.setKubernetesPortType(KubernetesConstants.NODE_PORT);
} else if (!type.equals(KubernetesConstants.NODE_PORT) && !type.equals
(KubernetesConstants.CLUSTER_IP)) {
[04/50] [abbrv] stratos git commit: add ignore file for python agent
log in live test
Posted by la...@apache.org.
add ignore file for python agent log in live test
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/67a43925
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/67a43925
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/67a43925
Branch: refs/heads/data-publisher-integration
Commit: 67a439253fd6487545ab683abf2596bb3318469c
Parents: 7f8fb76
Author: Akila Perera <ra...@gmail.com>
Authored: Wed Aug 5 12:43:14 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Wed Aug 5 12:43:14 2015 +0530
----------------------------------------------------------------------
components/org.apache.stratos.python.cartridge.agent/.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/67a43925/components/org.apache.stratos.python.cartridge.agent/.gitignore
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/.gitignore b/components/org.apache.stratos.python.cartridge.agent/.gitignore
new file mode 100644
index 0000000..4d01b31
--- /dev/null
+++ b/components/org.apache.stratos.python.cartridge.agent/.gitignore
@@ -0,0 +1 @@
+cartridge-agent.log
[49/50] [abbrv] stratos git commit: Removing unnecessary features,
artifacts and restructuring distribution artifacts
Posted by la...@apache.org.
Removing unnecessary features, artifacts and restructuring distribution artifacts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8d321a26
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8d321a26
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8d321a26
Branch: refs/heads/data-publisher-integration
Commit: 8d321a267f5f0538cef745f607612f9a61ec17db
Parents: d616372
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Aug 11 20:53:36 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Aug 11 20:53:36 2015 +0530
----------------------------------------------------------------------
.../main/resources/conf/cloud-controller.xml | 62 +-
pom.xml | 1 +
.../stratos/conf/application-authenticators.xml | 26 -
products/stratos/conf/axis2.xml | 526 ----------------
products/stratos/conf/bam.xml | 45 --
products/stratos/conf/billing-config.xml | 68 ---
products/stratos/conf/cipher-text.properties | 26 -
products/stratos/conf/cloud-services-desc.xml | 205 -------
.../conf/data-bridge/data-bridge-config.xml | 74 ---
.../conf/data-bridge/thrift-agent-config.xml | 47 --
products/stratos/conf/datasources.properties | 58 --
products/stratos/conf/email-bill-generated.xml | 39 --
.../conf/email-billing-notifications.xml | 50 --
.../conf/email-new-tenant-activation.xml | 47 --
.../conf/email-new-tenant-registration.xml | 47 --
products/stratos/conf/email-password-reset.xml | 43 --
.../conf/email-payment-received-customer.xml | 39 --
.../conf/email-payment-received-wso2.xml | 39 --
.../conf/email-registration-complete.xml | 38 --
.../conf/email-registration-moderation.xml | 47 --
...l-registration-payment-received-customer.xml | 39 --
products/stratos/conf/email-registration.xml | 46 --
products/stratos/conf/email-update.xml | 39 --
products/stratos/conf/embedded-ldap.xml | 165 -----
products/stratos/conf/event-broker.xml | 63 --
products/stratos/conf/features-dashboard.xml | 66 --
products/stratos/conf/identity.xml | 108 ----
products/stratos/conf/jaas.conf | 30 -
products/stratos/conf/jndi.properties | 22 -
.../conf/metering-config-non-manager.xml | 104 ----
products/stratos/conf/mqtttopic.properties | 21 -
products/stratos/conf/nhttp.properties | 42 --
products/stratos/conf/passthru-http.properties | 34 --
products/stratos/conf/registry.xml | 103 ----
products/stratos/conf/rule-component.conf | 22 -
products/stratos/conf/samples-desc.xml | 33 -
products/stratos/conf/sso-idp-config.xml | 39 --
products/stratos/conf/status-monitor-config.xml | 53 --
products/stratos/conf/stratos-config.xml | 30 -
products/stratos/conf/stratos-datasources.xml | 69 ---
.../conf/synapse-configs/default/registry.xml | 26 -
.../default/sequences/errorHandler.xml | 31 -
.../synapse-configs/default/sequences/fault.xml | 76 ---
.../synapse-configs/default/sequences/main.xml | 110 ----
.../conf/synapse-configs/default/synapse.xml | 25 -
products/stratos/conf/synapse.properties | 38 --
.../conf/temp-artifacts/carbon/module.xml | 69 ---
.../carbon/scripts/registry/artifacts.js | 595 -------------------
.../carbon/scripts/registry/registry-osgi.js | 466 ---------------
.../carbon/scripts/registry/registry-ws.js | 77 ---
.../carbon/scripts/registry/registry.js | 45 --
.../carbon/scripts/server/config.js | 53 --
.../carbon/scripts/server/osgi.js | 31 -
.../carbon/scripts/server/server.js | 115 ----
.../carbon/scripts/server/tenant.js | 70 ---
.../carbon/scripts/user/registry-space.js | 60 --
.../temp-artifacts/carbon/scripts/user/space.js | 31 -
.../carbon/scripts/user/user-manager.js | 179 ------
.../temp-artifacts/carbon/scripts/user/user.js | 99 ---
...ryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar | Bin 11856 -> 0 bytes
.../org.wso2.store.sso.common_1.0.0.jar | Bin 13957 -> 0 bytes
...so2.stratos.identity.saml2.sso.mgt_2.2.0.jar | Bin 12276 -> 0 bytes
.../stratos/conf/temp-artifacts/sso/module.xml | 28 -
.../temp-artifacts/sso/scripts/sso.client.js | 193 ------
products/stratos/conf/tenant-mgt.xml | 42 --
products/stratos/conf/tenant-reg-agent.xml | 25 -
products/stratos/conf/thrift-client-config.xml | 27 -
products/stratos/conf/throttling-rules.drl | 270 ---------
products/stratos/conf/user-mgt.xml | 241 --------
products/stratos/conf/zoo.cfg | 24 -
.../modules/distribution/lib/home/faq.html | 413 -------------
.../distribution/lib/home/images/bottom.gif | Bin 523 -> 0 bytes
.../distribution/lib/home/images/bullet-01.gif | Bin 159 -> 0 bytes
.../distribution/lib/home/images/content-bg.gif | Bin 233 -> 0 bytes
.../distribution/lib/home/images/favicon.ico | Bin 17542 -> 0 bytes
.../lib/home/images/feature-01-icon.gif | Bin 2825 -> 0 bytes
.../lib/home/images/feature-02-icon.gif | Bin 3361 -> 0 bytes
.../lib/home/images/feature-03-icon.gif | Bin 3285 -> 0 bytes
.../lib/home/images/feature-middle-bg.gif | Bin 1139 -> 0 bytes
.../distribution/lib/home/images/intro-bg.gif | Bin 3964 -> 0 bytes
.../distribution/lib/home/images/intro-text.gif | Bin 4082 -> 0 bytes
.../distribution/lib/home/images/left-bg.gif | Bin 1135 -> 0 bytes
.../distribution/lib/home/images/logo.gif | Bin 11127 -> 0 bytes
.../lib/home/images/powered-logo.gif | Bin 1280 -> 0 bytes
.../distribution/lib/home/images/register.gif | Bin 6946 -> 0 bytes
.../distribution/lib/home/images/sign-in.gif | Bin 3150 -> 0 bytes
.../lib/home/images/stratos-products-new.jpg | Bin 25720 -> 0 bytes
.../distribution/lib/home/images/title-bg.gif | Bin 1182 -> 0 bytes
.../distribution/lib/home/images/top.gif | Bin 16149 -> 0 bytes
.../distribution/lib/home/images/webinar.png | Bin 12318 -> 0 bytes
.../lib/home/images/white-paper.png | Bin 15148 -> 0 bytes
.../modules/distribution/lib/home/index.html | 140 -----
.../lib/home/js/jquery-1.5.1.min.js | 16 -
.../lib/home/js/jquery.orbit-1.2.3.min.js | 17 -
.../distribution/lib/home/js/orbit-1.2.3.css | 223 -------
.../lib/home/js/orbit/left-arrow.png | Bin 860 -> 0 bytes
.../distribution/lib/home/js/orbit/loading.gif | Bin 2608 -> 0 bytes
.../lib/home/js/orbit/mask-black.png | Bin 705 -> 0 bytes
.../lib/home/js/orbit/right-arrow.png | Bin 825 -> 0 bytes
.../lib/home/js/orbit/rotator-black.png | Bin 733 -> 0 bytes
.../lib/home/js/orbit/timer-black.png | Bin 705 -> 0 bytes
.../modules/distribution/lib/home/style.css | 181 ------
.../distribution/qpid-resources/etc/config.xml | 101 ----
.../qpid-resources/etc/jmxremote.access | 23 -
.../qpid-resources/etc/virtualhosts.xml | 62 --
.../distribution/qpid-resources/qpid.xml | 25 -
.../modules/distribution/src/assembly/bin.xml | 453 +++++---------
.../distribution/src/assembly/filter.properties | 4 +-
.../main/conf/application-authenticators.xml | 26 +
.../conf/data-bridge/data-bridge-config.xml | 74 +++
.../conf/data-bridge/thrift-agent-config.xml | 47 ++
.../distribution/src/main/conf/etc/launch.ini | 269 +++++++++
.../distribution/src/main/conf/event-broker.xml | 63 ++
.../distribution/src/main/conf/jndi.properties | 6 +-
.../src/main/conf/mqtttopic.properties | 21 +
.../distribution/src/main/conf/registry.xml | 103 ++++
.../src/main/conf/sso-idp-config.xml | 39 ++
.../distribution/src/main/conf/tenant-mgt.xml | 42 ++
.../src/main/conf/thrift-client-config.xml | 27 +
.../distribution/src/main/conf/user-mgt.xml | 343 +++++++++++
.../resources/allthemes/Dark/admin/logo.gif | Bin 0 -> 3476 bytes
.../resources/allthemes/Dark/admin/main.css | 253 ++++++++
.../allthemes/Dark/admin/powered-stratos.gif | Bin 0 -> 1515 bytes
.../allthemes/Dark/admin/right-logo.gif | Bin 0 -> 2325 bytes
.../allthemes/Dark/admin/theme-header-bg.gif | Bin 0 -> 4245 bytes
.../Dark/admin/theme-header-region-bg.gif | Bin 0 -> 793 bytes
.../allthemes/Dark/admin/theme-menu-header.gif | Bin 0 -> 261 bytes
.../Dark/admin/theme-menu-panel-l-bg.gif | Bin 0 -> 312 bytes
.../Dark/admin/theme-menu-table-bg.gif | Bin 0 -> 5671 bytes
.../Dark/admin/theme-right-links-bg.gif | Bin 0 -> 1005 bytes
.../src/main/resources/allthemes/Dark/thumb.png | Bin 0 -> 19546 bytes
.../allthemes/Default/admin/def-body-bg.gif | Bin 0 -> 419 bytes
.../allthemes/Default/admin/def-header-bg.gif | Bin 0 -> 17875 bytes
.../Default/admin/def-header-region-bg.gif | Bin 0 -> 22784 bytes
.../resources/allthemes/Default/admin/logo.gif | Bin 0 -> 3476 bytes
.../resources/allthemes/Default/admin/main.css | 250 ++++++++
.../allthemes/Default/admin/powered-stratos.gif | Bin 0 -> 1515 bytes
.../allthemes/Default/admin/right-logo.gif | Bin 0 -> 3629 bytes
.../main/resources/allthemes/Default/thumb.png | Bin 0 -> 24432 bytes
.../resources/allthemes/Light/admin/logo.gif | Bin 0 -> 3476 bytes
.../resources/allthemes/Light/admin/main.css | 250 ++++++++
.../allthemes/Light/admin/menu_header.gif | Bin 0 -> 243 bytes
.../allthemes/Light/admin/powered-stratos.gif | Bin 0 -> 1515 bytes
.../allthemes/Light/admin/right-links-bg.gif | Bin 0 -> 1191 bytes
.../allthemes/Light/admin/right-logo.gif | Bin 0 -> 2325 bytes
.../allthemes/Light/admin/theme-header-bg.gif | Bin 0 -> 3792 bytes
.../Light/admin/theme-header-region-b-bg.gif | Bin 0 -> 121 bytes
.../Light/admin/theme-header-region-bg.gif | Bin 0 -> 534 bytes
.../Light/admin/theme-menu-panel-l-bg.gif | Bin 0 -> 772 bytes
.../Light/admin/theme-menu-table-bg.gif | Bin 0 -> 5991 bytes
.../main/resources/allthemes/Light/thumb.png | Bin 0 -> 18102 bytes
.../distribution/src/main/resources/launch.ini | 269 ---------
.../powerded-by-logos/appserver-logo.gif | Bin 0 -> 1473 bytes
.../resources/powerded-by-logos/bam-logo.gif | Bin 0 -> 1690 bytes
.../resources/powerded-by-logos/bps-logo.gif | Bin 0 -> 1606 bytes
.../resources/powerded-by-logos/brs-logo.gif | Bin 0 -> 1596 bytes
.../resources/powerded-by-logos/csg-logo.gif | Bin 0 -> 2030 bytes
.../resources/powerded-by-logos/ds-logo.gif | Bin 0 -> 1528 bytes
.../resources/powerded-by-logos/esb-logo.gif | Bin 0 -> 1598 bytes
.../resources/powerded-by-logos/gadget-logo.gif | Bin 0 -> 1368 bytes
.../powerded-by-logos/governance-logo.gif | Bin 0 -> 1525 bytes
.../powerded-by-logos/identity-logo.gif | Bin 0 -> 1398 bytes
.../resources/powerded-by-logos/mashup-logo.gif | Bin 0 -> 1440 bytes
.../src/main/temp-artifacts/carbon/module.xml | 69 +++
.../carbon/scripts/registry/artifacts.js | 595 +++++++++++++++++++
.../carbon/scripts/registry/registry-osgi.js | 466 +++++++++++++++
.../carbon/scripts/registry/registry-ws.js | 77 +++
.../carbon/scripts/registry/registry.js | 45 ++
.../carbon/scripts/server/config.js | 53 ++
.../carbon/scripts/server/osgi.js | 31 +
.../carbon/scripts/server/server.js | 115 ++++
.../carbon/scripts/server/tenant.js | 70 +++
.../carbon/scripts/user/registry-space.js | 60 ++
.../temp-artifacts/carbon/scripts/user/space.js | 31 +
.../carbon/scripts/user/user-manager.js | 179 ++++++
.../temp-artifacts/carbon/scripts/user/user.js | 99 +++
...ryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar | Bin 0 -> 11856 bytes
.../org.wso2.store.sso.common_1.0.0.jar | Bin 0 -> 13957 bytes
...so2.stratos.identity.saml2.sso.mgt_2.2.0.jar | Bin 0 -> 12276 bytes
.../src/main/temp-artifacts/sso/module.xml | 28 +
.../temp-artifacts/sso/scripts/sso.client.js | 193 ++++++
products/stratos/modules/p2-profile-gen/pom.xml | 59 +-
.../payload/user-data/ssl-cert-snakeoil.key | 16 -
.../payload/user-data/ssl-cert-snakeoil.pem | 14 -
.../resources/allthemes/Dark/admin/logo.gif | Bin 3476 -> 0 bytes
.../resources/allthemes/Dark/admin/main.css | 253 --------
.../allthemes/Dark/admin/powered-stratos.gif | Bin 1515 -> 0 bytes
.../allthemes/Dark/admin/right-logo.gif | Bin 2325 -> 0 bytes
.../allthemes/Dark/admin/theme-header-bg.gif | Bin 4245 -> 0 bytes
.../Dark/admin/theme-header-region-bg.gif | Bin 793 -> 0 bytes
.../allthemes/Dark/admin/theme-menu-header.gif | Bin 261 -> 0 bytes
.../Dark/admin/theme-menu-panel-l-bg.gif | Bin 312 -> 0 bytes
.../Dark/admin/theme-menu-table-bg.gif | Bin 5671 -> 0 bytes
.../Dark/admin/theme-right-links-bg.gif | Bin 1005 -> 0 bytes
.../stratos/resources/allthemes/Dark/thumb.png | Bin 19546 -> 0 bytes
.../allthemes/Default/admin/def-body-bg.gif | Bin 419 -> 0 bytes
.../allthemes/Default/admin/def-header-bg.gif | Bin 17875 -> 0 bytes
.../Default/admin/def-header-region-bg.gif | Bin 22784 -> 0 bytes
.../resources/allthemes/Default/admin/logo.gif | Bin 3476 -> 0 bytes
.../resources/allthemes/Default/admin/main.css | 250 --------
.../allthemes/Default/admin/powered-stratos.gif | Bin 1515 -> 0 bytes
.../allthemes/Default/admin/right-logo.gif | Bin 3629 -> 0 bytes
.../resources/allthemes/Default/thumb.png | Bin 24432 -> 0 bytes
.../resources/allthemes/Light/admin/logo.gif | Bin 3476 -> 0 bytes
.../resources/allthemes/Light/admin/main.css | 250 --------
.../allthemes/Light/admin/menu_header.gif | Bin 243 -> 0 bytes
.../allthemes/Light/admin/powered-stratos.gif | Bin 1515 -> 0 bytes
.../allthemes/Light/admin/right-links-bg.gif | Bin 1191 -> 0 bytes
.../allthemes/Light/admin/right-logo.gif | Bin 2325 -> 0 bytes
.../allthemes/Light/admin/theme-header-bg.gif | Bin 3792 -> 0 bytes
.../Light/admin/theme-header-region-b-bg.gif | Bin 121 -> 0 bytes
.../Light/admin/theme-header-region-bg.gif | Bin 534 -> 0 bytes
.../Light/admin/theme-menu-panel-l-bg.gif | Bin 772 -> 0 bytes
.../Light/admin/theme-menu-table-bg.gif | Bin 5991 -> 0 bytes
.../stratos/resources/allthemes/Light/thumb.png | Bin 18102 -> 0 bytes
.../cloud-services-icons/appserver.gif | Bin 2086 -> 0 bytes
.../resources/cloud-services-icons/bam.gif | Bin 1773 -> 0 bytes
.../resources/cloud-services-icons/bps.gif | Bin 1531 -> 0 bytes
.../resources/cloud-services-icons/brs-old.gif | Bin 1772 -> 0 bytes
.../resources/cloud-services-icons/brs.gif | Bin 2170 -> 0 bytes
.../resources/cloud-services-icons/cep.png | Bin 3218 -> 0 bytes
.../resources/cloud-services-icons/cg.gif | Bin 2385 -> 0 bytes
.../cloud-services-icons/csg-inactive.gif | Bin 3188 -> 0 bytes
.../resources/cloud-services-icons/csg.gif | Bin 3176 -> 0 bytes
.../resources/cloud-services-icons/ds.gif | Bin 2012 -> 0 bytes
.../resources/cloud-services-icons/esb.gif | Bin 1787 -> 0 bytes
.../resources/cloud-services-icons/gadget.gif | Bin 2242 -> 0 bytes
.../cloud-services-icons/governance.gif | Bin 1977 -> 0 bytes
.../resources/cloud-services-icons/identity.gif | Bin 1936 -> 0 bytes
.../cloud-services-icons/inactive-appserver.gif | Bin 1957 -> 0 bytes
.../cloud-services-icons/inactive-bam.gif | Bin 1647 -> 0 bytes
.../cloud-services-icons/inactive-brs.gif | Bin 1874 -> 0 bytes
.../cloud-services-icons/inactive-cep.png | Bin 2959 -> 0 bytes
.../cloud-services-icons/inactive-esb.gif | Bin 1656 -> 0 bytes
.../cloud-services-icons/inactive-gadget.gif | Bin 2087 -> 0 bytes
.../inactive-governance.gif | Bin 1850 -> 0 bytes
.../cloud-services-icons/inactive-identity.gif | Bin 1794 -> 0 bytes
.../cloud-services-icons/inactive-mashup.gif | Bin 1772 -> 0 bytes
.../cloud-services-icons/inactive-mb.png | Bin 2746 -> 0 bytes
.../resources/cloud-services-icons/mashup.gif | Bin 1850 -> 0 bytes
.../resources/cloud-services-icons/mb.png | Bin 3139 -> 0 bytes
.../resources/cloud-services-icons/pom.xml | 58 --
.../resources/cloud-services-icons/ss.gif | Bin 2432 -> 0 bytes
.../resources/cloud-services-icons/ts.gif | Bin 2475 -> 0 bytes
.../powerded-by-logos/appserver-logo.gif | Bin 1473 -> 0 bytes
.../resources/powerded-by-logos/bam-logo.gif | Bin 1690 -> 0 bytes
.../resources/powerded-by-logos/bps-logo.gif | Bin 1606 -> 0 bytes
.../resources/powerded-by-logos/brs-logo.gif | Bin 1596 -> 0 bytes
.../resources/powerded-by-logos/csg-logo.gif | Bin 2030 -> 0 bytes
.../resources/powerded-by-logos/ds-logo.gif | Bin 1528 -> 0 bytes
.../resources/powerded-by-logos/esb-logo.gif | Bin 1598 -> 0 bytes
.../resources/powerded-by-logos/gadget-logo.gif | Bin 1368 -> 0 bytes
.../powerded-by-logos/governance-logo.gif | Bin 1525 -> 0 bytes
.../powerded-by-logos/identity-logo.gif | Bin 1398 -> 0 bytes
.../resources/powerded-by-logos/mashup-logo.gif | Bin 1440 -> 0 bytes
255 files changed, 4120 insertions(+), 8332 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
index dc0ea72..78f7f6a 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
@@ -16,43 +16,43 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
- -->
+ -->
<cloudController xmlns:svns="http://org.wso2.securevault/configuration">
- <svns:secureVault provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler" />
+ <svns:secureVault provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler"/>
<!-- BAM data publisher configuration -->
<dataPublisher enable="false">
- <bamServer>
+ <bamServer>
<!-- BAM server URL should be specified in carbon.xml -->
- <adminUserName>admin</adminUserName>
- <adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">admin</adminPassword>
- </bamServer>
- <!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'.
- Optional element. -->
- <cron>1 * * * * ? *</cron>
- </dataPublisher>
+ <adminUserName>admin</adminUserName>
+ <adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">admin</adminPassword>
+ </bamServer>
+ <!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'.
+ Optional element. -->
+ <cron>1 * * * * ? *</cron>
+ </dataPublisher>
<!-- Complete topology event publisher cron configuration -->
<topologySync enable="true">
- <property name="cron" value="1 * * * * ? *" />
- </topologySync>
+ <property name="cron" value="1 * * * * ? *"/>
+ </topologySync>
- <!-- Specify the properties that are common to an IaaS here. This element
- is not necessary [0..1]. But you can use this section to avoid specifying
- same property over and over again. -->
- <iaasProviders>
- <!-- iaasProvider type="openstack" name="Openstack">
+ <!-- Specify the properties that are common to an IaaS here. This element
+ is not necessary [0..1]. But you can use this section to avoid specifying
+ same property over and over again. -->
+ <iaasProviders>
+ <!-- iaasProvider type="openstack" name="Openstack">
<className>org.apache.stratos.cloud.controller.iaases.openstack.OpenstackIaas</className>
- <provider>openstack-nova</provider>
- <identity svns:secretAlias="cloud.controller.openstack.identity">demo:demo</identity>
- <credential svns:secretAlias="cloud.controller.openstack.credential">openstack</credential>
- <property name="jclouds.endpoint" value="http://192.168.16.20:5000/" />
- <property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/>
- <property name="jclouds.api-version" value="2.0/" />
- <property name="openstack.networking.provider" value="nova" />
- <property name="X" value="x" />
- <property name="Y" value="y" />
- </iaasProvider -->
+ <provider>openstack-nova</provider>
+ <identity svns:secretAlias="cloud.controller.openstack.identity">project:username</identity>
+ <credential svns:secretAlias="cloud.controller.openstack.credential">credential</credential>
+ <property name="jclouds.endpoint" value="http://192.168.16.99:5000/v2.0" />
+ <property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/>
+ <property name="jclouds.api-version" value="2.0/" />
+ <property name="openstack.networking.provider" value="nova" />
+ <property name="keyPair" value="keypair-name" />
+ <property name="securityGroups" value="default" />
+ </iaasProvider -->
<!-- iaasProvider type="ec2" name="Amazon EC2">
<className>org.apache.stratos.cloud.controller.iaases.ec2.EC2Iaas</className>
<provider>aws-ec2</provider>
@@ -60,7 +60,7 @@
<credential svns:secretAlias="cloud.controller.ec2.credential">credential</credential>
<property name="jclouds.ec2.ami-query" value="owner-id=owner-id;state=available;image-type=machine"/>
<property name="availabilityZone" value="ap-southeast-1b"/>
- <property name="securityGroups" value="security-group"/>
+ <property name="securityGroups" value="default"/>
<property name="autoAssignIp" value="true" />
<property name="keyPair" value="keypair-name"/>
</iaasProvider -->
@@ -75,7 +75,7 @@
<provider>mock</provider>
<identity svns:secretAlias="cloud.controller.mock.identity">identity</identity>
<credential svns:secretAlias="cloud.controller.mock.credential">credential</credential>
- <property name="api.endpoint" value="https://localhost:9443/mock-iaas/api" />
+ <property name="api.endpoint" value="https://localhost:9443/mock-iaas/api"/>
</iaasProvider>
- </iaasProviders>
-</cloudController>
+ </iaasProviders>
+</cloudController>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 993194a..1b46728 100644
--- a/pom.xml
+++ b/pom.xml
@@ -555,5 +555,6 @@
<jclouds.version>1.8.1</jclouds.version>
<project.jclouds.stratos.version>1.8.1-stratosv1</project.jclouds.stratos.version>
<kubernetes.api.version>2.2.16</kubernetes.api.version>
+ <store.version>1.0.1</store.version>
</properties>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/application-authenticators.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/application-authenticators.xml b/products/stratos/conf/application-authenticators.xml
deleted file mode 100644
index 5a12e34..0000000
--- a/products/stratos/conf/application-authenticators.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
- -->
-
-<Authenticators>
- <Authenticator name="BasicAuthenticator" disabled="false" factor="1">
- <Status value="10" loginPage="/sso/login" />
- </Authenticator>
-</Authenticators>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/axis2.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/axis2.xml b/products/stratos/conf/axis2.xml
deleted file mode 100755
index 01075e5..0000000
--- a/products/stratos/conf/axis2.xml
+++ /dev/null
@@ -1,526 +0,0 @@
-<?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.
- -->
-
-<axisconfig name="AxisJava2.0">
-
- <!-- ================================================= -->
- <!-- Parameters -->
- <!-- ================================================= -->
-
- <!-- This will give out the timout of the configuration contexts, in milliseconds -->
- <parameter name="ConfigContextTimeoutInterval" locked="false">30000</parameter>
-
- <!-- Synapse Configuration file location relative to CARBON_HOME -->
- <parameter name="SynapseConfig.ConfigurationFile" locked="false">repository/deployment/server/synapse-configs</parameter>
- <!-- Synapse Home parameter -->
- <parameter name="SynapseConfig.HomeDirectory" locked="false">.</parameter>
- <!-- Resolve root used to resolve synapse references like schemas inside a WSDL -->
- <parameter name="SynapseConfig.ResolveRoot" locked="false">.</parameter>
- <!-- Synapse Server name parameter -->
- <parameter name="SynapseConfig.ServerName" locked="false">localhost</parameter>
-
-
- <!-- ================================================= -->
- <!-- Message Formatters -->
- <!-- ================================================= -->
-
- <!-- Following content type to message formatter mapping can be used to implement support -->
- <!-- for different message format serializations in Axis2. These message formats are -->
- <!-- expected to be resolved based on the content type. -->
- <messageFormatters>
- <!--messageFormatter contentType="application/xml"
- class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>-->
- <!--messageFormatter contentType="text/xml"
- class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>-->
- <!--messageFormatter contentType="application/soap+xml"
- class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>-->
- <!--messageFormatter contentType="application/x-www-form-urlencoded"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
- <messageFormatter contentType="multipart/related"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/xml"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/txt"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="text/html"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/soap+xml"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="text/xml"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <!--messageFormatter contentType="x-application/hessian"
- class="org.apache.synapse.format.hessian.HessianMessageFormatter"/-->
- <!--messageFormatter contentType=""
- class="org.apache.synapse.format.hessian.HessianMessageFormatter"/-->
-
- <messageFormatter contentType="text/css"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="text/javascript"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
- <messageFormatter contentType="image/gif"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="img/gif"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="image/jpeg"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="image/png"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="image/ico"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="image/x-icon"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
- <messageFormatter contentType="application/x-javascript"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/x-shockwave-flash"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/atom+xml"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/x-www-form-urlencoded"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/xhtml+xml"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/octet-stream"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/javascript"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
- <messageFormatter contentType="multipart/form-data"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/soap+xml"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
- <!--JSON Message Formatters-->
- <messageFormatter contentType="application/json"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/json/badgerfish"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="text/javascript"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
-
- <messageFormatter contentType=".*"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
- </messageFormatters>
-
- <!-- ================================================= -->
- <!-- Message Builders -->
- <!-- ================================================= -->
-
- <!-- Following content type to builder mapping can be used to implement support for -->
- <!-- different message formats in Axis2. These message formats are expected to be -->
- <!-- resolved based on the content type. -->
- <messageBuilders>
- <messageBuilder contentType="application/xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/txt"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <!--messageBuilder contentType="application/xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
- <!--messageBuilder contentType="application/x-www-form-urlencoded"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
- <!--messageBuilder contentType="multipart/form-data"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
- <messageBuilder contentType="multipart/related"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/soap+xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="text/plain"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="text/xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <!--messageBuilder contentType="x-application/hessian"
- class="org.apache.synapse.format.hessian.HessianMessageBuilder"/-->
- <!--messageBuilder contentType=""
- class="org.apache.synapse.format.hessian.HessianMessageBuilder"/-->
-
- <!--JSON Message Builders-->
- <messageBuilder contentType="application/json"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/json/badgerfish"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="text/javascript"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
-
- <messageBuilder contentType="text/html"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="text/css"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="text/javascript"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
- <messageBuilder contentType="image/gif"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="img/gif"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="image/jpeg"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="image/png"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="image/ico"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="image/x-icon"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
-
- <messageBuilder contentType="application/x-javascript"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/x-shockwave-flash"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/atom+xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/x-www-form-urlencoded"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/xhtml+xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/octet-stream"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/javascript"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
- <messageBuilder contentType="multipart/form-data"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/soap+xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
-
- <messageBuilder contentType=".*"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
- </messageBuilders>
-
- <!-- ================================================= -->
- <!-- Transport Ins (Listeners) -->
- <!-- ================================================= -->
- <!--Default trasnport will be passthrough if you need to change please add it here -->
- <transportReceiver name="http" class="org.apache.synapse.transport.passthru.PassThroughHttpListener">
- <parameter name="port">8280</parameter>
- <parameter name="non-blocking"> true</parameter>
- <parameter name="httpGetProcessor" locked="false">org.wso2.carbon.transport.nhttp.api.PassThroughNHttpGetProcessor</parameter>
- </transportReceiver>
- <transportReceiver name="https" class="org.apache.synapse.transport.passthru.PassThroughHttpSSLListener">
- <parameter name="port" locked="false">8243</parameter>
- <parameter name="non-blocking" locked="false">true</parameter>
- <parameter name="httpGetProcessor" locked="false">org.wso2.carbon.transport.nhttp.api.PassThroughNHttpGetProcessor</parameter>
- <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
- <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
- <parameter name="keystore" locked="false">
- <KeyStore>
- <Location>repository/resources/security/wso2carbon.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- <KeyPassword>wso2carbon</KeyPassword>
- </KeyStore>
- </parameter>
- <parameter name="truststore" locked="false">
- <TrustStore>
- <Location>repository/resources/security/client-truststore.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- </TrustStore>
- </parameter>
- <!--<parameter name="SSLVerifyClient">require</parameter>
- supports optional|require or defaults to none -->
- </transportReceiver>
-
- <!-- uncomment for non blocking http transport based on HttpCore + NIO extensions -->
- <!--transportReceiver name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOListener">
- <parameter name="port" locked="false">8280</parameter>
- <parameter name="non-blocking" locked="false">true</parameter-->
- <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
- <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
- <!--parameter name="httpGetProcessor" locked="false">org.wso2.carbon.transport.nhttp.api.NHttpGetProcessor</parameter-->
- <!--/transportReceiver-->
-
- <!-- the non blocking https transport based on HttpCore + SSL-NIO extensions -->
- <!--transportReceiver name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLListener">
- <parameter name="port" locked="false">8243</parameter>
- <parameter name="non-blocking" locked="false">true</parameter-->
- <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
- <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
- <!--parameter name="httpGetProcessor" locked="false">org.wso2.carbon.transport.nhttp.api.NHttpGetProcessor</parameter-->
- <!--parameter name="keystore" locked="false">
- <KeyStore>
- <Location>repository/resources/security/wso2carbon.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- <KeyPassword>wso2carbon</KeyPassword>
- </KeyStore>
- </parameter>
- <parameter name="truststore" locked="false">
- <TrustStore>
- <Location>repository/resources/security/client-truststore.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- </TrustStore>
- </parameter-->
- <!--<parameter name="SSLVerifyClient">require</parameter>
- supports optional|require or defaults to none -->
- <!--/transportReceiver-->
-
- <!-- ================================================= -->
- <!-- Transport Outs (Senders) -->
- <!-- ================================================= -->
- <!--Default trasnport will be passthrough if you need to change please add it here -->
- <transportSender name="http" class="org.apache.synapse.transport.passthru.PassThroughHttpSender">
- <parameter name="non-blocking" locked="false">true</parameter>
- <parameter name="warnOnHTTP500" locked="false">*</parameter>
- <!--parameter name="http.proxyHost" locked="false">localhost</parameter>
- <parameter name="http.proxyPort" locked="false">3128</parameter>
- <parameter name="http.nonProxyHosts" locked="false">localhost|moon|sun</parameter-->
- </transportSender>
- <transportSender name="https" class="org.apache.synapse.transport.passthru.PassThroughHttpSSLSender">
- <parameter name="non-blocking" locked="false">true</parameter>
- <parameter name="keystore" locked="false">
- <KeyStore>
- <Location>repository/resources/security/wso2carbon.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- <KeyPassword>wso2carbon</KeyPassword>
- </KeyStore>
- </parameter>
- <parameter name="truststore" locked="false">
- <TrustStore>
- <Location>repository/resources/security/client-truststore.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- </TrustStore>
- </parameter>
- <parameter name="HostnameVerifier">AllowAll</parameter>
- <!--supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified -->
- </transportSender>
- <!-- Uncomment for non-blocking http transport based on HttpCore + NIO extensions -->
- <!--transportSender name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSender">
- <parameter name="non-blocking" locked="false">true</parameter>
- </transportSender>
- <transportSender name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLSender">
- <parameter name="non-blocking" locked="false">true</parameter>
- <parameter name="keystore" locked="false">
- <KeyStore>
- <Location>repository/resources/security/wso2carbon.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- <KeyPassword>wso2carbon</KeyPassword>
- </KeyStore>
- </parameter>
- <parameter name="truststore" locked="false">
- <TrustStore>
- <Location>repository/resources/security/client-truststore.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- </TrustStore>
- </parameter>
- <parameter name="HostnameVerifier">AllowAll</parameter-->
- <!--supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified -->
- <!--/transportSender-->
-
- <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
-
- <!-- ================================================= -->
- <!-- Clustering -->
- <!-- ================================================= -->
- <!--
- To enable clustering for this node, set the value of "enable" attribute of the "clustering"
- element to "true". The initialization of a node in the cluster is handled by the class
- corresponding to the "class" attribute of the "clustering" element. It is also responsible for
- getting this node to join the cluster.
- -->
- <clustering class="org.apache.axis2.clustering.tribes.TribesClusteringAgent" enable="true">
-
- <!--
- This parameter indicates whether the cluster has to be automatically initalized
- when the AxisConfiguration is built. If set to "true" the initialization will not be
- done at that stage, and some other party will have to explictly initialize the cluster.
- -->
- <parameter name="AvoidInitiation">true</parameter>
-
- <!--
- The membership scheme used in this setup. The only values supported at the moment are
- "multicast" and "wka"
-
- 1. multicast - membership is automatically discovered using multicasting
- 2. wka - Well-Known Address based multicasting. Membership is discovered with the help
- of one or more nodes running at a Well-Known Address. New members joining a
- cluster will first connect to a well-known node, register with the well-known node
- and get the membership list from it. When new members join, one of the well-known
- nodes will notify the others in the group. When a member leaves the cluster or
- is deemed to have left the cluster, it will be detected by the Group Membership
- Service (GMS) using a TCP ping mechanism.
- -->
- <parameter name="membershipScheme">wka</parameter>
-
- <!--
- The clustering domain/group. Nodes in the same group will belong to the same multicast
- domain. There will not be interference between nodes in different groups.
- -->
- <parameter name="domain">wso2.adc.domain</parameter>
-
- <!--
- When a Web service request is received, and processed, before the response is sent to the
- client, should we update the states of all members in the cluster? If the value of
- this parameter is set to "true", the response to the client will be sent only after
- all the members have been updated. Obviously, this can be time consuming. In some cases,
- such this overhead may not be acceptable, in which case the value of this parameter
- should be set to "false"
- -->
- <parameter name="synchronizeAll">false</parameter>
-
- <!--
- The maximum number of times we need to retry to send a message to a particular node
- before giving up and considering that node to be faulty
- -->
- <parameter name="maxRetries">10</parameter>
-
- <!-- The multicast address to be used -->
- <parameter name="mcastAddress">228.0.0.4</parameter>
-
- <!-- The multicast port to be used -->
- <parameter name="mcastPort">45564</parameter>
-
- <!-- The frequency of sending membership multicast messages (in ms) -->
- <parameter name="mcastFrequency">500</parameter>
-
- <!-- The time interval within which if a member does not respond, the member will be
- deemed to have left the group (in ms)
- -->
- <parameter name="memberDropTime">3000</parameter>
-
- <!--
- The IP address of the network interface to which the multicasting has to be bound to.
- Multicasting would be done using this interface.
- -->
- <parameter name="mcastBindAddress">127.0.0.1</parameter>
-
- <!-- The host name or IP address of this member -->
-
- <!--parameter name="localMemberHost">127.0.0.1</parameter-->
-
-
- <!--
- The TCP port used by this member. This is the port through which other nodes will
- contact this member
- -->
- <parameter name="localMemberPort">4000</parameter>
-
- <!--
- Preserve message ordering. This will be done according to sender order.
- -->
- <parameter name="preserveMessageOrder">false</parameter>
-
- <!--
- Maintain atmost-once message processing semantics
- -->
- <parameter name="atmostOnceMessageSemantics">false</parameter>
-
- <!--
- This interface is responsible for handling state replication. The property changes in
- the Axis2 context hierarchy in this node, are propagated to all other nodes in the cluster.
-
- The "excludes" patterns can be used to specify the prefixes (e.g. local_*) or
- suffixes (e.g. *_local) of the properties to be excluded from replication. The pattern
- "*" indicates that all properties in a particular context should not be replicated.
-
- The "enable" attribute indicates whether context replication has been enabled
- -->
- <stateManager class="org.apache.axis2.clustering.state.DefaultStateManager"
- enable="false">
- <replication>
- <defaults>
- <exclude name="local_*"/>
- <exclude name="LOCAL_*"/>
- </defaults>
- <context class="org.apache.axis2.context.ConfigurationContext">
- <exclude name="local_*"/>
- <exclude name="UseAsyncOperations"/>
- <exclude name="SequencePropertyBeanMap"/>
- </context>
- <context class="org.apache.axis2.context.ServiceGroupContext">
- <exclude name="local_*"/>
- <exclude name="my.sandesha.*"/>
- </context>
- <context class="org.apache.axis2.context.ServiceContext">
- <exclude name="local_*"/>
- <exclude name="my.sandesha.*"/>
- </context>
- </replication>
- </stateManager>
- </clustering>
-
- <!-- ================================================= -->
- <!-- Phases -->
- <!-- ================================================= -->
-
- <phaseOrder type="InFlow">
- <!-- System pre defined phases -->
- <phase name="Transport"/>
- <phase name="Addressing"/>
- <phase name="Security"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"/>
- <!-- System pre defined phases -->
- <phase name="RMPhase"/>
- <phase name="OpPhase"/>
- </phaseOrder>
-
- <phaseOrder type="OutFlow">
- <!-- Handlers related to unified-endpoint component are added to the UEPPhase -->
- <phase name="UEPPhase" />
- <!-- user can add his own phases to this area -->
- <phase name="RMPhase"/>
- <phase name="MUPhase"/>
- <phase name="OpPhase"/>
- <phase name="OperationOutPhase"/>
- <!--system predefined phase-->
- <!--these phase will run irrespective of the service-->
- <phase name="PolicyDetermination"/>
- <phase name="MessageOut"/>
- <phase name="Security"/>
- </phaseOrder>
-
- <phaseOrder type="InFaultFlow">
- <phase name="Transport"/>
- <phase name="Addressing"/>
- <phase name="Security"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"/>
- <!-- user can add his own phases to this area -->
- <phase name="RMPhase"/>
- <phase name="OpPhase"/>
- <phase name="MUPhase"/>
- <phase name="OperationInFaultPhase"/>
- </phaseOrder>
-
- <phaseOrder type="OutFaultFlow">
- <!-- Handlers related to unified-endpoint component are added to the UEPPhase -->
- <phase name="UEPPhase" />
- <!-- user can add his own phases to this area -->
- <phase name="RMPhase"/>
- <!-- Must Understand Header processing phase -->
- <phase name="MUPhase"/>
- <phase name="OperationOutFaultPhase"/>
- <phase name="PolicyDetermination"/>
- <phase name="MessageOut"/>
- <phase name="Security"/>
- </phaseOrder>
-
-</axisconfig>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/bam.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/bam.xml b/products/stratos/conf/bam.xml
deleted file mode 100755
index 8e8822b..0000000
--- a/products/stratos/conf/bam.xml
+++ /dev/null
@@ -1,45 +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.
- -->
-
-<bamServer>
-
- <!--
- Configuration for Billing and Metering.
- -->
-
- <!--Configuration for summary generation task.
- 1. initial-delay = Time for first summary generation after the server start. (in seconds)
- 2. interval = Periodic interval to run summary generation task. (in seconds)
- -->
- <summaryGeneration>
- <initial-delay>600</initial-delay>
- <interval>3600</interval>
- </summaryGeneration>
-
- <!--Configuration for data collection task for pull mode servers.
- 1. initial-delay = Time for first data collection after the server start. (in seconds)
- 2. interval = Periodic interval to run summary generation task. (in seconds)
- -->
- <dataCollection>
- <initial-delay>60</initial-delay>
- <interval>60</interval>
- </dataCollection>
-
-</bamServer>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/billing-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/billing-config.xml b/products/stratos/conf/billing-config.xml
deleted file mode 100755
index e50beb6..0000000
--- a/products/stratos/conf/billing-config.xml
+++ /dev/null
@@ -1,68 +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.
- -->
-
-<!--
- Defines the database and the Task for billing. Multi-tenancy billing rules (by default, uses
- multitenancy-billing-rules.drl) and email for billing notifications (by default, uses
- email-billing-notifications.xml) are specified here.
- -->
-
-<billingConfig xmlns="http://wso2.com/carbon/multitenancy/billing/config">
- <tasks>
- <task id="multitenancyScheduledTask">
- <schedule scheduleHelperClass="org.wso2.carbon.billing.core.scheduler.scheduleHelpers.MonthlyScheduleHelper">
- <parameter name="timeZone">GMT-8:00</parameter>
- <!--cron format: second minute hour dayOfTheMonth Month DayOfWeek-->
- <parameter name="cron">0 0 0 1 * ?</parameter>
- </schedule>
- <handlers>
- <handler service="org.wso2.carbon.billing.mgt.handlers.MultitenancySubscriptionFeedingHandler">
- </handler>
- <handler class="org.wso2.carbon.billing.core.handlers.SubscriptionTreeBuildingHandler">
- </handler>
- <handler class="org.wso2.carbon.billing.core.handlers.RuleHandler">
- <parameter name="file">multitenancy-billing-rules.drl</parameter>
- </handler>
- <handler class="org.wso2.carbon.billing.core.handlers.InvoiceCalculationHandler">
- </handler>
- <handler class="org.wso2.carbon.billing.core.handlers.DefaultFinalizingHandler">
- </handler>
- <handler class="org.wso2.carbon.billing.core.handlers.EmailSendingHandler">
- <parameter name="file">email-billing-notifications.xml</parameter>
- </handler>
- </handlers>
- </task>
- <task id="multitenancyViewingTask">
- <handlers>
- <handler service="org.wso2.carbon.billing.mgt.handlers.MultitenancySubscriptionFeedingHandler">
- </handler>
- <handler class="org.wso2.carbon.billing.core.handlers.SubscriptionTreeBuildingHandler">
- </handler>
- <handler class="org.wso2.carbon.billing.core.handlers.RuleHandler">
- <parameter name="file">multitenancy-billing-rules.drl</parameter>
- </handler>
- <handler class="org.wso2.carbon.billing.core.handlers.InvoiceCalculationHandler">
- </handler>
- <!--
- <handler class="org.wso2.carbon.billing.core.handlers.DefaultFinalizingHandler">
- </handler>-->
- </handlers>
- </task>
- </tasks>
-</billingConfig>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/cipher-text.properties
----------------------------------------------------------------------
diff --git a/products/stratos/conf/cipher-text.properties b/products/stratos/conf/cipher-text.properties
deleted file mode 100644
index 4a1c469..0000000
--- a/products/stratos/conf/cipher-text.properties
+++ /dev/null
@@ -1,26 +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.
-#
-
-#aliases=esb
-#
-## configuration per each plaintext
-#esb.secret=M6U74dMVvRm4XFMczki2qZ6CsTvnUuRTjSditlACR5vTISSMI7F/mCTVJGOGdKJjij+VWVhBtmAOkElyvR9TwlUECnZ1o5DNsTK6l8je+9amc/ziTQLP3Q1tzm/Ex1pzHsG6jPGGrv3O0B9pZTfYFqRvlcNhM7Ve3WvA3ibs4Yk=
-#esb.secret.alias=wso2carbon
-#esb.secret.keystore=identity
-#
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/cloud-services-desc.xml b/products/stratos/conf/cloud-services-desc.xml
deleted file mode 100644
index 110624f..0000000
--- a/products/stratos/conf/cloud-services-desc.xml
+++ /dev/null
@@ -1,205 +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.
- -->
-
-<!--
- This has the configurations for the cloud services.
- Label, link, icon, description, and the other similar information for each of the services are
- given here.
- -->
-<cloudServices xmlns="http://wso2.com/carbon/cloud/mgt/services">
- <cloudService name="Apache Stratos" default="true">
- <key>STRATOS</key>
- <label>Apache Stratos</label>
- <link>https://stratos.cloud.wso2.com</link>
- <!--icon>
- https://localhost:9443/cloud-services-icons/esb.gif
- </icon-->
- <productPageURL>http://wso2.com/cloud/stratos</productPageURL>
- <description>Apache stratos</description>
- </cloudService>
- <cloudService name="WSO2 Stratos Controller" default="true">
- <key>SCC</key>
- <label>WSO2 Stratos Controller</label>
- <link>https://scc.cloud.wso2.com</link>
- <!--icon>
- https://localhost:9443/cloud-services-icons/esb.gif
- </icon-->
- <productPageURL>http://wso2.com/cloud/stratos</productPageURL>
- <description>WSO2 stratos controller.</description>
- </cloudService>
- <cloudService name="WSO2 Cloud Controller" default="true">
- <key>CC</key>
- <label>WSO2 Cloud Controller</label>
- <link>https://cc.cloud.wso2.com</link>
- <!--icon>
- https://localhost:9443/cloud-services-icons/esb.gif
- </icon-->
- <productPageURL>http://wso2.com/cloud/stratos</productPageURL>
- <description>WSO2 Cloud Controller.</description>
- </cloudService>
- <cloudService name="WSO2 Stratos Agent" default="true">
- <key>Agent</key>
- <label>WSO2 Stratos Agent</label>
- <link>https://cc.cloud.wso2.com</link>
- <!--icon>
- https://localhost:9443/cloud-services-icons/esb.gif
- </icon-->
- <productPageURL>http://wso2.com/cloud/stratos</productPageURL>
- <description>WSO2 Stratos Agent.</description>
- </cloudService>
- <cloudService name="WSO2 Enterprise Service Bus" default="true">
- <key>ESB</key>
- <label>Enterprise Service Bus</label>
- <link>https://esb.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/esb.gif
- </icon>
- <productPageURL>http://wso2.com/products/enterprise-service-bus/</productPageURL>
- <description>Enterprise Service Bus in the cloud.</description>
- </cloudService>
- <cloudService name="Application Server" default="true">
- <key>AS</key>
- <label>Application Server</label>
- <link>https://appserver.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/appserver.gif
- </icon>
- <productPageURL>http://wso2.com/products/application-server/</productPageURL>
- <description>Application Server in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Data Services Server" default="true">
- <key>DSS</key>
- <label>WSO2 Data Services Server</label>
- <link>https://dss.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/ds.gif
- </icon>
- <productPageURL>http://wso2.com/products/data-services-server/</productPageURL>
- <description>Data Services Server in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Governance Registry" default="true">
- <key>Greg</key>
- <label>Governance</label>
- <link>https://governance.cloud.wso2.com</link>
- <description>Governance in the cloud.</description>
- <icon>
- https://localhost:9443/cloud-services-icons/governance.gif
- </icon>
- <productPageURL>http://wso2.com/products/governance-registry/</productPageURL>
- </cloudService>
- <cloudService name="WSO2 Identity Server" default="true">
- <key>IS</key>
- <label>WSO2 Identity Server</label>
- <link>https://identity.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/identity.gif
- </icon>
- <description>Identity in the cloud.</description>
- <productPageURL>http://wso2.com/products/identity-server/</productPageURL>
- </cloudService>
- <cloudService name="WSO2 Business Activity Monitor" default="true">
- <label>Business Activity Monitor</label>
- <link>https://bam.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/bam.gif
- </icon>
- <description>Business Activity Monitor in the cloud.</description>
- <productPageURL>http://wso2.com/products/business-activity-monitor/</productPageURL>
- </cloudService>
- <cloudService name="WSO2 Business Process Server" default="true">
- <key>BPS</key>
- <label>Business Process Server</label>
- <link>https://bps.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/bps.gif
- </icon>
- <description>Business Process Server in the cloud.</description>
- <productPageURL>http://wso2.com/products/business-process-server/</productPageURL>
- </cloudService>
- <cloudService name="WSO2 Business Rule Server" default="true">
- <key>BRS</key>
- <label>Business Rule Server</label>
- <link>https://brs.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/brs.gif
- </icon>
- <description>Business Rules Server in the cloud.</description>
- <productPageURL>http://wso2.com/products/business-rules-server/</productPageURL>
- </cloudService>
- <cloudService name="WSO2 Mashup Server" default="true">
- <key>MB</key>
- <label>Mashup Server</label>
- <link>https://mashup.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/mashup.gif
- </icon>
- <description>Mashup Server in the cloud.</description>
- <productPageURL>http://wso2.com/products/mashup-server/</productPageURL>
- </cloudService>
- <cloudService name="WSO2 Gadget Server" default="true">
- <key>GS</key>
- <label>Gadget Server</label>
- <link>https://gadget.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/gadget.gif
- </icon>
- <description>Gadgets in the cloud.</description>
- <productPageURL>http://wso2.com/products/gadget-server/</productPageURL>
- </cloudService>
- <cloudService name="Cloud Gateway" default="true">
- <key>CG</key>
- <label>Cloud Gateway</label>
- <link>https://cg.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/csg.gif
- </icon>
- <description>Cloud Gateway in the cloud.</description>
- <productPageURL>http://wso2.com/products/cloud-services-gateway/</productPageURL> <!-- FIXME, put the correct project home -->
- </cloudService>
- <cloudService name="WSO2 Complex Event Processor" default="true">
- <key>CEP</key>
- <label>Complex Event Processor</label>
- <link>https://cep.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/cep.gif
- </icon>
- <productPageURL>http://wso2.com/products/complex-event-processing-server/</productPageURL> <!-- FIXME, put the correct project home -->
- <description>Complex Event Processor in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Message Broker" default="true">
- <key>MB</key>
- <label>Message Broker</label>
- <link>https://mb.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/mb.gif
- </icon>
- <productPageURL>http://wso2.com/products/message-broker/</productPageURL>
- <description>Message Broker in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Storage Server" default="true">
- <key>SS</key>
- <label>WSO2 Storage Server</label>
- <link>https://ss.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/ss.gif
- </icon>
- <description>WSO2 Storage Server.</description>
- <productPageURL>http://wso2.com/products/storage-server/</productPageURL>
- </cloudService>
-</cloudServices>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/data-bridge/data-bridge-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/data-bridge/data-bridge-config.xml b/products/stratos/conf/data-bridge/data-bridge-config.xml
deleted file mode 100644
index 33f9905..0000000
--- a/products/stratos/conf/data-bridge/data-bridge-config.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<dataBridgeConfiguration xmlns="http://wso2.org/carbon/databridge">
-
- <!--<StreamDefinitionStore>org.wso2.carbon.databridge.streamdefn.cassandra.datastore.CassandraStreamDefinitionStore</StreamDefinitionStore>-->
- <StreamDefinitionStore>org.wso2.carbon.databridge.streamdefn.registry.datastore.RegistryStreamDefinitionStore</StreamDefinitionStore>
-
- <workerThreads>10</workerThreads>
- <eventBufferCapacity>10000</eventBufferCapacity>
- <clientTimeoutMS>30000</clientTimeoutMS>
- <keySpaceName>EVENT_KS</keySpaceName>
-
- <!-- Default configuration for thriftDataReceiver -->
- <thriftDataReceiver>
- <hostName>0.0.0.0</hostName>
- <port>7611</port>
- <securePort>7711</securePort>
- </thriftDataReceiver>
-
- <!--<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/8d321a26/products/stratos/conf/data-bridge/thrift-agent-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/data-bridge/thrift-agent-config.xml b/products/stratos/conf/data-bridge/thrift-agent-config.xml
deleted file mode 100644
index 628909f..0000000
--- a/products/stratos/conf/data-bridge/thrift-agent-config.xml
+++ /dev/null
@@ -1,47 +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.
- -->
-
-
-
-<thriftAgentConfiguration xmlns="http://wso2.org/carbon/databridge/agent/thrift">
-
- <bufferedEventsSize>20000</bufferedEventsSize>
-
- <poolSize>50</poolSize>
- <maxPoolSize>50</maxPoolSize>
-
- <maxTransportPoolSize>250</maxTransportPoolSize>
- <maxIdleConnections>250</maxIdleConnections>
- <evictionTimePeriod>5500</evictionTimePeriod>
- <minIdleTimeInPool>5000</minIdleTimeInPool>
-
- <secureMaxTransportPoolSize>250</secureMaxTransportPoolSize>
- <secureMaxIdleConnections>250</secureMaxIdleConnections>
- <secureEvictionTimePeriod>5500</secureEvictionTimePeriod>
- <secureMinIdleTimeInPool>5000</secureMinIdleTimeInPool>
-
- <maxMessageBundleSize>100</maxMessageBundleSize>
- <asyncDataPublisherBufferedEventSize>10000</asyncDataPublisherBufferedEventSize>
- <loadBalancingReconnectionInterval>30</loadBalancingReconnectionInterval>
- <!--<trustStore>
- .../wso2cep-1.0.0/repository/resources/security/client-truststore.jks
- </trustStore>
- <trustStorePassword>wso2carbon</trustStorePassword>-->
-
-</thriftAgentConfiguration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/datasources.properties
----------------------------------------------------------------------
diff --git a/products/stratos/conf/datasources.properties b/products/stratos/conf/datasources.properties
deleted file mode 100644
index 0cf8cdb..0000000
--- a/products/stratos/conf/datasources.properties
+++ /dev/null
@@ -1,58 +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.
-#
-
-################################################################################
-## DataSources Configuration
-################################################################################
-#synapse.datasources=lookupds,reportds
-#synapse.datasources.icFactory=com.sun.jndi.rmi.registry.RegistryContextFactory
-#synapse.datasources.providerPort=2199
-## If following property is present , then assumes that there is an external JNDI provider and will not start a RMI registry
-##synapse.datasources.providerUrl=rmi://localhost:2199
-#
-#synapse.datasources.lookupds.registry=Memory
-#synapse.datasources.lookupds.type=BasicDataSource
-#synapse.datasources.lookupds.driverClassName=org.apache.derby.jdbc.ClientDriver
-#synapse.datasources.lookupds.url=jdbc:derby://localhost:1527/lookupdb;create=false
-## Optionally you can specifiy a specific password provider implementation which overrides any globally configured provider
-#synapse.datasources.lookupds.secretProvider=org.apache.synapse.commons.security.secret.handler.SharedSecretCallbackHandler
-#synapse.datasources.lookupds.username=esb
-## Depending on the password provider used, you may have to use an encrypted password here!
-#synapse.datasources.lookupds.password=esb
-#synapse.datasources.lookupds.dsName=lookupdb
-#synapse.datasources.lookupds.maxActive=100
-#synapse.datasources.lookupds.maxIdle=20
-#synapse.datasources.lookupds.maxWait=10000
-#
-#synapse.datasources.reportds.registry=JNDI
-#synapse.datasources.reportds.type=PerUserPoolDataSource
-#synapse.datasources.reportds.cpdsadapter.factory=org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS
-#synapse.datasources.reportds.cpdsadapter.className=org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS
-#synapse.datasources.reportds.cpdsadapter.name=cpds
-#synapse.datasources.reportds.dsName=reportdb
-#synapse.datasources.reportds.driverClassName=org.apache.derby.jdbc.ClientDriver
-#synapse.datasources.reportds.url=jdbc:derby://localhost:1527/reportdb;create=false
-## Optionally you can specifiy a specific password provider implementation which overrides any globally configured provider
-#synapse.datasources.reportds.secretProvider=org.apache.synapse.commons.security.secret.handler.SharedSecretCallbackHandler
-#synapse.datasources.reportds.username=esb
-## Depending on the password provider used, you may have to use an encrypted password here!
-#synapse.datasources.reportds.password=esb
-#synapse.datasources.reportds.maxActive=100
-#synapse.datasources.reportds.maxIdle=20
-#synapse.datasources.reportds.maxWait=10000
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-bill-generated.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-bill-generated.xml b/products/stratos/conf/email-bill-generated.xml
deleted file mode 100755
index 2310fa4..0000000
--- a/products/stratos/conf/email-bill-generated.xml
+++ /dev/null
@@ -1,39 +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.
- -->
-
-<!--
- Contains the body of the mail that to be sent when bill generation is completed.
- -->
-
-<configuration>
- <subject>[BillGeneration] Bill generation completed</subject>
- <body>
-Hi ,
-
-Bill generation completed successfully on {date}. Following customers may need your attention.
-
-Customer Name Subscription Plan Carried Forward Balance
-===============================================
-{reported-customers}
-
-Best Regards,
-WSO2 Cloud Services
-http://stratoslive.wso2.com
- </body>
-</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-billing-notifications.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-billing-notifications.xml b/products/stratos/conf/email-billing-notifications.xml
deleted file mode 100755
index afc2807..0000000
--- a/products/stratos/conf/email-billing-notifications.xml
+++ /dev/null
@@ -1,50 +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.
- -->
-
-<!--
- Contains the body of the mail that to be sent as the invoice of the tenant for the period.
- -->
-
-<configuration>
- <subject>WSO2 Cloud Services</subject>
- <body>
-Hi {customer-name},
-
-This is the billing information for the time period of {start-date} to {end-date} for the use of WSO2 cloud services.
-
-Charges for subscriptions
-=========================
-{subscription-charges}
-
-Payment details
-===============
-{payment-details}
-
-Invoice Summary
-===============
-Brought Forward {bought-forward}
-Total Cost {total-cost}
-Total Payments {total-payments}
-Carried Forward {carried-forward}
-
-Best Regards,
-WSO2 Cloud Services
-http://stratoslive.wso2.com
- </body>
-</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-new-tenant-activation.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-new-tenant-activation.xml b/products/stratos/conf/email-new-tenant-activation.xml
deleted file mode 100755
index e24b0cb..0000000
--- a/products/stratos/conf/email-new-tenant-activation.xml
+++ /dev/null
@@ -1,47 +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.
- -->
-
-<!--
- Contains the body of the mail that to be sent to the super admin or a given admin email address,
- when a new tenant activates their account.
- -->
-
-<configuration>
- <subject>WSO2 Cloud Services - A Tenant Has Activated Their Account</subject>
- <body>
-Hi,
-
-Congratulations! A tenant has activated their account just now in WSO2 Cloud Services.
-
-Tenant Details
-===============
-Admin Name: {user-name}
-Domain Name: {domain-name}
-Email Address: {email-address}
-
-Tenant Admin Profile
-====================
-First Name: {first-name}
-Last Name: {last-name}
-
-Best Regards,
-WSO2 Cloud Services Team
-http://stratoslive.wso2.com
- </body>
-</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-new-tenant-registration.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-new-tenant-registration.xml b/products/stratos/conf/email-new-tenant-registration.xml
deleted file mode 100755
index 8423625..0000000
--- a/products/stratos/conf/email-new-tenant-registration.xml
+++ /dev/null
@@ -1,47 +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.
- -->
-
-<!--
- Contains the body of the mail that to be sent to the super admin or a given admin email address,
- when a new tenant registers for an account.
- -->
-
-<configuration>
- <subject>WSO2 Cloud Services - A New Tenant Has Registererd To Stratos</subject>
- <body>
-Hi,
-
-Congratulations! A new tenant has registered an account in WSO2 Cloud Services.
-
-Tenant Details
-===============
-Admin Name: {user-name}
-Domain Name: {domain-name}
-Email Address: {email-address}
-
-Tenant Admin Profile
-====================
-First Name: {first-name}
-Last Name: {last-name}
-
-Best Regards,
-WSO2 Cloud Services Team
-http://stratoslive.wso2.com
- </body>
-</configuration>
[13/50] [abbrv] stratos git commit: Introducing stratos integration
test suite for the artifacts
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
new file mode 100644
index 0000000..7162cdf
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
@@ -0,0 +1,394 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.integration.tests;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext;
+import org.apache.stratos.common.client.AutoscalerServiceClient;
+import org.apache.stratos.common.threading.StratosThreadPool;
+import org.apache.stratos.messaging.domain.application.*;
+import org.apache.stratos.messaging.domain.instance.ClusterInstance;
+import org.apache.stratos.messaging.domain.instance.GroupInstance;
+import org.apache.stratos.messaging.domain.topology.Cluster;
+import org.apache.stratos.messaging.domain.topology.Member;
+import org.apache.stratos.messaging.domain.topology.MemberStatus;
+import org.apache.stratos.messaging.domain.topology.Service;
+import org.apache.stratos.messaging.message.receiver.application.ApplicationManager;
+import org.apache.stratos.messaging.message.receiver.application.ApplicationsEventReceiver;
+import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver;
+import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
+
+import java.io.File;
+import java.rmi.RemoteException;
+import java.util.Collection;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+
+/**
+ * To start the Topology receivers
+ */
+public class TopologyHandler {
+ private static final Log log = LogFactory.getLog(TopologyHandler.class);
+
+ public static final int APPLICATION_ACTIVATION_TIMEOUT = 120000;
+ public static final int APPLICATION_TOPOLOGY_TIMEOUT = 60000;
+ public static final String APPLICATION_STATUS_CREATED = "Created";
+ public static final String APPLICATION_STATUS_UNDEPLOYING = "Undeploying";
+ private ApplicationsEventReceiver applicationsEventReceiver;
+ private TopologyEventReceiver topologyEventReceiver;
+ public static TopologyHandler topologyHandler;
+
+ private TopologyHandler() {
+ // Set jndi.properties.dir system property for initializing event receivers
+ System.setProperty("jndi.properties.dir", getResourcesFolderPath());
+ System.setProperty("autoscaler.service.url", "https://localhost:9443/services/AutoscalerService");
+ initializeApplicationEventReceiver();
+ initializeTopologyEventReceiver();
+ assertApplicationTopologyInitialized();
+ assertTopologyInitialized();
+ }
+
+ public static TopologyHandler getInstance() {
+ if (topologyHandler == null) {
+ synchronized (TopologyHandler.class) {
+ if (topologyHandler == null) {
+ topologyHandler = new TopologyHandler();
+ }
+ }
+ }
+ return topologyHandler;
+ }
+
+
+ /**
+ * Initialize application event receiver
+ */
+ private void initializeApplicationEventReceiver() {
+ if (applicationsEventReceiver == null) {
+ applicationsEventReceiver = new ApplicationsEventReceiver();
+ ExecutorService executorService = StratosThreadPool.getExecutorService("STRATOS_TEST_SERVER", 1);
+ applicationsEventReceiver.setExecutorService(executorService);
+ applicationsEventReceiver.execute();
+ }
+ }
+
+ /**
+ * Initialize Topology event receiver
+ */
+ private void initializeTopologyEventReceiver() {
+ if (topologyEventReceiver == null) {
+ topologyEventReceiver = new TopologyEventReceiver();
+ ExecutorService executorService = StratosThreadPool.getExecutorService("STRATOS_TEST_SERVER1", 1);
+ topologyEventReceiver.setExecutorService(executorService);
+ topologyEventReceiver.execute();
+ }
+ }
+
+ /**
+ * Assert application Topology initialization
+ */
+ private void assertApplicationTopologyInitialized() {
+ long startTime = System.currentTimeMillis();
+ boolean applicationTopologyInitialized = ApplicationManager.getApplications().isInitialized();
+ while (!applicationTopologyInitialized) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignore) {
+ }
+ applicationTopologyInitialized = ApplicationManager.getApplications().isInitialized();
+ if ((System.currentTimeMillis() - startTime) > APPLICATION_TOPOLOGY_TIMEOUT) {
+ break;
+ }
+ }
+ assertEquals(String.format("Application Topology didn't get initialized "), applicationTopologyInitialized, true);
+ }
+
+ /**
+ * Assert Topology initialization
+ */
+ private void assertTopologyInitialized() {
+ long startTime = System.currentTimeMillis();
+ boolean topologyInitialized = TopologyManager.getTopology().isInitialized();
+ while (!topologyInitialized) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignore) {
+ }
+ topologyInitialized = TopologyManager.getTopology().isInitialized();
+ if ((System.currentTimeMillis() - startTime) > APPLICATION_TOPOLOGY_TIMEOUT) {
+ break;
+ }
+ }
+ assertEquals(String.format("Topology didn't get initialized "), topologyInitialized, true);
+ }
+
+ /**
+ * Assert application activation
+ *
+ * @param applicationName
+ */
+ public void assertApplicationActivation(String applicationName) {
+ long startTime = System.currentTimeMillis();
+ Application application = ApplicationManager.getApplications().getApplication(applicationName);
+ while (!((application != null) && (application.getStatus() == ApplicationStatus.Active))) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignore) {
+ }
+ application = ApplicationManager.getApplications().getApplication(applicationName);
+ if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
+ break;
+ }
+ }
+ assertNotNull(String.format("Application is not found: [application-id] %s", applicationName), application);
+ assertEquals(String.format("Application status did not change to active: [application-id] %s", applicationName),
+ ApplicationStatus.Active, application.getStatus());
+ }
+
+ /**
+ * Assert application activation
+ *
+ * @param applicationName
+ */
+ public void assertGroupActivation(String applicationName) {
+ Application application = ApplicationManager.getApplications().getApplication(applicationName);
+ assertNotNull(String.format("Application is not found: [application-id] %s",
+ applicationName), application);
+
+ Collection<Group> groups = application.getAllGroupsRecursively();
+ for (Group group : groups) {
+ assertEquals(group.getInstanceContextCount() >= group.getGroupMinInstances(), true);
+ }
+ }
+
+ /**
+ * Assert application activation
+ *
+ * @param applicationName
+ */
+ public void assertClusterActivation(String applicationName) {
+ Application application = ApplicationManager.getApplications().getApplication(applicationName);
+ assertNotNull(String.format("Application is not found: [application-id] %s",
+ applicationName), application);
+
+ Set<ClusterDataHolder> clusterDataHolderSet = application.getClusterDataRecursively();
+ for (ClusterDataHolder clusterDataHolder : clusterDataHolderSet) {
+ String serviceName = clusterDataHolder.getServiceType();
+ String clusterId = clusterDataHolder.getClusterId();
+ Service service = TopologyManager.getTopology().getService(serviceName);
+ assertNotNull(String.format("Service is not found: [application-id] %s [service] %s",
+ applicationName, serviceName), service);
+
+ Cluster cluster = service.getCluster(clusterId);
+ assertNotNull(String.format("Cluster is not found: [application-id] %s [service] %s [cluster-id] %s",
+ applicationName, serviceName, clusterId), cluster);
+ boolean clusterActive = false;
+
+ for (ClusterInstance instance : cluster.getInstanceIdToInstanceContextMap().values()) {
+ int activeInstances = 0;
+ for (Member member : cluster.getMembers()) {
+ if (member.getClusterInstanceId().equals(instance.getInstanceId())) {
+ if (member.getStatus().equals(MemberStatus.Active)) {
+ activeInstances++;
+ }
+ }
+ }
+ clusterActive = activeInstances >= clusterDataHolder.getMinInstances();
+
+ if (!clusterActive) {
+ break;
+ }
+ }
+ assertEquals(String.format("Cluster status did not change to active: [cluster-id] %s", clusterId),
+ clusterActive, true);
+ }
+
+ }
+
+ public void assertClusterMinMemberCount(String applicationName, int minMembers) {
+ long startTime = System.currentTimeMillis();
+
+ Application application = ApplicationManager.getApplications().getApplication(applicationName);
+ assertNotNull(String.format("Application is not found: [application-id] %s",
+ applicationName), application);
+
+ Set<ClusterDataHolder> clusterDataHolderSet = application.getClusterDataRecursively();
+ for (ClusterDataHolder clusterDataHolder : clusterDataHolderSet) {
+ String serviceName = clusterDataHolder.getServiceType();
+ String clusterId = clusterDataHolder.getClusterId();
+ Service service = TopologyManager.getTopology().getService(serviceName);
+ assertNotNull(String.format("Service is not found: [application-id] %s [service] %s",
+ applicationName, serviceName), service);
+
+ Cluster cluster = service.getCluster(clusterId);
+ assertNotNull(String.format("Cluster is not found: [application-id] %s [service] %s [cluster-id] %s",
+ applicationName, serviceName, clusterId), cluster);
+ boolean clusterActive = false;
+
+ for (ClusterInstance instance : cluster.getInstanceIdToInstanceContextMap().values()) {
+ int activeInstances = 0;
+ for (Member member : cluster.getMembers()) {
+ if (member.getClusterInstanceId().equals(instance.getInstanceId())) {
+ if (member.getStatus().equals(MemberStatus.Active)) {
+ activeInstances++;
+ }
+ }
+ }
+ clusterActive = activeInstances >= minMembers;
+
+ while (!clusterActive) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignore) {
+ }
+ service = TopologyManager.getTopology().getService(serviceName);
+ assertNotNull(String.format("Service is not found: [application-id] %s [service] %s",
+ applicationName, serviceName), service);
+
+ cluster = service.getCluster(clusterId);
+ activeInstances = 0;
+ for (Member member : cluster.getMembers()) {
+ if (member.getClusterInstanceId().equals(instance.getInstanceId())) {
+ if (member.getStatus().equals(MemberStatus.Active)) {
+ activeInstances++;
+ }
+ }
+ }
+ clusterActive = activeInstances >= minMembers;
+ assertNotNull(String.format("Cluster is not found: [application-id] %s [service] %s [cluster-id] %s",
+ applicationName, serviceName, clusterId), cluster);
+
+ if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
+ break;
+ }
+ }
+ }
+ assertEquals(String.format("Cluster status did not change to active: [cluster-id] %s", clusterId),
+ clusterActive, true);
+ }
+
+ }
+
+
+ /**
+ * Assert application activation
+ *
+ * @param applicationName
+ */
+ public boolean assertApplicationUndeploy(String applicationName) {
+ long startTime = System.currentTimeMillis();
+ Application application = ApplicationManager.getApplications().getApplication(applicationName);
+ ApplicationContext applicationContext = null;
+ try {
+ applicationContext = AutoscalerServiceClient.getInstance().getApplication(applicationName);
+ } catch (RemoteException e) {
+ log.error("Error while getting the application context for [application] " + applicationName);
+ }
+ while (((application != null) && application.getInstanceContextCount() > 0) ||
+ (applicationContext == null || applicationContext.getStatus().equals(APPLICATION_STATUS_UNDEPLOYING))) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignore) {
+ }
+ application = ApplicationManager.getApplications().getApplication(applicationName);
+ try {
+ applicationContext = AutoscalerServiceClient.getInstance().getApplication(applicationName);
+ } catch (RemoteException e) {
+ log.error("Error while getting the application context for [application] " + applicationName);
+ }
+ if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
+ break;
+ }
+ }
+
+ assertNotNull(String.format("Application is not found: [application-id] %s",
+ applicationName), application);
+ assertNotNull(String.format("Application Context is not found: [application-id] %s",
+ applicationName), applicationContext);
+
+ //Force undeployment after the graceful deployment
+ if (application.getInstanceContextCount() > 0 ||
+ applicationContext.getStatus().equals(APPLICATION_STATUS_UNDEPLOYING)) {
+ return false;
+ }
+ assertEquals(String.format("Application status did not change to Created: [application-id] %s", applicationName),
+ APPLICATION_STATUS_CREATED, applicationContext.getStatus());
+ return true;
+ }
+
+ /**
+ * Assert application activation
+ *
+ * @param applicationName
+ */
+ public void assertGroupInstanceCount(String applicationName, String groupAlias, int count) {
+ long startTime = System.currentTimeMillis();
+ Application application = ApplicationManager.getApplications().getApplication(applicationName);
+ if (application != null) {
+ Group group = application.getGroupRecursively(groupAlias);
+ while (group.getInstanceContextCount() != count) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignore) {
+ }
+ if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
+ break;
+ }
+ }
+ for (GroupInstance instance : group.getInstanceIdToInstanceContextMap().values()) {
+ while (!instance.getStatus().equals(GroupStatus.Active)) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignore) {
+ }
+ if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
+ break;
+ }
+ }
+ }
+ assertEquals(String.format("Application status did not change to active: [application-id] %s", applicationName),
+ group.getInstanceContextCount(), count);
+ }
+ assertNotNull(String.format("Application is not found: [application-id] %s", applicationName), application);
+
+ }
+
+ public void assertApplicationNotExists(String applicationName) {
+ Application application = ApplicationManager.getApplications().getApplication(applicationName);
+ assertNull(String.format("Application is found in the topology : [application-id] %s", applicationName), application);
+ }
+
+ /**
+ * Get resources folder path
+ *
+ * @return
+ */
+ private String getResourcesFolderPath() {
+ String path = getClass().getResource("/").getPath();
+ return StringUtils.removeEnd(path, File.separator);
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/config/ApplicationBean.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/config/ApplicationBean.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/config/ApplicationBean.java
new file mode 100644
index 0000000..ce23728
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/config/ApplicationBean.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.integration.tests.config;
+
+/**
+ * Created by reka on 5/7/15.
+ */
+public class ApplicationBean {
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/config/ApplicationConfigParser.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/config/ApplicationConfigParser.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/config/ApplicationConfigParser.java
new file mode 100644
index 0000000..ace17e6
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/config/ApplicationConfigParser.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.integration.tests.config;
+
+/**
+ * Created by reka on 5/7/15.
+ */
+public class ApplicationConfigParser {
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
index 5ff8fd3..34a9d75 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
@@ -315,7 +315,7 @@ public class RestClient {
log.error(msg + entityName);
throw new RuntimeException(msg + entityName);
} catch (Exception e) {
- String message = "Could not add " + entityName;
+ String message = "Could not update " + entityName;
log.error(message, e);
throw new RuntimeException(message, e);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-2.json b/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-2.json
new file mode 100644
index 0000000..1137942
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/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/5b844043/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v1.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v1.json
new file mode 100644
index 0000000..ff332c0
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v1.json
@@ -0,0 +1,86 @@
+{
+ "alias": "g-sc-G123-1",
+ "applicationId": "g-sc-G123-1",
+ "components": {
+ "cartridges": [],
+ "groups": [
+ {
+ "name": "G1",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group1",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c1",
+ "subscribableInfo": {
+ "alias": "c1-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G2",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group2",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 4,
+ "type": "c2",
+ "subscribableInfo": {
+ "alias": "c2-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G3",
+ "groupMaxInstances": 3,
+ "groupMinInstances": 2,
+ "deploymentPolicy": "static-1",
+ "alias": "group3",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c3",
+ "subscribableInfo": {
+ "alias": "c3-1x0",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v2.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v2.json
new file mode 100644
index 0000000..6f827c2
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v2.json
@@ -0,0 +1,86 @@
+{
+ "alias": "g-sc-G123-1",
+ "applicationId": "g-sc-G123-1",
+ "components": {
+ "cartridges": [],
+ "groups": [
+ {
+ "name": "G1",
+ "groupMaxInstances": 5,
+ "groupMinInstances": 2,
+ "alias": "group1",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c1",
+ "subscribableInfo": {
+ "alias": "c1-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G2",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group2",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 4,
+ "type": "c2",
+ "subscribableInfo": {
+ "alias": "c2-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G3",
+ "groupMaxInstances": 3,
+ "groupMinInstances": 2,
+ "deploymentPolicy": "static-1",
+ "alias": "group3",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c3",
+ "subscribableInfo": {
+ "alias": "c3-1x0",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v3.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v3.json
new file mode 100644
index 0000000..a6e5fd7
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v3.json
@@ -0,0 +1,86 @@
+{
+ "alias": "g-sc-G123-1",
+ "applicationId": "g-sc-G123-1",
+ "components": {
+ "cartridges": [],
+ "groups": [
+ {
+ "name": "G1",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group1",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c1",
+ "subscribableInfo": {
+ "alias": "c1-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G2",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group2",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 4,
+ "type": "c2",
+ "subscribableInfo": {
+ "alias": "c2-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G3",
+ "groupMaxInstances": 4,
+ "groupMinInstances": 3,
+ "deploymentPolicy": "static-1",
+ "alias": "group3",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c3",
+ "subscribableInfo": {
+ "alias": "c3-1x0",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/update/g-sc-G123-1-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/update/g-sc-G123-1-v1.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/update/g-sc-G123-1-v1.json
deleted file mode 100644
index fb5e000..0000000
--- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/update/g-sc-G123-1-v1.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
- "alias": "g-sc-G123-1",
- "applicationId": "g-sc-G123-1",
- "components": {
- "cartridges": [],
- "groups": [
- {
- "name": "G1",
- "groupMaxInstances": 5,
- "groupMinInstances": 4,
- "alias": "group1",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 3,
- "type": "c1",
- "subscribableInfo": {
- "alias": "c1-1x0",
- "deploymentPolicy": "deployment-policy-1",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": [
- {
- "name": "G2",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group2",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 4,
- "type": "c2",
- "subscribableInfo": {
- "alias": "c2-1x0",
- "deploymentPolicy": "deployment-policy-1",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": [
- {
- "name": "G3",
- "groupMaxInstances": 3,
- "groupMinInstances": 2,
- "deploymentPolicy": "static-1",
- "alias": "group3",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 3,
- "type": "c3",
- "subscribableInfo": {
- "alias": "c3-1x0",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": []
- }
- ]
- }
- ]
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/update/g-sc-G123-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/update/g-sc-G123-1.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/update/g-sc-G123-1.json
deleted file mode 100644
index ff332c0..0000000
--- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/update/g-sc-G123-1.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
- "alias": "g-sc-G123-1",
- "applicationId": "g-sc-G123-1",
- "components": {
- "cartridges": [],
- "groups": [
- {
- "name": "G1",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group1",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 3,
- "type": "c1",
- "subscribableInfo": {
- "alias": "c1-1x0",
- "deploymentPolicy": "deployment-policy-1",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": [
- {
- "name": "G2",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group2",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 4,
- "type": "c2",
- "subscribableInfo": {
- "alias": "c2-1x0",
- "deploymentPolicy": "deployment-policy-1",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": [
- {
- "name": "G3",
- "groupMaxInstances": 3,
- "groupMinInstances": 2,
- "deploymentPolicy": "static-1",
- "alias": "group3",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 3,
- "type": "c3",
- "subscribableInfo": {
- "alias": "c3-1x0",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": []
- }
- ]
- }
- ]
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0-v1.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0-v1.json
new file mode 100644
index 0000000..31c2b84
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0-v1.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-c0",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "threshold": 30
+ },
+ "memoryConsumption": {
+ "threshold": 40
+ },
+ "loadAverage": {
+ "threshold": 20
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/autoscaling-policies/update/autoscaling-policy-c0.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/update/autoscaling-policy-c0.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policies/update/autoscaling-policy-c0.json
deleted file mode 100644
index 31c2b84..0000000
--- a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/update/autoscaling-policy-c0.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-c0",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 30
- },
- "memoryConsumption": {
- "threshold": 40
- },
- "loadAverage": {
- "threshold": 20
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested-v1.json b/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested-v1.json
new file mode 100644
index 0000000..6020e1e
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested-v1.json
@@ -0,0 +1,50 @@
+{
+ "name": "G1",
+ "dependencies": {
+ "terminationBehaviour": "terminate-none",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group2",
+ "cartridge.c1-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c1"
+ ],
+ "groups": [
+ {
+ "name": "G2",
+ "dependencies": {
+ "terminationBehaviour": "terminate-dependents",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group3",
+ "cartridge.c2-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c2"
+ ],
+ "groups": [
+ {
+ "name": "G3",
+ "dependencies": {
+ "terminationBehaviour": "terminate-all",
+ "startupOrders": []
+ },
+ "cartridges": [
+ "c3"
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6-v1.json b/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6-v1.json
new file mode 100644
index 0000000..c0132f0
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6-v1.json
@@ -0,0 +1,50 @@
+{
+ "name": "G4",
+ "dependencies": {
+ "terminationBehaviour": "terminate-none",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group2",
+ "cartridge.c1-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c4"
+ ],
+ "groups": [
+ {
+ "name": "G5",
+ "dependencies": {
+ "terminationBehaviour": "terminate-dependents",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group6",
+ "cartridge.c5-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c5"
+ ],
+ "groups": [
+ {
+ "name": "G6",
+ "dependencies": {
+ "terminationBehaviour": "terminate-all",
+ "startupOrders": []
+ },
+ "cartridges": [
+ "c6"
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6.json b/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6.json
new file mode 100644
index 0000000..ef28723
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridges-groups/g4-g5-g6.json
@@ -0,0 +1,50 @@
+{
+ "name": "G4",
+ "dependencies": {
+ "terminationBehaviour": "terminate-none",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group5",
+ "cartridge.c4-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c4"
+ ],
+ "groups": [
+ {
+ "name": "G5",
+ "dependencies": {
+ "terminationBehaviour": "terminate-dependents",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group6",
+ "cartridge.c5-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c5"
+ ],
+ "groups": [
+ {
+ "name": "G6",
+ "dependencies": {
+ "terminationBehaviour": "terminate-all",
+ "startupOrders": []
+ },
+ "cartridges": [
+ "c6"
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/cartridges-groups/update/cartrdige-nested.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges-groups/update/cartrdige-nested.json b/products/stratos/modules/integration/src/test/resources/cartridges-groups/update/cartrdige-nested.json
deleted file mode 100644
index 6020e1e..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges-groups/update/cartrdige-nested.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "name": "G1",
- "dependencies": {
- "terminationBehaviour": "terminate-none",
- "startupOrders": [
- {
- "aliases": [
- "group.group2",
- "cartridge.c1-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c1"
- ],
- "groups": [
- {
- "name": "G2",
- "dependencies": {
- "terminationBehaviour": "terminate-dependents",
- "startupOrders": [
- {
- "aliases": [
- "group.group3",
- "cartridge.c2-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c2"
- ],
- "groups": [
- {
- "name": "G3",
- "dependencies": {
- "terminationBehaviour": "terminate-all",
- "startupOrders": []
- },
- "cartridges": [
- "c3"
- ],
- "groups": []
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/cartridges/mock/c0-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c0-v1.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c0-v1.json
new file mode 100755
index 0000000..6d922a9
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c0-v1.json
@@ -0,0 +1,124 @@
+{
+ "category": "Data",
+ "description": "c0 Cartridge",
+ "displayName": "c0",
+ "host": "qmog.cisco.com12",
+ "iaasProvider": [
+ {
+ "imageId": "RegionOne/16e7e35b-0c88-4605-90ce-cbef9e9d123",
+ "maxInstanceLimit": "4",
+ "networkInterfaces": [
+ {
+ "floatingNetworks": [
+ {
+ "name": "private",
+ "networkUuid": "26b4aa2b-06bc-4e4f-a6eb-c19fbc2112121"
+ }
+ ],
+ "name": "core1",
+ "networkUuid": "5e107fbd-4820-47ad-84ea-6f1354961212"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/2cdbd576-8c9b-4c2d-8b1a-0f79dc4fb812"
+ },
+ {
+ "name": "keyPair",
+ "value": "phoenix12"
+ },
+ {
+ "name": "autoAssignIp",
+ "value": "true"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default123"
+ }
+ ],
+ "type": "mock"
+ }
+ ],
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "port": "22",
+ "protocol": "http",
+ "proxyPort": "8280"
+ }
+ ],
+ "property": [
+ {
+ "name": "payload_parameter.MB_IP",
+ "value": "octl.qmog.cisco.com123"
+ },
+ {
+ "name": "payload_parameter.MB_PORT",
+ "value": "61617"
+ },
+ {
+ "name": "payload_parameter.CEP_IP",
+ "value": "octl.qmog.cisco.com123"
+ },
+ {
+ "name": "payload_parameter.CEP_PORT",
+ "value": "7612"
+ },
+ {
+ "name": "payload_parameter.CEP_ADMIN_USERNAME",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.CEP_ADMIN_PASSWORD",
+ "value": "admin123"
+ },
+ {
+ "name": "payload_parameter.CERT_TRUSTSTORE",
+ "value": "/opt/apache-stratos-cartridge-agent/security/client-truststore.jks"
+ },
+ {
+ "name": "payload_parameter.TRUSTSTORE_PASSWORD",
+ "value": "wso2carbon"
+ },
+ {
+ "name": "payload_parameter.ENABLE_DATA_PUBLISHER",
+ "value": "false"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_IP",
+ "value": "octl.qmog.cisco.com123"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_PORT",
+ "value": "7612"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_SECURE_PORT",
+ "value": "7712"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_ADMIN_USERNAME",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD",
+ "value": "admin123"
+ },
+ {
+ "name": "payload_parameter.QTCM_DNS_SEGMENT",
+ "value": "test123"
+ },
+ {
+ "name": "payload_parameter.QTCM_NETWORK_COUNT",
+ "value": "3"
+ },
+ {
+ "name": "payload_parameter.SIMPLE_PROPERTY",
+ "value": "value"
+ }
+ ],
+ "provider": "apache",
+ "type": "c0",
+ "version": "1.0"
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/cartridges/mock/c4.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c4.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c4.json
new file mode 100755
index 0000000..ec7d8b2
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c4.json
@@ -0,0 +1,45 @@
+{
+ "type": "c4",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c4",
+ "description": "c4 Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "vishanth-key"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/cartridges/mock/c5.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c5.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c5.json
new file mode 100755
index 0000000..0e438fd
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c5.json
@@ -0,0 +1,124 @@
+{
+ "category": "Application",
+ "description": "c5 Cartridge",
+ "displayName": "c5",
+ "host": "qmog.cisco.com",
+ "iaasProvider": [
+ {
+ "imageId": "RegionOne/16e7e35b-0c88-4605-90ce-cbef9e9dde0f",
+ "maxInstanceLimit": "4",
+ "networkInterfaces": [
+ {
+ "floatingNetworks": [
+ {
+ "name": "public",
+ "networkUuid": "26b4aa2b-06bc-4e4f-a6eb-c19fbc211af6"
+ }
+ ],
+ "name": "core",
+ "networkUuid": "5e107fbd-4820-47ad-84ea-6f135496f889"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/2cdbd576-8c9b-4c2d-8b1a-0f79dc4fb809"
+ },
+ {
+ "name": "keyPair",
+ "value": "phoenix"
+ },
+ {
+ "name": "autoAssignIp",
+ "value": "false"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ],
+ "type": "mock"
+ }
+ ],
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "port": "22",
+ "protocol": "http",
+ "proxyPort": "8280"
+ }
+ ],
+ "property": [
+ {
+ "name": "payload_parameter.MB_IP",
+ "value": "octl.qmog.cisco.com"
+ },
+ {
+ "name": "payload_parameter.MB_PORT",
+ "value": "61616"
+ },
+ {
+ "name": "payload_parameter.CEP_IP",
+ "value": "octl.qmog.cisco.com"
+ },
+ {
+ "name": "payload_parameter.CEP_PORT",
+ "value": "7611"
+ },
+ {
+ "name": "payload_parameter.CEP_ADMIN_USERNAME",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.CEP_ADMIN_PASSWORD",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.CERT_TRUSTSTORE",
+ "value": "/opt/apache-stratos-cartridge-agent/security/client-truststore.jks"
+ },
+ {
+ "name": "payload_parameter.TRUSTSTORE_PASSWORD",
+ "value": "wso2carbon"
+ },
+ {
+ "name": "payload_parameter.ENABLE_DATA_PUBLISHER",
+ "value": "false"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_IP",
+ "value": "octl.qmog.cisco.com"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_PORT",
+ "value": "7611"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_SECURE_PORT",
+ "value": "7711"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_ADMIN_USERNAME",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD",
+ "value": "admin"
+ },
+ {
+ "name": "payload_parameter.QTCM_DNS_SEGMENT",
+ "value": "test"
+ },
+ {
+ "name": "payload_parameter.QTCM_NETWORK_COUNT",
+ "value": "1"
+ },
+ {
+ "name": "payload_parameter.SIMPLE_PROPERTY",
+ "value": "value"
+ }
+ ],
+ "provider": "cisco",
+ "type": "c5",
+ "version": "1.0"
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/cartridges/mock/c6.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c6.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c6.json
new file mode 100755
index 0000000..8f41441
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c6.json
@@ -0,0 +1,45 @@
+{
+ "type": "c6",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c6",
+ "description": "c6 Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "vishanth-key"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/cartridges/mock/update/c0.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/update/c0.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/update/c0.json
deleted file mode 100755
index 6d922a9..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridges/mock/update/c0.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "category": "Data",
- "description": "c0 Cartridge",
- "displayName": "c0",
- "host": "qmog.cisco.com12",
- "iaasProvider": [
- {
- "imageId": "RegionOne/16e7e35b-0c88-4605-90ce-cbef9e9d123",
- "maxInstanceLimit": "4",
- "networkInterfaces": [
- {
- "floatingNetworks": [
- {
- "name": "private",
- "networkUuid": "26b4aa2b-06bc-4e4f-a6eb-c19fbc2112121"
- }
- ],
- "name": "core1",
- "networkUuid": "5e107fbd-4820-47ad-84ea-6f1354961212"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/2cdbd576-8c9b-4c2d-8b1a-0f79dc4fb812"
- },
- {
- "name": "keyPair",
- "value": "phoenix12"
- },
- {
- "name": "autoAssignIp",
- "value": "true"
- },
- {
- "name": "securityGroups",
- "value": "default123"
- }
- ],
- "type": "mock"
- }
- ],
- "multiTenant": "false",
- "portMapping": [
- {
- "port": "22",
- "protocol": "http",
- "proxyPort": "8280"
- }
- ],
- "property": [
- {
- "name": "payload_parameter.MB_IP",
- "value": "octl.qmog.cisco.com123"
- },
- {
- "name": "payload_parameter.MB_PORT",
- "value": "61617"
- },
- {
- "name": "payload_parameter.CEP_IP",
- "value": "octl.qmog.cisco.com123"
- },
- {
- "name": "payload_parameter.CEP_PORT",
- "value": "7612"
- },
- {
- "name": "payload_parameter.CEP_ADMIN_USERNAME",
- "value": "admin"
- },
- {
- "name": "payload_parameter.CEP_ADMIN_PASSWORD",
- "value": "admin123"
- },
- {
- "name": "payload_parameter.CERT_TRUSTSTORE",
- "value": "/opt/apache-stratos-cartridge-agent/security/client-truststore.jks"
- },
- {
- "name": "payload_parameter.TRUSTSTORE_PASSWORD",
- "value": "wso2carbon"
- },
- {
- "name": "payload_parameter.ENABLE_DATA_PUBLISHER",
- "value": "false"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_IP",
- "value": "octl.qmog.cisco.com123"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_PORT",
- "value": "7612"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_SECURE_PORT",
- "value": "7712"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_ADMIN_USERNAME",
- "value": "admin"
- },
- {
- "name": "payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD",
- "value": "admin123"
- },
- {
- "name": "payload_parameter.QTCM_DNS_SEGMENT",
- "value": "test123"
- },
- {
- "name": "payload_parameter.QTCM_NETWORK_COUNT",
- "value": "3"
- },
- {
- "name": "payload_parameter.SIMPLE_PROPERTY",
- "value": "value"
- }
- ],
- "provider": "apache",
- "type": "c0",
- "version": "1.0"
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-1-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-1-v1.json b/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-1-v1.json
new file mode 100644
index 0000000..2ba5eb3
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-1-v1.json
@@ -0,0 +1,36 @@
+{
+ "id": "deployment-policy-1",
+ "networkPartitions": [
+ {
+ "id": "network-partition-1",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "partitionMax": 25
+ },
+ {
+ "id": "partition-2",
+ "partitionMax": 20
+ }
+ ]
+ },
+ {
+ "id": "network-partition-2",
+ "partitionAlgo": "round-robin",
+ "partitions": [
+ {
+ "id": "network-partition-2-partition-1",
+ "partitionMax": 15
+ },
+ {
+ "id": "network-partition-2-partition-2",
+ "partitionMax": 5
+ }
+ ]
+ }
+ ]
+}
+
+
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2-v1.json b/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2-v1.json
new file mode 100644
index 0000000..b5c305c
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2-v1.json
@@ -0,0 +1,36 @@
+{
+ "id": "deployment-policy-2",
+ "networkPartitions": [
+ {
+ "id": "network-partition-5",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "partitionMax": 25
+ },
+ {
+ "id": "partition-2",
+ "partitionMax": 20
+ }
+ ]
+ },
+ {
+ "id": "network-partition-6",
+ "partitionAlgo": "round-robin",
+ "partitions": [
+ {
+ "id": "network-partition-6-partition-1",
+ "partitionMax": 15
+ },
+ {
+ "id": "network-partition-6-partition-2",
+ "partitionMax": 5
+ }
+ ]
+ }
+ ]
+}
+
+
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2.json b/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2.json
new file mode 100644
index 0000000..5df3e24
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-2.json
@@ -0,0 +1,32 @@
+{
+ "id": "deployment-policy-2",
+ "networkPartitions": [
+ {
+ "id": "network-partition-5",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "partitionMax": 20
+ }
+ ]
+ },
+ {
+ "id": "network-partition-6",
+ "partitionAlgo": "round-robin",
+ "partitions": [
+ {
+ "id": "network-partition-6-partition-1",
+ "partitionMax": 10
+ },
+ {
+ "id": "network-partition-6-partition-2",
+ "partitionMax": 9
+ }
+ ]
+ }
+ ]
+}
+
+
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-3.json b/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-3.json
new file mode 100644
index 0000000..d024922
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/deployment-policies/deployment-policy-3.json
@@ -0,0 +1,32 @@
+{
+ "id": "deployment-policy-1",
+ "networkPartitions": [
+ {
+ "id": "network-partition-3",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "partitionMax": 20
+ }
+ ]
+ },
+ {
+ "id": "network-partition-4",
+ "partitionAlgo": "round-robin",
+ "partitions": [
+ {
+ "id": "network-partition-2-partition-1",
+ "partitionMax": 10
+ },
+ {
+ "id": "network-partition-2-partition-2",
+ "partitionMax": 9
+ }
+ ]
+ }
+ ]
+}
+
+
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/deployment-policies/update/deployment-policy-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policies/update/deployment-policy-1.json b/products/stratos/modules/integration/src/test/resources/deployment-policies/update/deployment-policy-1.json
deleted file mode 100644
index 2ba5eb3..0000000
--- a/products/stratos/modules/integration/src/test/resources/deployment-policies/update/deployment-policy-1.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "id": "deployment-policy-1",
- "networkPartitions": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "partitionMax": 25
- },
- {
- "id": "partition-2",
- "partitionMax": 20
- }
- ]
- },
- {
- "id": "network-partition-2",
- "partitionAlgo": "round-robin",
- "partitions": [
- {
- "id": "network-partition-2-partition-1",
- "partitionMax": 15
- },
- {
- "id": "network-partition-2-partition-2",
- "partitionMax": 5
- }
- ]
- }
- ]
-}
-
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/ec2/network-partition-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/ec2/network-partition-1.json b/products/stratos/modules/integration/src/test/resources/network-partitions/ec2/network-partition-1.json
deleted file mode 100644
index 3fbeeac..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/ec2/network-partition-1.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "id": "network-partition-1",
- "provider": "ec2",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "ap-southeast-1"
- },
- {
- "name": "zone",
- "value": "ap-southeast-1a"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/ec2/network-partition-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/ec2/network-partition-2.json b/products/stratos/modules/integration/src/test/resources/network-partitions/ec2/network-partition-2.json
deleted file mode 100644
index 02f9b1d..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/ec2/network-partition-2.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "id": "network-partition-2",
- "partitions": [
- {
- "id": "partition-2",
- "provider": "ec2",
- "property": [
- {
- "name": "region",
- "value": "ap-southeast-2"
- },
- {
- "name": "region",
- "value": "ap-southeast-2b"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/gce/network-partition-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/gce/network-partition-1.json b/products/stratos/modules/integration/src/test/resources/network-partitions/gce/network-partition-1.json
deleted file mode 100644
index 177e7d2..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/gce/network-partition-1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-1",
- "provider": "gce",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/kubernetes/network-partition-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/kubernetes/network-partition-1.json b/products/stratos/modules/integration/src/test/resources/network-partitions/kubernetes/network-partition-1.json
deleted file mode 100644
index bb27086..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/kubernetes/network-partition-1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-1",
- "provider": "kubernetes",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "cluster",
- "value": "kubernetes-cluster-2"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/kubernetes/network-partition-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/kubernetes/network-partition-2.json b/products/stratos/modules/integration/src/test/resources/network-partitions/kubernetes/network-partition-2.json
deleted file mode 100644
index 8f9f053..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/kubernetes/network-partition-2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-2",
- "provider": "kubernetes",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "cluster",
- "value": "kubernetes-cluster-2"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/kubernetes/network-partition-3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/kubernetes/network-partition-3.json b/products/stratos/modules/integration/src/test/resources/network-partitions/kubernetes/network-partition-3.json
deleted file mode 100644
index 5188f3c..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/kubernetes/network-partition-3.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-3",
- "provider": "kubernetes",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "cluster",
- "value": "kubernetes-cluster-1"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-1-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-1-v1.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-1-v1.json
new file mode 100644
index 0000000..054265a
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-1-v1.json
@@ -0,0 +1,28 @@
+{
+ "id": "network-partition-1",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ },
+ {
+ "id": "partition-2",
+ "property": [
+ {
+ "name": "region",
+ "value": "default1"
+ },
+ {
+ "name": "zone",
+ "value": "z1"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-3-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-3-v1.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-3-v1.json
new file mode 100644
index 0000000..c7d4733
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-3-v1.json
@@ -0,0 +1,28 @@
+{
+ "id": "network-partition-3",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ },
+ {
+ "id": "partition-2",
+ "property": [
+ {
+ "name": "region",
+ "value": "default1"
+ },
+ {
+ "name": "zone",
+ "value": "z1"
+ }
+ ]
+ }
+ ]
+}
[32/50] [abbrv] stratos git commit: Uplift JDK and Tomcat versions in
Puppet and Dockerfiles
Posted by la...@apache.org.
Uplift JDK and Tomcat versions in Puppet and Dockerfiles
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ad3066ab
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ad3066ab
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ad3066ab
Branch: refs/heads/data-publisher-integration
Commit: ad3066abe59e23696846e9ea464516b42b27b6a2
Parents: bd65af0
Author: Akila Perera <ra...@gmail.com>
Authored: Sat Aug 8 00:11:33 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Sat Aug 8 00:11:33 2015 +0530
----------------------------------------------------------------------
tools/docker-images/cartridge-docker-images/build.sh | 7 +++----
.../service-images/tomcat-saml-sso/Dockerfile | 4 ++--
.../cartridge-docker-images/service-images/tomcat/Dockerfile | 6 +++---
.../service-images/wso2is-saml-sso/Dockerfile | 4 ++--
.../stratos-docker-images/puppetmaster/docker-build.sh | 4 ++--
tools/docker-images/stratos-docker-images/puppetmaster/run | 4 ++--
tools/puppet3/manifests/nodes/base.pp | 4 ++--
7 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/tools/docker-images/cartridge-docker-images/build.sh
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/build.sh b/tools/docker-images/cartridge-docker-images/build.sh
index 6ceab94..8a8c30a 100755
--- a/tools/docker-images/cartridge-docker-images/build.sh
+++ b/tools/docker-images/cartridge-docker-images/build.sh
@@ -30,14 +30,13 @@ cp -vf target/apache-stratos-python-cartridge-agent-4.1.1.zip ${script_path}/bas
popd
pushd ${script_path}/base-image/
-echo "Building base docker image..."
+echo "Building base Docker image..."
sudo docker build -t stratos/base-image:4.1.1 .
pushd ${script_path}/service-images/php
-echo "Building php docker image..."
+echo "Building PHP Docker image..."
sudo docker build -t stratos/php:4.1.1 .
pushd ${script_path}/service-images/tomcat
-echo "Building tomcat docker image..."
+echo "Building Tomcat Docker image..."
sudo docker build -t stratos/tomcat:4.1.1 .
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile
index 12ccb98..3a8d46b 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile
@@ -22,8 +22,8 @@
FROM stratos/base-image:4.1.1
MAINTAINER dev@stratos.apache.org
-ENV JDK_VERSION 1.7.0_60
-ENV JDK_TAR_FILENAME jdk-7u60-linux-x64.tar.gz
+ENV JDK_VERSION 1.7.0_80
+ENV JDK_TAR_FILENAME jdk-7u80-linux-x64.tar.gz
ENV TOMCAT_VERSION 7.0.55
# ----------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile
index 0bc4ecb..fec1792 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile
@@ -22,9 +22,9 @@
FROM stratos/base-image:4.1.1
MAINTAINER dev@stratos.apache.org
-ENV JDK_VERSION 1.7.0_67
-ENV JDK_TAR_FILENAME jdk-7u67-linux-x64.tar.gz
-ENV TOMCAT_VERSION 7.0.59
+ENV JDK_VERSION 1.7.0_80
+ENV JDK_TAR_FILENAME jdk-7u80-linux-x64.tar.gz
+ENV TOMCAT_VERSION 7.0.63
# ----------------------
# Install prerequisites
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
index 9298ad2..5b895f0 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
@@ -23,8 +23,8 @@ FROM stratos/base-image:4.1.1
MAINTAINER dev@stratos.apache.org
ENV DEBIAN_FRONTEND noninteractive
-ENV JDK_VERSION 1.7.0_60
-ENV JDK_TAR_FILENAME jdk-7u60-linux-x64.tar.gz
+ENV JDK_VERSION 1.7.0_80
+ENV JDK_TAR_FILENAME jdk-7u80-linux-x64.tar.gz
ENV WSO2_IS_VERSION 5.0.0
# ----------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/tools/docker-images/stratos-docker-images/puppetmaster/docker-build.sh
----------------------------------------------------------------------
diff --git a/tools/docker-images/stratos-docker-images/puppetmaster/docker-build.sh b/tools/docker-images/stratos-docker-images/puppetmaster/docker-build.sh
index 86280a7..4336334 100755
--- a/tools/docker-images/stratos-docker-images/puppetmaster/docker-build.sh
+++ b/tools/docker-images/stratos-docker-images/puppetmaster/docker-build.sh
@@ -37,7 +37,7 @@ TOMCAT_URL="http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.52/bin/apache-to
HAWTBUF_URL="http://repo1.maven.org/maven2/org/fusesource/hawtbuf/hawtbuf/1.9/hawtbuf-1.9.jar"
# if you change the JDK version, you will need to change the version in the Dockerfile too
-JDK_URL="http://download.oracle.com/otn-pub/java/jdk/7u51-b13/jdk-7u51-linux-x64.tar.gz"
+JDK_URL="http://download.oracle.com/otn-pub/java/jdk/7u51-b13/jdk-7u80-linux-x64.tar.gz"
#
# Tomcat to be copied to the image
@@ -87,7 +87,7 @@ cp -f $STRATOS_SOURCE/products/load-balancer/modules/distribution/target/apache-
cd files/
tar -cvzf apache-activemq-libs.tgz -C apache-activemq-lib/ .
-tar -cvzf jdk.tgz jdk-7u51-linux-x64.tar.gz
+tar -cvzf jdk.tgz jdk-7u80-linux-x64.tar.gz
tar -cvzf apache-tomcat.tgz apache-tomcat-7.0.52.tar.gz
tar -cvzf apache-stratos-cartridge-agent.tgz apache-stratos-cartridge-agent-*.zip
tar -cvzf apache-stratos-load-balancer.tgz apache-stratos-load-balancer-*.zip
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/tools/docker-images/stratos-docker-images/puppetmaster/run
----------------------------------------------------------------------
diff --git a/tools/docker-images/stratos-docker-images/puppetmaster/run b/tools/docker-images/stratos-docker-images/puppetmaster/run
index 80a4840..c3d7f94 100755
--- a/tools/docker-images/stratos-docker-images/puppetmaster/run
+++ b/tools/docker-images/stratos-docker-images/puppetmaster/run
@@ -47,8 +47,8 @@ sed -i "3i dns_alt_names=${MASTERHOSTNAME}" /etc/puppet/puppet.conf
PUPPET_FILE=/etc/puppet/manifests/nodes/base.pp
# TODO java version is hard coded
-sed -i -E "s:(\s*[$]java_name.*=).*$:\1 \"jdk1.7.0_51\":g" $PUPPET_FILE
-sed -i -E "s:(\s*[$]java_distribution.*=).*$:\1 \"jdk-7u51-linux-x64.tar.gz\":g" $PUPPET_FILE
+sed -i -E "s:(\s*[$]java_name.*=).*$:\1 \"jdk1.7.0_80\":g" $PUPPET_FILE
+sed -i -E "s:(\s*[$]java_distribution.*=).*$:\1 \"jdk-7u80-linux-x64.tar.gz\":g" $PUPPET_FILE
sed -i -E "s:(\s*[$]local_package_dir.*=).*$:\1 \"/mnt/packs\":g" $PUPPET_FILE
sed -i -E "s:(\s*[$]mb_ip.*=).*$:\1 \"$MB_HOSTNAME\":g" $PUPPET_FILE
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/tools/puppet3/manifests/nodes/base.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/manifests/nodes/base.pp b/tools/puppet3/manifests/nodes/base.pp
index a92942a..412aa31 100755
--- a/tools/puppet3/manifests/nodes/base.pp
+++ b/tools/puppet3/manifests/nodes/base.pp
@@ -28,8 +28,8 @@ node 'base' {
$cep_username ='admin'
$cep_password ='admin'
$truststore_password = 'wso2carbon'
- $java_distribution = 'jdk-7u51-linux-x64.tar.gz'
- $java_name = 'jdk1.7.0_51'
+ $java_distribution = 'jdk-7u80-linux-x64.tar.gz'
+ $java_name = 'jdk1.7.0_80'
$member_type_ip = 'private'
$lb_httpPort = '80'
$lb_httpsPort = '443'
[40/50] [abbrv] stratos git commit: Updating Stratos dependencies
versions to project version
Posted by la...@apache.org.
Updating Stratos dependencies versions to project version
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d6163723
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d6163723
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d6163723
Branch: refs/heads/data-publisher-integration
Commit: d61637239268903ffef7148de0d51eabfcf956bb
Parents: e5dbd77
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Aug 11 17:23:54 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Aug 11 17:23:54 2015 +0530
----------------------------------------------------------------------
components/org.apache.stratos.cloud.controller/pom.xml | 2 +-
components/org.apache.stratos.kubernetes.client/pom.xml | 6 +++---
dependencies/fabric8/kubernetes-api/pom.xml | 6 ++----
dependencies/org.wso2.carbon.ui/pom.xml | 1 -
.../org.apache.stratos.cloud.controller.feature/pom.xml | 4 ++--
pom.xml | 1 -
products/stratos/modules/distribution/pom.xml | 2 +-
7 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/components/org.apache.stratos.cloud.controller/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml
index 3c5869c..2b75e3d 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -317,7 +317,7 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>kubernetes-api</artifactId>
- <version>${kubernetes.api.stratos.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<properties>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/components/org.apache.stratos.kubernetes.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/pom.xml b/components/org.apache.stratos.kubernetes.client/pom.xml
index f2a03fd..c496318 100644
--- a/components/org.apache.stratos.kubernetes.client/pom.xml
+++ b/components/org.apache.stratos.kubernetes.client/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>kubernetes-api</artifactId>
- <version>${kubernetes.api.stratos.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -71,8 +71,8 @@
org.apache.stratos.kubernetes.client.exceptions,
</Export-Package>
<Import-Package>
- io.fabric8.kubernetes.api.*;version=${kubernetes.api.stratos.version},
- io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.stratos.version},
+ io.fabric8.kubernetes.api.*;version=${kubernetes.api.version},
+ io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.version},
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/dependencies/fabric8/kubernetes-api/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-api/pom.xml b/dependencies/fabric8/kubernetes-api/pom.xml
index baddfa2..6c4ac71 100644
--- a/dependencies/fabric8/kubernetes-api/pom.xml
+++ b/dependencies/fabric8/kubernetes-api/pom.xml
@@ -27,9 +27,7 @@
</parent>
<artifactId>kubernetes-api</artifactId>
- <version>2.2.16-stratosv1</version>
<packaging>bundle</packaging>
-
<name>Fabric8 :: Kubernetes API</name>
<description>
This is a wrapper bundle for Fabric8 Kubernetes API for exposing proper bundle import
@@ -141,8 +139,8 @@
<instructions>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- io.fabric8.kubernetes.api.*;version=${kubernetes.api.stratos.version},
- io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.stratos.version},
+ io.fabric8.kubernetes.api.*;version=${kubernetes.api.version},
+ io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.version},
io.fabric8.kubernetes.internal.*,
</Export-Package>
<Import-Package>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/dependencies/org.wso2.carbon.ui/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/org.wso2.carbon.ui/pom.xml b/dependencies/org.wso2.carbon.ui/pom.xml
index 0b03b2c..6c9e470 100644
--- a/dependencies/org.wso2.carbon.ui/pom.xml
+++ b/dependencies/org.wso2.carbon.ui/pom.xml
@@ -32,7 +32,6 @@
<packaging>bundle</packaging>
<name>WSO2 Carbon - UI</name>
<description>org.wso2.carbon.ui patch version for apache stratos</description>
- <version>4.2.0-stratosv1</version>
<url>http://wso2.org</url>
<repositories>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
index a9c535c..d4a3388 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
@@ -254,7 +254,7 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>kubernetes-api</artifactId>
- <version>${kubernetes.api.stratos.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -360,7 +360,7 @@
<bundleDef>org.apache.jclouds.api:sts:${jclouds.version}</bundleDef>
<bundleDef>javax.ws.rs:jsr311-api:1.1.1</bundleDef>
<bundleDef>org.apache.stratos:org.apache.stratos.messaging:${project.version}</bundleDef>
- <bundleDef>org.apache.stratos:kubernetes-api:${kubernetes.api.stratos.version}</bundleDef>
+ <bundleDef>org.apache.stratos:kubernetes-api:${project.version}</bundleDef>
</bundles>
<importBundles>
</importBundles>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 555130e..993194a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -555,6 +555,5 @@
<jclouds.version>1.8.1</jclouds.version>
<project.jclouds.stratos.version>1.8.1-stratosv1</project.jclouds.stratos.version>
<kubernetes.api.version>2.2.16</kubernetes.api.version>
- <kubernetes.api.stratos.version>2.2.16-stratosv1</kubernetes.api.stratos.version>
</properties>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/products/stratos/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml
index add0975..d19d392 100755
--- a/products/stratos/modules/distribution/pom.xml
+++ b/products/stratos/modules/distribution/pom.xml
@@ -482,7 +482,7 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>4.2.0-stratos</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<build>
[42/50] [abbrv] stratos git commit: Removing unnecessary features,
artifacts and restructuring distribution artifacts
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/esb-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/esb-logo.gif b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/esb-logo.gif
new file mode 100755
index 0000000..95cb5b3
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/esb-logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/gadget-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/gadget-logo.gif b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/gadget-logo.gif
new file mode 100755
index 0000000..8e89ef5
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/gadget-logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/governance-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/governance-logo.gif b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/governance-logo.gif
new file mode 100755
index 0000000..af1ac45
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/governance-logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/identity-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/identity-logo.gif b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/identity-logo.gif
new file mode 100755
index 0000000..a2447bc
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/identity-logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/mashup-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/mashup-logo.gif b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/mashup-logo.gif
new file mode 100755
index 0000000..f8ed9be
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/mashup-logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/module.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/module.xml b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/module.xml
new file mode 100644
index 0000000..2cb5634
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/module.xml
@@ -0,0 +1,69 @@
+<?xml version='1.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.
+
+-->
+
+<module name="carbon" xmlns="http://wso2.org/projects/jaggery/module.xml">
+ <!-- scripts -->
+ <script>
+ <name>osgi</name>
+ <path>scripts/server/osgi.js</path>
+ </script>
+ <script>
+ <name>tenant</name>
+ <path>scripts/server/tenant.js</path>
+ </script>
+ <script>
+ <name>server</name>
+ <path>scripts/server/server.js</path>
+ </script>
+ <script>
+ <name>config</name>
+ <path>scripts/server/config.js</path>
+ </script>
+ <script>
+ <name>user</name>
+ <path>scripts/user/user.js</path>
+ </script>
+ <script>
+ <name>registry</name>
+ <path>scripts/registry/registry.js</path>
+ </script>
+ <script>
+ <name>registry-osgi</name>
+ <path>scripts/registry/registry-osgi.js</path>
+ </script>
+ <script>
+ <name>artifacts</name>
+ <path>scripts/registry/artifacts.js</path>
+ </script>
+ <script>
+ <name>space</name>
+ <path>scripts/user/space.js</path>
+ </script>
+ <script>
+ <name>registry-space</name>
+ <path>scripts/user/registry-space.js</path>
+ </script>
+ <script>
+ <name>user-manager</name>
+ <path>scripts/user/user-manager.js</path>
+ </script>
+</module>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/artifacts.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/artifacts.js b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/artifacts.js
new file mode 100644
index 0000000..a05e567
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/artifacts.js
@@ -0,0 +1,595 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+(function (server, registry) {
+
+ var log = new Log();
+
+ var GenericArtifactManager = Packages.org.wso2.carbon.governance.api.generic.GenericArtifactManager;
+ var GenericArtifactFilter = Packages.org.wso2.carbon.governance.api.generic.GenericArtifactFilter;
+ var ByteArrayInputStream = Packages.java.io.ByteArrayInputStream;
+ var QName = Packages.javax.xml.namespace.QName;
+ var IOUtils = Packages.org.apache.commons.io.IOUtils;
+ var PrivilegedCarbonContext = Packages.org.wso2.carbon.context.PrivilegedCarbonContext; //Used regard tenant details
+ var CarbonContext = Packages.org.wso2.carbon.context.CarbonContext;
+ var MultitenantConstants = Packages.org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+ var List = java.util.List;
+ var Map = java.util.Map;
+ var ArrayList = java.util.ArrayList;
+ var HashMap = java.util.HashMap;
+
+ var GovernanceUtils = Packages.org.wso2.carbon.governance.api.util.GovernanceUtils;//Used to obtain Asset Types
+ var DEFAULT_MEDIA_TYPE = 'application/vnd.wso2.registry-ext-type+xml';//Used to obtain Asset types
+ var PaginationContext = Packages.org.wso2.carbon.registry.core.pagination.PaginationContext;//Used for pagination on register
+
+ var REGISTRY_ABSOLUTE_PATH = "/_system/governance";
+
+ var HISTORY_PATH_SEPERATOR = '_';
+ var ASSET_PATH_SEPERATOR = '/';
+ var lcHistoryRegExpression = new RegExp(ASSET_PATH_SEPERATOR, 'g');
+ var HISTORY_PATH = '/_system/governance/_system/governance/repository/components/org.wso2.carbon.governance/lifecycles/history/';
+
+
+ var buildArtifact = function (manager, artifact) {
+ return {
+ id: String(artifact.id),
+ type: String(manager.type),
+ path: "/_system/governance" + String(artifact.getPath()),
+ lifecycle: artifact.getLifecycleName(),
+ lifecycleState: artifact.getLifecycleState(),
+ mediaType: String(artifact.getMediaType()),
+ attributes: (function () {
+ var i, name,
+ names = artifact.getAttributeKeys(),
+ length = names.length,
+ attributes = {};
+ for (i = 0; i < length; i++) {
+ name = names[i];
+
+ var data = artifact.getAttributes(name);
+
+ //Check if there is only one element
+ if (data.length == 1) {
+ attributes[name] = String(artifact.getAttribute(name));
+ }
+ else {
+ attributes[name] = data;
+ }
+ }
+ return attributes;
+ }()),
+ content: function () {
+ return new Stream(new ByteArrayInputStream(artifact.getContent()));
+ }
+ };
+ };
+
+ var createArtifact = function (manager, options) {
+ var name, attribute, i, length, lc,
+ artifact = manager.newGovernanceArtifact(new QName(options.name)),
+ attributes = options.attributes;
+ for (name in attributes) {
+ if (attributes.hasOwnProperty(name)) {
+ attribute = attributes[name];
+ if (attribute instanceof Array) {
+ /*length = attribute.length;
+ for (i = 0; i < length; i++) {
+ artifact.addAttribute(name, attribute[i]);
+ }*/
+ artifact.setAttributes(name, attribute);
+ } else {
+ artifact.setAttribute(name, attribute);
+ }
+ }
+ }
+ if (options.id) {
+ artifact.id = options.id;
+ }
+ if (options.content) {
+ if (options.content instanceof Stream) {
+ artifact.setContent(IOUtils.toByteArray(options.content.getStream()));
+ } else {
+ artifact.setContent(new java.lang.String(options.content).getBytes());
+ }
+ }
+ lc = options.lifecycles;
+ if (lc) {
+ length = lc.length;
+ for (i = 0; i < length; i++) {
+ artifact.attachLifeCycle(lc[i]);
+ }
+ }
+ return artifact;
+ };
+
+ var ArtifactManager = function (registry, type) {
+ this.registry = registry;
+ this.manager = new GenericArtifactManager(registry.registry.getChrootedRegistry("/_system/governance"), type);
+ this.type = type;
+ };
+ registry.ArtifactManager = ArtifactManager;
+
+ ArtifactManager.prototype.find = function (fn, paging) {
+ var i, length, artifacts,
+ artifactz = [];
+ artifacts = this.manager.findGenericArtifacts(new GenericArtifactFilter({
+ matches: function (artifact) {
+ return fn(buildArtifact(this, artifact));
+ }
+ }));
+ length = artifacts.length;
+ for (i = 0; i < length; i++) {
+ artifactz.push(buildArtifact(this, artifacts[i]));
+ }
+ return artifactz;
+ };
+
+
+ /*
+ * this funtion is used ArtifactManager find with map for query for solr basicly
+ * query - for maping attribute of resource
+ * pagin - pagination details
+ * return - list of artifacts under the seach request
+ *
+ */
+ ArtifactManager.prototype.search = function (query, paging) {
+
+ var list, map, key, artifacts, pagination, value, that,
+ artifactz = [];
+ pagination = generatePaginationForm(paging);
+ try {
+ PaginationContext.init(pagination.start, pagination.count, pagination.sortOrder,
+ pagination.sortBy, pagination.paginationLimit);
+ map = HashMap();
+ //case senstive search as it using greg with solr 1.4.1
+ if (!query) {
+ //listing for sorting
+ map = java.util.Collections.emptyMap();
+ } else if (query instanceof String || typeof query === 'string') {
+ list = new ArrayList();
+ list.add('*' + query + '*');
+ map.put('overview_name', list);
+ } else {
+ //support for only on name of attribut -
+ for (key in query) {
+ // if attribute is string values
+ if (query.hasOwnProperty(key)) {
+ value = query[key];
+ list = new ArrayList();
+ if (value instanceof Array) {
+ value.forEach(function (val) {
+ //solr config update need have '*' as first char in below line
+ //check life_cycle state
+ list.add(key == 'lcState' ? val : '*' + val + '*');
+ });
+ } else {
+ //solr config update need have '*' as first char in below line
+ list.add(key == 'lcState' ? value : '*' + value + '*');
+ }
+ map.put(key, list);
+ }
+ }//end of attribut looping (all attributes)
+ }
+ artifacts = this.manager.findGenericArtifacts(map);
+ that = this;
+ artifacts.forEach(function (artifact) {
+ artifactz.push(buildArtifact(that, artifact));
+ });
+ } finally {
+ PaginationContext.destroy();
+ }
+ return artifactz;
+ };
+
+ ArtifactManager.prototype.get = function (id) {
+ return buildArtifact(this, this.manager.getGenericArtifact(id))
+ };
+
+ ArtifactManager.prototype.count = function () {
+ return this.manager.getAllGenericArtifactIds().length;
+ };
+
+ /**
+ * @deprecated Please use search method instead
+ * @param paging
+ * @return {*}
+ */
+ ArtifactManager.prototype.list = function (paging) {
+ return this.search(null, paging);
+ };
+
+ /*
+ The function returns an array of asset types
+ @mediaType - The media type of the assets
+ @return An array of strings containing the asset paths
+ */
+ ArtifactManager.prototype.getAssetTypePaths = function (mediaType) {
+
+ //Use the default media type if one is not provided
+ if (!mediaType) {
+ mediaType = DEFAULT_MEDIA_TYPE;
+ }
+
+ //var assetArray=GovernanceUtils.findGovernanceArtifacts(mediaType,this.registry);
+ var result = Packages.org.wso2.carbon.governance.api.util.GovernanceUtils.findGovernanceArtifacts(mediaType, registry.registry);
+
+ return result;
+ //Create an empty array if no asset types are found
+ //return (!assetArray)?[]:assetArray;
+ };
+
+ /*
+ {
+ name: 'AndroidApp1',
+ attributes: {
+ overview_status: "CREATED",
+ overview_name: 'AndroidApp1',
+ overview_version: '1.0.0',
+ overview_url: 'http://overview.com',
+ overview_provider: 'admin',
+ images_thumbnail: 'http://localhost:9763/portal/gadgets/co2-emission/thumbnail.jpg',
+ images_banner: 'http://localhost:9763/portal/gadgets/electric-power/banner.jpg'
+ },
+ lifecycles : ['lc1', 'lc2'],
+ content : '<?xml ....>'
+ }
+ */
+ ArtifactManager.prototype.add = function (options) {
+ this.manager.addGenericArtifact(createArtifact(this.manager, options));
+ };
+
+ ArtifactManager.prototype.update = function (options) {
+ this.manager.updateGenericArtifact(createArtifact(this.manager, options));
+ };
+
+ ArtifactManager.prototype.remove = function (id) {
+ this.manager.removeGenericArtifact(id);
+ };
+
+ /*
+ Attaches the provided lifecycle name to the artifact
+ @lifecycleName: The name of a valid lifecycle.The lifecycle should be visible to the
+ registry.
+ @options: The artifact to which the life cycle must be attached.
+ */
+ ArtifactManager.prototype.attachLifecycle = function (lifecycleName, options) {
+ var artifact = getArtifactFromImage(this.manager, options);
+ if (!artifact) {
+ throw new Error('Specified artifact cannot be found : ' + JSON.stringify(options));
+ }
+ artifact.attachLifecycle(lifecycleName);
+ };
+
+ /*
+ Removes the attached lifecycle from the artifact
+ @options: The artifact from which the life cycle must be removed
+ */
+ ArtifactManager.prototype.detachLifecycle = function (options) {
+ var artifact = getArtifactFromImage(this.manager, options);
+ if (!artifact) {
+ throw new Error('Specified artifact cannot be found : ' + JSON.stringify(options));
+ }
+ artifact.detachLifecycle();
+ };
+
+ /*
+ Promotes the artifact to the next stage in its life cycle
+ @options: An artifact image (Not a real artifact)
+ */
+ ArtifactManager.prototype.promoteLifecycleState = function (state, options) {
+ var checkListItems,
+ artifact = getArtifactFromImage(this.manager, options);
+ if (!artifact) {
+ throw new Error('Specified artifact cannot be found : ' + JSON.stringify(options));
+ }
+ //checkListItems = artifact.getAllCheckListItemNames();
+ artifact.invokeAction(state);
+ };
+
+ /*
+ Gets the current lifecycle state
+ @options: An artifact object
+ @returns: The life cycle state
+ */
+ ArtifactManager.prototype.getLifecycleState = function (options) {
+ var artifact = getArtifactFromImage(this.manager, options);
+ if (!artifact) {
+ throw new Error('Specified artifact cannot be found : ' + JSON.stringify(options));
+ }
+ return artifact.getLifecycleState();
+ };
+
+ /*
+ The function returns the list of check list items for a given state
+ @options: The artifact
+ @returns: A String array containing the check list items.(Can be empty if no check list items are present)
+ */
+ ArtifactManager.prototype.getCheckListItemNames = function (options) {
+ var artifact = getArtifactFromImage(this.manager, options);
+
+ var checkListItems = artifact.getAllCheckListItemNames() || [];
+
+ var checkListItemArray = [];
+
+ //Go through each check list item
+ for (var index in checkListItems) {
+ //Get whether the check list item is checked
+ var state = artifact.isLCItemChecked(index);
+ checkListItemArray.push({ 'name': checkListItems[index], 'checked': state });
+ }
+
+ return checkListItemArray;
+ };
+
+ /*
+ The function checks whether a given check list item at the provided index is checked for the current state
+ @index: The index of the check list item.This must be a value between 0 and the maximum check list item
+ that appears in the lifecycle definition
+ @options: An artifact object
+ @throws Exception: If the index is not within 0 and the max check list item or if there is an issue ticking the item
+ */
+ ArtifactManager.prototype.isItemChecked = function (index, options) {
+
+ var artifact = getArtifactFromImage(this.manager, options);
+
+ var checkListItems = artifact.getAllCheckListItemNames();
+
+ var checkListLength = checkListItems.length;
+
+ if ((index < 0) || (index > checkListLength)) {
+ throw "The index value: " + index + " must be between 0 and " + checkListLength + ".Please refer to the lifecycle definition in the registry.xml for the number of check list items.";
+ }
+
+ var result = artifact.isLCItemChecked(index);
+
+ return result;
+ };
+
+ /*
+ The method enables the check list item and the given index
+ @index: The index of the check list item.This must be a value between 0 and the maximum check list item
+ that appears in the lifecycle definition.
+ @options: An artifact object
+ @throws Exception: If the index is not within 0 and max check list item or if there is an issue ticking the item.
+ */
+ ArtifactManager.prototype.checkItem = function (index, options) {
+
+ var artifact = getArtifactFromImage(this.manager, options);
+
+ var checkListItems = artifact.getAllCheckListItemNames();
+
+ var checkListLength = checkListItems.length;
+
+ if ((index < 0) || (index > checkListLength)) {
+ throw "The index value: " + index + " must be between 0 and " + checkListLength + ".Please refer to the lifecycle definition in the registry.xml for the number of check list items.";
+ }
+
+ artifact.checkLCItem(index);
+ };
+
+ /*
+ The method disables the check list item at the given index
+ @index: The index of the check list item.This must be a value between 0 and the maximum check list item
+ that appears in the lifecycle definition
+ @options: An artifact object
+ @throws Exception: If the index is not within 0 and max check list item or if there is an issue ticking the item
+ */
+ ArtifactManager.prototype.uncheckItem = function (index, options) {
+
+ var artifact = getArtifactFromImage(this.manager, options);
+
+ var checkListItems = artifact.getAllCheckListItemNames();
+
+ var checkListLength = checkListItems.length;
+
+ if ((index < 0) || (index > checkListLength)) {
+ throw "The index value: " + index + " must be between 0 and " + checkListLength + ".Please refer to the lifecycle definition in the registry.xml for the number of check list items.";
+ }
+
+ artifact.uncheckLCItem(index);
+ };
+
+ /*
+ The method obtains the list of all available actions for the current state of the asset
+ @options: An artifact object
+ @returns: The list of available actions for the current state,else false
+ */
+ ArtifactManager.prototype.availableActions = function (options) {
+ var artifact = getArtifactFromImage(this.manager, options);
+ if (!artifact) {
+ throw new Error('Specified artifact cannot be found : ' + JSON.stringify(options));
+ }
+ return artifact.getAllLifecycleActions() || [];
+ };
+
+ /*
+ The function returns the life-cycle history path using
+ the provided asset.
+ @options: An asset.
+ @return: A string path of the life-cycle history.
+ */
+ ArtifactManager.prototype.getLifecycleHistoryPath = function (options) {
+
+ return getHistoryPath(options.path);
+ };
+
+ /*
+ The function obtains the lifecycle history for the provided asset
+ @options: An asset with a valid path.(A path which exists in the registry
+ @return: A resource object containing the history as an xml
+ */
+ ArtifactManager.prototype.getLifecycleHistory=function(options){
+ var historyPath=getHistoryPath(options.path);
+ return this.registry.get(historyPath);
+ };
+
+ /*
+ The function returns the life-cycle attached to the provided artifact
+ @options: An asset as returned by the ArtifactManager get method
+ @return: A string indicating the lifecycle name.If the artifact does not
+ have a life-cycle then an empty string is returned.
+ */
+ ArtifactManager.prototype.getLifeCycleName = function (options) {
+
+ var artifact = getArtifactFromImage(this.manager, options);
+
+ var lifecycleName = '';
+
+ if (artifact != null) {
+ lifecycleName = artifact.getLifecycleName();
+ }
+
+ return lifecycleName;
+ };
+
+ /*
+ The function returns all versions of the provided artifact
+ @options: The artifact to be checked
+ @return: A list of all the different versions of the provided asset
+ */
+ ArtifactManager.prototype.getAllAssetVersions = function (assetName) {
+
+ var matchingArtifacts = [];
+
+ var pred = {
+ overview_name: assetName || ''
+ };
+
+ this.find(function (artifact) {
+
+ //Add to the matches if the artifact exists
+ if (assert(artifact.attributes, pred)) {
+
+ //We only need the id and version
+ matchingArtifacts.push({id: artifact.id, version: artifact.attributes.overview_version});
+ }
+ });
+
+ return matchingArtifacts;
+ };
+
+ /*
+ The function checks if the two objects a and b are equal.If a property in b is not
+ in a, then both objects are assumed to be different.
+ @a: The object to be compared
+ @b: The object containing properties that must match in a
+ @return: True if the objects are equal,else false.
+ */
+ var assert = function (a, b) {
+
+ //Assume the objects will be same
+ var equal = true;
+
+ for (var key in b) {
+
+
+ if (a.hasOwnProperty(key)) {
+
+ //If the two keys are not equal
+ if (a[key] != b[key]) {
+ return false;
+ }
+ }
+ else {
+ return false;
+ }
+ }
+
+ return equal;
+ };
+
+ /*
+ The function generates the history path of a given asset
+ using its path
+ @assetPath:The path of the asset to be retrieved.
+ @return: The path of lifecycle history information
+ */
+ var getHistoryPath = function (assetPath) {
+
+ //Replace the / in the assetPath
+ var partialHistoryPath = assetPath.replace(lcHistoryRegExpression, HISTORY_PATH_SEPERATOR);
+
+ var fullPath = HISTORY_PATH + partialHistoryPath;
+
+ return fullPath;
+ };
+
+ /*
+ generatePaginationForm will genrate json for registry pagination context, (pagination consistent handling)
+ @pagin:The pagination details from UI
+ @
+ */
+ var generatePaginationForm = function (pagin) {
+
+ //pagination context for default
+ var paginationLimit = 300;
+ var paginationForm = {
+ 'start': 0,
+ 'count': 12,
+ 'sortOrder': 'ASC',
+ 'sortBy': 'overview_name',
+ 'paginationLimit': 2147483647
+ };
+
+ if (!pagin) {
+ return paginationForm;
+ }
+
+ if (pagin.count != null) {
+ paginationForm.count = pagin.count;
+ }
+ if (pagin.start != null) {
+ paginationForm.start = pagin.start;
+ }
+ if (pagin.paginationLimit != null) {
+ paginationForm.paginationLimit = pagin.paginationLimit;
+ }
+ if (pagin.sortBy != null) {
+ paginationForm.sortBy = pagin.sortBy;
+ }
+ if (paginationForm.sortOrder != null) {
+ paginationForm.sortOrder = pagin.sortOrder;
+ }
+ return paginationForm;
+
+ };
+
+ /*
+ Helper function to create an artifact instance from a set of options (an image).
+ */
+ var getArtifactFromImage = function (manager, options) {
+
+ var path = options.path || '';
+ var lcName = options.lifecycle || '';
+ var artifact = createArtifact(manager, {
+ id: options.id,
+ attributes: options.attributes
+ });
+
+ path = path.replace(REGISTRY_ABSOLUTE_PATH, '');
+
+ artifact.setArtifactPath(path);
+ artifact.setLcName(lcName);
+
+ return artifact;
+ };
+
+}(server, registry));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/registry-osgi.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/registry-osgi.js b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/registry-osgi.js
new file mode 100644
index 0000000..eefbaad
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/registry-osgi.js
@@ -0,0 +1,466 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+var registry = registry || {};
+
+(function (server, registry) {
+ var log = new Log();
+
+ var Resource = Packages.org.wso2.carbon.registry.core.Resource;
+
+ var Collection = Packages.org.wso2.carbon.registry.core.Collection;
+
+ var Comment = Packages.org.wso2.carbon.registry.core.Comment;
+
+ var StaticConfiguration = Packages.org.wso2.carbon.registry.core.config.StaticConfiguration;
+
+ var queryPath = '/_system/config/repository/components/org.wso2.carbon.registry/queries/';
+
+ var content = function (registry, resource, paging) {
+ if (resource instanceof Collection) {
+ // #1 : this always sort children by name, so sorting cannot be done for the chunk
+ return children(registry, resource, paging);
+ }
+ if (resource instanceof Comment) {
+ return String(resource.getText());
+ }
+ var stream = resource.getContentStream();
+ if (stream) {
+ return new Stream(stream);
+ }
+ return String(resource.content);
+ };
+
+ var resourceSorter = function (key) {
+ var nameAsc = function (l, r) {
+ var lname, rname;
+ if (l instanceof Collection) {
+ lname = l.getName();
+ lname = lname.substring(lname.lastIndexOf('/') + 1);
+ } else {
+ lname = l.name;
+ }
+ if (r instanceof Collection) {
+ rname = r.getName();
+ rname = rname.substring(rname.lastIndexOf('/') + 1);
+ } else {
+ rname = r.name;
+ }
+ return lname === rname ? 0 : (lname > rname ? 1 : -1);
+ };
+ switch (key) {
+ case 'time-created-asc' :
+ return function (l, r) {
+ return l.getCreatedTime().getTime() - r.getCreatedTime().getTime();
+ };
+ case 'time-created-des' :
+ return function (l, r) {
+ return r.getCreatedTime().getTime() - l.getCreatedTime().getTime();
+ };
+ case 'name-asc' :
+ return nameAsc;
+ case 'name-des' :
+ return function (l, r) {
+ return -nameAsc(l, r);
+ };
+ default:
+ return resourceSorter('time-created-des');
+ }
+ };
+
+ var children = function (registry, resource, paging) {
+ var resources = resource.getChildren();
+ //we have to manually sort this due to the bug in registry.getChildren() (#1 above)
+ //resources.sort(resourceSorter(paging.sort));
+ return resources.slice(paging.start, paging.start + paging.count);
+ };
+
+ var resource = function (registry, resource) {
+ var path = String(resource.path),
+ o = {
+ created: {
+ author: String(resource.authorUserName),
+ time: resource.createdTime.time
+ },
+ content: content(registry, resource, {
+ start: 0,
+ count: 10
+ }),
+ id: String(resource.id),
+ version: resource.versionNumber
+ };
+ if (resource instanceof Comment) {
+ return o;
+ }
+ if (resource instanceof Collection) {
+ o.collection = (resource instanceof Collection);
+ }
+ o.uuid = String(resource.UUID);
+ o.path = String(path);
+ o.name = String(resource.name) || resolveName(path);
+ o.description = String(resource.description);
+ o.updated = {
+ author: String(resource.lastUpdaterUserName),
+ time: resource.lastModified.time
+ };
+ o.mediaType = String(resource.mediaType);
+ o.properties = function () {
+ return properties(resource);
+ };
+ o.aspects = function () {
+ return aspects(resource);
+ };
+ return o;
+ };
+
+ var properties = function (resource) {
+ var prop,
+ properties = resource.properties,
+ props = properties.keySet().toArray(),
+ length = props.length,
+ o = {};
+ for (var i = 0; i < length; i++) {
+ prop = props[i];
+ o[prop] = resource.getPropertyValues(prop).toArray();
+ }
+ return o;
+ };
+
+ var aspects = function (resource) {
+ var aspects = resource.getAspects();
+ return aspects ? aspects.toArray() : [];
+ };
+
+ var resolveName = function (path) {
+ path = path.charAt(path.length - 1) === '/' ? path.substring(0, path.length - 1) : path;
+ return path.substring(path.lastIndexOf('/') + 1);
+ };
+
+ var merge = function (def, options) {
+ if (options) {
+ for (var op in def) {
+ if (def.hasOwnProperty(op)) {
+ def[op] = options[op] || def[op];
+ }
+ }
+ }
+ return def;
+ };
+
+ var Registry = function (serv, options) {
+ var registryService = server.osgiService('org.wso2.carbon.registry.core.service.RegistryService'),
+ carbon = require('carbon');
+ if (options) {
+ this.server = serv;
+ } else {
+ this.server = new server.Server();
+ options = serv || {};
+ }
+
+ if (options.tenantId) {
+ this.tenantId = options.tenantId;
+ } else if (options.username || options.domain) {
+ this.tenantId = server.tenantId({
+ domain: options.domain,
+ username: options.username
+ });
+ } else {
+ this.tenantId = server.tenantId();
+ }
+
+ if (options.username) {
+ this.username = options.username;
+ } else if (options.system) {
+ this.username = carbon.user.systemUser;
+ } else {
+ this.username = carbon.user.anonUser;
+ }
+
+ this.registry = registryService.getRegistry(this.username, this.tenantId);
+ this.versioning = {
+ comments: StaticConfiguration.isVersioningComments()
+ };
+ };
+
+ registry.Registry = Registry;
+
+ Registry.prototype.put = function (path, resource) {
+ var res;
+ if (resource.collection) {
+ res = this.registry.newCollection();
+ } else {
+ res = this.registry.newResource();
+ if (resource.content instanceof Stream) {
+ res.contentStream = resource.content.getStream();
+ } else {
+ res.content = resource.content || null;
+ }
+ res.mediaType = resource.mediaType || null;
+ }
+ res.name = resource.name;
+ res.description = resource.description || null;
+ res.UUID = resource.uuid || null;
+
+ var values, length, i, ArrayList,
+ properties = resource.properties;
+ if (properties) {
+ ArrayList = java.util.ArrayList;
+ for (var name in properties) {
+ var list = new ArrayList();
+ if (properties.hasOwnProperty(name)) {
+ values = properties[name];
+ values = values instanceof Array ? values : [values];
+ length = values.length;
+ for (i = 0; i < length; i++) {
+ list.add(values[i]);
+ }
+ res.setProperty(name, list);
+ }
+ }
+ }
+
+ var aspects = resource.aspects;
+ if (aspects) {
+ length = aspects.length;
+ for (i = 0; i < length; i++) {
+ res.addAspect(aspects[i]);
+ }
+ }
+
+ this.registry.put(path, res);
+ };
+
+ Registry.prototype.remove = function (path) {
+ this.registry.delete(path);
+ };
+
+ Registry.prototype.move = function (src, dest) {
+ this.registry.move(src, dest);
+ };
+
+ Registry.prototype.rename = function (current, newer) {
+ this.registry.rename(current, newer);
+ };
+
+ Registry.prototype.copy = function (src, dest) {
+ this.registry.copy(src, dest);
+ };
+
+ Registry.prototype.restore = function (path) {
+ this.registry.restoreVersion(path);
+ };
+
+ Registry.prototype.get = function (path) {
+ if (!this.exists(path)) {
+ return null;
+ }
+ var res = this.registry.get(path);
+ return resource(this, res);
+ };
+
+ Registry.prototype.exists = function (path) {
+ return this.registry.resourceExists(path);
+ };
+
+ Registry.prototype.content = function (path, paging) {
+ if (!this.exists(path)) {
+ return null;
+ }
+ var resource = this.registry.get(path);
+ paging = merge({
+ start: 0,
+ count: 10,
+ sort: 'recent'
+ }, paging);
+ return content(this, resource, paging);
+ };
+
+ Registry.prototype.tags = function (path) {
+ var tags, i, length,
+ tagz = [];
+ tags = this.registry.getTags(path);
+ length = tags.length;
+ for (i = 0; i < length; i++) {
+ tagz.push(String(tags[i].tagName));
+ }
+ return tagz;
+ };
+
+ Registry.prototype.tag = function (path, tags) {
+ var i, length;
+ tags = tags instanceof Array ? tags : [tags];
+ length = tags.length;
+ for (i = 0; i < length; i++) {
+ this.registry.applyTag(path, tags[i]);
+ }
+ };
+
+ Registry.prototype.untag = function (path, tags) {
+ var i, length;
+ tags = tags instanceof Array ? tags : [tags];
+ length = tags.length;
+ for (i = 0; i < length; i++) {
+ this.registry.removeTag(path, tags[i]);
+ }
+ };
+
+ Registry.prototype.associate = function (src, dest, type) {
+ this.registry.addAssociation(src, dest, type);
+ };
+
+ Registry.prototype.dissociate = function (src, dest, type) {
+ this.registry.removeAssociation(src, dest, type);
+ };
+
+ Registry.prototype.associations = function (path, type) {
+ var i, asso,
+ assos = type ? this.registry.getAssociations(path, type) : this.registry.getAllAssociations(path),
+ length = assos.length,
+ associations = [];
+ for (i = 0; i < length; i++) {
+ asso = assos[i];
+ associations.push({
+ type: String(asso.associationType),
+ src: String(asso.sourcePath),
+ dest: String(asso.destinationPath)
+ });
+ }
+ return associations;
+ };
+
+ Registry.prototype.addProperty = function (path, name, value) {
+ var resource = this.registry.get(path);
+ resource.addProperty(name, value);
+ };
+
+ Registry.prototype.removeProperty = function (path, name, value) {
+ var resource = this.registry.get(path);
+ (value ? resource.removePropertyValue(name, value) : resource.removeProperty(name));
+ };
+
+ Registry.prototype.properties = function (path) {
+ var resource = this.registry.get(path);
+ return properties(resource);
+ };
+
+ Registry.prototype.version = function (path) {
+ this.registry.createVersion(path);
+ };
+
+ Registry.prototype.versions = function (path) {
+ return this.registry.getVersions(path);
+ };
+
+ Registry.prototype.unversion = function (path, snapshot) {
+ this.registry.removeVersionHistory(path, snapshot);
+ };
+
+ Registry.prototype.comment = function (path, comment) {
+ this.registry.addComment(path, new Comment(comment));
+ };
+
+ Registry.prototype.comments = function (path, paging) {
+ var i, length, comments, comment, key,
+ commentz = [];
+ paging = merge({
+ start: 0,
+ count: 25,
+ sort: 'recent'
+ }, paging);
+
+ comments = this.registry.getComments(path);
+ //we have to manually sort this due to the bug in registry.getChildren() (#1 above)
+ key = paging.sort;
+ key = (key === 'time-created-des' || key === 'time-created-asc') ? key : 'time-created-des';
+ comments = comments.sort(resourceSorter(key));
+ comments = comments.slice(paging.start, paging.start + paging.count);
+ length = comments.length;
+ for (i = 0; i < length; i++) {
+ comment = comments[i];
+ commentz.push({
+ content: comment.getText(),
+ created: {
+ author: comment.getUser(),
+ time: comment.getCreatedTime().getTime()
+ },
+ path: comment.getCommentPath()
+ });
+ }
+ return commentz;
+ };
+
+ Registry.prototype.commentCount = function (path) {
+ return this.registry.getComments(path).length;
+ };
+
+ Registry.prototype.uncomment = function (path) {
+ this.registry.removeComment(path);
+ };
+
+ Registry.prototype.rate = function (path, rating) {
+ this.registry.rateResource(path, rating);
+ };
+
+ Registry.prototype.unrate = function (path) {
+ this.registry.rateResource(path, 0);
+ };
+
+ Registry.prototype.rating = function (path, username) {
+ var rating = {
+ average: this.registry.getAverageRating(path)
+ };
+ if (username) {
+ rating.user = this.registry.getRating(path, username);
+ }
+ return rating;
+ };
+
+ Registry.prototype.link = function (path, target) {
+ return this.registry.createLink(path, target);
+ };
+
+ Registry.prototype.unlink = function (path) {
+ return this.registry.removeLink(path);
+ };
+
+ Registry.prototype.search = function (query, paging) {
+ var res = this.registry.searchContent(query);
+ paging = merge({
+ start: 0,
+ count: 10,
+ sort: 'recent'
+ }, paging);
+ return res ? content(this, res, paging) : [];
+ };
+
+ Registry.prototype.query = function (path, params) {
+ var res, name,
+ map = new java.util.HashMap();
+ for (name in params) {
+ if (params.hasOwnProperty(name)) {
+ map.put(name, params[name]);
+ }
+ }
+ res = this.registry.executeQuery(path, map);
+ return res.getChildren();
+ };
+
+}(server, registry));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/registry-ws.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/registry-ws.js b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/registry-ws.js
new file mode 100644
index 0000000..014a75c
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/registry-ws.js
@@ -0,0 +1,77 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+var log = new Log();
+
+var Registry = function (server) {
+ this.server = server;
+};
+
+var Resource = function (name) {
+
+};
+
+var Collection = function (name) {
+
+};
+
+Registry.prototype.invoke = function (action, payload) {
+ var options,
+ ws = require('ws'),
+ client = new ws.WSRequest(),
+ server = this.server;
+
+ options = {
+ useSOAP: 1.2,
+ useWSA: 1.0,
+ action: action,
+ HTTPHeaders: [
+ { name: 'Cookie', value: server.cookie }
+ ]
+ };
+
+ try {
+ client.open(options, server.url + '/services/WSRegistryService', false);
+ client.send(payload);
+ return client.responseXML;
+ } catch (e) {
+ log.error(e.toString());
+ throw new Error('Error while invoking action in WSRegistryService : ' +
+ action + ', user : ' + server.user.username);
+ }
+};
+
+Registry.prototype.putResource = function (path, resource) {
+
+};
+
+Registry.prototype.getResource = function (path) {
+ var res, payload,
+ base64 = require('/modules/base64.js');
+
+ payload =
+ <api:getContent xmlns:api="http://api.ws.registry.carbon.wso2.org">
+ <api:path>{path}</api:path>
+ </api:getContent>;
+
+ res = this.invoke('urn:getContent', payload);
+ return base64.decode(String(res.*::['return'].text()));
+};
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/registry.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/registry.js b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/registry.js
new file mode 100644
index 0000000..43467bc
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/registry/registry.js
@@ -0,0 +1,45 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+var registry = {};
+
+(function (registry) {
+ var ActionConstants = Packages.org.wso2.carbon.registry.core.ActionConstants,
+ AccessControlConstants = Packages.org.wso2.carbon.registry.core.utils.AccessControlConstants;
+
+ registry.Registry = function (server, auth) {
+ var osgi = require('registry-osgi.js').registry,
+ o = new osgi.Registry(server, auth);
+ o.prototype = this;
+ return o;
+ };
+
+ registry.actions = {};
+
+ registry.actions.GET = ActionConstants.GET;
+
+ registry.actions.PUT = ActionConstants.PUT;
+
+ registry.actions.DELETE = ActionConstants.DELETE;
+
+ registry.actions.AUTHORIZE = AccessControlConstants.AUTHORIZE;
+
+}(registry));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/config.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/config.js b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/config.js
new file mode 100644
index 0000000..fe5078f
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/config.js
@@ -0,0 +1,53 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+(function (server) {
+ var process = require('process'),
+ configDir = 'file:///' + process.getProperty('carbon.config.dir.path').replace(/[\\]/g, '/').replace(/^[\/]/g, '') + '/';
+ server.loadConfig = function (path) {
+ var content,
+ index = path.lastIndexOf('.'),
+ ext = (index !== -1 && index < path.length) ? path.substring(index + 1) : '',
+ file = new File(configDir + path);
+ if (!file.isExists()) {
+ throw new Error('Specified config file does not exists : ' + path);
+ }
+ if (file.isDirectory()) {
+ throw new Error('Specified config file is a directory : ' + path);
+ }
+ file.open('r');
+ content = file.readAll();
+ file.close();
+ switch (ext) {
+ case 'xml' :
+ return new XML(content);
+ case 'json' :
+ return parse(content);
+ case 'properties' :
+ default :
+ return content;
+
+ }
+ };
+
+ server.home = 'file:///' + require('process').getProperty('carbon.home').replace(/[\\]/g, '/').replace(/^[\/]/g, '');
+
+}(server));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/osgi.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/osgi.js b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/osgi.js
new file mode 100644
index 0000000..2175c23
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/osgi.js
@@ -0,0 +1,31 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+var server = {};
+
+(function (server) {
+ var PrivilegedCarbonContext = Packages.org.wso2.carbon.context.PrivilegedCarbonContext,
+ Class = java.lang.Class;
+
+ server.osgiService = function (clazz) {
+ return PrivilegedCarbonContext.getThreadLocalCarbonContext().getOSGiService(Class.forName(clazz));
+ };
+}(server));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/server.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/server.js b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/server.js
new file mode 100644
index 0000000..ba6300d
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/server.js
@@ -0,0 +1,115 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+(function (server) {
+ var log = new Log();
+
+ var login = function (url, username, password) {
+ var res, options, payload,
+ ws = require('ws'),
+ client = new ws.WSRequest(),
+ host = url.match(/.*:\/\/([^:\/]*)/)[1];
+
+ options = {
+ useSOAP: 1.2,
+ useWSA: 1.0,
+ action: 'urn:login'
+ };
+
+ payload =
+ <aut:login xmlns:aut="http://authentication.services.core.carbon.wso2.org">
+ <aut:username>{username}</aut:username>
+ <aut:password>{password}</aut:password>
+ <aut:remoteAddress>{host}</aut:remoteAddress>
+ </aut:login>;
+
+ try {
+ client.open(options, url + '/services/AuthenticationAdmin', false);
+ client.send(payload);
+ res = client.responseXML;
+ if (res.*::["return"].text() != 'true') {
+ return false;
+ }
+ return client.getResponseHeader('Set-Cookie');
+ } catch (e) {
+ log.error(e.toString());
+ throw new Error('Error while login to the server : ' + url + ', user : ' + username);
+ }
+ };
+
+ var logout = function (url, cookie) {
+ var options,
+ ws = require('ws'),
+ client = new ws.WSRequest();
+
+ options = {
+ useSOAP: 1.2,
+ useWSA: 1.0,
+ action: 'urn:logout',
+ mep: 'in-only',
+ HTTPHeaders: [
+ { name: 'Cookie', value: cookie }
+ ]
+ };
+
+ try {
+ client.open(options, url + '/services/AuthenticationAdmin', false);
+ client.send(null);
+ return true;
+ } catch (e) {
+ log.error(e.toString());
+ throw new Error('Error while logging out in server : ' + url + ', cookie : ' + cookie);
+ }
+ };
+
+ var Cookie = function (cookie) {
+ this.cookie = cookie;
+ };
+
+ server.Cookie = Cookie;
+
+ var Server = function (options) {
+ this.url = (options && options.url) ? options.url : 'local:/';
+ };
+ server.Server = Server;
+
+ Server.prototype.authenticate = function (username, password) {
+ var realm, user,
+ carbon = require('carbon'),
+ realmService = server.osgiService('org.wso2.carbon.user.core.service.RealmService');
+ user = carbon.server.tenantUser(username);
+ realm = realmService.getTenantUserRealm(user.tenantId);
+ if(realm == null){
+ throw new Error("Invalid domain or unactivated tenant login");
+ }else{
+ return realm.getUserStoreManager().authenticate(user.username, password);
+ }
+ };
+
+ Server.prototype.login = function (username, password) {
+ var cookie = login(this.url, username, password);
+ return new Cookie(cookie);
+ };
+
+ Server.prototype.logout = function (cookie) {
+ return logout(this.url, cookie.cookie);
+ };
+}(server));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/tenant.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/tenant.js b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/tenant.js
new file mode 100644
index 0000000..255e7d7
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/server/tenant.js
@@ -0,0 +1,70 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+(function (server) {
+ var PrivilegedCarbonContext = Packages.org.wso2.carbon.context.PrivilegedCarbonContext,
+ MultitenantConstants = Packages.org.wso2.carbon.utils.multitenancy.MultitenantConstants,
+ MultitenantUtils = Packages.org.wso2.carbon.utils.multitenancy.MultitenantUtils,
+ realmService = server.osgiService('org.wso2.carbon.user.core.service.RealmService'),
+ tenantManager = realmService.getTenantManager();
+
+ server.tenantDomain = function (options) {
+ if (!options) {
+ return PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
+ }
+ if(options.tenantId) {
+ return tenantManager.getDomain(options.tenantId);
+ }
+ if (options.username) {
+ return MultitenantUtils.getTenantDomain(options.username);
+ }
+ if (options.url) {
+ return MultitenantUtils.getTenantDomainFromRequestURL(options.url);
+ }
+ return null;
+ };
+
+ server.tenantId = function (options) {
+ var domain = options ? (options.domain || server.tenantDomain(options)) : server.tenantDomain();
+ return domain ? tenantManager.getTenantId(domain) : null;
+ };
+
+ server.tenantUser = function (username) {
+ var domain = server.tenantDomain({
+ username: username
+ }),
+ id = server.tenantId({
+ domain: domain
+ });
+ username = MultitenantUtils.getTenantAwareUsername(username);
+ return {
+ domain: domain,
+ username: username,
+ tenantId: id
+ };
+ };
+
+ server.superTenant = {
+ tenantId: MultitenantConstants.SUPER_TENANT_ID,
+ domain: MultitenantConstants.SUPER_TENANT_DOMAIN_NAME
+ };
+
+}(server));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/registry-space.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/registry-space.js b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/registry-space.js
new file mode 100644
index 0000000..9536fb4
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/registry-space.js
@@ -0,0 +1,60 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+(function (server, registry, user) {
+
+ var Space = function (user, space, options) {
+ var serv = new server.Server(options.serverUrl);
+ this.registry = new registry.Registry(serv, {
+ username: options.username || user,
+ domain: options.domain || server.tenantDomain()
+ });
+ this.prefix = options.path + '/' + user + '/' + space;
+ if (!this.registry.exists(this.prefix)) {
+ this.registry.put(this.prefix, {
+ collection: true
+ });
+ }
+ };
+ user.Space = Space;
+
+ Space.prototype.put = function (key, value) {
+ value = (!(value instanceof String) && typeof value !== "string") ? stringify(value) : value;
+ this.registry.put(this.prefix + '/' + key, {
+ content: value
+ });
+ };
+
+ Space.prototype.get = function (key) {
+ var o = this.registry.content(this.prefix + '/' + key);
+ return o ? o.toString() : null;
+ };
+
+ Space.prototype.remove = function (key) {
+ this.registry.remove(this.prefix + '/' + key);
+ };
+
+ Space.prototype.find = function (filter) {
+
+ };
+
+
+}(server, registry, user));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/space.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/space.js b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/space.js
new file mode 100644
index 0000000..c895cc1
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/space.js
@@ -0,0 +1,31 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+(function (server, user) {
+
+ user.Space = function (user, space, options) {
+ var reg = require('registry-space.js').user,
+ o = new reg.Space(user, space, options);
+ o.prototype = this;
+ return o;
+ };
+
+}(server, user));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/user-manager.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/user-manager.js b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/user-manager.js
new file mode 100644
index 0000000..56833b9
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/user-manager.js
@@ -0,0 +1,179 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+(function (server, user) {
+
+ var log = new Log();
+
+ var processPerms = function (perms, fn) {
+ var perm, actions, i, length;
+ for (perm in perms) {
+ if (perms.hasOwnProperty(perm)) {
+ actions = perms[perm];
+ length = actions.length;
+ for (i = 0; i < length; i++) {
+ fn(perm, actions[i]);
+ }
+ }
+ }
+ };
+
+ var UserManager = function (serv, tenantId) {
+ this.server = serv;
+ this.tenantId = tenantId || server.superTenant.tenantId;
+ var realmService = server.osgiService('org.wso2.carbon.user.core.service.RealmService'),
+ realm = realmService.getTenantUserRealm(this.tenantId);
+ this.manager = realm.getUserStoreManager();
+ this.authorizer = realm.getAuthorizationManager();
+ };
+ user.UserManager = UserManager;
+
+ UserManager.prototype.getUser = function (username) {
+ if (!this.manager.isExistingUser(username)) {
+ return null;
+ }
+ return new user.User(this, username);
+ };
+ UserManager.prototype.getRoleListOfUser = function (username) {
+ return this.manager.getRoleListOfUser(username);
+ };
+ UserManager.prototype.addUser = function (username, password, roles, claims, profile) {
+ this.manager.addUser(username, password, roles || [], claims || null, profile);
+ };
+
+ UserManager.prototype.removeUser = function (username) {
+ this.manager.deleteUser(username);
+ };
+
+ UserManager.prototype.userExists = function (username) {
+ return this.manager.isExistingUser(username);
+ };
+
+ UserManager.prototype.roleExists = function (role) {
+ return this.manager.isExistingRole(role);
+ };
+ UserManager.prototype.updateRole = function (previousRoleName, newRoleName) {
+ return this.manager.updateRoleName(previousRoleName, newRoleName);
+ };
+ UserManager.prototype.getClaims = function (username, profile) {
+ return this.manager.getUserClaimValues(username, profile);
+ };
+ UserManager.prototype.getClaimsForSet = function (username,claims, profile) {
+ return this.manager.getUserClaimValues(username,claims, profile);
+ };
+ UserManager.prototype.getClaim = function (username, claim, profile) {
+ return this.manager.getUserClaimValue(username, claim, profile);
+ };
+
+ UserManager.prototype.setClaims = function (username, claims, profile) {
+ return this.manager.setUserClaimValues(username, claims, profile);
+ };
+
+ UserManager.prototype.setClaim = function (username, claim, value, profile) {
+ return this.manager.setUserClaimValue(username, claim, value, profile);
+ };
+
+ UserManager.prototype.isAuthorized = function (role, permission, action) {
+ return this.authorizer.isRoleAuthorized(role, permission, action);
+ };
+ UserManager.prototype.updateRoleListOfUser = function(name, deletedRoles, newRoles){
+ return this.manager.updateRoleListOfUser(name, deletedRoles, newRoles);
+ };
+ UserManager.prototype.updateUserListOfRole = function(name, deletedUsers, newUsers){
+ return this.manager.updateUserListOfRole(name, deletedUsers, newUsers);
+ };
+ UserManager.prototype.listUsers = function () {
+ return this.manager.listUsers("*", -1);
+ };
+ UserManager.prototype.addRole = function (role, users, permissions) {
+ var perms = [],
+ Permission = Packages.org.wso2.carbon.user.api.Permission;
+ processPerms(permissions, function (id, action) {
+ perms.push(new Permission(id, action));
+ });
+ this.manager['addRole(java.lang.String,java.lang.String[],org.wso2.carbon.user.api.Permission[])']
+ (role, users, perms);
+ };
+
+ UserManager.prototype.removeRole = function (role) {
+ this.manager.deleteRole(role);
+ };
+
+ UserManager.prototype.allRoles = function () {
+ return this.manager.getRoleNames();
+ };
+ UserManager.prototype.getUserListOfRole = function (role) {
+ return this.manager.getUserListOfRole(role);
+ };
+ /**
+ * um.authorizeRole('store-admin', '/permissions/mypermission', 'ui-execute');
+ *
+ * um.authorizeRole('store-admin', {
+ * '/permissions/myperm1' : ['read', 'write'],
+ * '/permissions/myperm2' : ['read', 'write']
+ * });
+ *
+ * @param role
+ * @param permission
+ * @param action
+ */
+ UserManager.prototype.authorizeRole = function (role, permission, action) {
+ var that = this;
+ if (permission instanceof String || typeof permission === 'string') {
+ if (!that.isAuthorized(role, permission, action)) {
+ that.authorizer.authorizeRole(role, permission, action);
+ }
+ } else {
+ processPerms(permission, function (id, action) {
+ if (!that.isAuthorized(role, id, action)) {
+ that.authorizer.authorizeRole(role, id, action);
+ if (log.isDebugEnabled()) {
+ log.debug('permission added(role:permission:action) - ' + role + ':' + id + ':' + action);
+ }
+ }
+ });
+ }
+ };
+
+ /**
+ * um.denyRole('store-admin', '/permissions/mypermission', 'ui-execute');
+ *
+ * um.denyRole('store-admin', {
+ * '/permissions/myperm1' : ['read', 'write'],
+ * '/permissions/myperm2' : ['read', 'write']
+ * });
+ *
+ * @param role
+ * @param permission
+ * @param action
+ */
+ UserManager.prototype.denyRole = function (role, permission, action) {
+ var deny = this.authorizer.denyRole;
+ if (permission instanceof String || typeof permission === 'string') {
+ deny(role, permission, action);
+ } else {
+ processPerms(permission, function (id, action) {
+ deny(role, id, action);
+ });
+ }
+ };
+
+}(server, user));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/user.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/user.js b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/user.js
new file mode 100644
index 0000000..66b253d
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/carbon/scripts/user/user.js
@@ -0,0 +1,99 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+var user = {};
+
+(function (user) {
+
+ var CarbonConstants = Packages.org.wso2.carbon.CarbonConstants;
+
+ user.systemUser = CarbonConstants.REGISTRY_SYSTEM_USERNAME;
+
+ user.anonUser = CarbonConstants.REGISTRY_ANONNYMOUS_USERNAME;
+
+ user.anonRole = CarbonConstants.REGISTRY_ANONNYMOUS_ROLE_NAME;
+
+ var User = function (manager, username) {
+ this.um = manager;
+ this.tenantId = manager.tenantId;
+ this.username = username;
+ };
+ user.User = User;
+
+ User.prototype.getClaims = function (profile) {
+ return this.um.getClaims(this.username, profile);
+ };
+ User.prototype.getClaimsForSet = function (claims,profile) {
+ return this.um.getClaimsForSet(this.username, claims, profile);
+ };
+
+ User.prototype.setClaims = function (claims, profile) {
+ this.um.setClaims(this.username, claims, profile);
+ };
+
+ User.prototype.getRoles = function () {
+ return this.um.manager.getRoleListOfUser(this.username);
+ };
+
+ User.prototype.hasRoles = function (roles) {
+ var i, j, role,
+ rs = this.getRoles(),
+ length1 = roles.length,
+ length2 = rs.length;
+ L1:
+ for (i = 0; i < length1; i++) {
+ //Array.indexOf() fails due to Java String vs JS String difference
+ role = roles[i];
+ for (j = 0; j < length2; j++) {
+ if (role == rs[j]) {
+ continue L1;
+ }
+ }
+ return false;
+ }
+ return true;
+ };
+
+ User.prototype.addRoles = function (roles) {
+ return this.um.manager.updateRoleListOfUser(this.username, [], roles);
+ };
+
+ User.prototype.removeRoles = function (roles) {
+ return this.um.manager.updateRoleListOfUser(this.username, roles, []);
+ };
+
+ User.prototype.updateRoles = function (remove, add) {
+ return this.um.manager.updateRoleListOfUser(this.username, remove, add);
+ };
+
+ User.prototype.isAuthorized = function (permission, action) {
+ var i,
+ roles = this.getRoles(),
+ length = roles.length;
+ for (i = 0; i < length; i++) {
+ if (this.um.authorizer.isRoleAuthorized(roles[i], permission, action)) {
+ return true;
+ }
+ }
+ return false;
+ };
+
+}(user));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar b/products/stratos/modules/distribution/src/main/temp-artifacts/org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar
new file mode 100644
index 0000000..60f6f07
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/temp-artifacts/org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/org.wso2.store.sso.common_1.0.0.jar
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/org.wso2.store.sso.common_1.0.0.jar b/products/stratos/modules/distribution/src/main/temp-artifacts/org.wso2.store.sso.common_1.0.0.jar
new file mode 100644
index 0000000..4a74e5b
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/temp-artifacts/org.wso2.store.sso.common_1.0.0.jar differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar b/products/stratos/modules/distribution/src/main/temp-artifacts/org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar
new file mode 100644
index 0000000..29a9fb7
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/temp-artifacts/org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/sso/module.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/sso/module.xml b/products/stratos/modules/distribution/src/main/temp-artifacts/sso/module.xml
new file mode 100644
index 0000000..159203b
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/sso/module.xml
@@ -0,0 +1,28 @@
+<?xml version='1.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.
+
+-->
+
+<module name="sso" xmlns="http://wso2.org/projects/jaggery/module.xml">
+ <script>
+ <name>client</name>
+ <path>scripts/sso.client.js</path>
+ </script>
+</module>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/temp-artifacts/sso/scripts/sso.client.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/temp-artifacts/sso/scripts/sso.client.js b/products/stratos/modules/distribution/src/main/temp-artifacts/sso/scripts/sso.client.js
new file mode 100644
index 0000000..9553220
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/temp-artifacts/sso/scripts/sso.client.js
@@ -0,0 +1,193 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+/**
+ * Following module act as a client to create a saml request and also to
+ * unwrap and return attributes of a returning saml response
+ * @type {{}}
+ */
+
+var client = {};
+
+(function (client) {
+
+ var Util = Packages.org.wso2.store.sso.common.util.Util,
+ carbon = require('carbon'),
+ log = new Log();
+
+ /**
+ * obtains an encoded saml response and return a decoded/unmarshalled saml obj
+ * @param samlResp
+ * @return {*}
+ */
+ client.getSamlObject = function (samlResp) {
+ var decodedResp = Util.decode(samlResp);
+ return Util.unmarshall(decodedResp);
+ };
+
+ /**
+ * validating the signature of the response saml object
+ */
+ client.validateSignature = function (samlObj, config) {
+ var tDomain = Util.getDomainName(samlObj);
+ var tId = carbon.server.tenantId({domain: tDomain});
+
+ return Util.validateSignature(samlObj,
+ config.KEY_STORE_NAME, config.KEY_STORE_PASSWORD, config.IDP_ALIAS, tId, tDomain);
+ };
+
+ /**
+ * Checking if the request is a logout call
+ */
+ client.isLogoutRequest = function (samlObj) {
+ return samlObj instanceof Packages.org.opensaml.saml2.core.LogoutRequest;
+ };
+
+ /**
+ * Checking if the request is a logout call
+ */
+ client.isLogoutResponse = function (samlObj) {
+ return samlObj instanceof Packages.org.opensaml.saml2.core.LogoutResponse;
+ };
+
+ /**
+ * getting url encoded saml authentication request
+ * @param issuerId
+ */
+ client.getEncodedSAMLAuthRequest = function (issuerId) {
+ return Util.encode(
+ Util.marshall(
+ new Packages.org.wso2.store.sso.common.builders.AuthReqBuilder().buildAuthenticationRequest(issuerId)
+ ));
+ };
+
+ /**
+ * get url encoded saml logout request
+ */
+ client.getEncodedSAMLLogoutRequest = function (user, sessionIndex, issuerId) {
+ return Util.encode(
+ Util.marshall(
+ new Packages.org.wso2.store.sso.common.builders.LogoutRequestBuilder().buildLogoutRequest(user, sessionIndex,
+ Packages.org.wso2.store.sso.common.constants.SSOConstants.LOGOUT_USER,
+ issuerId)));
+ };
+
+ /**
+ * Reads the returning SAML login response and populates a session info object
+ */
+ client.decodeSAMLLoginResponse = function (samlObj, samlResp, sessionId) {
+ var samlSessionObj = {
+ // sessionId, loggedInUser, sessionIndex, samlToken
+ };
+
+ if (samlObj instanceof Packages.org.opensaml.saml2.core.Response) {
+
+ var assertions = samlObj.getAssertions();
+
+ // extract the session index
+ if (assertions != null && assertions.size() > 0) {
+ var authenticationStatements = assertions.get(0).getAuthnStatements();
+ var authnStatement = authenticationStatements.get(0);
+ if (authnStatement != null) {
+ if (authnStatement.getSessionIndex() != null) {
+ samlSessionObj.sessionIndex = authnStatement.getSessionIndex();
+ }
+ }
+ }
+
+ // extract the username
+ if (assertions != null && assertions.size() > 0) {
+ var subject = assertions.get(0).getSubject();
+ var samlAssertion = assertions.get(0);
+ if (subject != null) {
+ if (subject.getNameID() != null) {
+ samlSessionObj.loggedInUser = subject.getNameID().getValue();
+ }
+ }
+ }
+ samlSessionObj.sessionId = sessionId;
+ samlSessionObj.samlToken = samlResp;
+ }
+
+ return samlSessionObj;
+ };
+
+ client.getURLencodedB64EncodedSAML2Token = function(samlObj){
+ var saml2Token = {
+ // URLEncodedB64
+ };
+ if (samlObj instanceof Packages.org.opensaml.saml2.core.Response) {
+ saml2Token.URLEncodedB64 = Util.getURLEncodedB64SAML2Token(samlObj);
+ }
+ return saml2Token;
+ };
+
+ client.getB64EncodedtSAMLAssertion = function(samlObj){
+ var saml2Token = {
+ // URLEncodedB64
+ };
+ if (samlObj instanceof Packages.org.opensaml.saml2.core.Response) {
+ saml2Token.b64Encoded = Util.getB64EncodedtSAMLAssertion(samlObj);
+ }
+ return saml2Token;
+ };
+
+
+ client.b64encode = function(str){
+ return Util.encode(str);
+ };
+
+ /**
+ * This method is to get the session index when a single logout happens
+ * The IDP sends a logout request to the ACS with the session index, so that
+ * the app can invalidate the associated HTTP Session
+ */
+ client.decodeSAMLLogoutRequest = function (samlObj) {
+ var sessionIndex = null;
+
+ if (samlObj instanceof org.opensaml.saml2.core.LogoutRequest) {
+ var sessionIndexes = samlObj.getSessionIndexes();
+ if (sessionIndexes != null && sessionIndexes.size() > 0) {
+ sessionIndex = sessionIndexes.get(0).getSessionIndex();
+ }
+ }
+
+ return sessionIndex;
+
+ };
+
+ client.getTenantDomain = function (samlObj) {
+ var tDomain = Util.getDomainName(samlObj);
+ return tDomain;
+ };
+
+ client.getRoleList = function(samlObj) {
+ var roleObj = [];
+ var roleString = Util.getRoles(samlObj);
+ log.info("role string : " + roleString);
+ var roleSplit = roleString.split(",");
+ for(var i=0; i < roleSplit.length;i++){
+ roleObj.push(roleSplit[i].trim());
+ }
+ return roleObj;
+ };
+
+}(client));
[47/50] [abbrv] stratos git commit: Removing unnecessary features,
artifacts and restructuring distribution artifacts
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/carbon/scripts/registry/artifacts.js
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/carbon/scripts/registry/artifacts.js b/products/stratos/conf/temp-artifacts/carbon/scripts/registry/artifacts.js
deleted file mode 100644
index a05e567..0000000
--- a/products/stratos/conf/temp-artifacts/carbon/scripts/registry/artifacts.js
+++ /dev/null
@@ -1,595 +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.
- *
-*/
-
-(function (server, registry) {
-
- var log = new Log();
-
- var GenericArtifactManager = Packages.org.wso2.carbon.governance.api.generic.GenericArtifactManager;
- var GenericArtifactFilter = Packages.org.wso2.carbon.governance.api.generic.GenericArtifactFilter;
- var ByteArrayInputStream = Packages.java.io.ByteArrayInputStream;
- var QName = Packages.javax.xml.namespace.QName;
- var IOUtils = Packages.org.apache.commons.io.IOUtils;
- var PrivilegedCarbonContext = Packages.org.wso2.carbon.context.PrivilegedCarbonContext; //Used regard tenant details
- var CarbonContext = Packages.org.wso2.carbon.context.CarbonContext;
- var MultitenantConstants = Packages.org.wso2.carbon.utils.multitenancy.MultitenantConstants;
- var List = java.util.List;
- var Map = java.util.Map;
- var ArrayList = java.util.ArrayList;
- var HashMap = java.util.HashMap;
-
- var GovernanceUtils = Packages.org.wso2.carbon.governance.api.util.GovernanceUtils;//Used to obtain Asset Types
- var DEFAULT_MEDIA_TYPE = 'application/vnd.wso2.registry-ext-type+xml';//Used to obtain Asset types
- var PaginationContext = Packages.org.wso2.carbon.registry.core.pagination.PaginationContext;//Used for pagination on register
-
- var REGISTRY_ABSOLUTE_PATH = "/_system/governance";
-
- var HISTORY_PATH_SEPERATOR = '_';
- var ASSET_PATH_SEPERATOR = '/';
- var lcHistoryRegExpression = new RegExp(ASSET_PATH_SEPERATOR, 'g');
- var HISTORY_PATH = '/_system/governance/_system/governance/repository/components/org.wso2.carbon.governance/lifecycles/history/';
-
-
- var buildArtifact = function (manager, artifact) {
- return {
- id: String(artifact.id),
- type: String(manager.type),
- path: "/_system/governance" + String(artifact.getPath()),
- lifecycle: artifact.getLifecycleName(),
- lifecycleState: artifact.getLifecycleState(),
- mediaType: String(artifact.getMediaType()),
- attributes: (function () {
- var i, name,
- names = artifact.getAttributeKeys(),
- length = names.length,
- attributes = {};
- for (i = 0; i < length; i++) {
- name = names[i];
-
- var data = artifact.getAttributes(name);
-
- //Check if there is only one element
- if (data.length == 1) {
- attributes[name] = String(artifact.getAttribute(name));
- }
- else {
- attributes[name] = data;
- }
- }
- return attributes;
- }()),
- content: function () {
- return new Stream(new ByteArrayInputStream(artifact.getContent()));
- }
- };
- };
-
- var createArtifact = function (manager, options) {
- var name, attribute, i, length, lc,
- artifact = manager.newGovernanceArtifact(new QName(options.name)),
- attributes = options.attributes;
- for (name in attributes) {
- if (attributes.hasOwnProperty(name)) {
- attribute = attributes[name];
- if (attribute instanceof Array) {
- /*length = attribute.length;
- for (i = 0; i < length; i++) {
- artifact.addAttribute(name, attribute[i]);
- }*/
- artifact.setAttributes(name, attribute);
- } else {
- artifact.setAttribute(name, attribute);
- }
- }
- }
- if (options.id) {
- artifact.id = options.id;
- }
- if (options.content) {
- if (options.content instanceof Stream) {
- artifact.setContent(IOUtils.toByteArray(options.content.getStream()));
- } else {
- artifact.setContent(new java.lang.String(options.content).getBytes());
- }
- }
- lc = options.lifecycles;
- if (lc) {
- length = lc.length;
- for (i = 0; i < length; i++) {
- artifact.attachLifeCycle(lc[i]);
- }
- }
- return artifact;
- };
-
- var ArtifactManager = function (registry, type) {
- this.registry = registry;
- this.manager = new GenericArtifactManager(registry.registry.getChrootedRegistry("/_system/governance"), type);
- this.type = type;
- };
- registry.ArtifactManager = ArtifactManager;
-
- ArtifactManager.prototype.find = function (fn, paging) {
- var i, length, artifacts,
- artifactz = [];
- artifacts = this.manager.findGenericArtifacts(new GenericArtifactFilter({
- matches: function (artifact) {
- return fn(buildArtifact(this, artifact));
- }
- }));
- length = artifacts.length;
- for (i = 0; i < length; i++) {
- artifactz.push(buildArtifact(this, artifacts[i]));
- }
- return artifactz;
- };
-
-
- /*
- * this funtion is used ArtifactManager find with map for query for solr basicly
- * query - for maping attribute of resource
- * pagin - pagination details
- * return - list of artifacts under the seach request
- *
- */
- ArtifactManager.prototype.search = function (query, paging) {
-
- var list, map, key, artifacts, pagination, value, that,
- artifactz = [];
- pagination = generatePaginationForm(paging);
- try {
- PaginationContext.init(pagination.start, pagination.count, pagination.sortOrder,
- pagination.sortBy, pagination.paginationLimit);
- map = HashMap();
- //case senstive search as it using greg with solr 1.4.1
- if (!query) {
- //listing for sorting
- map = java.util.Collections.emptyMap();
- } else if (query instanceof String || typeof query === 'string') {
- list = new ArrayList();
- list.add('*' + query + '*');
- map.put('overview_name', list);
- } else {
- //support for only on name of attribut -
- for (key in query) {
- // if attribute is string values
- if (query.hasOwnProperty(key)) {
- value = query[key];
- list = new ArrayList();
- if (value instanceof Array) {
- value.forEach(function (val) {
- //solr config update need have '*' as first char in below line
- //check life_cycle state
- list.add(key == 'lcState' ? val : '*' + val + '*');
- });
- } else {
- //solr config update need have '*' as first char in below line
- list.add(key == 'lcState' ? value : '*' + value + '*');
- }
- map.put(key, list);
- }
- }//end of attribut looping (all attributes)
- }
- artifacts = this.manager.findGenericArtifacts(map);
- that = this;
- artifacts.forEach(function (artifact) {
- artifactz.push(buildArtifact(that, artifact));
- });
- } finally {
- PaginationContext.destroy();
- }
- return artifactz;
- };
-
- ArtifactManager.prototype.get = function (id) {
- return buildArtifact(this, this.manager.getGenericArtifact(id))
- };
-
- ArtifactManager.prototype.count = function () {
- return this.manager.getAllGenericArtifactIds().length;
- };
-
- /**
- * @deprecated Please use search method instead
- * @param paging
- * @return {*}
- */
- ArtifactManager.prototype.list = function (paging) {
- return this.search(null, paging);
- };
-
- /*
- The function returns an array of asset types
- @mediaType - The media type of the assets
- @return An array of strings containing the asset paths
- */
- ArtifactManager.prototype.getAssetTypePaths = function (mediaType) {
-
- //Use the default media type if one is not provided
- if (!mediaType) {
- mediaType = DEFAULT_MEDIA_TYPE;
- }
-
- //var assetArray=GovernanceUtils.findGovernanceArtifacts(mediaType,this.registry);
- var result = Packages.org.wso2.carbon.governance.api.util.GovernanceUtils.findGovernanceArtifacts(mediaType, registry.registry);
-
- return result;
- //Create an empty array if no asset types are found
- //return (!assetArray)?[]:assetArray;
- };
-
- /*
- {
- name: 'AndroidApp1',
- attributes: {
- overview_status: "CREATED",
- overview_name: 'AndroidApp1',
- overview_version: '1.0.0',
- overview_url: 'http://overview.com',
- overview_provider: 'admin',
- images_thumbnail: 'http://localhost:9763/portal/gadgets/co2-emission/thumbnail.jpg',
- images_banner: 'http://localhost:9763/portal/gadgets/electric-power/banner.jpg'
- },
- lifecycles : ['lc1', 'lc2'],
- content : '<?xml ....>'
- }
- */
- ArtifactManager.prototype.add = function (options) {
- this.manager.addGenericArtifact(createArtifact(this.manager, options));
- };
-
- ArtifactManager.prototype.update = function (options) {
- this.manager.updateGenericArtifact(createArtifact(this.manager, options));
- };
-
- ArtifactManager.prototype.remove = function (id) {
- this.manager.removeGenericArtifact(id);
- };
-
- /*
- Attaches the provided lifecycle name to the artifact
- @lifecycleName: The name of a valid lifecycle.The lifecycle should be visible to the
- registry.
- @options: The artifact to which the life cycle must be attached.
- */
- ArtifactManager.prototype.attachLifecycle = function (lifecycleName, options) {
- var artifact = getArtifactFromImage(this.manager, options);
- if (!artifact) {
- throw new Error('Specified artifact cannot be found : ' + JSON.stringify(options));
- }
- artifact.attachLifecycle(lifecycleName);
- };
-
- /*
- Removes the attached lifecycle from the artifact
- @options: The artifact from which the life cycle must be removed
- */
- ArtifactManager.prototype.detachLifecycle = function (options) {
- var artifact = getArtifactFromImage(this.manager, options);
- if (!artifact) {
- throw new Error('Specified artifact cannot be found : ' + JSON.stringify(options));
- }
- artifact.detachLifecycle();
- };
-
- /*
- Promotes the artifact to the next stage in its life cycle
- @options: An artifact image (Not a real artifact)
- */
- ArtifactManager.prototype.promoteLifecycleState = function (state, options) {
- var checkListItems,
- artifact = getArtifactFromImage(this.manager, options);
- if (!artifact) {
- throw new Error('Specified artifact cannot be found : ' + JSON.stringify(options));
- }
- //checkListItems = artifact.getAllCheckListItemNames();
- artifact.invokeAction(state);
- };
-
- /*
- Gets the current lifecycle state
- @options: An artifact object
- @returns: The life cycle state
- */
- ArtifactManager.prototype.getLifecycleState = function (options) {
- var artifact = getArtifactFromImage(this.manager, options);
- if (!artifact) {
- throw new Error('Specified artifact cannot be found : ' + JSON.stringify(options));
- }
- return artifact.getLifecycleState();
- };
-
- /*
- The function returns the list of check list items for a given state
- @options: The artifact
- @returns: A String array containing the check list items.(Can be empty if no check list items are present)
- */
- ArtifactManager.prototype.getCheckListItemNames = function (options) {
- var artifact = getArtifactFromImage(this.manager, options);
-
- var checkListItems = artifact.getAllCheckListItemNames() || [];
-
- var checkListItemArray = [];
-
- //Go through each check list item
- for (var index in checkListItems) {
- //Get whether the check list item is checked
- var state = artifact.isLCItemChecked(index);
- checkListItemArray.push({ 'name': checkListItems[index], 'checked': state });
- }
-
- return checkListItemArray;
- };
-
- /*
- The function checks whether a given check list item at the provided index is checked for the current state
- @index: The index of the check list item.This must be a value between 0 and the maximum check list item
- that appears in the lifecycle definition
- @options: An artifact object
- @throws Exception: If the index is not within 0 and the max check list item or if there is an issue ticking the item
- */
- ArtifactManager.prototype.isItemChecked = function (index, options) {
-
- var artifact = getArtifactFromImage(this.manager, options);
-
- var checkListItems = artifact.getAllCheckListItemNames();
-
- var checkListLength = checkListItems.length;
-
- if ((index < 0) || (index > checkListLength)) {
- throw "The index value: " + index + " must be between 0 and " + checkListLength + ".Please refer to the lifecycle definition in the registry.xml for the number of check list items.";
- }
-
- var result = artifact.isLCItemChecked(index);
-
- return result;
- };
-
- /*
- The method enables the check list item and the given index
- @index: The index of the check list item.This must be a value between 0 and the maximum check list item
- that appears in the lifecycle definition.
- @options: An artifact object
- @throws Exception: If the index is not within 0 and max check list item or if there is an issue ticking the item.
- */
- ArtifactManager.prototype.checkItem = function (index, options) {
-
- var artifact = getArtifactFromImage(this.manager, options);
-
- var checkListItems = artifact.getAllCheckListItemNames();
-
- var checkListLength = checkListItems.length;
-
- if ((index < 0) || (index > checkListLength)) {
- throw "The index value: " + index + " must be between 0 and " + checkListLength + ".Please refer to the lifecycle definition in the registry.xml for the number of check list items.";
- }
-
- artifact.checkLCItem(index);
- };
-
- /*
- The method disables the check list item at the given index
- @index: The index of the check list item.This must be a value between 0 and the maximum check list item
- that appears in the lifecycle definition
- @options: An artifact object
- @throws Exception: If the index is not within 0 and max check list item or if there is an issue ticking the item
- */
- ArtifactManager.prototype.uncheckItem = function (index, options) {
-
- var artifact = getArtifactFromImage(this.manager, options);
-
- var checkListItems = artifact.getAllCheckListItemNames();
-
- var checkListLength = checkListItems.length;
-
- if ((index < 0) || (index > checkListLength)) {
- throw "The index value: " + index + " must be between 0 and " + checkListLength + ".Please refer to the lifecycle definition in the registry.xml for the number of check list items.";
- }
-
- artifact.uncheckLCItem(index);
- };
-
- /*
- The method obtains the list of all available actions for the current state of the asset
- @options: An artifact object
- @returns: The list of available actions for the current state,else false
- */
- ArtifactManager.prototype.availableActions = function (options) {
- var artifact = getArtifactFromImage(this.manager, options);
- if (!artifact) {
- throw new Error('Specified artifact cannot be found : ' + JSON.stringify(options));
- }
- return artifact.getAllLifecycleActions() || [];
- };
-
- /*
- The function returns the life-cycle history path using
- the provided asset.
- @options: An asset.
- @return: A string path of the life-cycle history.
- */
- ArtifactManager.prototype.getLifecycleHistoryPath = function (options) {
-
- return getHistoryPath(options.path);
- };
-
- /*
- The function obtains the lifecycle history for the provided asset
- @options: An asset with a valid path.(A path which exists in the registry
- @return: A resource object containing the history as an xml
- */
- ArtifactManager.prototype.getLifecycleHistory=function(options){
- var historyPath=getHistoryPath(options.path);
- return this.registry.get(historyPath);
- };
-
- /*
- The function returns the life-cycle attached to the provided artifact
- @options: An asset as returned by the ArtifactManager get method
- @return: A string indicating the lifecycle name.If the artifact does not
- have a life-cycle then an empty string is returned.
- */
- ArtifactManager.prototype.getLifeCycleName = function (options) {
-
- var artifact = getArtifactFromImage(this.manager, options);
-
- var lifecycleName = '';
-
- if (artifact != null) {
- lifecycleName = artifact.getLifecycleName();
- }
-
- return lifecycleName;
- };
-
- /*
- The function returns all versions of the provided artifact
- @options: The artifact to be checked
- @return: A list of all the different versions of the provided asset
- */
- ArtifactManager.prototype.getAllAssetVersions = function (assetName) {
-
- var matchingArtifacts = [];
-
- var pred = {
- overview_name: assetName || ''
- };
-
- this.find(function (artifact) {
-
- //Add to the matches if the artifact exists
- if (assert(artifact.attributes, pred)) {
-
- //We only need the id and version
- matchingArtifacts.push({id: artifact.id, version: artifact.attributes.overview_version});
- }
- });
-
- return matchingArtifacts;
- };
-
- /*
- The function checks if the two objects a and b are equal.If a property in b is not
- in a, then both objects are assumed to be different.
- @a: The object to be compared
- @b: The object containing properties that must match in a
- @return: True if the objects are equal,else false.
- */
- var assert = function (a, b) {
-
- //Assume the objects will be same
- var equal = true;
-
- for (var key in b) {
-
-
- if (a.hasOwnProperty(key)) {
-
- //If the two keys are not equal
- if (a[key] != b[key]) {
- return false;
- }
- }
- else {
- return false;
- }
- }
-
- return equal;
- };
-
- /*
- The function generates the history path of a given asset
- using its path
- @assetPath:The path of the asset to be retrieved.
- @return: The path of lifecycle history information
- */
- var getHistoryPath = function (assetPath) {
-
- //Replace the / in the assetPath
- var partialHistoryPath = assetPath.replace(lcHistoryRegExpression, HISTORY_PATH_SEPERATOR);
-
- var fullPath = HISTORY_PATH + partialHistoryPath;
-
- return fullPath;
- };
-
- /*
- generatePaginationForm will genrate json for registry pagination context, (pagination consistent handling)
- @pagin:The pagination details from UI
- @
- */
- var generatePaginationForm = function (pagin) {
-
- //pagination context for default
- var paginationLimit = 300;
- var paginationForm = {
- 'start': 0,
- 'count': 12,
- 'sortOrder': 'ASC',
- 'sortBy': 'overview_name',
- 'paginationLimit': 2147483647
- };
-
- if (!pagin) {
- return paginationForm;
- }
-
- if (pagin.count != null) {
- paginationForm.count = pagin.count;
- }
- if (pagin.start != null) {
- paginationForm.start = pagin.start;
- }
- if (pagin.paginationLimit != null) {
- paginationForm.paginationLimit = pagin.paginationLimit;
- }
- if (pagin.sortBy != null) {
- paginationForm.sortBy = pagin.sortBy;
- }
- if (paginationForm.sortOrder != null) {
- paginationForm.sortOrder = pagin.sortOrder;
- }
- return paginationForm;
-
- };
-
- /*
- Helper function to create an artifact instance from a set of options (an image).
- */
- var getArtifactFromImage = function (manager, options) {
-
- var path = options.path || '';
- var lcName = options.lifecycle || '';
- var artifact = createArtifact(manager, {
- id: options.id,
- attributes: options.attributes
- });
-
- path = path.replace(REGISTRY_ABSOLUTE_PATH, '');
-
- artifact.setArtifactPath(path);
- artifact.setLcName(lcName);
-
- return artifact;
- };
-
-}(server, registry));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/carbon/scripts/registry/registry-osgi.js
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/carbon/scripts/registry/registry-osgi.js b/products/stratos/conf/temp-artifacts/carbon/scripts/registry/registry-osgi.js
deleted file mode 100644
index eefbaad..0000000
--- a/products/stratos/conf/temp-artifacts/carbon/scripts/registry/registry-osgi.js
+++ /dev/null
@@ -1,466 +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.
- *
-*/
-
-var registry = registry || {};
-
-(function (server, registry) {
- var log = new Log();
-
- var Resource = Packages.org.wso2.carbon.registry.core.Resource;
-
- var Collection = Packages.org.wso2.carbon.registry.core.Collection;
-
- var Comment = Packages.org.wso2.carbon.registry.core.Comment;
-
- var StaticConfiguration = Packages.org.wso2.carbon.registry.core.config.StaticConfiguration;
-
- var queryPath = '/_system/config/repository/components/org.wso2.carbon.registry/queries/';
-
- var content = function (registry, resource, paging) {
- if (resource instanceof Collection) {
- // #1 : this always sort children by name, so sorting cannot be done for the chunk
- return children(registry, resource, paging);
- }
- if (resource instanceof Comment) {
- return String(resource.getText());
- }
- var stream = resource.getContentStream();
- if (stream) {
- return new Stream(stream);
- }
- return String(resource.content);
- };
-
- var resourceSorter = function (key) {
- var nameAsc = function (l, r) {
- var lname, rname;
- if (l instanceof Collection) {
- lname = l.getName();
- lname = lname.substring(lname.lastIndexOf('/') + 1);
- } else {
- lname = l.name;
- }
- if (r instanceof Collection) {
- rname = r.getName();
- rname = rname.substring(rname.lastIndexOf('/') + 1);
- } else {
- rname = r.name;
- }
- return lname === rname ? 0 : (lname > rname ? 1 : -1);
- };
- switch (key) {
- case 'time-created-asc' :
- return function (l, r) {
- return l.getCreatedTime().getTime() - r.getCreatedTime().getTime();
- };
- case 'time-created-des' :
- return function (l, r) {
- return r.getCreatedTime().getTime() - l.getCreatedTime().getTime();
- };
- case 'name-asc' :
- return nameAsc;
- case 'name-des' :
- return function (l, r) {
- return -nameAsc(l, r);
- };
- default:
- return resourceSorter('time-created-des');
- }
- };
-
- var children = function (registry, resource, paging) {
- var resources = resource.getChildren();
- //we have to manually sort this due to the bug in registry.getChildren() (#1 above)
- //resources.sort(resourceSorter(paging.sort));
- return resources.slice(paging.start, paging.start + paging.count);
- };
-
- var resource = function (registry, resource) {
- var path = String(resource.path),
- o = {
- created: {
- author: String(resource.authorUserName),
- time: resource.createdTime.time
- },
- content: content(registry, resource, {
- start: 0,
- count: 10
- }),
- id: String(resource.id),
- version: resource.versionNumber
- };
- if (resource instanceof Comment) {
- return o;
- }
- if (resource instanceof Collection) {
- o.collection = (resource instanceof Collection);
- }
- o.uuid = String(resource.UUID);
- o.path = String(path);
- o.name = String(resource.name) || resolveName(path);
- o.description = String(resource.description);
- o.updated = {
- author: String(resource.lastUpdaterUserName),
- time: resource.lastModified.time
- };
- o.mediaType = String(resource.mediaType);
- o.properties = function () {
- return properties(resource);
- };
- o.aspects = function () {
- return aspects(resource);
- };
- return o;
- };
-
- var properties = function (resource) {
- var prop,
- properties = resource.properties,
- props = properties.keySet().toArray(),
- length = props.length,
- o = {};
- for (var i = 0; i < length; i++) {
- prop = props[i];
- o[prop] = resource.getPropertyValues(prop).toArray();
- }
- return o;
- };
-
- var aspects = function (resource) {
- var aspects = resource.getAspects();
- return aspects ? aspects.toArray() : [];
- };
-
- var resolveName = function (path) {
- path = path.charAt(path.length - 1) === '/' ? path.substring(0, path.length - 1) : path;
- return path.substring(path.lastIndexOf('/') + 1);
- };
-
- var merge = function (def, options) {
- if (options) {
- for (var op in def) {
- if (def.hasOwnProperty(op)) {
- def[op] = options[op] || def[op];
- }
- }
- }
- return def;
- };
-
- var Registry = function (serv, options) {
- var registryService = server.osgiService('org.wso2.carbon.registry.core.service.RegistryService'),
- carbon = require('carbon');
- if (options) {
- this.server = serv;
- } else {
- this.server = new server.Server();
- options = serv || {};
- }
-
- if (options.tenantId) {
- this.tenantId = options.tenantId;
- } else if (options.username || options.domain) {
- this.tenantId = server.tenantId({
- domain: options.domain,
- username: options.username
- });
- } else {
- this.tenantId = server.tenantId();
- }
-
- if (options.username) {
- this.username = options.username;
- } else if (options.system) {
- this.username = carbon.user.systemUser;
- } else {
- this.username = carbon.user.anonUser;
- }
-
- this.registry = registryService.getRegistry(this.username, this.tenantId);
- this.versioning = {
- comments: StaticConfiguration.isVersioningComments()
- };
- };
-
- registry.Registry = Registry;
-
- Registry.prototype.put = function (path, resource) {
- var res;
- if (resource.collection) {
- res = this.registry.newCollection();
- } else {
- res = this.registry.newResource();
- if (resource.content instanceof Stream) {
- res.contentStream = resource.content.getStream();
- } else {
- res.content = resource.content || null;
- }
- res.mediaType = resource.mediaType || null;
- }
- res.name = resource.name;
- res.description = resource.description || null;
- res.UUID = resource.uuid || null;
-
- var values, length, i, ArrayList,
- properties = resource.properties;
- if (properties) {
- ArrayList = java.util.ArrayList;
- for (var name in properties) {
- var list = new ArrayList();
- if (properties.hasOwnProperty(name)) {
- values = properties[name];
- values = values instanceof Array ? values : [values];
- length = values.length;
- for (i = 0; i < length; i++) {
- list.add(values[i]);
- }
- res.setProperty(name, list);
- }
- }
- }
-
- var aspects = resource.aspects;
- if (aspects) {
- length = aspects.length;
- for (i = 0; i < length; i++) {
- res.addAspect(aspects[i]);
- }
- }
-
- this.registry.put(path, res);
- };
-
- Registry.prototype.remove = function (path) {
- this.registry.delete(path);
- };
-
- Registry.prototype.move = function (src, dest) {
- this.registry.move(src, dest);
- };
-
- Registry.prototype.rename = function (current, newer) {
- this.registry.rename(current, newer);
- };
-
- Registry.prototype.copy = function (src, dest) {
- this.registry.copy(src, dest);
- };
-
- Registry.prototype.restore = function (path) {
- this.registry.restoreVersion(path);
- };
-
- Registry.prototype.get = function (path) {
- if (!this.exists(path)) {
- return null;
- }
- var res = this.registry.get(path);
- return resource(this, res);
- };
-
- Registry.prototype.exists = function (path) {
- return this.registry.resourceExists(path);
- };
-
- Registry.prototype.content = function (path, paging) {
- if (!this.exists(path)) {
- return null;
- }
- var resource = this.registry.get(path);
- paging = merge({
- start: 0,
- count: 10,
- sort: 'recent'
- }, paging);
- return content(this, resource, paging);
- };
-
- Registry.prototype.tags = function (path) {
- var tags, i, length,
- tagz = [];
- tags = this.registry.getTags(path);
- length = tags.length;
- for (i = 0; i < length; i++) {
- tagz.push(String(tags[i].tagName));
- }
- return tagz;
- };
-
- Registry.prototype.tag = function (path, tags) {
- var i, length;
- tags = tags instanceof Array ? tags : [tags];
- length = tags.length;
- for (i = 0; i < length; i++) {
- this.registry.applyTag(path, tags[i]);
- }
- };
-
- Registry.prototype.untag = function (path, tags) {
- var i, length;
- tags = tags instanceof Array ? tags : [tags];
- length = tags.length;
- for (i = 0; i < length; i++) {
- this.registry.removeTag(path, tags[i]);
- }
- };
-
- Registry.prototype.associate = function (src, dest, type) {
- this.registry.addAssociation(src, dest, type);
- };
-
- Registry.prototype.dissociate = function (src, dest, type) {
- this.registry.removeAssociation(src, dest, type);
- };
-
- Registry.prototype.associations = function (path, type) {
- var i, asso,
- assos = type ? this.registry.getAssociations(path, type) : this.registry.getAllAssociations(path),
- length = assos.length,
- associations = [];
- for (i = 0; i < length; i++) {
- asso = assos[i];
- associations.push({
- type: String(asso.associationType),
- src: String(asso.sourcePath),
- dest: String(asso.destinationPath)
- });
- }
- return associations;
- };
-
- Registry.prototype.addProperty = function (path, name, value) {
- var resource = this.registry.get(path);
- resource.addProperty(name, value);
- };
-
- Registry.prototype.removeProperty = function (path, name, value) {
- var resource = this.registry.get(path);
- (value ? resource.removePropertyValue(name, value) : resource.removeProperty(name));
- };
-
- Registry.prototype.properties = function (path) {
- var resource = this.registry.get(path);
- return properties(resource);
- };
-
- Registry.prototype.version = function (path) {
- this.registry.createVersion(path);
- };
-
- Registry.prototype.versions = function (path) {
- return this.registry.getVersions(path);
- };
-
- Registry.prototype.unversion = function (path, snapshot) {
- this.registry.removeVersionHistory(path, snapshot);
- };
-
- Registry.prototype.comment = function (path, comment) {
- this.registry.addComment(path, new Comment(comment));
- };
-
- Registry.prototype.comments = function (path, paging) {
- var i, length, comments, comment, key,
- commentz = [];
- paging = merge({
- start: 0,
- count: 25,
- sort: 'recent'
- }, paging);
-
- comments = this.registry.getComments(path);
- //we have to manually sort this due to the bug in registry.getChildren() (#1 above)
- key = paging.sort;
- key = (key === 'time-created-des' || key === 'time-created-asc') ? key : 'time-created-des';
- comments = comments.sort(resourceSorter(key));
- comments = comments.slice(paging.start, paging.start + paging.count);
- length = comments.length;
- for (i = 0; i < length; i++) {
- comment = comments[i];
- commentz.push({
- content: comment.getText(),
- created: {
- author: comment.getUser(),
- time: comment.getCreatedTime().getTime()
- },
- path: comment.getCommentPath()
- });
- }
- return commentz;
- };
-
- Registry.prototype.commentCount = function (path) {
- return this.registry.getComments(path).length;
- };
-
- Registry.prototype.uncomment = function (path) {
- this.registry.removeComment(path);
- };
-
- Registry.prototype.rate = function (path, rating) {
- this.registry.rateResource(path, rating);
- };
-
- Registry.prototype.unrate = function (path) {
- this.registry.rateResource(path, 0);
- };
-
- Registry.prototype.rating = function (path, username) {
- var rating = {
- average: this.registry.getAverageRating(path)
- };
- if (username) {
- rating.user = this.registry.getRating(path, username);
- }
- return rating;
- };
-
- Registry.prototype.link = function (path, target) {
- return this.registry.createLink(path, target);
- };
-
- Registry.prototype.unlink = function (path) {
- return this.registry.removeLink(path);
- };
-
- Registry.prototype.search = function (query, paging) {
- var res = this.registry.searchContent(query);
- paging = merge({
- start: 0,
- count: 10,
- sort: 'recent'
- }, paging);
- return res ? content(this, res, paging) : [];
- };
-
- Registry.prototype.query = function (path, params) {
- var res, name,
- map = new java.util.HashMap();
- for (name in params) {
- if (params.hasOwnProperty(name)) {
- map.put(name, params[name]);
- }
- }
- res = this.registry.executeQuery(path, map);
- return res.getChildren();
- };
-
-}(server, registry));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/carbon/scripts/registry/registry-ws.js
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/carbon/scripts/registry/registry-ws.js b/products/stratos/conf/temp-artifacts/carbon/scripts/registry/registry-ws.js
deleted file mode 100644
index 014a75c..0000000
--- a/products/stratos/conf/temp-artifacts/carbon/scripts/registry/registry-ws.js
+++ /dev/null
@@ -1,77 +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.
- *
-*/
-
-var log = new Log();
-
-var Registry = function (server) {
- this.server = server;
-};
-
-var Resource = function (name) {
-
-};
-
-var Collection = function (name) {
-
-};
-
-Registry.prototype.invoke = function (action, payload) {
- var options,
- ws = require('ws'),
- client = new ws.WSRequest(),
- server = this.server;
-
- options = {
- useSOAP: 1.2,
- useWSA: 1.0,
- action: action,
- HTTPHeaders: [
- { name: 'Cookie', value: server.cookie }
- ]
- };
-
- try {
- client.open(options, server.url + '/services/WSRegistryService', false);
- client.send(payload);
- return client.responseXML;
- } catch (e) {
- log.error(e.toString());
- throw new Error('Error while invoking action in WSRegistryService : ' +
- action + ', user : ' + server.user.username);
- }
-};
-
-Registry.prototype.putResource = function (path, resource) {
-
-};
-
-Registry.prototype.getResource = function (path) {
- var res, payload,
- base64 = require('/modules/base64.js');
-
- payload =
- <api:getContent xmlns:api="http://api.ws.registry.carbon.wso2.org">
- <api:path>{path}</api:path>
- </api:getContent>;
-
- res = this.invoke('urn:getContent', payload);
- return base64.decode(String(res.*::['return'].text()));
-};
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/carbon/scripts/registry/registry.js
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/carbon/scripts/registry/registry.js b/products/stratos/conf/temp-artifacts/carbon/scripts/registry/registry.js
deleted file mode 100644
index 43467bc..0000000
--- a/products/stratos/conf/temp-artifacts/carbon/scripts/registry/registry.js
+++ /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.
- *
-*/
-
-var registry = {};
-
-(function (registry) {
- var ActionConstants = Packages.org.wso2.carbon.registry.core.ActionConstants,
- AccessControlConstants = Packages.org.wso2.carbon.registry.core.utils.AccessControlConstants;
-
- registry.Registry = function (server, auth) {
- var osgi = require('registry-osgi.js').registry,
- o = new osgi.Registry(server, auth);
- o.prototype = this;
- return o;
- };
-
- registry.actions = {};
-
- registry.actions.GET = ActionConstants.GET;
-
- registry.actions.PUT = ActionConstants.PUT;
-
- registry.actions.DELETE = ActionConstants.DELETE;
-
- registry.actions.AUTHORIZE = AccessControlConstants.AUTHORIZE;
-
-}(registry));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/carbon/scripts/server/config.js
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/carbon/scripts/server/config.js b/products/stratos/conf/temp-artifacts/carbon/scripts/server/config.js
deleted file mode 100644
index fe5078f..0000000
--- a/products/stratos/conf/temp-artifacts/carbon/scripts/server/config.js
+++ /dev/null
@@ -1,53 +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.
- *
-*/
-
-(function (server) {
- var process = require('process'),
- configDir = 'file:///' + process.getProperty('carbon.config.dir.path').replace(/[\\]/g, '/').replace(/^[\/]/g, '') + '/';
- server.loadConfig = function (path) {
- var content,
- index = path.lastIndexOf('.'),
- ext = (index !== -1 && index < path.length) ? path.substring(index + 1) : '',
- file = new File(configDir + path);
- if (!file.isExists()) {
- throw new Error('Specified config file does not exists : ' + path);
- }
- if (file.isDirectory()) {
- throw new Error('Specified config file is a directory : ' + path);
- }
- file.open('r');
- content = file.readAll();
- file.close();
- switch (ext) {
- case 'xml' :
- return new XML(content);
- case 'json' :
- return parse(content);
- case 'properties' :
- default :
- return content;
-
- }
- };
-
- server.home = 'file:///' + require('process').getProperty('carbon.home').replace(/[\\]/g, '/').replace(/^[\/]/g, '');
-
-}(server));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/carbon/scripts/server/osgi.js
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/carbon/scripts/server/osgi.js b/products/stratos/conf/temp-artifacts/carbon/scripts/server/osgi.js
deleted file mode 100644
index 2175c23..0000000
--- a/products/stratos/conf/temp-artifacts/carbon/scripts/server/osgi.js
+++ /dev/null
@@ -1,31 +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.
- *
-*/
-
-var server = {};
-
-(function (server) {
- var PrivilegedCarbonContext = Packages.org.wso2.carbon.context.PrivilegedCarbonContext,
- Class = java.lang.Class;
-
- server.osgiService = function (clazz) {
- return PrivilegedCarbonContext.getThreadLocalCarbonContext().getOSGiService(Class.forName(clazz));
- };
-}(server));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/carbon/scripts/server/server.js
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/carbon/scripts/server/server.js b/products/stratos/conf/temp-artifacts/carbon/scripts/server/server.js
deleted file mode 100644
index ba6300d..0000000
--- a/products/stratos/conf/temp-artifacts/carbon/scripts/server/server.js
+++ /dev/null
@@ -1,115 +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.
- *
-*/
-
-(function (server) {
- var log = new Log();
-
- var login = function (url, username, password) {
- var res, options, payload,
- ws = require('ws'),
- client = new ws.WSRequest(),
- host = url.match(/.*:\/\/([^:\/]*)/)[1];
-
- options = {
- useSOAP: 1.2,
- useWSA: 1.0,
- action: 'urn:login'
- };
-
- payload =
- <aut:login xmlns:aut="http://authentication.services.core.carbon.wso2.org">
- <aut:username>{username}</aut:username>
- <aut:password>{password}</aut:password>
- <aut:remoteAddress>{host}</aut:remoteAddress>
- </aut:login>;
-
- try {
- client.open(options, url + '/services/AuthenticationAdmin', false);
- client.send(payload);
- res = client.responseXML;
- if (res.*::["return"].text() != 'true') {
- return false;
- }
- return client.getResponseHeader('Set-Cookie');
- } catch (e) {
- log.error(e.toString());
- throw new Error('Error while login to the server : ' + url + ', user : ' + username);
- }
- };
-
- var logout = function (url, cookie) {
- var options,
- ws = require('ws'),
- client = new ws.WSRequest();
-
- options = {
- useSOAP: 1.2,
- useWSA: 1.0,
- action: 'urn:logout',
- mep: 'in-only',
- HTTPHeaders: [
- { name: 'Cookie', value: cookie }
- ]
- };
-
- try {
- client.open(options, url + '/services/AuthenticationAdmin', false);
- client.send(null);
- return true;
- } catch (e) {
- log.error(e.toString());
- throw new Error('Error while logging out in server : ' + url + ', cookie : ' + cookie);
- }
- };
-
- var Cookie = function (cookie) {
- this.cookie = cookie;
- };
-
- server.Cookie = Cookie;
-
- var Server = function (options) {
- this.url = (options && options.url) ? options.url : 'local:/';
- };
- server.Server = Server;
-
- Server.prototype.authenticate = function (username, password) {
- var realm, user,
- carbon = require('carbon'),
- realmService = server.osgiService('org.wso2.carbon.user.core.service.RealmService');
- user = carbon.server.tenantUser(username);
- realm = realmService.getTenantUserRealm(user.tenantId);
- if(realm == null){
- throw new Error("Invalid domain or unactivated tenant login");
- }else{
- return realm.getUserStoreManager().authenticate(user.username, password);
- }
- };
-
- Server.prototype.login = function (username, password) {
- var cookie = login(this.url, username, password);
- return new Cookie(cookie);
- };
-
- Server.prototype.logout = function (cookie) {
- return logout(this.url, cookie.cookie);
- };
-}(server));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/carbon/scripts/server/tenant.js
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/carbon/scripts/server/tenant.js b/products/stratos/conf/temp-artifacts/carbon/scripts/server/tenant.js
deleted file mode 100644
index 255e7d7..0000000
--- a/products/stratos/conf/temp-artifacts/carbon/scripts/server/tenant.js
+++ /dev/null
@@ -1,70 +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.
- *
-*/
-
-(function (server) {
- var PrivilegedCarbonContext = Packages.org.wso2.carbon.context.PrivilegedCarbonContext,
- MultitenantConstants = Packages.org.wso2.carbon.utils.multitenancy.MultitenantConstants,
- MultitenantUtils = Packages.org.wso2.carbon.utils.multitenancy.MultitenantUtils,
- realmService = server.osgiService('org.wso2.carbon.user.core.service.RealmService'),
- tenantManager = realmService.getTenantManager();
-
- server.tenantDomain = function (options) {
- if (!options) {
- return PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
- }
- if(options.tenantId) {
- return tenantManager.getDomain(options.tenantId);
- }
- if (options.username) {
- return MultitenantUtils.getTenantDomain(options.username);
- }
- if (options.url) {
- return MultitenantUtils.getTenantDomainFromRequestURL(options.url);
- }
- return null;
- };
-
- server.tenantId = function (options) {
- var domain = options ? (options.domain || server.tenantDomain(options)) : server.tenantDomain();
- return domain ? tenantManager.getTenantId(domain) : null;
- };
-
- server.tenantUser = function (username) {
- var domain = server.tenantDomain({
- username: username
- }),
- id = server.tenantId({
- domain: domain
- });
- username = MultitenantUtils.getTenantAwareUsername(username);
- return {
- domain: domain,
- username: username,
- tenantId: id
- };
- };
-
- server.superTenant = {
- tenantId: MultitenantConstants.SUPER_TENANT_ID,
- domain: MultitenantConstants.SUPER_TENANT_DOMAIN_NAME
- };
-
-}(server));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/carbon/scripts/user/registry-space.js
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/carbon/scripts/user/registry-space.js b/products/stratos/conf/temp-artifacts/carbon/scripts/user/registry-space.js
deleted file mode 100644
index 9536fb4..0000000
--- a/products/stratos/conf/temp-artifacts/carbon/scripts/user/registry-space.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-(function (server, registry, user) {
-
- var Space = function (user, space, options) {
- var serv = new server.Server(options.serverUrl);
- this.registry = new registry.Registry(serv, {
- username: options.username || user,
- domain: options.domain || server.tenantDomain()
- });
- this.prefix = options.path + '/' + user + '/' + space;
- if (!this.registry.exists(this.prefix)) {
- this.registry.put(this.prefix, {
- collection: true
- });
- }
- };
- user.Space = Space;
-
- Space.prototype.put = function (key, value) {
- value = (!(value instanceof String) && typeof value !== "string") ? stringify(value) : value;
- this.registry.put(this.prefix + '/' + key, {
- content: value
- });
- };
-
- Space.prototype.get = function (key) {
- var o = this.registry.content(this.prefix + '/' + key);
- return o ? o.toString() : null;
- };
-
- Space.prototype.remove = function (key) {
- this.registry.remove(this.prefix + '/' + key);
- };
-
- Space.prototype.find = function (filter) {
-
- };
-
-
-}(server, registry, user));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/carbon/scripts/user/space.js
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/carbon/scripts/user/space.js b/products/stratos/conf/temp-artifacts/carbon/scripts/user/space.js
deleted file mode 100644
index c895cc1..0000000
--- a/products/stratos/conf/temp-artifacts/carbon/scripts/user/space.js
+++ /dev/null
@@ -1,31 +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.
- *
-*/
-
-(function (server, user) {
-
- user.Space = function (user, space, options) {
- var reg = require('registry-space.js').user,
- o = new reg.Space(user, space, options);
- o.prototype = this;
- return o;
- };
-
-}(server, user));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/carbon/scripts/user/user-manager.js
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/carbon/scripts/user/user-manager.js b/products/stratos/conf/temp-artifacts/carbon/scripts/user/user-manager.js
deleted file mode 100644
index 56833b9..0000000
--- a/products/stratos/conf/temp-artifacts/carbon/scripts/user/user-manager.js
+++ /dev/null
@@ -1,179 +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.
- *
-*/
-
-(function (server, user) {
-
- var log = new Log();
-
- var processPerms = function (perms, fn) {
- var perm, actions, i, length;
- for (perm in perms) {
- if (perms.hasOwnProperty(perm)) {
- actions = perms[perm];
- length = actions.length;
- for (i = 0; i < length; i++) {
- fn(perm, actions[i]);
- }
- }
- }
- };
-
- var UserManager = function (serv, tenantId) {
- this.server = serv;
- this.tenantId = tenantId || server.superTenant.tenantId;
- var realmService = server.osgiService('org.wso2.carbon.user.core.service.RealmService'),
- realm = realmService.getTenantUserRealm(this.tenantId);
- this.manager = realm.getUserStoreManager();
- this.authorizer = realm.getAuthorizationManager();
- };
- user.UserManager = UserManager;
-
- UserManager.prototype.getUser = function (username) {
- if (!this.manager.isExistingUser(username)) {
- return null;
- }
- return new user.User(this, username);
- };
- UserManager.prototype.getRoleListOfUser = function (username) {
- return this.manager.getRoleListOfUser(username);
- };
- UserManager.prototype.addUser = function (username, password, roles, claims, profile) {
- this.manager.addUser(username, password, roles || [], claims || null, profile);
- };
-
- UserManager.prototype.removeUser = function (username) {
- this.manager.deleteUser(username);
- };
-
- UserManager.prototype.userExists = function (username) {
- return this.manager.isExistingUser(username);
- };
-
- UserManager.prototype.roleExists = function (role) {
- return this.manager.isExistingRole(role);
- };
- UserManager.prototype.updateRole = function (previousRoleName, newRoleName) {
- return this.manager.updateRoleName(previousRoleName, newRoleName);
- };
- UserManager.prototype.getClaims = function (username, profile) {
- return this.manager.getUserClaimValues(username, profile);
- };
- UserManager.prototype.getClaimsForSet = function (username,claims, profile) {
- return this.manager.getUserClaimValues(username,claims, profile);
- };
- UserManager.prototype.getClaim = function (username, claim, profile) {
- return this.manager.getUserClaimValue(username, claim, profile);
- };
-
- UserManager.prototype.setClaims = function (username, claims, profile) {
- return this.manager.setUserClaimValues(username, claims, profile);
- };
-
- UserManager.prototype.setClaim = function (username, claim, value, profile) {
- return this.manager.setUserClaimValue(username, claim, value, profile);
- };
-
- UserManager.prototype.isAuthorized = function (role, permission, action) {
- return this.authorizer.isRoleAuthorized(role, permission, action);
- };
- UserManager.prototype.updateRoleListOfUser = function(name, deletedRoles, newRoles){
- return this.manager.updateRoleListOfUser(name, deletedRoles, newRoles);
- };
- UserManager.prototype.updateUserListOfRole = function(name, deletedUsers, newUsers){
- return this.manager.updateUserListOfRole(name, deletedUsers, newUsers);
- };
- UserManager.prototype.listUsers = function () {
- return this.manager.listUsers("*", -1);
- };
- UserManager.prototype.addRole = function (role, users, permissions) {
- var perms = [],
- Permission = Packages.org.wso2.carbon.user.api.Permission;
- processPerms(permissions, function (id, action) {
- perms.push(new Permission(id, action));
- });
- this.manager['addRole(java.lang.String,java.lang.String[],org.wso2.carbon.user.api.Permission[])']
- (role, users, perms);
- };
-
- UserManager.prototype.removeRole = function (role) {
- this.manager.deleteRole(role);
- };
-
- UserManager.prototype.allRoles = function () {
- return this.manager.getRoleNames();
- };
- UserManager.prototype.getUserListOfRole = function (role) {
- return this.manager.getUserListOfRole(role);
- };
- /**
- * um.authorizeRole('store-admin', '/permissions/mypermission', 'ui-execute');
- *
- * um.authorizeRole('store-admin', {
- * '/permissions/myperm1' : ['read', 'write'],
- * '/permissions/myperm2' : ['read', 'write']
- * });
- *
- * @param role
- * @param permission
- * @param action
- */
- UserManager.prototype.authorizeRole = function (role, permission, action) {
- var that = this;
- if (permission instanceof String || typeof permission === 'string') {
- if (!that.isAuthorized(role, permission, action)) {
- that.authorizer.authorizeRole(role, permission, action);
- }
- } else {
- processPerms(permission, function (id, action) {
- if (!that.isAuthorized(role, id, action)) {
- that.authorizer.authorizeRole(role, id, action);
- if (log.isDebugEnabled()) {
- log.debug('permission added(role:permission:action) - ' + role + ':' + id + ':' + action);
- }
- }
- });
- }
- };
-
- /**
- * um.denyRole('store-admin', '/permissions/mypermission', 'ui-execute');
- *
- * um.denyRole('store-admin', {
- * '/permissions/myperm1' : ['read', 'write'],
- * '/permissions/myperm2' : ['read', 'write']
- * });
- *
- * @param role
- * @param permission
- * @param action
- */
- UserManager.prototype.denyRole = function (role, permission, action) {
- var deny = this.authorizer.denyRole;
- if (permission instanceof String || typeof permission === 'string') {
- deny(role, permission, action);
- } else {
- processPerms(permission, function (id, action) {
- deny(role, id, action);
- });
- }
- };
-
-}(server, user));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/carbon/scripts/user/user.js
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/carbon/scripts/user/user.js b/products/stratos/conf/temp-artifacts/carbon/scripts/user/user.js
deleted file mode 100644
index 66b253d..0000000
--- a/products/stratos/conf/temp-artifacts/carbon/scripts/user/user.js
+++ /dev/null
@@ -1,99 +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.
- *
-*/
-
-var user = {};
-
-(function (user) {
-
- var CarbonConstants = Packages.org.wso2.carbon.CarbonConstants;
-
- user.systemUser = CarbonConstants.REGISTRY_SYSTEM_USERNAME;
-
- user.anonUser = CarbonConstants.REGISTRY_ANONNYMOUS_USERNAME;
-
- user.anonRole = CarbonConstants.REGISTRY_ANONNYMOUS_ROLE_NAME;
-
- var User = function (manager, username) {
- this.um = manager;
- this.tenantId = manager.tenantId;
- this.username = username;
- };
- user.User = User;
-
- User.prototype.getClaims = function (profile) {
- return this.um.getClaims(this.username, profile);
- };
- User.prototype.getClaimsForSet = function (claims,profile) {
- return this.um.getClaimsForSet(this.username, claims, profile);
- };
-
- User.prototype.setClaims = function (claims, profile) {
- this.um.setClaims(this.username, claims, profile);
- };
-
- User.prototype.getRoles = function () {
- return this.um.manager.getRoleListOfUser(this.username);
- };
-
- User.prototype.hasRoles = function (roles) {
- var i, j, role,
- rs = this.getRoles(),
- length1 = roles.length,
- length2 = rs.length;
- L1:
- for (i = 0; i < length1; i++) {
- //Array.indexOf() fails due to Java String vs JS String difference
- role = roles[i];
- for (j = 0; j < length2; j++) {
- if (role == rs[j]) {
- continue L1;
- }
- }
- return false;
- }
- return true;
- };
-
- User.prototype.addRoles = function (roles) {
- return this.um.manager.updateRoleListOfUser(this.username, [], roles);
- };
-
- User.prototype.removeRoles = function (roles) {
- return this.um.manager.updateRoleListOfUser(this.username, roles, []);
- };
-
- User.prototype.updateRoles = function (remove, add) {
- return this.um.manager.updateRoleListOfUser(this.username, remove, add);
- };
-
- User.prototype.isAuthorized = function (permission, action) {
- var i,
- roles = this.getRoles(),
- length = roles.length;
- for (i = 0; i < length; i++) {
- if (this.um.authorizer.isRoleAuthorized(roles[i], permission, action)) {
- return true;
- }
- }
- return false;
- };
-
-}(user));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar b/products/stratos/conf/temp-artifacts/org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar
deleted file mode 100644
index 60f6f07..0000000
Binary files a/products/stratos/conf/temp-artifacts/org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/org.wso2.store.sso.common_1.0.0.jar
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/org.wso2.store.sso.common_1.0.0.jar b/products/stratos/conf/temp-artifacts/org.wso2.store.sso.common_1.0.0.jar
deleted file mode 100644
index 4a74e5b..0000000
Binary files a/products/stratos/conf/temp-artifacts/org.wso2.store.sso.common_1.0.0.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar b/products/stratos/conf/temp-artifacts/org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar
deleted file mode 100644
index 29a9fb7..0000000
Binary files a/products/stratos/conf/temp-artifacts/org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/sso/module.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/sso/module.xml b/products/stratos/conf/temp-artifacts/sso/module.xml
deleted file mode 100644
index 159203b..0000000
--- a/products/stratos/conf/temp-artifacts/sso/module.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.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.
-
--->
-
-<module name="sso" xmlns="http://wso2.org/projects/jaggery/module.xml">
- <script>
- <name>client</name>
- <path>scripts/sso.client.js</path>
- </script>
-</module>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/sso/scripts/sso.client.js
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/sso/scripts/sso.client.js b/products/stratos/conf/temp-artifacts/sso/scripts/sso.client.js
deleted file mode 100644
index 9553220..0000000
--- a/products/stratos/conf/temp-artifacts/sso/scripts/sso.client.js
+++ /dev/null
@@ -1,193 +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.
- *
-*/
-
-/**
- * Following module act as a client to create a saml request and also to
- * unwrap and return attributes of a returning saml response
- * @type {{}}
- */
-
-var client = {};
-
-(function (client) {
-
- var Util = Packages.org.wso2.store.sso.common.util.Util,
- carbon = require('carbon'),
- log = new Log();
-
- /**
- * obtains an encoded saml response and return a decoded/unmarshalled saml obj
- * @param samlResp
- * @return {*}
- */
- client.getSamlObject = function (samlResp) {
- var decodedResp = Util.decode(samlResp);
- return Util.unmarshall(decodedResp);
- };
-
- /**
- * validating the signature of the response saml object
- */
- client.validateSignature = function (samlObj, config) {
- var tDomain = Util.getDomainName(samlObj);
- var tId = carbon.server.tenantId({domain: tDomain});
-
- return Util.validateSignature(samlObj,
- config.KEY_STORE_NAME, config.KEY_STORE_PASSWORD, config.IDP_ALIAS, tId, tDomain);
- };
-
- /**
- * Checking if the request is a logout call
- */
- client.isLogoutRequest = function (samlObj) {
- return samlObj instanceof Packages.org.opensaml.saml2.core.LogoutRequest;
- };
-
- /**
- * Checking if the request is a logout call
- */
- client.isLogoutResponse = function (samlObj) {
- return samlObj instanceof Packages.org.opensaml.saml2.core.LogoutResponse;
- };
-
- /**
- * getting url encoded saml authentication request
- * @param issuerId
- */
- client.getEncodedSAMLAuthRequest = function (issuerId) {
- return Util.encode(
- Util.marshall(
- new Packages.org.wso2.store.sso.common.builders.AuthReqBuilder().buildAuthenticationRequest(issuerId)
- ));
- };
-
- /**
- * get url encoded saml logout request
- */
- client.getEncodedSAMLLogoutRequest = function (user, sessionIndex, issuerId) {
- return Util.encode(
- Util.marshall(
- new Packages.org.wso2.store.sso.common.builders.LogoutRequestBuilder().buildLogoutRequest(user, sessionIndex,
- Packages.org.wso2.store.sso.common.constants.SSOConstants.LOGOUT_USER,
- issuerId)));
- };
-
- /**
- * Reads the returning SAML login response and populates a session info object
- */
- client.decodeSAMLLoginResponse = function (samlObj, samlResp, sessionId) {
- var samlSessionObj = {
- // sessionId, loggedInUser, sessionIndex, samlToken
- };
-
- if (samlObj instanceof Packages.org.opensaml.saml2.core.Response) {
-
- var assertions = samlObj.getAssertions();
-
- // extract the session index
- if (assertions != null && assertions.size() > 0) {
- var authenticationStatements = assertions.get(0).getAuthnStatements();
- var authnStatement = authenticationStatements.get(0);
- if (authnStatement != null) {
- if (authnStatement.getSessionIndex() != null) {
- samlSessionObj.sessionIndex = authnStatement.getSessionIndex();
- }
- }
- }
-
- // extract the username
- if (assertions != null && assertions.size() > 0) {
- var subject = assertions.get(0).getSubject();
- var samlAssertion = assertions.get(0);
- if (subject != null) {
- if (subject.getNameID() != null) {
- samlSessionObj.loggedInUser = subject.getNameID().getValue();
- }
- }
- }
- samlSessionObj.sessionId = sessionId;
- samlSessionObj.samlToken = samlResp;
- }
-
- return samlSessionObj;
- };
-
- client.getURLencodedB64EncodedSAML2Token = function(samlObj){
- var saml2Token = {
- // URLEncodedB64
- };
- if (samlObj instanceof Packages.org.opensaml.saml2.core.Response) {
- saml2Token.URLEncodedB64 = Util.getURLEncodedB64SAML2Token(samlObj);
- }
- return saml2Token;
- };
-
- client.getB64EncodedtSAMLAssertion = function(samlObj){
- var saml2Token = {
- // URLEncodedB64
- };
- if (samlObj instanceof Packages.org.opensaml.saml2.core.Response) {
- saml2Token.b64Encoded = Util.getB64EncodedtSAMLAssertion(samlObj);
- }
- return saml2Token;
- };
-
-
- client.b64encode = function(str){
- return Util.encode(str);
- };
-
- /**
- * This method is to get the session index when a single logout happens
- * The IDP sends a logout request to the ACS with the session index, so that
- * the app can invalidate the associated HTTP Session
- */
- client.decodeSAMLLogoutRequest = function (samlObj) {
- var sessionIndex = null;
-
- if (samlObj instanceof org.opensaml.saml2.core.LogoutRequest) {
- var sessionIndexes = samlObj.getSessionIndexes();
- if (sessionIndexes != null && sessionIndexes.size() > 0) {
- sessionIndex = sessionIndexes.get(0).getSessionIndex();
- }
- }
-
- return sessionIndex;
-
- };
-
- client.getTenantDomain = function (samlObj) {
- var tDomain = Util.getDomainName(samlObj);
- return tDomain;
- };
-
- client.getRoleList = function(samlObj) {
- var roleObj = [];
- var roleString = Util.getRoles(samlObj);
- log.info("role string : " + roleString);
- var roleSplit = roleString.split(",");
- for(var i=0; i < roleSplit.length;i++){
- roleObj.push(roleSplit[i].trim());
- }
- return roleObj;
- };
-
-}(client));
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/tenant-mgt.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/tenant-mgt.xml b/products/stratos/conf/tenant-mgt.xml
deleted file mode 100644
index ddfe83a..0000000
--- a/products/stratos/conf/tenant-mgt.xml
+++ /dev/null
@@ -1,42 +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.
- -->
-<TenantManagers>
- <TenantManager class="org.wso2.carbon.user.core.tenant.JDBCTenantManager">
- <Property name="MultiTenantRealmConfigBuilder">org.wso2.carbon.user.core.config.multitenancy.SimpleRealmConfigBuilder</Property>
- </TenantManager>
-</TenantManagers>
-
-<!--If the product is using LDAP user store in MT mode, use following tenant manager.-->
-<!--TenantManager class="org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager">
- <Property name="RootPartition">dc=wso2,dc=com</Property>
- <Property name="OrganizationalObjectClass">organizationalUnit</Property>
- <Property name="OrganizationalAttribute">ou</Property>
- <Property name="OrganizationalSubContextObjectClass">organizationalUnit</Property>
- <Property name="OrganizationalSubContextAttribute">ou</Property>
-</TenantManager-->
-<!--Following tenant manager is used by Identity Server (IS) as its default tenant manager.
- IS will do token replacement when building the product. Therefore do not change the syntax.-->
-<!--TenantManager class="org.wso2.carbon.user.core.tenant.JDBCTenantManager">
- <Property name="RootPartition">dc=wso2,dc=org</Property>
- <Property name="OrganizationalObjectClass">organizationalUnit</Property>
- <Property name="OrganizationalAttribute">ou</Property>
- <Property name="OrganizationalSubContextObjectClass">organizationalUnit</Property>
- <Property name="OrganizationalSubContextAttribute">ou</Property>
-</TenantManager-->
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/tenant-reg-agent.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/tenant-reg-agent.xml b/products/stratos/conf/tenant-reg-agent.xml
deleted file mode 100755
index c39e189..0000000
--- a/products/stratos/conf/tenant-reg-agent.xml
+++ /dev/null
@@ -1,25 +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.
- -->
-<tenantRegListenerServers>
- <!--<server>
- <serverUrl>https://10.100.1.206:9443/services/</serverUrl>
- <userName>admin</userName>
- <password>admin</password>
- </server>-->
-</tenantRegListenerServers>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/thrift-client-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/thrift-client-config.xml b/products/stratos/conf/thrift-client-config.xml
deleted file mode 100644
index 5cacada..0000000
--- a/products/stratos/conf/thrift-client-config.xml
+++ /dev/null
@@ -1,27 +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.
- -->
-
-<!-- Apache thrift client configuration for publishing statistics to WSO2 CEP -->
-<thriftClientConfiguration>
- <username>admin</username>
- <password>admin</password>
- <ip>localhost</ip>
- <port>7611</port>
-</thriftClientConfiguration>
\ No newline at end of file
[31/50] [abbrv] stratos git commit: Fixing application monitor
creating failure issue due to re-try timeout
Posted by la...@apache.org.
Fixing application monitor creating failure issue due to re-try timeout
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bd65af0a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bd65af0a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bd65af0a
Branch: refs/heads/data-publisher-integration
Commit: bd65af0a2bb034b5d2fd94bc7f6f4eb3e57ff51d
Parents: 2c052c4
Author: Akila Perera <ra...@gmail.com>
Authored: Fri Aug 7 22:52:12 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Fri Aug 7 22:52:12 2015 +0530
----------------------------------------------------------------------
.../event/receiver/topology/AutoscalerTopologyEventReceiver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bd65af0a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
index 4e6d8fd..119c9c6 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
@@ -133,7 +133,7 @@ public class AutoscalerTopologyEventReceiver {
(ApplicationClustersCreatedEvent) event;
String appId = applicationClustersCreatedEvent.getAppId();
boolean appMonitorCreationTriggered = false;
- int retries = 5;
+ int retries = 30;
while (!appMonitorCreationTriggered && retries > 0) {
try {
//acquire read lock
[41/50] [abbrv] stratos git commit: Removing unnecessary features,
artifacts and restructuring distribution artifacts
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index 86fdc71..a5be8a7 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -19,7 +19,6 @@
-->
<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">
-
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos</artifactId>
@@ -291,15 +290,15 @@
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.webapp.mgt.server.feature:${carbon.platform.patch.version.4.2.2}
</featureArtifactDef>
- <featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.captcha.mgt.server.feature:${carbon.version}
- </featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.apache.synapse.wso2.feature:2.1.1-wso2v4
+ <featureArtifactDef>org.wso2.store:org.wso2.store.feature:${store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.task.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
+ org.wso2.carbon:org.wso2.carbon.captcha.mgt.server.feature:${carbon.version}
+ </featureArtifactDef>
+ <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.datasource.server.feature:${carbon.platform.patch.version.4.2.1}
</featureArtifactDef>
<featureArtifactDef>
@@ -385,8 +384,7 @@
<featureArtifactDef>org.jaggeryjs:org.jaggeryjs.feature:0.9.0.ALPHA4.wso2v3
</featureArtifactDef>
<featureArtifactDef>caramel:caramel.feature:1.0.1</featureArtifactDef>
- <featureArtifactDef>org.wso2.store:org.wso2.store.feature:${store.version}
- </featureArtifactDef>
+
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:4.2.1
</featureArtifactDef>
@@ -405,11 +403,6 @@
<featureArtifactDef>
org.apache.stratos:org.apache.stratos.cloud.controller.feature:${project.version}
</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.apache.synapse.wso2.feature:${synapse.version}
- </featureArtifactDef>
- <featureArtifactDef>
- org.wso2.carbon:org.apache.synapse.transport.nhttp.feature:${synapse.version}
- </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.datasource.server.feature:${carbon.version}
</featureArtifactDef>
@@ -441,7 +434,8 @@
</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.formatter.feature:1.0.0
</featureArtifactDef>
- <featureArtifactDef>org.apache.stratos:org.apache.stratos.event.processor.feature:${project.version}
+ <featureArtifactDef>
+ org.apache.stratos:org.apache.stratos.event.processor.feature:${project.version}
</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.tracer.feature:1.0.0
</featureArtifactDef>
@@ -583,6 +577,10 @@
<deleteOldProfileFiles>true</deleteOldProfileFiles>
<features>
<feature>
+ <id>org.wso2.store.feature.group</id>
+ <version>${store.version}</version>
+ </feature>
+ <feature>
<id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
<version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
@@ -679,11 +677,9 @@
<version>1.0.1</version>
</feature>
<feature>
- <id>org.wso2.store.feature.group</id>
- <version>${store.version}</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
+ <id>
+ org.wso2.carbon.identity.application.authentication.framework.server.feature.group
+ </id>
<version>4.2.2</version>
</feature>
<feature>
@@ -838,10 +834,6 @@
<version>${project.version}</version>
</feature>
<feature>
- <id>org.wso2.carbon.task.server.feature.group</id>
- <version>${carbon.version}</version>
- </feature>
- <feature>
<id>org.wso2.carbon.datasource.server.feature.group</id>
<version>${carbon.version}</version>
</feature>
@@ -956,6 +948,10 @@
<deleteOldProfileFiles>true</deleteOldProfileFiles>
<features>
<feature>
+ <id>org.wso2.store.feature.group</id>
+ <version>${store.version}</version>
+ </feature>
+ <feature>
<id>org.wso2.carbon.logaggregator.feature.group</id>
<version>1.0.0</version>
</feature>
@@ -1071,15 +1067,15 @@
<version>1.0.1</version>
</feature>
<feature>
- <id>org.wso2.store.feature.group</id>
- <version>${store.version}</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
+ <id>
+ org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
+ </id>
<version>4.2.1</version>
</feature>
<feature>
- <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
+ <id>
+ org.wso2.carbon.identity.application.authentication.framework.server.feature.group
+ </id>
<version>4.2.2</version>
</feature>
<feature>
@@ -1242,9 +1238,4 @@
</plugin>
</plugins>
</build>
- <properties>
- <synapse.version>2.1.2-wso2v3</synapse.version>
- <store.version>1.0.1</store.version>
- </properties>
-</project>
-
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/payload/user-data/ssl-cert-snakeoil.key
----------------------------------------------------------------------
diff --git a/products/stratos/payload/user-data/ssl-cert-snakeoil.key b/products/stratos/payload/user-data/ssl-cert-snakeoil.key
deleted file mode 100644
index 41f6064..0000000
--- a/products/stratos/payload/user-data/ssl-cert-snakeoil.key
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJSn+hXW9Zzz9ORB
-KIC9Oi6wzM4zhqwHaKW2vZAqjOeLlpUW7zXwyk4tkivwsydPNaWUm+9oDlEAB2ls
-QJv7jwWNsF7SGx5R03kenC+cf8Nbxlxwa+Tncjo6uruEsK/Vke244KiSCHP8BOuH
-I+r5CS0x9edFLgesoYlPPFoJxTs5AgMBAAECgYBL/6iiO7hr2mjrvMgZMSSqtCaw
-kLUcA9mjRs6ZArfwtHNymzwGZqj22ONu5WqiASPbGCO0fI09KfegFQDe/fe6wnpi
-rBWtawLoXCZmGrwC+x/3iqbiGJMd7UB3FaZkZOzV5Jhzomc8inSJWMcR+ywiUY37
-stfVDqR1sJ/jzZ1OdQJBAO8vCa2OVQBJbzjMvk8Sc0KiuVwnyqMYqVty6vYuufe9
-ILJfhwhYzE82wIa9LYg7UK2bPvKyyehuFfqI5oU5lU8CQQCfG5LA3gp3D1mS7xxz
-tqJ+cm4SPO4R6YzVybAZKqKUvTFSKNV57Kp/LL7WjtUUNr+dY+aYRlKo81Hq61y8
-tBT3AkAjJyak+2ZCxIg0MONHe8603HWhtbdygQ1jA2DFDdkHMCS+EowmDeb5PXLO
-Wr92ZkFVQpvdz6kdIBDa4YP/0JbBAkBVHLjqd1z9x7ZRBZwgwkg2gBwloXZxGpB+
-JMARFl+WVYa2vqVD7bhfA56qxAl0IL1sAm7ucl/xhQgDNRiM0YCNAkEAqySTBx2H
-O9VyzuWWbf7BYTNsxfO80GaRkZGENfqO1QgnhT1FMeK+ox7Kbi+nSaCBoPjNzyrM
-bU08M6nSnkDEGA==
------END PRIVATE KEY-----
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/payload/user-data/ssl-cert-snakeoil.pem
----------------------------------------------------------------------
diff --git a/products/stratos/payload/user-data/ssl-cert-snakeoil.pem b/products/stratos/payload/user-data/ssl-cert-snakeoil.pem
deleted file mode 100644
index f0fac8d..0000000
--- a/products/stratos/payload/user-data/ssl-cert-snakeoil.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICNTCCAZ6gAwIBAgIES343gjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxDTALBgNVBAoM
-BFdTTzIxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0xMDAyMTkwNzAyMjZaFw0zNTAy
-MTMwNzAyMjZaMFUxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwN
-TW91bnRhaW4gVmlldzENMAsGA1UECgwEV1NPMjESMBAGA1UEAwwJbG9jYWxob3N0
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCUp/oV1vWc8/TkQSiAvTousMzO
-M4asB2iltr2QKozni5aVFu818MpOLZIr8LMnTzWllJvvaA5RAAdpbECb+48FjbBe
-0hseUdN5HpwvnH/DW8ZccGvk53I6Orq7hLCv1ZHtuOCokghz/ATrhyPq+QktMfXn
-RS4HrKGJTzxaCcU7OQIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCBPAwDQYJKoZIhvcN
-AQEFBQADgYEAW5wPR7cr1LAdq+IrR44iQlRG5ITCZXY9hI0PygLP2rHANh+PYfTm
-xbuOnykNGyhM6FjFLbW2uZHQTY1jMrPprjOrmyK5sjJRO4d1DeGHT/YnIjs9JogR
-Kv4XHECwLtIVdAbIdWHEtVZJyMSktcyysFcvuhPQK8Qc/E/Wq8uHSCo=
------END CERTIFICATE-----
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Dark/admin/logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Dark/admin/logo.gif b/products/stratos/resources/allthemes/Dark/admin/logo.gif
deleted file mode 100755
index 3b1e913..0000000
Binary files a/products/stratos/resources/allthemes/Dark/admin/logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Dark/admin/main.css
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Dark/admin/main.css b/products/stratos/resources/allthemes/Dark/admin/main.css
deleted file mode 100644
index 1271433..0000000
--- a/products/stratos/resources/allthemes/Dark/admin/main.css
+++ /dev/null
@@ -1,253 +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.
- *
-*/
-
-/* ---------------- template styles ------------------------- */
-
-table#main-table td#header {
- background-image: url( theme-header-region-bg.gif);
-}
-
-table#main-table td#menu-panel {
- border-right: solid 0px #73559D;
- background-image: url(theme-menu-panel-l-bg.gif);
- background-position: left top;
- background-repeat: no-repeat;
- padding-left: 0;
- background-color: #F4F4F4;
-}
-
-table#main-table td#menu-panel table#menu-table {
- background-image:url("theme-menu-table-bg.gif");
- background-position:left bottom;
- background-repeat:no-repeat;
-}
-table#main-table td#menu-panel table#menu-table td {
- padding-left: 6px;
- padding-right:16px;
-}
-table#main-table td#menu-panel table#menu-table tbody tr td img {
- height: 17px;
-}
-/* ---------------- header styles ------------------ */
-div#header-div {
- background-image: url( theme-header-bg.gif);
- height: 115px;
-}
-
-div#header-div div.left-logo {
- background-image: url( logo.gif );
- background-position: left center;
- height: 80px;
- margin-left:65px;
- margin-top:0px;
-}
-
-div#header-div div.middle-ad {
- float: left;
- margin-top: 18px;
- height: 55px;
- width: 35%;
- display: none;
-}
-
-div#header-div div.right-logo {
- background-image:url("../../../../../../../../../carbon/admin/images/t-right-logo.gif");
- background-position:right top;
- background-repeat:no-repeat;
- height:45px;
- margin-right:20px;
- line-height: 0px;
- margin-top:10px;
- padding-right:0px;
- padding-top:5px;
- color: #fff;
- font-size: 0px;
- width: 500px;
-}
-div#header-div div.header-links {
- margin-top:0px;
-}
-div#header-div div.header-links div.right-links {
- margin-right: 0px;
- height: 35px;
- padding-top: 0px;
-}
-div#header-div div.header-links div.right-links ul {
- background-image:url("theme-right-links-bg.gif");
- background-position:left top;
- background-repeat:repeat-x;
- padding-left: 25px;
- padding-right: 15px;
- padding-top: 6px;
- padding-bottom: 7px;
-}
-/* ------------- menu styles ---------------------- */
-div#menu {
-}
-
-div#menu ul.main {
-}
-
-div#menu ul.main li {
-}
-
-div#menu ul.main li.normal {
-}
-
-div#menu ul.main li a.menu-home {
- display:block !important;
-}
-
-div#menu ul.main li.menu-header {
- background-image:url("theme-menu-header.gif");
- background-position: top;
- height: 28px;
-}
-
-div#menu ul.main li a.menu-default {
-}
-
-div#menu ul.main li a.menu-default:hover {
- background-color: #EFECF5;
- border-bottom: solid 1px #C2B7D8;
- border-top: solid 1px #C2B7D8;
- color: #00447C;
-}
-
-div#menu ul.sub {
-}
-
-/* -------------- child no-01 styles -------------- */
-
-div#menu ul.sub li.normal {
-
-}
-
-div#menu ul.sub li a.menu-default {
-}
-
-/* ----------- child no-01 (disabled) styles ------------------- */
-
-div#menu ul.sub li a.menu-disabled-link {
- }
-
- div#menu ul.sub li a.menu-disabled-link:hover {
- }
-
-/* -------------- child no-02 styles -------------- */
-
-div#menu ul.sub li.normal ul.sub li a.menu-default {
-
-}
-
-/* -------------- child no-03 styles -------------- */
-
-div#menu ul.sub li.normal ul.sub li.normal ul.sub li a.menu-default {
-}
-
-/* ------------- footer styles -------------------- */
-
-
-div#footer-div div.footer-content {
- background-image: url(../../../../../../../../../carbon/admin/images/powered.gif);
- background-position: right center;
- background-repeat: no-repeat;
- margin-right: 10px;
-
-}
-
-/* ---- login styles ----- */
-
-
-/* --------------- table styles -------------------- */
-
-.tableOddRow{background-color: white;}
-.tableEvenRow{background-color: #EFECF5;}
-
-.button:hover{
- border:solid 1px #8268A8;
-}
-
-/* =============================================================================================================== */
-
-
-
-.cornerExpand {
- position: relative;
- top: 3px;
- left: -12px;
- cursor: pointer;
-}
-
-.cornerCollapse {
- position: relative;
- top: 3px;
- left: -12px;
- cursor: pointer;
-}
-
-/* chanaka */
-
-.form-table td{
- padding-bottom:5px !important;
- padding-left:5px !important;
- padding-top:5px !important;
- padding-right:10px !important;
-}
-.form-table td div.indented{
- padding-left:7px !important;
- color:#595959 !important;
-}
-.form-table-left{
-width:100px;
-}
-
-.longTextField{
-width:270px;
-}
-.rowAlone{
-padding-top:10px;
-padding-bottom:10px;
-}
-.tabedBox{
-border:solid 1px #cccccc;
-margin-left:10px;
-padding:10px;
-margin-bottom:10px;
-}
-/* chanaka end */
-
-a.fact-selector-icon-link {
- background-repeat: no-repeat;
- background-position: left top;
- padding-left: 20px;
- line-height: 17px;
- height: 17px;
- float: left;
- position: relative;
- margin-left: 10px;
- margin-top: 5px;
- margin-bottom: 3px;
- white-space: nowrap;
-}
-table#main-table td#middle-content {
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Dark/admin/powered-stratos.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Dark/admin/powered-stratos.gif b/products/stratos/resources/allthemes/Dark/admin/powered-stratos.gif
deleted file mode 100755
index 6597d26..0000000
Binary files a/products/stratos/resources/allthemes/Dark/admin/powered-stratos.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Dark/admin/right-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Dark/admin/right-logo.gif b/products/stratos/resources/allthemes/Dark/admin/right-logo.gif
deleted file mode 100755
index e6c3d13..0000000
Binary files a/products/stratos/resources/allthemes/Dark/admin/right-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Dark/admin/theme-header-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Dark/admin/theme-header-bg.gif b/products/stratos/resources/allthemes/Dark/admin/theme-header-bg.gif
deleted file mode 100755
index 99add93..0000000
Binary files a/products/stratos/resources/allthemes/Dark/admin/theme-header-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Dark/admin/theme-header-region-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Dark/admin/theme-header-region-bg.gif b/products/stratos/resources/allthemes/Dark/admin/theme-header-region-bg.gif
deleted file mode 100755
index 7cc3f52..0000000
Binary files a/products/stratos/resources/allthemes/Dark/admin/theme-header-region-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Dark/admin/theme-menu-header.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Dark/admin/theme-menu-header.gif b/products/stratos/resources/allthemes/Dark/admin/theme-menu-header.gif
deleted file mode 100755
index 84bb42e..0000000
Binary files a/products/stratos/resources/allthemes/Dark/admin/theme-menu-header.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Dark/admin/theme-menu-panel-l-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Dark/admin/theme-menu-panel-l-bg.gif b/products/stratos/resources/allthemes/Dark/admin/theme-menu-panel-l-bg.gif
deleted file mode 100755
index a6c268f..0000000
Binary files a/products/stratos/resources/allthemes/Dark/admin/theme-menu-panel-l-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Dark/admin/theme-menu-table-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Dark/admin/theme-menu-table-bg.gif b/products/stratos/resources/allthemes/Dark/admin/theme-menu-table-bg.gif
deleted file mode 100755
index 213819a..0000000
Binary files a/products/stratos/resources/allthemes/Dark/admin/theme-menu-table-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Dark/admin/theme-right-links-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Dark/admin/theme-right-links-bg.gif b/products/stratos/resources/allthemes/Dark/admin/theme-right-links-bg.gif
deleted file mode 100755
index 0a2e51a..0000000
Binary files a/products/stratos/resources/allthemes/Dark/admin/theme-right-links-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Dark/thumb.png
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Dark/thumb.png b/products/stratos/resources/allthemes/Dark/thumb.png
deleted file mode 100755
index 7db90a6..0000000
Binary files a/products/stratos/resources/allthemes/Dark/thumb.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Default/admin/def-body-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Default/admin/def-body-bg.gif b/products/stratos/resources/allthemes/Default/admin/def-body-bg.gif
deleted file mode 100755
index 5db1464..0000000
Binary files a/products/stratos/resources/allthemes/Default/admin/def-body-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Default/admin/def-header-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Default/admin/def-header-bg.gif b/products/stratos/resources/allthemes/Default/admin/def-header-bg.gif
deleted file mode 100755
index 758363d..0000000
Binary files a/products/stratos/resources/allthemes/Default/admin/def-header-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Default/admin/def-header-region-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Default/admin/def-header-region-bg.gif b/products/stratos/resources/allthemes/Default/admin/def-header-region-bg.gif
deleted file mode 100755
index 935ee9e..0000000
Binary files a/products/stratos/resources/allthemes/Default/admin/def-header-region-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Default/admin/logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Default/admin/logo.gif b/products/stratos/resources/allthemes/Default/admin/logo.gif
deleted file mode 100755
index 3b1e913..0000000
Binary files a/products/stratos/resources/allthemes/Default/admin/logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Default/admin/main.css
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Default/admin/main.css b/products/stratos/resources/allthemes/Default/admin/main.css
deleted file mode 100644
index 25f4dfe..0000000
--- a/products/stratos/resources/allthemes/Default/admin/main.css
+++ /dev/null
@@ -1,250 +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.
- *
-*/
-
-/* ---------------- template styles ------------------------- */
-body {
- background-image: url( def-body-bg.gif);
- background-position: left top;
- background-repeat: repeat-x;
-}
-
-table#main-table td#header {
- background-image: url( def-header-region-bg.gif);
- background-position: right top;
- background-repeat: no-repeat;
-}
-
-table#main-table td#menu-panel {
- border-right: solid 0px #78BDE8;
- padding-right: 10px;
-}
-
-table#main-table td#menu-panel table#menu-table {
- background-image: none;
- background-position:left bottom;
- background-repeat:no-repeat;
-}
-table#main-table td#menu-panel table#menu-table {
- background-image: none;
- background-position:left bottom;
- background-repeat:no-repeat;
- border-right:1px solid #B6D8F2;
- border-bottom:1px solid #B6D8F2;
-}
-table#main-table td#menu-panel table#menu-table tbody tr td img {
- height: 17px;
-}
-/* ---------------- header styles ------------------ */
-div#header-div {
- background-image: url( def-header-bg.gif);
- height: 121px;
-}
-
-div#header-div div.left-logo {
- background-image:url("logo.gif");
- background-position:left center;
- height:50px;
- margin-left:50px;
- margin-top:37px;
-}
-
-div#header-div div.middle-ad {
- float: left;
- margin-top: 18px;
- height: 55px;
- width: 35%;
- display:none;
-}
-
-div#header-div div.right-logo {
- background-image:url("../../../../../../../../../carbon/admin/images/t-right-logo.gif");
- background-position:right top;
- background-repeat:no-repeat;
- color:#B6D8F2;
- font-size:0;
- height:45px;
- line-height:0;
- margin-right:20px;
- margin-top:20px;
- padding-right:0;
- padding-top:5px;
- width:500px;
-}
-div#header-div div.header-links {
- margin-top: 8px;
-}
-div#header-div div.header-links div.right-links {
- margin-right: 0px;
- height: 20px;
- padding-top: 0px;
-}
-div#header-div div.header-links div.right-links ul {
- background-image: none;
- background-position:left top;
- background-repeat:repeat-x;
- padding-left: 25px;
- padding-right: 15px;
- padding-top: 6px;
- padding-bottom: 7px;
-}
-/* ------------- menu styles ---------------------- */
-div#menu {
-}
-
-div#menu ul.main {
-}
-
-div#menu ul.main li {
-}
-
-div#menu ul.main li.normal {
-}
-
-div#menu ul.main li a.menu-home {
- display: block !important;
-}
-
-div#menu ul.main li.menu-header {
- background-image:none;
- background-position:center top;
- border-top: 1px solid #CFE3F6;
- border-bottom:1px solid #78BDE8;
- height:25px;
-}
-
-div#menu ul.main li a.menu-default {
-}
-
-div#menu ul.main li a.menu-default:hover {
- background-color: #DAF0FC;
- border-bottom: solid 1px #72CDF4;
- border-top: solid 1px #72CDF4;
- color: #00447C;
-}
-
-div#menu ul.sub {
-}
-
-/* -------------- child no-01 styles -------------- */
-
-div#menu ul.sub li.normal {
-
-}
-
-div#menu ul.sub li a.menu-default {
-}
-
-/* ----------- child no-01 (disabled) styles ------------------- */
-
-div#menu ul.sub li a.menu-disabled-link {
- }
-
- div#menu ul.sub li a.menu-disabled-link:hover {
- }
-
-/* -------------- child no-02 styles -------------- */
-
-div#menu ul.sub li.normal ul.sub li a.menu-default {
-
-}
-
-/* -------------- child no-03 styles -------------- */
-
-div#menu ul.sub li.normal ul.sub li.normal ul.sub li a.menu-default {
-}
-
-/* ------------- footer styles -------------------- */
-
-div#footer-div div.footer-content {
- background-image: url(../../../../../../../../../carbon/admin/images/powered.gif);
- background-position: right center;
- background-repeat: no-repeat;
- margin-right: 10px;
-}
-
-div#middle {
- background-color: #fff;
-}
-
-/* ---- login styles ----- */
-
-
-/* --------------- table styles -------------------- */
-
-.tableOddRow{background-color: white;}
-.tableEvenRow{background-color: #EFECF5;}
-
-.button:hover{
- border:solid 1px #8268A8;
-}
-
-/* =============================================================================================================== */
-
-
-
-.cornerExpand {
- position: relative;
- top: 3px;
- left: -12px;
- cursor: pointer;
-}
-
-.cornerCollapse {
- position: relative;
- top: 3px;
- left: -12px;
- cursor: pointer;
-}
-
-/* chanaka */
-
-.form-table td{
- padding-bottom:5px !important;
- padding-left:5px !important;
- padding-top:5px !important;
- padding-right:10px !important;
-}
-.form-table td div.indented{
- padding-left:7px !important;
- color:#595959 !important;
-}
-.form-table-left{
-width:100px;
-}
-
-.longTextField{
-width:270px;
-}
-.rowAlone{
-padding-top:10px;
-padding-bottom:10px;
-}
-.tabedBox{
-border:solid 1px #cccccc;
-margin-left:10px;
-padding:10px;
-margin-bottom:10px;
-}
-/* chanaka end */
-
-table#main-table td#middle-content {
- background-color: #fff;
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Default/admin/powered-stratos.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Default/admin/powered-stratos.gif b/products/stratos/resources/allthemes/Default/admin/powered-stratos.gif
deleted file mode 100755
index 6597d26..0000000
Binary files a/products/stratos/resources/allthemes/Default/admin/powered-stratos.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Default/admin/right-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Default/admin/right-logo.gif b/products/stratos/resources/allthemes/Default/admin/right-logo.gif
deleted file mode 100755
index f118904..0000000
Binary files a/products/stratos/resources/allthemes/Default/admin/right-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Default/thumb.png
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Default/thumb.png b/products/stratos/resources/allthemes/Default/thumb.png
deleted file mode 100755
index 46fc8e6..0000000
Binary files a/products/stratos/resources/allthemes/Default/thumb.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Light/admin/logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Light/admin/logo.gif b/products/stratos/resources/allthemes/Light/admin/logo.gif
deleted file mode 100755
index 3b1e913..0000000
Binary files a/products/stratos/resources/allthemes/Light/admin/logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Light/admin/main.css
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Light/admin/main.css b/products/stratos/resources/allthemes/Light/admin/main.css
deleted file mode 100644
index 7d8f94e..0000000
--- a/products/stratos/resources/allthemes/Light/admin/main.css
+++ /dev/null
@@ -1,250 +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.
- *
-*/
-
-/* ---------------- template styles ------------------------- */
-
-table#main-table td#header {
- background-image: url( theme-header-region-bg.gif);
-}
-
-table#main-table td#menu-panel {
- border-right: solid 0px #73559D;
- background-image: url(theme-menu-panel-l-bg.gif);
- background-position: left top;
- background-repeat: no-repeat;
- padding-left: 0;
- background-color: #F4F4F4;
-}
-
-table#main-table td#menu-panel table#menu-table {
- background-image:url("theme-menu-table-bg.gif");
- background-position:left bottom;
- background-repeat:no-repeat;
-}
-table#main-table td#menu-panel table#menu-table td {
- padding-left: 6px;
- padding-right:16px;
-}
-table#main-table td#menu-panel table#menu-table tbody tr td img {
- height: 17px;
-}
-/* ---------------- header styles ------------------ */
-div#header-div {
- background-image: url( theme-header-bg.gif);
- height: 103px;
-}
-
-div#header-div div.left-logo {
- background-image: url( logo.gif );
- background-position: left center;
- height: 80px;
- margin-left:65px;
- margin-top:0px;
-}
-
-div#header-div div.middle-ad {
- float: left;
- margin-top: 18px;
- height: 55px;
- width: 35%;
- display:none;
-}
-
-div#header-div div.right-logo {
- background-image:url("../../../../../../../../../carbon/admin/images/t-right-logo.gif");
- background-position:right top;
- background-repeat:no-repeat;
- height:45px;
- margin-right:20px;
- line-height: 0px;
- margin-top:10px;
- padding-right:0px;
- padding-top:5px;
- color: #fff;
- font-size: 0px;
- width:500px;
-}
-div#header-div div.header-links {
- margin-top:-10px;
-}
-div#header-div div.header-links div.right-links {
- margin-right: 0px;
- height: 35px;
- padding-top: 0px;
-}
-div#header-div div.header-links div.right-links ul {
- background-position:left top;
- background-repeat:repeat-x;
- padding-left: 25px;
- padding-right: 15px;
- padding-top: 6px;
- padding-bottom: 7px;
-}
-/* ------------- menu styles ---------------------- */
-div#menu {
-}
-
-div#menu ul.main {
-}
-
-div#menu ul.main li {
-}
-
-div#menu ul.main li.normal {
-}
-
-div#menu ul.main li a.menu-home {
- display:block !important;
-}
-
-div#menu ul.main li.menu-header {
- background-position: top;
- height: 28px;
-}
-
-div#menu ul.main li a.menu-default {
-}
-
-div#menu ul.main li a.menu-default:hover {
- background-color: #EFECF5;
- border-bottom: solid 1px #C2B7D8;
- border-top: solid 1px #C2B7D8;
- color: #00447C;
-}
-
-div#menu ul.sub {
-}
-
-/* -------------- child no-01 styles -------------- */
-
-div#menu ul.sub li.normal {
-
-}
-
-div#menu ul.sub li a.menu-default {
-}
-
-/* ----------- child no-01 (disabled) styles ------------------- */
-
-div#menu ul.sub li a.menu-disabled-link {
- }
-
- div#menu ul.sub li a.menu-disabled-link:hover {
- }
-
-/* -------------- child no-02 styles -------------- */
-
-div#menu ul.sub li.normal ul.sub li a.menu-default {
-
-}
-
-/* -------------- child no-03 styles -------------- */
-
-div#menu ul.sub li.normal ul.sub li.normal ul.sub li a.menu-default {
-}
-
-/* ------------- footer styles -------------------- */
-
-
-div#footer-div div.footer-content {
- background-image: url(../../../../../../../../../carbon/admin/images/powered.gif);
- background-position: right center;
- background-repeat: no-repeat;
- margin-right: 10px;
-}
-
-/* ---- login styles ----- */
-
-
-/* --------------- table styles -------------------- */
-
-.tableOddRow{background-color: white;}
-.tableEvenRow{background-color: #EFECF5;}
-
-.button:hover{
- border:solid 1px #8268A8;
-}
-
-/* =============================================================================================================== */
-
-
-
-.cornerExpand {
- position: relative;
- top: 3px;
- left: -12px;
- cursor: pointer;
-}
-
-.cornerCollapse {
- position: relative;
- top: 3px;
- left: -12px;
- cursor: pointer;
-}
-
-/* chanaka */
-
-.form-table td{
- padding-bottom:5px !important;
- padding-left:5px !important;
- padding-top:5px !important;
- padding-right:10px !important;
-}
-.form-table td div.indented{
- padding-left:7px !important;
- color:#595959 !important;
-}
-.form-table-left{
-width:100px;
-}
-
-.longTextField{
-width:270px;
-}
-.rowAlone{
-padding-top:10px;
-padding-bottom:10px;
-}
-.tabedBox{
-border:solid 1px #cccccc;
-margin-left:10px;
-padding:10px;
-margin-bottom:10px;
-}
-/* chanaka end */
-
-a.fact-selector-icon-link {
- background-repeat: no-repeat;
- background-position: left top;
- padding-left: 20px;
- line-height: 17px;
- height: 17px;
- float: left;
- position: relative;
- margin-left: 10px;
- margin-top: 5px;
- margin-bottom: 3px;
- white-space: nowrap;
-}
-table#main-table td#middle-content {
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Light/admin/menu_header.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Light/admin/menu_header.gif b/products/stratos/resources/allthemes/Light/admin/menu_header.gif
deleted file mode 100755
index 6887ec4..0000000
Binary files a/products/stratos/resources/allthemes/Light/admin/menu_header.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Light/admin/powered-stratos.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Light/admin/powered-stratos.gif b/products/stratos/resources/allthemes/Light/admin/powered-stratos.gif
deleted file mode 100755
index 6597d26..0000000
Binary files a/products/stratos/resources/allthemes/Light/admin/powered-stratos.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Light/admin/right-links-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Light/admin/right-links-bg.gif b/products/stratos/resources/allthemes/Light/admin/right-links-bg.gif
deleted file mode 100755
index ba9d5d0..0000000
Binary files a/products/stratos/resources/allthemes/Light/admin/right-links-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Light/admin/right-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Light/admin/right-logo.gif b/products/stratos/resources/allthemes/Light/admin/right-logo.gif
deleted file mode 100755
index e6c3d13..0000000
Binary files a/products/stratos/resources/allthemes/Light/admin/right-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Light/admin/theme-header-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Light/admin/theme-header-bg.gif b/products/stratos/resources/allthemes/Light/admin/theme-header-bg.gif
deleted file mode 100755
index 4d47044..0000000
Binary files a/products/stratos/resources/allthemes/Light/admin/theme-header-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Light/admin/theme-header-region-b-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Light/admin/theme-header-region-b-bg.gif b/products/stratos/resources/allthemes/Light/admin/theme-header-region-b-bg.gif
deleted file mode 100755
index 463b157..0000000
Binary files a/products/stratos/resources/allthemes/Light/admin/theme-header-region-b-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Light/admin/theme-header-region-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Light/admin/theme-header-region-bg.gif b/products/stratos/resources/allthemes/Light/admin/theme-header-region-bg.gif
deleted file mode 100755
index 57a2ec1..0000000
Binary files a/products/stratos/resources/allthemes/Light/admin/theme-header-region-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Light/admin/theme-menu-panel-l-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Light/admin/theme-menu-panel-l-bg.gif b/products/stratos/resources/allthemes/Light/admin/theme-menu-panel-l-bg.gif
deleted file mode 100755
index bafb43a..0000000
Binary files a/products/stratos/resources/allthemes/Light/admin/theme-menu-panel-l-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Light/admin/theme-menu-table-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Light/admin/theme-menu-table-bg.gif b/products/stratos/resources/allthemes/Light/admin/theme-menu-table-bg.gif
deleted file mode 100755
index 9582772..0000000
Binary files a/products/stratos/resources/allthemes/Light/admin/theme-menu-table-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/allthemes/Light/thumb.png
----------------------------------------------------------------------
diff --git a/products/stratos/resources/allthemes/Light/thumb.png b/products/stratos/resources/allthemes/Light/thumb.png
deleted file mode 100755
index 6dba1ff..0000000
Binary files a/products/stratos/resources/allthemes/Light/thumb.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/appserver.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/appserver.gif b/products/stratos/resources/cloud-services-icons/appserver.gif
deleted file mode 100755
index b760eb0..0000000
Binary files a/products/stratos/resources/cloud-services-icons/appserver.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/bam.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/bam.gif b/products/stratos/resources/cloud-services-icons/bam.gif
deleted file mode 100755
index 264f289..0000000
Binary files a/products/stratos/resources/cloud-services-icons/bam.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/bps.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/bps.gif b/products/stratos/resources/cloud-services-icons/bps.gif
deleted file mode 100755
index 1cd9d5e..0000000
Binary files a/products/stratos/resources/cloud-services-icons/bps.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/brs-old.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/brs-old.gif b/products/stratos/resources/cloud-services-icons/brs-old.gif
deleted file mode 100755
index c5a7dd8..0000000
Binary files a/products/stratos/resources/cloud-services-icons/brs-old.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/brs.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/brs.gif b/products/stratos/resources/cloud-services-icons/brs.gif
deleted file mode 100755
index 38f20e3..0000000
Binary files a/products/stratos/resources/cloud-services-icons/brs.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/cep.png
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/cep.png b/products/stratos/resources/cloud-services-icons/cep.png
deleted file mode 100755
index 3a481b1..0000000
Binary files a/products/stratos/resources/cloud-services-icons/cep.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/cg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/cg.gif b/products/stratos/resources/cloud-services-icons/cg.gif
deleted file mode 100755
index 1e8ad73..0000000
Binary files a/products/stratos/resources/cloud-services-icons/cg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/csg-inactive.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/csg-inactive.gif b/products/stratos/resources/cloud-services-icons/csg-inactive.gif
deleted file mode 100755
index 00d542c..0000000
Binary files a/products/stratos/resources/cloud-services-icons/csg-inactive.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/csg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/csg.gif b/products/stratos/resources/cloud-services-icons/csg.gif
deleted file mode 100755
index df9da9f..0000000
Binary files a/products/stratos/resources/cloud-services-icons/csg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/ds.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/ds.gif b/products/stratos/resources/cloud-services-icons/ds.gif
deleted file mode 100755
index 5721908..0000000
Binary files a/products/stratos/resources/cloud-services-icons/ds.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/esb.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/esb.gif b/products/stratos/resources/cloud-services-icons/esb.gif
deleted file mode 100755
index bb43e99..0000000
Binary files a/products/stratos/resources/cloud-services-icons/esb.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/gadget.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/gadget.gif b/products/stratos/resources/cloud-services-icons/gadget.gif
deleted file mode 100755
index 55b41de..0000000
Binary files a/products/stratos/resources/cloud-services-icons/gadget.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/governance.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/governance.gif b/products/stratos/resources/cloud-services-icons/governance.gif
deleted file mode 100755
index f9dfce4..0000000
Binary files a/products/stratos/resources/cloud-services-icons/governance.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/identity.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/identity.gif b/products/stratos/resources/cloud-services-icons/identity.gif
deleted file mode 100755
index 40f1fb7..0000000
Binary files a/products/stratos/resources/cloud-services-icons/identity.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/inactive-appserver.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/inactive-appserver.gif b/products/stratos/resources/cloud-services-icons/inactive-appserver.gif
deleted file mode 100755
index 2e7b33f..0000000
Binary files a/products/stratos/resources/cloud-services-icons/inactive-appserver.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/inactive-bam.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/inactive-bam.gif b/products/stratos/resources/cloud-services-icons/inactive-bam.gif
deleted file mode 100755
index 2401c11..0000000
Binary files a/products/stratos/resources/cloud-services-icons/inactive-bam.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/inactive-brs.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/inactive-brs.gif b/products/stratos/resources/cloud-services-icons/inactive-brs.gif
deleted file mode 100755
index 3e29688..0000000
Binary files a/products/stratos/resources/cloud-services-icons/inactive-brs.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/inactive-cep.png
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/inactive-cep.png b/products/stratos/resources/cloud-services-icons/inactive-cep.png
deleted file mode 100755
index e454bab..0000000
Binary files a/products/stratos/resources/cloud-services-icons/inactive-cep.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/inactive-esb.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/inactive-esb.gif b/products/stratos/resources/cloud-services-icons/inactive-esb.gif
deleted file mode 100755
index 8ae52bc..0000000
Binary files a/products/stratos/resources/cloud-services-icons/inactive-esb.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/inactive-gadget.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/inactive-gadget.gif b/products/stratos/resources/cloud-services-icons/inactive-gadget.gif
deleted file mode 100755
index 243f893..0000000
Binary files a/products/stratos/resources/cloud-services-icons/inactive-gadget.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/inactive-governance.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/inactive-governance.gif b/products/stratos/resources/cloud-services-icons/inactive-governance.gif
deleted file mode 100755
index fba1531..0000000
Binary files a/products/stratos/resources/cloud-services-icons/inactive-governance.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/inactive-identity.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/inactive-identity.gif b/products/stratos/resources/cloud-services-icons/inactive-identity.gif
deleted file mode 100755
index 6f5e1be..0000000
Binary files a/products/stratos/resources/cloud-services-icons/inactive-identity.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/inactive-mashup.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/inactive-mashup.gif b/products/stratos/resources/cloud-services-icons/inactive-mashup.gif
deleted file mode 100755
index 17c74c4..0000000
Binary files a/products/stratos/resources/cloud-services-icons/inactive-mashup.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/inactive-mb.png
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/inactive-mb.png b/products/stratos/resources/cloud-services-icons/inactive-mb.png
deleted file mode 100755
index 275136b..0000000
Binary files a/products/stratos/resources/cloud-services-icons/inactive-mb.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/mashup.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/mashup.gif b/products/stratos/resources/cloud-services-icons/mashup.gif
deleted file mode 100755
index 58d91af..0000000
Binary files a/products/stratos/resources/cloud-services-icons/mashup.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/mb.png
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/mb.png b/products/stratos/resources/cloud-services-icons/mb.png
deleted file mode 100755
index 928c95e..0000000
Binary files a/products/stratos/resources/cloud-services-icons/mb.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/pom.xml b/products/stratos/resources/cloud-services-icons/pom.xml
deleted file mode 100755
index 98902da..0000000
--- a/products/stratos/resources/cloud-services-icons/pom.xml
+++ /dev/null
@@ -1,58 +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.
- -->
-<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>
- <groupId>org.wso2.manager</groupId>
- <artifactId>cloud-services-icons</artifactId>
- <version>1.0.0</version>
- <packaging>pom</packaging>
- <name>Apache Stratos - Manager Cloud Services Icons</name>
- <description>Apache Stratos - Manager Cloud Services Icons</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <executions>
- <execution>
- <id>war</id>
- <phase>package</phase>
- <goals>
- <goal>war</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <warName>cloud-services-icons</warName>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- <webResources>
- <resource>
- <directory>.</directory>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/ss.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/ss.gif b/products/stratos/resources/cloud-services-icons/ss.gif
deleted file mode 100755
index f2bcc75..0000000
Binary files a/products/stratos/resources/cloud-services-icons/ss.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/cloud-services-icons/ts.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/cloud-services-icons/ts.gif b/products/stratos/resources/cloud-services-icons/ts.gif
deleted file mode 100755
index a2f3ebc..0000000
Binary files a/products/stratos/resources/cloud-services-icons/ts.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/powerded-by-logos/appserver-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/powerded-by-logos/appserver-logo.gif b/products/stratos/resources/powerded-by-logos/appserver-logo.gif
deleted file mode 100755
index 55e4751..0000000
Binary files a/products/stratos/resources/powerded-by-logos/appserver-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/powerded-by-logos/bam-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/powerded-by-logos/bam-logo.gif b/products/stratos/resources/powerded-by-logos/bam-logo.gif
deleted file mode 100755
index f8b6a74..0000000
Binary files a/products/stratos/resources/powerded-by-logos/bam-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/powerded-by-logos/bps-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/powerded-by-logos/bps-logo.gif b/products/stratos/resources/powerded-by-logos/bps-logo.gif
deleted file mode 100755
index 5dd2171..0000000
Binary files a/products/stratos/resources/powerded-by-logos/bps-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/powerded-by-logos/brs-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/powerded-by-logos/brs-logo.gif b/products/stratos/resources/powerded-by-logos/brs-logo.gif
deleted file mode 100755
index ccba887..0000000
Binary files a/products/stratos/resources/powerded-by-logos/brs-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/powerded-by-logos/csg-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/powerded-by-logos/csg-logo.gif b/products/stratos/resources/powerded-by-logos/csg-logo.gif
deleted file mode 100755
index e69aaa6..0000000
Binary files a/products/stratos/resources/powerded-by-logos/csg-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/powerded-by-logos/ds-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/powerded-by-logos/ds-logo.gif b/products/stratos/resources/powerded-by-logos/ds-logo.gif
deleted file mode 100755
index f70a205..0000000
Binary files a/products/stratos/resources/powerded-by-logos/ds-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/powerded-by-logos/esb-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/powerded-by-logos/esb-logo.gif b/products/stratos/resources/powerded-by-logos/esb-logo.gif
deleted file mode 100755
index 95cb5b3..0000000
Binary files a/products/stratos/resources/powerded-by-logos/esb-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/powerded-by-logos/gadget-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/powerded-by-logos/gadget-logo.gif b/products/stratos/resources/powerded-by-logos/gadget-logo.gif
deleted file mode 100755
index 8e89ef5..0000000
Binary files a/products/stratos/resources/powerded-by-logos/gadget-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/powerded-by-logos/governance-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/powerded-by-logos/governance-logo.gif b/products/stratos/resources/powerded-by-logos/governance-logo.gif
deleted file mode 100755
index af1ac45..0000000
Binary files a/products/stratos/resources/powerded-by-logos/governance-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/powerded-by-logos/identity-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/powerded-by-logos/identity-logo.gif b/products/stratos/resources/powerded-by-logos/identity-logo.gif
deleted file mode 100755
index a2447bc..0000000
Binary files a/products/stratos/resources/powerded-by-logos/identity-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/resources/powerded-by-logos/mashup-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/resources/powerded-by-logos/mashup-logo.gif b/products/stratos/resources/powerded-by-logos/mashup-logo.gif
deleted file mode 100755
index f8ed9be..0000000
Binary files a/products/stratos/resources/powerded-by-logos/mashup-logo.gif and /dev/null differ
[44/50] [abbrv] stratos git commit: Removing unnecessary features,
artifacts and restructuring distribution artifacts
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/jquery.orbit-1.2.3.min.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/jquery.orbit-1.2.3.min.js b/products/stratos/modules/distribution/lib/home/js/jquery.orbit-1.2.3.min.js
deleted file mode 100755
index 13acb8d..0000000
--- a/products/stratos/modules/distribution/lib/home/js/jquery.orbit-1.2.3.min.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * jQuery Orbit Plugin 1.2.3
- * www.ZURB.com/playground
- * Copyright 2010, ZURB
- * Free to use under the MIT license.
- * http://www.opensource.org/licenses/mit-license.php
-*/
-
-(function(d){d.fn.orbit=function(a){a=d.extend({animation:"horizontal-push",animationSpeed:600,timer:!0,advanceSpeed:4E3,pauseOnHover:!1,startClockOnMouseOut:!1,startClockOnMouseOutAfter:1E3,directionalNav:!0,captions:!0,captionAnimation:"fade",captionAnimationSpeed:600,bullets:!1,bulletThumbs:!1,bulletThumbLocation:"",afterSlideChange:function(){}},a);return this.each(function(){function q(){if(!a.timer||a.timer=="false")return!1;else r.is(":hidden")?s=setInterval(function(){l("next")},a.advanceSpeed):
-(o=!0,x.removeClass("active"),s=setInterval(function(){var a="rotate("+m+"deg)";m+=2;t.css({"-webkit-transform":a,"-moz-transform":a,"-o-transform":a});m>180&&(t.addClass("move"),z.addClass("move"));m>360&&(t.removeClass("move"),z.removeClass("move"),m=0,l("next"))},a.advanceSpeed/180))}function n(){if(!a.timer||a.timer=="false")return!1;else o=!1,clearInterval(s),x.addClass("active")}function A(){if(!a.captions||a.captions=="false")return!1;else{var y=e.eq(b).data("caption");(_captionHTML=d(y).html())?
-(j.attr("id",y).html(_captionHTML),a.captionAnimation=="none"&&j.show(),a.captionAnimation=="fade"&&j.fadeIn(a.captionAnimationSpeed),a.captionAnimation=="slideOpen"&&j.slideDown(a.captionAnimationSpeed)):(a.captionAnimation=="none"&&j.hide(),a.captionAnimation=="fade"&&j.fadeOut(a.captionAnimationSpeed),a.captionAnimation=="slideOpen"&&j.slideUp(a.captionAnimationSpeed))}}function B(){if(a.bullets)D.children("li").removeClass("active").eq(b).addClass("active");else return!1}function l(d){function c(){e.eq(f).css({"z-index":1});
-u=!1;a.afterSlideChange.call(this)}var f=b,g=d;if(f==g)return!1;if(e.length=="1")return!1;u||(u=!0,d=="next"?(b++,b==p&&(b=0)):d=="prev"?(b--,b<0&&(b=p-1)):(b=d,f<b?g="next":f>b&&(g="prev")),B(),e.eq(f).css({"z-index":2}),a.animation=="fade"&&e.eq(b).css({opacity:0,"z-index":3}).animate({opacity:1},a.animationSpeed,c),a.animation=="horizontal-slide"&&(g=="next"&&e.eq(b).css({left:h,"z-index":3}).animate({left:0},a.animationSpeed,c),g=="prev"&&e.eq(b).css({left:-h,"z-index":3}).animate({left:0},a.animationSpeed,
-c)),a.animation=="vertical-slide"&&(g=="prev"&&e.eq(b).css({top:v,"z-index":3}).animate({top:0},a.animationSpeed,c),g=="next"&&e.eq(b).css({top:-v,"z-index":3}).animate({top:0},a.animationSpeed,c)),a.animation=="horizontal-push"&&(g=="next"&&(e.eq(b).css({left:h,"z-index":3}).animate({left:0},a.animationSpeed,c),e.eq(f).animate({left:-h},a.animationSpeed)),g=="prev"&&(e.eq(b).css({left:-h,"z-index":3}).animate({left:0},a.animationSpeed,c),e.eq(f).animate({left:h},a.animationSpeed))),A())}var b=0,
-p=0,h,v,u,f=d(this).addClass("orbit"),c=f.wrap('<div class="orbit-wrapper" />').parent();f.add(h).width("1px").height("1px");var e=f.children("img, a, div");e.each(function(){var a=d(this),b=a.width(),a=a.height();b>f.width()&&(f.add(c).width(b),h=f.width());a>f.height()&&(f.add(c).height(a),v=f.height());p++});if(e.length==1)a.directionalNav=!1,a.timer=!1,a.bullets=!1;e.eq(b).css({"z-index":3}).fadeIn(function(){e.css({display:"block"})});if(a.timer){c.append('<div class="timer"><span class="mask"><span class="rotator"></span></span><span class="pause"></span></div>');
-var r=d("div.timer"),o;if(r.length!=0){var t=d("div.timer span.rotator"),z=d("div.timer span.mask"),x=d("div.timer span.pause"),m=0,s;q();r.click(function(){o?n():q()});if(a.startClockOnMouseOut){var C;c.mouseleave(function(){C=setTimeout(function(){o||q()},a.startClockOnMouseOutAfter)});c.mouseenter(function(){clearTimeout(C)})}}}a.pauseOnHover&&c.mouseenter(function(){n()});if(a.captions){c.append('<div class="orbit-caption"></div>');var j=c.children(".orbit-caption");A()}if(a.directionalNav){if(a.directionalNav==
-"false")return!1;c.append('<div class="slider-nav"><span class="right">Right</span><span class="left">Left</span></div>');var k=c.children("div.slider-nav").children("span.left"),w=c.children("div.slider-nav").children("span.right");k.click(function(){n();l("prev")});w.click(function(){n();l("next")})}if(a.bullets){c.append('<ul class="orbit-bullets"></ul>');var D=d("ul.orbit-bullets");for(i=0;i<p;i++){k=d("<li>"+(i+1)+"</li>");if(a.bulletThumbs&&(w=e.eq(i).data("thumb")))k=d('<li class="has-thumb">'+
-i+"</li>"),k.css({background:"url("+a.bulletThumbLocation+w+") no-repeat"});d("ul.orbit-bullets").append(k);k.data("index",i);k.click(function(){n();l(d(this).data("index"))})}B()}})}})(jQuery);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit-1.2.3.css
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit-1.2.3.css b/products/stratos/modules/distribution/lib/home/js/orbit-1.2.3.css
deleted file mode 100644
index 90ecd2d..0000000
--- a/products/stratos/modules/distribution/lib/home/js/orbit-1.2.3.css
+++ /dev/null
@@ -1,223 +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.
- *
-*/
-
-/* CSS for jQuery Orbit Plugin 1.2.3
- * www.ZURB.com/playground
- * Copyright 2010, ZURB
- * Free to use under the MIT license.
- * http://www.opensource.org/licenses/mit-license.php
-
-
-
-/* PUT IN YOUR SLIDER ID AND SIZE TO MAKE LOAD BEAUTIFULLY
- ================================================== */
-#featured {
- width: 940px;
- height: 450px;
- url('orbit/loading.gif') no-repeat center center;
- overflow: hidden; }
-#featured>img,
-#featured>div,
-#featured>a { display: none; }
-
-
-
-
-/* CONTAINER
- ================================================== */
-
-div.orbit-wrapper {
- width: 1px;
- height: 1px;
- position: relative; }
-
-div.orbit {
- width: 1px;
- height: 1px;
- position: relative;
- overflow: hidden }
-
-div.orbit>img {
- position: absolute;
- top: 0;
- left: 0;
- display: none; }
-
-div.orbit>a {
- border: none;
- position: absolute;
- top: 0;
- left: 0;
- line-height: 0;
- display: none; }
-
-.orbit>div {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%; }
-
-/* Note: If your slider only uses content or anchors, you're going to want to put the width and height declarations on the ".orbit>div" and "div.orbit>a" tags in addition to just the .orbit-wrapper */
-
-
-/* TIMER
- ================================================== */
-
-div.timer {
- width: 40px;
- height: 40px;
- overflow: hidden;
- position: absolute;
- top: 10px;
- right: 10px;
- opacity: .6;
- cursor: pointer;
- z-index: 1001; }
-
-span.rotator {
- display: block;
- width: 40px;
- height: 40px;
- position: absolute;
- top: 0;
- left: -20px;
- background: url(orbit/rotator-black.png) no-repeat;
- z-index: 3; }
-
-span.mask {
- display: block;
- width: 20px;
- height: 40px;
- position: absolute;
- top: 0;
- right: 0;
- z-index: 2;
- overflow: hidden; }
-
-span.rotator.move {
- left: 0 }
-
-span.mask.move {
- width: 40px;
- left: 0;
- background: url(orbit/timer-black.png) repeat 0 0; }
-
-span.pause {
- display: block;
- width: 40px;
- height: 40px;
- position: absolute;
- top: 0;
- left: 0;
- background: url(orbit/pause-black.png) no-repeat;
- z-index: 4;
- opacity: 0; }
-
-span.pause.active {
- background: url(orbit/pause-black.png) no-repeat 0 -40px }
-
-div.timer:hover span.pause,
-span.pause.active {
- opacity: 1 }
-
-
-/* CAPTIONS
- ================================================== */
-
-.orbit-caption {
- display: none;
- font-family: "HelveticaNeue", "Helvetica-Neue", Helvetica, Arial, sans-serif; }
-
-.orbit-wrapper .orbit-caption {
- background: #000;
- background: rgba(0,0,0,.6);
- z-index: 1000;
- color: #fff;
- text-align: center;
- padding: 7px 0;
- font-size: 13px;
- position: absolute;
- right: 0;
- bottom: 0;
- width: 100%; }
-
-
-/* DIRECTIONAL NAV
- ================================================== */
-
-div.slider-nav {
- display: block }
-
-div.slider-nav span {
- width: 30px;
- height: 41px;
- text-indent: -9999px;
- position: absolute;
- z-index: 1000;
- background-color: #fffff;
- top: 50%;
- margin-top: -22px;
- cursor: pointer; }
-
-div.slider-nav span.right {
- background: url(orbit/right-arrow.png);
- right: 0; }
-
-div.slider-nav span.left {
- background: url(orbit/left-arrow.png);
- left: 0; }
-
-/* BULLET NAV
- ================================================== */
-
-.orbit-bullets {
- position: absolute;
- z-index: 1000;
- list-style: none;
- bottom: -40px;
- left: 50%;
- margin-left: -50px;
- padding: 0; }
-
-.orbit-bullets li {
- float: left;
- margin-left: 5px;
- cursor: pointer;
- color: #999;
- text-indent: -9999px;
- background: url(orbit/bullets.jpg) no-repeat 4px 0;
- width: 13px;
- height: 12px;
- overflow: hidden; }
-
-.orbit-bullets li.active {
- color: #222;
- background-position: -8px 0; }
-
-.orbit-bullets li.has-thumb {
- background: none;
- width: 100px;
- height: 75px; }
-
-.orbit-bullets li.active.has-thumb {
- background-position: 0 0;
- border-top: 2px solid #000; }
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit/left-arrow.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit/left-arrow.png b/products/stratos/modules/distribution/lib/home/js/orbit/left-arrow.png
deleted file mode 100755
index bd65cb1..0000000
Binary files a/products/stratos/modules/distribution/lib/home/js/orbit/left-arrow.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit/loading.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit/loading.gif b/products/stratos/modules/distribution/lib/home/js/orbit/loading.gif
deleted file mode 100755
index 969f505..0000000
Binary files a/products/stratos/modules/distribution/lib/home/js/orbit/loading.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit/mask-black.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit/mask-black.png b/products/stratos/modules/distribution/lib/home/js/orbit/mask-black.png
deleted file mode 100755
index e4e77b5..0000000
Binary files a/products/stratos/modules/distribution/lib/home/js/orbit/mask-black.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit/right-arrow.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit/right-arrow.png b/products/stratos/modules/distribution/lib/home/js/orbit/right-arrow.png
deleted file mode 100755
index 2c9baab..0000000
Binary files a/products/stratos/modules/distribution/lib/home/js/orbit/right-arrow.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit/rotator-black.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit/rotator-black.png b/products/stratos/modules/distribution/lib/home/js/orbit/rotator-black.png
deleted file mode 100755
index a0d24a7..0000000
Binary files a/products/stratos/modules/distribution/lib/home/js/orbit/rotator-black.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit/timer-black.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit/timer-black.png b/products/stratos/modules/distribution/lib/home/js/orbit/timer-black.png
deleted file mode 100755
index e4e77b5..0000000
Binary files a/products/stratos/modules/distribution/lib/home/js/orbit/timer-black.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/style.css
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/style.css b/products/stratos/modules/distribution/lib/home/style.css
deleted file mode 100644
index c98a894..0000000
--- a/products/stratos/modules/distribution/lib/home/style.css
+++ /dev/null
@@ -1,181 +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.
- *
-*/
-
-body { font-family: "Calibri","Lucida Grande","Lucida Sans","Microsoft Sans Serif","Lucida Sans Unicode","Verdana","Sans-serif","trebuchet ms"; font-size: .85em; line-height: 135%; color: #434343; margin: 0px; padding: 0px; background-color: #94C8EC;}
-
-p { }
-
-td { }
-
-a:link { text-decoration: none; }
-
-a:visited { text-decoration: none; }
-
-a:hover { text-decoration: none; }
-
-a:active { text-decoration: none; }
-
-a img { border: 0px; }
-div.clear { clear: both; }
-
-div#main-content { width: 960px; margin: auto; background-image: url(images/top.gif); background-repeat: no-repeat; background-position: left 15px; }
-
-div#header { height: 140px; }
-div.top-nav {
- float: right;
-}
-div.top-nav ul {
- list-style: none;
- margin: 0px;
- padding: 0px;
-}
-div.top-nav ul li {
- position: relative;
- float: left;
- padding-left: 10px;
- padding-right: 10px;
- padding-top: 10px;
- padding-bottom: 0px;
- border-right: solid 1px #005577;
-}
-div.top-nav ul li.right {
- border-right: 0px;
-}
-div.top-nav ul li a {
- color: #005577;
- font-weight: bold;
- font-size: 16px;
-}
-div.top-nav ul li a:hover {
- color: #ffffff;
-}
-div.logo { float: left; margin-top: 25px; }
-div#content { background-color: #ffffff; background-image: url(images/content-bg.gif); background-repeat: repeat-y; background-position: left top; }
-div#left {
- float: left;
- width: 400px;
- background-image: url(images/left-bg.gif);
- background-position: right top;
- background-repeat: no-repeat;
-}
-div#left div.stratos-products div.title {
- margin-left: 30px;
- margin-top: 5px;
- font-size: 24px;
- font-weight: normal;
- line-height: 32px;
-}
-div#left div.stratos-products div.products {
- margin-left: 30px;
- margin-top: 25px;
- padding-bottom: 40px;
-}
-div#left div.stratos-products div.products a {
- display: block;
- height: 24px;
- margin-bottom: 7px;
- background-image: url(images/stratos-products.gif);
- background-repeat: no-repeat;
- background-position: left top;
-}
-div#left div.stratos-products div.products a {
- background: url(images/stratos-products-new.jpg) no-repeat top left;
-}
-div#left div.stratos-products div.products a.as-new{ background-position: 0 0; width: 170px; height: 24px; }
-div#left div.stratos-products div.products a.bam-new{ background-position: 0 -74px; width: 204px; height: 23px; }
-div#left div.stratos-products div.products a.bps-new{ background-position: 0 -147px; width: 198px; height: 23px; }
-div#left div.stratos-products div.products a.brs-new{ background-position: 0 -220px; width: 183px; height: 23px; }
-div#left div.stratos-products div.products a.cep-new{ background-position: 0 -293px; width: 231px; height: 22px; }
-div#left div.stratos-products div.products a.cg-new{ background-position: 0 -365px; width: 148px; height: 24px; }
-div#left div.stratos-products div.products a.dss-new{ background-position: 0 -439px; width: 181px; height: 24px; }
-div#left div.stratos-products div.products a.esb-new{ background-position: 0 -513px; width: 192px; height: 24px; }
-div#left div.stratos-products div.products a.greg-new{ background-position: 0 -587px; width: 180px; height: 23px; }
-div#left div.stratos-products div.products a.is-new{ background-position: 0 -660px; width: 147px; height: 23px; }
-div#left div.stratos-products div.products a.mb-new{ background-position: 0 -733px; width: 157px; height: 23px; }
-div#left div.stratos-products div.products a.ss-new{ background-position: 0 -806px; width: 142px; height: 23px; }
-div#left div.stratos-products div.products a.ts-new{ background-position: 0 -879px; width: 130px; height: 23px; }
-div#left div.stratos-products div.products a:hover { opacity:0.7;filter:alpha(opacity=70) }
-div#right {
- float: left;
- width: 560px;
-}
-
-div#right div.register { width: 555px; margin-top: 15px; margin-right: 0px; padding-bottom: 10px; text-align: center;
-background-image: url(images/intro-bg.gif);background-position: center bottom; background-repeat: no-repeat;
-}
-div#right div.register a { display: block; height: 62px; margin-bottom: 10px; }
-div#right div.register a img { margin-bottom: 7px; }
-div#right div.register a:hover img { opacity:0.7;filter:alpha(opacity=70) }
-
-div#right div.banner{
- width: 500px;
- margin: auto;
- height: 297px;
- margin-top: 30px;
-}
-div#right div.banner div#featured {
- width: 500px;
- height: 297px;
-}
-div#right div.banner div#featured div.screencast {
- width: 500px;
- height: 297px;
- text-align: center;
-}
-div#right div.banner div#featured div.screencast h2 {
- font-size: 16px;
- margin-top: 0px;
- margin-bottom: 0px;
- padding-bottom: 8px;
- padding-top: 8px;
- line-height: 16px;
- background-color: #000000;
- color: #ffffff;
- margin-left: 30px;
- margin-right: 30px;
-}
-div#right div.banner div#featured div.whitepaper, div#right div.banner div#featured div.webinar {
- width: 500px;
- height: 297px;
- text-align: center;
- margin-top: 23px;
-}
-div#bottom {
- background-image: url(images/feature-middle-bg.gif);
- background-position: center top;
- background-repeat: no-repeat;
- }
-div#bottom div.feature {
- float: left;
- width: 240px;
- padding-left: 40px;
- padding-right: 40px;
- font-size: 20px;
- line-height: 25px;
- font-weight: bold;
- text-align: center;
- padding-bottom: 20px;
-}
-div#footer { height: 80px; background-image: url(images/bottom.gif); background-position: left top; background-repeat: no-repeat; padding-top: 25px;}
-div#footer div.powered { color: #333333; float: right; font-size: 85%; margin-right: 10px; }
-div#footer div.powered span { float: left; line-height: 23px; margin-right: 5px; }
-div.footer-links { padding-bottom: 5px; padding-left: 10px; border-bottom: solid 1px #4E84C4; margin-bottom: 10px; color: #4E84C4; }
-div#footer span.copyright { font-size: 90%; padding-left: 10px; }
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/qpid-resources/etc/config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/qpid-resources/etc/config.xml b/products/stratos/modules/distribution/qpid-resources/etc/config.xml
deleted file mode 100755
index a54dd98..0000000
--- a/products/stratos/modules/distribution/qpid-resources/etc/config.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?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.
- -->
-<broker>
- <prefix>${QPID_HOME}</prefix>
- <work>${QPID_WORK}</work>
- <conf>${prefix}/etc</conf>
-
- <plugin-directory>${QPID_HOME}/lib/plugins</plugin-directory>
- <cache-directory>${QPID_WORK}/cache</cache-directory>
-
- <connector>
- <!-- To enable SSL edit the keystorePath and keystorePassword
- and set enabled to true.
- To disasble Non-SSL port set sslOnly to true -->
- <ssl>
- <enabled>false</enabled>
- <sslOnly>false</sslOnly>
- <keystorePath>/path/to/keystore.ks</keystorePath>
- <keystorePassword>keystorepass</keystorePassword>
- </ssl>
- <qpidnio>false</qpidnio>
- <protectio>
- <enabled>false</enabled>
- <readBufferLimitSize>262144</readBufferLimitSize>
- <writeBufferLimitSize>262144</writeBufferLimitSize>
- </protectio>
- <transport>nio</transport>
- <port>5672</port>
- <sslport>8672</sslport>
- <socketReceiveBuffer>32768</socketReceiveBuffer>
- <socketSendBuffer>32768</socketSendBuffer>
- </connector>
- <management>
- <enabled>true</enabled>
- <jmxport>8999</jmxport>
- <ssl>
- <enabled>false</enabled>
- <!-- Update below path to your keystore location, or run the bin/create-example-ssl-stores(.sh|.bat)
- script from within the etc/ folder to generate an example store with self-signed cert -->
- <keyStorePath>${conf}/qpid.keystore</keyStorePath>
- <keyStorePassword>password</keyStorePassword>
- </ssl>
- </management>
- <advanced>
- <filterchain enableExecutorPool="true"/>
- <enablePooledAllocator>false</enablePooledAllocator>
- <enableDirectBuffers>false</enableDirectBuffers>
- <framesize>65535</framesize>
- <compressBufferOnQueue>false</compressBufferOnQueue>
- <enableJMSXUserID>false</enableJMSXUserID>
- <locale>en_US</locale>
- </advanced>
-
- <security>
- <principal-databases>
- <principal-database>
- <name>carbon-user-store</name>
- <class>org.wso2.carbon.qpid.authentication.qpid.CarbonBasedPrincipalDatabase</class>
- </principal-database>
- </principal-databases>
-
- <msg-auth>false</msg-auth>
-
- <jmx>
- <access>${conf}/jmxremote.access</access>
- <principal-database>carbon-user-store</principal-database>
- </jmx>
- </security>
-
- <virtualhosts>${conf}/virtualhosts.xml</virtualhosts>
-
- <heartbeat>
- <delay>0</delay>
- <timeoutFactor>2.0</timeoutFactor>
- </heartbeat>
- <queue>
- <auto_register>true</auto_register>
- </queue>
-
- <status-updates>ON</status-updates>
-
-</broker>
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/qpid-resources/etc/jmxremote.access
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/qpid-resources/etc/jmxremote.access b/products/stratos/modules/distribution/qpid-resources/etc/jmxremote.access
deleted file mode 100755
index f496e92..0000000
--- a/products/stratos/modules/distribution/qpid-resources/etc/jmxremote.access
+++ /dev/null
@@ -1,23 +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.
-
-#Generated by JMX Console : Last edited by user:admin
-#Tue Jun 12 16:46:39 BST 2007
-#admin=admin
-#guest=readonly
-#user=readwrite
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/qpid-resources/etc/virtualhosts.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/qpid-resources/etc/virtualhosts.xml b/products/stratos/modules/distribution/qpid-resources/etc/virtualhosts.xml
deleted file mode 100755
index f55e8c8..0000000
--- a/products/stratos/modules/distribution/qpid-resources/etc/virtualhosts.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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.
- -->
-<virtualhosts>
- <default>carbon</default>
- <virtualhost>
- <name>carbon</name>
- <carbon>
- <store>
- <!--class>org.apache.qpid.server.store.MemoryMessageStore</class-->
- <class>org.apache.qpid.server.store.DerbyMessageStore</class>
- <environment-path>repository/database/qpid/derbystore</environment-path>
- </store>
-
- <housekeeping>
- <threadCount>2</threadCount>
- <expiredMessageCheckPeriod>20000</expiredMessageCheckPeriod>
- </housekeeping>
-
- <exchanges>
- <exchange>
- <type>direct</type>
- <name>carbon.direct</name>
- <durable>true</durable>
- </exchange>
- <exchange>
- <type>topic</type>
- <name>carbon.topic</name>
- </exchange>
- </exchanges>
-
- <queues>
- <maximumQueueDepth>4235264</maximumQueueDepth>
- <!-- 4Mb -->
- <maximumMessageSize>2117632</maximumMessageSize>
- <!-- 2Mb -->
- <maximumMessageAge>600000</maximumMessageAge>
- <!-- 10 mins -->
- <maximumMessageCount>50</maximumMessageCount>
- <!-- 50 messages -->
- </queues>
- </carbon>
- </virtualhost>
-</virtualhosts>
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/qpid-resources/qpid.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/qpid-resources/qpid.xml b/products/stratos/modules/distribution/qpid-resources/qpid.xml
deleted file mode 100755
index 086fb08..0000000
--- a/products/stratos/modules/distribution/qpid-resources/qpid.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.
- -->
-<Qpid>
- <!-- Start Qpid broker when Carbon starts up -->
- <AutoStart>true</AutoStart>
- <RegistryRoot>event</RegistryRoot>
-</Qpid>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/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 08de3f9..623e49b 100755
--- a/products/stratos/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos/modules/distribution/src/assembly/bin.xml
@@ -57,7 +57,8 @@
</fileSet>
<!-- Copying p2 profile and osgi bundles-->
<fileSet>
- <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
+ <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components
+ </directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/components</outputDirectory>
<excludes>
<exclude>**/eclipse.ini</exclude>
@@ -85,7 +86,9 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps</directory>
+ <directory>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps
+ </directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps</outputDirectory>
<excludes>
<exclude>**/publisher/**</exclude>
@@ -106,14 +109,16 @@
</fileSet>
<fileSet>
<directory>../../../../components/org.apache.stratos.manager.console/console</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/console</outputDirectory>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/console
+ </outputDirectory>
<excludes>
<exclude>**/README</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>../../../../components/org.apache.stratos.manager.console/sso</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/sso</outputDirectory>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/sso
+ </outputDirectory>
</fileSet>
<fileSet>
<directory>../../../../components/org.apache.stratos.manager.console/modules/console</directory>
@@ -135,140 +140,20 @@
</includes>
<fileMode>755</fileMode>
</fileSet>
- <fileSet>
- <directory>../../conf/synapse-configs</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../../conf</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>**/samples-desc.xml</exclude>
- <exclude>**/identity.xml</exclude>
- <exclude>**/user-mgt.xml</exclude>
- <exclude>**/datasources.properties</exclude>
- <exclude>.svn</exclude>
- <exclude>**/temp-artifacts/**</exclude>
- <exclude>tenant-mgt.xml</exclude>
- <exclude>email-bill-generated.xml</exclude>
- <exclude>email-billing-notifications.xml</exclude>
- <exclude>email-new-tenant-activation.xml</exclude>
- <exclude>email-new-tenant-registration.xml</exclude>
- <exclude>email-password-reset.xml</exclude>
- <exclude>email-payment-received-customer.xml</exclude>
- <exclude>email-registration-payment-received-customer.xml</exclude>
- <exclude>email-payment-received-wso2.xml</exclude>
- <exclude>email-registration-complete.xml</exclude>
- <exclude>email-registration-moderation.xml</exclude>
- <exclude>email-registration.xml</exclude>
- <exclude>email-update.xml</exclude>
- <exclude>tenant-reg-agent.xml</exclude>
- <exclude>features-dashboard.xml</exclude>
- <exclude>**/data-bridge/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../../conf</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/email</outputDirectory>
- <includes>
- <include>email-bill-generated.xml</include>
- <include>email-billing-notifications.xml</include>
- <include>email-new-tenant-activation.xml</include>
- <include>email-new-tenant-registration.xml</include>
- <include>email-password-reset.xml</include>
- <include>email-payment-received-customer.xml</include>
- <include>email-registration-payment-received-customer.xml</include>
- <include>email-payment-received-wso2.xml</include>
- <include>email-registration-complete.xml</include>
- <include>email-registration-moderation.xml</include>
- <include>email-registration.xml</include>
- <include>email-update.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../conf</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy</outputDirectory>
- <includes>
- <include>tenant-reg-agent.xml</include>
- <include>features-dashboard.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../conf</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources</outputDirectory>
- <includes>
- <include>stratos-datasources.xml</include>
- </includes>
- </fileSet>
+
<!-- Copying themes, cloud icons-->
<fileSet>
- <directory>../../resources</directory>
+ <directory>src/main/resources</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/resources</outputDirectory>
<fileMode>755</fileMode>
<includes>
<include>allthemes/**</include>
<include>powerded-by-logos/**</include>
</includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
- <!--start BAM related files -->
- <!--<fileSet>
- <directory>resources/dataservices</directory>
- <outputDirectory>
- ${pom.artifactId}-${pom.version}/repository/deployment/server/dataservices
- </outputDirectory>
- <includes>
- <include>*.dbs</include>
- <include>*.xml</include>
- </includes>
</fileSet>
+
+ <!-- ADC management related files -->
<fileSet>
- <directory>resources/dataservices/bam</directory>
- <outputDirectory>
- ${pom.artifactId}-${pom.version}/repository/deployment/server/dataservices
- </outputDirectory>
- <includes>
- <include>*.dbs</include>
- <include>*.xml</include>
- </includes>
- </fileSet>-->
- <fileSet>
- <directory>resources</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
- <!--fileSet>
- <directory>resources/dbscripts</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet-->
- <!--end BAM related files -->
- <!--qpid related files -->
- <fileSet>
- <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/advanced</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>**/jmx.xml</exclude>
- <exclude>**/authenticators.xml</exclude>
- <exclude>**/logging-config.xml</exclude>
- </excludes>
- </fileSet>
- <!-- end of qpid related files -->
- <!-- adc.mgt related files -->
- <fileSet>
- <!--directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/</directory-->
<directory>src/main/conf/</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<includes>
@@ -283,7 +168,7 @@
<include>policies.xsd</include>
</includes>
</fileSet>
- <!-- end of adc.mgt related files -->
+
<!-- axis2.xml -->
<fileSet>
<directory>src/main/conf/</directory>
@@ -307,32 +192,13 @@
</includes>
</fileSet>
<fileSet>
- <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/</directory>
+ <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
+ </directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy/</outputDirectory>
<includes>
<include>**/multitenancy-packages.xml</include>
<include>**/stratos.xml</include>
<include>**/usage-throttling-agent-config.xml</include>
- <!--include>**/cloud-services-desc.xml</include-->
- </includes>
- </fileSet>
- <!-- copy the landing page webapp -->
- <fileSet>
- <directory>lib/home</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../../modules/features-dashboard/target/</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
- <includes>
- <include>**/*.war</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../resources/cloud-services-icons/target/</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
- <includes>
- <include>**/*.war</include>
</includes>
</fileSet>
<fileSet>
@@ -381,11 +247,13 @@
<include>*/**</include>
</includes>
</fileSet>
+
<!-- copy the billing h2 db -->
<fileSet>
<directory>target/database</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
</fileSet>
+
<!-- Kernel Patches-->
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001</directory>
@@ -449,40 +317,25 @@
<include>**/patch0008/*.*</include>
</includes>
</fileSet>
- <!--
- <fileSet>
- <directory>../../dbscripts/</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory>
- </fileSet>
--->
+
+ <!-- Jaggery modules -->
<fileSet>
- <directory>../../payload</directory>
- <includes>
- <include>user-data</include>
- </includes>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../../payload/user-data/</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/user-data</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../../conf/temp-artifacts/sso</directory>
+ <directory>src/main/temp-artifacts/sso</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/modules/sso</outputDirectory>
</fileSet>
<fileSet>
- <directory>../../conf/temp-artifacts/carbon</directory>
+ <directory>src/main/temp-artifacts/carbon</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/modules/carbon</outputDirectory>
</fileSet>
<fileSet>
- <directory>../../conf/temp-artifacts</directory>
+ <directory>src/main/temp-artifacts</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/components/plugins</outputDirectory>
<includes>
<include>org.wso2.store.sso.common_1.0.0.jar</include>
</includes>
</fileSet>
<fileSet>
- <directory>../../conf/temp-artifacts</directory>
+ <directory>src/main/temp-artifacts</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/components/plugins</outputDirectory>
<includes>
<include>org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar</include>
@@ -490,44 +343,52 @@
</fileSet>
<!-- autoscaler -->
<fileSet>
- <directory>../../conf/temp-artifacts</directory>
+ <directory>src/main/temp-artifacts</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/components/plugins</outputDirectory>
<includes>
<include>org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar</include>
</includes>
</fileSet>
+
<!-- cep -->
<!--creating an empty input event adaptors directory-->
<fileSet>
<directory>../../../../extensions/cep/artifacts/inputeventadaptors</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/inputeventadaptors</outputDirectory>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/inputeventadaptors
+ </outputDirectory>
</fileSet>
<!--creating an empty output event adaptors directory-->
<fileSet>
<directory>../../../../extensions/cep/artifacts/outputeventadaptors</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/outputeventadaptors</outputDirectory>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/outputeventadaptors
+ </outputDirectory>
</fileSet>
<!--creating an empty event builders directory-->
<fileSet>
<directory>../../../../extensions/cep/artifacts/eventbuilders</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/eventbuilders</outputDirectory>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/eventbuilders
+ </outputDirectory>
</fileSet>
<!--creating an empty event formatters directory-->
<fileSet>
<directory>../../../../extensions/cep/artifacts/eventformatters</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/eventformatters</outputDirectory>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/eventformatters
+ </outputDirectory>
</fileSet>
<!--creating an empty execution plans directory-->
<fileSet>
<directory>../../../../extensions/cep/artifacts/executionplans</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/executionplans</outputDirectory>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/executionplans
+ </outputDirectory>
</fileSet>
<!--customization scripts-->
<fileSet>
- <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/scripts</directory>
+ <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/scripts
+ </directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/scripts</outputDirectory>
</fileSet>
</fileSets>
+
<dependencySets>
<dependencySet>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/lib</outputDirectory>
@@ -583,6 +444,7 @@
</includes>
</dependencySet>
</dependencySets>
+
<files>
<file>
<source>src/main/conf/log4j.properties</source>
@@ -590,6 +452,48 @@
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
+ <file>
+ <source>src/main/conf/jndi.properties</source>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>600</fileMode>
+ </file>
+ <file>
+ <source>src/main/conf/tenant-mgt.xml</source>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>600</fileMode>
+ </file>
+ <file>
+ <source>src/main/conf/registry.xml</source>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>600</fileMode>
+ </file>
+ <file>
+ <source>src/main/conf/user-mgt.xml</source>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>600</fileMode>
+ </file>
+ <file>
+ <source>src/main/conf/mqtttopic.properties</source>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>600</fileMode>
+ </file>
+ <file>
+ <source>src/main/conf/event-broker.xml</source>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>600</fileMode>
+ </file>
+ <file>
+ <source>src/main/conf/sso-idp-config.xml</source>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>600</fileMode>
+ </file>
<!-- cep -->
<file>
<source>src/main/conf/siddhi/siddhi.extension</source>
@@ -603,7 +507,9 @@
</file>
<!-- cloud-controller -->
<file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cloud-controller.xml</source>
+ <source>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cloud-controller.xml
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
</file>
<!-- cloud-controller -->
@@ -620,7 +526,7 @@
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
- <!--iindentity.xml and application-authentication.xml for oAuth feature -->
+ <!-- identity.xml and application-authentication.xml for oAuth feature -->
<file>
<source>src/main/conf/identity.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
@@ -634,6 +540,12 @@
<fileMode>600</fileMode>
</file>
<file>
+ <source>src/main/conf/application-authenticators.xml</source>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>600</fileMode>
+ </file>
+ <file>
<source>src/main/conf/security/client-truststore.jks</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security/</outputDirectory>
<filtered>false</filtered>
@@ -689,13 +601,7 @@
<fileMode>644</fileMode>
</file>
<file>
- <source>../../conf/samples-desc.xml</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
- <filtered>true</filtered>
- <fileMode>644</fileMode>
- </file>
- <file>
- <source>src/main/resources/launch.ini</source>
+ <source>src/main/conf/etc/launch.ini</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
@@ -712,55 +618,37 @@
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
- <file>
- <source>../../conf/datasources.properties</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
- <filtered>true</filtered>
- <fileMode>644</fileMode>
- </file>
<!-- copy custome webapp classLoading files -->
<file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml</source>
+ <source>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml</source>
+ <source>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml</source>
+ <source>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
- <!--file>
- <source>../../conf/cartridge-config.properties</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
- <filtered>true</filtered>
- <fileMode>644</fileMode>
- </file-->
- <file>
- <source>../../conf/cloud-services-desc.xml</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy</outputDirectory>
- <filtered>true</filtered>
- <fileMode>644</fileMode>
- </file>
<file>
<source>${project.basedir}/README.txt</source>
<outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
- <!--file>
- <source>LICENSE.txt</source>
- <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
- <filtered>true</filtered>
- <fileMode>644</fileMode>
- </file-->
<file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
<outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
@@ -773,32 +661,18 @@
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
- <!--file>
- <source>target/wso2carbon-core-${carbon.kernel.version}/bin/wso2server.bat</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
- <filtered>true</filtered>
- <fileMode>644</fileMode>
- </file-->
- <!--file>
- <source>bam-resources/bam.xml</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
- <filtered>true</filtered>
- <fileMode>644</fileMode>
- </file-->
<file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/security/userRP.jks</source>
+ <source>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/security/userRP.jks
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security/</outputDirectory>
<fileMode>644</fileMode>
</file>
- <!--file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
- <filtered>true</filtered>
- <fileMode>644</fileMode>
- </file-->
<!-- Including logging-config.xml file -->
<file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml</source>
+ <source>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory>
</file>
<file>
@@ -814,134 +688,87 @@
<fileMode>755</fileMode>
</file>
<file>
- <source>src/bin/git-folder-structure.sh</source>
- <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
- <filtered>true</filtered>
- <fileMode>755</fileMode>
- </file>
- <file>
- <source>src/bin/manage-git-repo.sh</source>
- <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
- <filtered>true</filtered>
- <fileMode>755</fileMode>
- </file>
- <file>
- <source>src/bin/set-mysql-password.sh</source>
- <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
- <filtered>true</filtered>
- <fileMode>755</fileMode>
- </file>
- <file>
- <source>src/bin/add_entry_zone_file.sh</source>
- <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
- <filtered>true</filtered>
- <fileMode>755</fileMode>
- </file>
- <file>
- <source>src/bin/remove_entry_zone_file.sh</source>
- <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
- <filtered>true</filtered>
- <fileMode>755</fileMode>
- </file>
- <file>
- <source>src/bin/update-instance.sh</source>
- <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
- <filtered>true</filtered>
- <fileMode>755</fileMode>
- </file>
- <file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml</source>
+ <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
- </file>
- <file>
- <source>../../conf/zoo.cfg</source>
+ <source>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
</file>
- <file>
- <source>../../conf/jaas.conf</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security</outputDirectory>
- <destName>jaas.conf</destName>
- <filtered>true</filtered>
- </file>
- <file>
- <source>../../conf/tenant-mgt.xml</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
- <filtered>true</filtered>
- <fileMode>644</fileMode>
- </file>
- <!--Application authenticators -->
- <file>
- <source>../../conf/application-authenticators.xml</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory>
- <fileMode>644</fileMode>
- </file>
<!-- REST endpoint webapp -->
<file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/api.war</source>
+ <source>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/api.war
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
<fileMode>644</fileMode>
</file>
<!-- Mock iaas webapp -->
<file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mock-iaas.war</source>
+ <source>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mock-iaas.war
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
<fileMode>644</fileMode>
</file>
<!--oauth2.war and authenticationendpoint.war is related to oAuth feature -->
<file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/oauth2.war</source>
+ <source>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/oauth2.war
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/authenticationendpoint.war</source>
+ <source>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/authenticationendpoint.war
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
<fileMode>644</fileMode>
</file>
<!-- End of REST endpoint webapp -->
<!-- Meta data service webapp -->
<file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/metadata.war</source>
+ <source>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/metadata.war
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
<fileMode>644</fileMode>
</file>
<!-- End of Meta data service webapp -->
<file>
- <source>../../conf/data-bridge/data-bridge-config.xml</source>
+ <source>src/main/conf/data-bridge/data-bridge-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge/</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
- <source>../../conf/data-bridge/thrift-agent-config.xml</source>
+ <source>src/main/conf/data-bridge/thrift-agent-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge/</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
- <source>../../conf/thrift-client-config.xml</source>
+ <source>src/main/conf/thrift-client-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
<fileMode>644</fileMode>
</file>
- <!--Copying config files from kernel patches -->
- <!--
- <file>
- <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts/mysql.sql</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/registry</outputDirectory>
- <filtered>true</filtered>
- </file>
--->
+
+ <!-- Kernel patches configuration -->
<file>
- <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties</source>
+ <source>
+ ../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory>
<filtered>true</filtered>
</file>
<file>
- <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties</source>
+ <source>
+ ../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties
+ </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory>
<filtered>true</filtered>
</file>
@@ -951,4 +778,4 @@
<filtered>true</filtered>
</file>
</files>
-</assembly>
+</assembly>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/assembly/filter.properties b/products/stratos/modules/distribution/src/assembly/filter.properties
index 7748c21..866e34e 100755
--- a/products/stratos/modules/distribution/src/assembly/filter.properties
+++ b/products/stratos/modules/distribution/src/assembly/filter.properties
@@ -19,8 +19,8 @@
product.name=Apache Stratos
product.key=STRATOS
-product.version=4.1.1
+product.version=4.1.2
hotdeployment=true
hotupdate=false
carbon.version=4.2.0
-default.server.role=Stratos
+default.server.role=Stratos
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/application-authenticators.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/application-authenticators.xml b/products/stratos/modules/distribution/src/main/conf/application-authenticators.xml
new file mode 100644
index 0000000..5a12e34
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/application-authenticators.xml
@@ -0,0 +1,26 @@
+<?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.
+ -->
+
+<Authenticators>
+ <Authenticator name="BasicAuthenticator" disabled="false" factor="1">
+ <Status value="10" loginPage="/sso/login" />
+ </Authenticator>
+</Authenticators>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/data-bridge/data-bridge-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/data-bridge/data-bridge-config.xml b/products/stratos/modules/distribution/src/main/conf/data-bridge/data-bridge-config.xml
new file mode 100644
index 0000000..33f9905
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/data-bridge/data-bridge-config.xml
@@ -0,0 +1,74 @@
+<!--
+ ~ 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 xmlns="http://wso2.org/carbon/databridge">
+
+ <!--<StreamDefinitionStore>org.wso2.carbon.databridge.streamdefn.cassandra.datastore.CassandraStreamDefinitionStore</StreamDefinitionStore>-->
+ <StreamDefinitionStore>org.wso2.carbon.databridge.streamdefn.registry.datastore.RegistryStreamDefinitionStore</StreamDefinitionStore>
+
+ <workerThreads>10</workerThreads>
+ <eventBufferCapacity>10000</eventBufferCapacity>
+ <clientTimeoutMS>30000</clientTimeoutMS>
+ <keySpaceName>EVENT_KS</keySpaceName>
+
+ <!-- Default configuration for thriftDataReceiver -->
+ <thriftDataReceiver>
+ <hostName>0.0.0.0</hostName>
+ <port>7611</port>
+ <securePort>7711</securePort>
+ </thriftDataReceiver>
+
+ <!--<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/8d321a26/products/stratos/modules/distribution/src/main/conf/data-bridge/thrift-agent-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/data-bridge/thrift-agent-config.xml b/products/stratos/modules/distribution/src/main/conf/data-bridge/thrift-agent-config.xml
new file mode 100644
index 0000000..628909f
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/data-bridge/thrift-agent-config.xml
@@ -0,0 +1,47 @@
+<!--
+ ~ 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.
+ -->
+
+
+
+<thriftAgentConfiguration xmlns="http://wso2.org/carbon/databridge/agent/thrift">
+
+ <bufferedEventsSize>20000</bufferedEventsSize>
+
+ <poolSize>50</poolSize>
+ <maxPoolSize>50</maxPoolSize>
+
+ <maxTransportPoolSize>250</maxTransportPoolSize>
+ <maxIdleConnections>250</maxIdleConnections>
+ <evictionTimePeriod>5500</evictionTimePeriod>
+ <minIdleTimeInPool>5000</minIdleTimeInPool>
+
+ <secureMaxTransportPoolSize>250</secureMaxTransportPoolSize>
+ <secureMaxIdleConnections>250</secureMaxIdleConnections>
+ <secureEvictionTimePeriod>5500</secureEvictionTimePeriod>
+ <secureMinIdleTimeInPool>5000</secureMinIdleTimeInPool>
+
+ <maxMessageBundleSize>100</maxMessageBundleSize>
+ <asyncDataPublisherBufferedEventSize>10000</asyncDataPublisherBufferedEventSize>
+ <loadBalancingReconnectionInterval>30</loadBalancingReconnectionInterval>
+ <!--<trustStore>
+ .../wso2cep-1.0.0/repository/resources/security/client-truststore.jks
+ </trustStore>
+ <trustStorePassword>wso2carbon</trustStorePassword>-->
+
+</thriftAgentConfiguration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/etc/launch.ini
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/etc/launch.ini b/products/stratos/modules/distribution/src/main/conf/etc/launch.ini
new file mode 100644
index 0000000..53dbec5
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/etc/launch.ini
@@ -0,0 +1,269 @@
+#
+# 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.
+#
+
+# Eclipse Runtime Configuration Overrides
+# These properties are loaded prior to starting the framework and can also be used to override System Properties
+# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework
+# "*" can be used together with @null to clear System Properties that match a prefix name.
+
+osgi.*=@null
+org.osgi.*=@null
+eclipse.*=@null
+
+osgi.parentClassloader=app
+osgi.contextClassLoaderParent=app
+
+# When osgi.clean is set to "true", any cached data used by the OSGi framework
+# will be wiped clean. This will clean the caches used to store bundle
+# dependency resolution and eclipse extension registry data. Using this
+# option will force OSGi framework to reinitialize these caches.
+# The following setting is put in place to get rid of the problems
+# faced when re-starting the system. Please note that, when this setting is
+# true, if you manually start a bundle, it would not be available when
+# you re-start the system. To avid this, copy the bundle jar to the plugins
+# folder, before you re-start the system.
+osgi.clean=true
+
+# Uncomment the following line to turn on Eclipse Equinox debugging.
+# You may also edit the osgi-debug.options file and fine tune the debugging
+# options to suite your needs.
+#osgi.debug=./repository/conf/osgi-debug.options
+
+# Following system property allows us to control the public JDK packages exported through the system bundle.
+org.osgi.framework.system.packages=javax.accessibility,\
+javax.lang.model.type, \
+javax.activity,\
+javax.crypto,\
+javax.crypto.interfaces,\
+javax.crypto.spec,\
+javax.imageio,\
+javax.imageio.event,\
+javax.imageio.metadata,\
+javax.imageio.plugins.bmp,\
+javax.imageio.plugins.jpeg,\
+javax.imageio.spi,\
+javax.imageio.stream,\
+javax.jms,\
+javax.management,\
+javax.management.loading,\
+javax.management.modelmbean,\
+javax.management.monitor,\
+javax.management.openmbean,\
+javax.management.relation,\
+javax.management.remote,\
+javax.management.remote.rmi,\
+javax.management.timer,\
+javax.naming,\
+javax.naming.directory,\
+javax.naming.event,\
+javax.naming.ldap,\
+javax.naming.spi,\
+javax.net,\
+javax.net.ssl,\
+javax.print,\
+javax.print.attribute,\
+javax.print.attribute.standard,\
+javax.print.event,\
+javax.rmi,\
+javax.rmi.CORBA,\
+javax.rmi.ssl,\
+javax.script,\
+javax.security.auth,\
+javax.security.auth.callback,\
+javax.security.auth.kerberos,\
+javax.security.auth.login,\
+javax.security.auth.spi,\
+javax.security.auth.x500,\
+javax.security.cert,\
+javax.security.sasl,\
+javax.sound.midi,\
+javax.sound.midi.spi,\
+javax.sound.sampled,\
+javax.sound.sampled.spi,\
+javax.sql,\
+javax.sql.rowset,\
+javax.sql.rowset.serial,\
+javax.sql.rowset.spi,\
+javax.swing,\
+javax.swing.border,\
+javax.swing.colorchooser,\
+javax.swing.event,\
+javax.swing.filechooser,\
+javax.swing.plaf,\
+javax.swing.plaf.basic,\
+javax.swing.plaf.metal,\
+javax.swing.plaf.multi,\
+javax.swing.plaf.synth,\
+javax.swing.table,\
+javax.swing.text,\
+javax.swing.text.html,\
+javax.swing.text.html.parser,\
+javax.swing.text.rtf,\
+javax.swing.tree,\
+javax.swing.undo,\
+javax.transaction,\
+javax.transaction.xa,\
+javax.xml.namespace,\
+javax.xml.parsers,\
+javax.xml.transform,\
+javax.xml.transform.stream,\
+javax.xml.transform.dom,\
+javax.xml.transform.sax,\
+javax.xml,\
+javax.xml.validation,\
+javax.xml.datatype,\
+javax.xml.xpath,\
+javax.activation,\
+com.sun.activation.registries,\
+com.sun.activation.viewers,\
+org.ietf.jgss,\
+org.omg.CORBA,\
+org.omg.CORBA_2_3,\
+org.omg.CORBA_2_3.portable,\
+org.omg.CORBA.DynAnyPackage,\
+org.omg.CORBA.ORBPackage,\
+org.omg.CORBA.portable,\
+org.omg.CORBA.TypeCodePackage,\
+org.omg.CosNaming,\
+org.omg.CosNaming.NamingContextExtPackage,\
+org.omg.CosNaming.NamingContextPackage,\
+org.omg.Dynamic,\
+org.omg.DynamicAny,\
+org.omg.DynamicAny.DynAnyFactoryPackage,\
+org.omg.DynamicAny.DynAnyPackage,\
+org.omg.IOP,\
+org.omg.IOP.CodecFactoryPackage,\
+org.omg.IOP.CodecPackage,\
+org.omg.Messaging,\
+org.omg.PortableInterceptor,\
+org.omg.PortableInterceptor.ORBInitInfoPackage,\
+org.omg.PortableServer,\
+org.omg.PortableServer.CurrentPackage,\
+org.omg.PortableServer.POAManagerPackage,\
+org.omg.PortableServer.POAPackage,\
+org.omg.PortableServer.portable,\
+org.omg.PortableServer.ServantLocatorPackage,\
+org.omg.SendingContext,\
+org.omg.stub.java.rmi,\
+org.w3c.dom,\
+org.w3c.dom.bootstrap,\
+org.w3c.dom.css,\
+org.w3c.dom.events,\
+org.w3c.dom.html,\
+org.w3c.dom.ls,\
+org.w3c.dom.ranges,\
+org.w3c.dom.stylesheets,\
+org.w3c.dom.traversal,\
+org.w3c.dom.views ,\
+org.xml.sax,\
+org.xml.sax.ext,\
+org.xml.sax.helpers,\
+org.apache.xerces.xpointer,\
+org.apache.xerces.xni.grammars,\
+org.apache.xerces.impl.xs.util,\
+org.apache.xerces.jaxp.validation,\
+org.apache.xerces.impl.dtd.models,\
+org.apache.xerces.impl.xpath,\
+org.apache.xerces.dom3.as,\
+org.apache.xerces.impl.dv.xs,\
+org.apache.xerces.util,\
+org.apache.xerces.impl.xs.identity,\
+org.apache.xerces.impl.xs.opti,\
+org.apache.xerces.jaxp,\
+org.apache.xerces.impl.dv,\
+org.apache.xerces.xs.datatypes,\
+org.apache.xerces.dom.events,\
+org.apache.xerces.impl.msg,\
+org.apache.xerces.xni,\
+org.apache.xerces.impl.xs,\
+org.apache.xerces.impl,\
+org.apache.xerces.impl.io,\
+org.apache.xerces.xinclude,\
+org.apache.xerces.jaxp.datatype,\
+org.apache.xerces.parsers,\
+org.apache.xerces.impl.dv.util,\
+org.apache.xerces.xni.parser,\
+org.apache.xerces.impl.xs.traversers,\
+org.apache.xerces.impl.dv.dtd,\
+org.apache.xerces.xs,\
+org.apache.xerces.impl.dtd,\
+org.apache.xerces.impl.validation,\
+org.apache.xerces.impl.xs.models,\
+org.apache.xerces.impl.xpath.regex,\
+org.apache.xml.serialize,\
+org.apache.xerces.dom,\
+org.apache.xalan,\
+org.apache.xalan.xslt,\
+org.apache.xalan.templates,\
+org.apache.xalan.xsltc,\
+org.apache.xalan.xsltc.cmdline,\
+org.apache.xalan.xsltc.cmdline.getopt,\
+org.apache.xalan.xsltc.trax,\
+org.apache.xalan.xsltc.dom,\
+org.apache.xalan.xsltc.runtime,\
+org.apache.xalan.xsltc.runtime.output,\
+org.apache.xalan.xsltc.util,\
+org.apache.xalan.xsltc.compiler,\
+org.apache.xalan.xsltc.compiler.util,\
+org.apache.xalan.serialize,\
+org.apache.xalan.client,\
+org.apache.xalan.res,\
+org.apache.xalan.transformer,\
+org.apache.xalan.extensions,\
+org.apache.xalan.lib,\
+org.apache.xalan.lib.sql,\
+org.apache.xalan.processor,\
+org.apache.xalan.trace,\
+org.apache.xml.dtm,\
+org.apache.xml.dtm.ref,\
+org.apache.xml.dtm.ref.sax2dtm,\
+org.apache.xml.dtm.ref.dom2dtm,\
+org.apache.xml.utils,\
+org.apache.xml.utils.res,\
+org.apache.xml.res,\
+org.apache.xml.serializer,\
+org.apache.xml.serializer.utils,\
+org.apache.xpath,\
+org.apache.xpath.domapi,\
+org.apache.xpath.objects,\
+org.apache.xpath.patterns,\
+org.apache.xpath.jaxp,\
+org.apache.xpath.res,\
+org.apache.xpath.operations,\
+org.apache.xpath.functions,\
+org.apache.xpath.axes,\
+org.apache.xpath.compiler,\
+org.apache.xml.resolver,\
+org.apache.xml.resolver.tools,\
+org.apache.xml.resolver.helpers,\
+org.apache.xml.resolver.readers,\
+org.apache.xml.resolver.etc,\
+org.apache.xml.resolver.apps,\
+javax.xml.ws,\
+javax.xml.bind,\
+javax.xml.bind.annotation,\
+javax.annotation,\
+javax.jws,\
+javax.jws.soap,\
+javax.xml.soap,\
+com.sun.xml.internal.messaging.saaj.soap.ver1_1,\
+com.sun.xml.internal.messaging.saaj.soap,\
+com.sun.tools.internal.ws.spi,\
+org.wso2.carbon.bootstrap
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/event-broker.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/event-broker.xml b/products/stratos/modules/distribution/src/main/conf/event-broker.xml
new file mode 100644
index 0000000..296c7cd
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/event-broker.xml
@@ -0,0 +1,63 @@
+<!--
+ ~ 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.
+ -->
+
+<!--
+this is the configuration file for the carbon event broker component. this configuration file configures the various subsystems of the event
+broker compoent and parameters.
+-->
+<eventBrokerConfig xmlns="http://wso2.org/carbon/event/broker">
+ <eventBroker name="carbonEventBroker" class = "org.wso2.carbon.event.core.internal.CarbonEventBrokerFactory">
+ <!-- topic manager implemenation class.-->
+ <topicManager name="TopicManager" class="org.wso2.carbon.event.core.internal.topic.registry.RegisistryTopicManagerFactory">
+ <!-- root node of the topic tree -->
+ <topicStoragePath>event/topics</topicStoragePath>
+ </topicManager>
+ <!-- subscriptionmnager implementaion. subscription manager persits the
+ subscriptions at the registry. users can configure the topics root node and the topicIndex path -->
+ <subscriptionManager name="subscriptionManager"
+ class="org.wso2.carbon.event.core.internal.subscription.registry.RegistrySubscriptionManagerFactory">
+ <topicStoragePath>event/topics</topicStoragePath>
+ <indexStoragePath>event/topicIndex</indexStoragePath>
+ </subscriptionManager>
+
+ <!-- delivary manager inmplementation. delivary manager does actual delivary part of the event broker -->
+ <deliveryManager name="deliveryManager"
+ class="org.wso2.carbon.event.core.internal.delivery.jms.QpidJMSDeliveryManagerFactory"
+ type="local">
+ <!-- <remoteMessageBroker>
+ <hostName>localhost</hostName>
+ <servicePort>9443</servicePort>
+ <webContext>/</webContext>
+ <userName>admin</userName>
+ <password>admin</password>
+ <qpidPort>5672</qpidPort>
+ <clientID>clientID</clientID>
+ <virtualHostName>carbon</virtualHostName>
+ </remoteMessageBroker> -->
+ </deliveryManager>
+
+ <!-- when publising an event event broker uses a seperate thread pool with an executor. following parameters configure different parameters of that -->
+ <eventPublisher>
+ <minSpareThreads>5</minSpareThreads>
+ <maxThreads>50</maxThreads>
+ <maxQueuedRequests>1000</maxQueuedRequests>
+ <keepAliveTime>1000</keepAliveTime>
+ </eventPublisher>
+ </eventBroker>
+</eventBrokerConfig>
[25/50] [abbrv] stratos git commit: Updating dependencies to SNAPSHOT
versions
Posted by la...@apache.org.
Updating dependencies to SNAPSHOT versions
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2f66da54
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2f66da54
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2f66da54
Branch: refs/heads/data-publisher-integration
Commit: 2f66da5437be35f2cf46aa2a1ba3e61eb06ec0d3
Parents: 3eb7d7c
Author: Akila Perera <ra...@gmail.com>
Authored: Fri Aug 7 12:54:45 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Fri Aug 7 12:54:58 2015 +0530
----------------------------------------------------------------------
dependencies/fabric8/kubernetes-api/pom.xml | 2 +-
dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml | 2 +-
.../jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml | 2 +-
dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml | 2 +-
dependencies/jclouds/provider/aws-ec2/1.8.1-stratos/pom.xml | 2 +-
dependencies/org.wso2.carbon.ui/pom.xml | 4 ++--
pom.xml | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2f66da54/dependencies/fabric8/kubernetes-api/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-api/pom.xml b/dependencies/fabric8/kubernetes-api/pom.xml
index c408dfb..57989a3 100644
--- a/dependencies/fabric8/kubernetes-api/pom.xml
+++ b/dependencies/fabric8/kubernetes-api/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>kubernetes-api</artifactId>
- <version>${kubernetes.api.stratos.version}</version>
+ <version>2.2.16-stratosv1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Fabric8 :: Kubernetes API</name>
http://git-wip-us.apache.org/repos/asf/stratos/blob/2f66da54/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml b/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
index 34f8bc7..a6b9868 100644
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
+++ b/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
@@ -28,7 +28,7 @@
<!-- TODO: when out of labs, switch to org.jclouds.provider -->
<groupId>org.apache.stratos</groupId>
<artifactId>gce</artifactId>
- <version>1.8.1-stratos</version>
+ <version>1.8.1-stratosv1-SNAPSHOT</version>
<name>jclouds Google Compute Engine provider</name>
<description>jclouds components to access GoogleCompute</description>
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/stratos/blob/2f66da54/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
index 37c2ded..559057b 100644
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
+++ b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
@@ -28,7 +28,7 @@
<!-- TODO: when out of labs, switch to org.jclouds.api -->
<groupId>org.apache.stratos</groupId>
<artifactId>openstack-neutron</artifactId>
- <version>1.8.1-stratos</version>
+ <version>1.8.1-stratosv1-SNAPSHOT</version>
<name>jclouds openstack-neutron api</name>
<description>jclouds components to access an implementation of OpenStack Neutron</description>
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/stratos/blob/2f66da54/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
index c731b6c..063114d 100644
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
+++ b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
@@ -26,7 +26,7 @@
</parent>
<groupId>org.apache.stratos</groupId>
<artifactId>vcloud</artifactId>
- <version>1.8.1-stratos</version>
+ <version>1.8.1-stratosv1-SNAPSHOT</version>
<name>jclouds vcloud api</name>
<description>jclouds components to access an implementation of VMWare vCloud</description>
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/stratos/blob/2f66da54/dependencies/jclouds/provider/aws-ec2/1.8.1-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/provider/aws-ec2/1.8.1-stratos/pom.xml b/dependencies/jclouds/provider/aws-ec2/1.8.1-stratos/pom.xml
index ca0c749..6f1f859 100644
--- a/dependencies/jclouds/provider/aws-ec2/1.8.1-stratos/pom.xml
+++ b/dependencies/jclouds/provider/aws-ec2/1.8.1-stratos/pom.xml
@@ -26,7 +26,7 @@
</parent>
<groupId>org.apache.stratos</groupId>
<artifactId>aws-ec2</artifactId>
- <version>1.8.1-stratos</version>
+ <version>1.8.1-stratosv1-SNAPSHOT</version>
<name>jclouds Amazon EC2 provider</name>
<description>EC2 implementation targeted to Amazon Web Services</description>
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/stratos/blob/2f66da54/dependencies/org.wso2.carbon.ui/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/org.wso2.carbon.ui/pom.xml b/dependencies/org.wso2.carbon.ui/pom.xml
index 89721d1..e1e5c17 100644
--- a/dependencies/org.wso2.carbon.ui/pom.xml
+++ b/dependencies/org.wso2.carbon.ui/pom.xml
@@ -32,7 +32,7 @@
<packaging>bundle</packaging>
<name>WSO2 Carbon - UI</name>
<description>org.wso2.carbon.ui patch version for apache stratos</description>
- <version>4.2.0-stratos</version>
+ <version>4.2.0-stratosv1-SNAPSHOT</version>
<url>http://wso2.org</url>
<repositories>
@@ -227,7 +227,7 @@
</Private-Package>
<Export-Package>
!org.wso2.carbon.ui.internal,
- org.wso2.carbon.ui.*
+ org.wso2.carbon.ui.*; version="${carbon.platform.version}"
</Export-Package>
<Import-Package>
!org.wso2.carbon.ui.*,
http://git-wip-us.apache.org/repos/asf/stratos/blob/2f66da54/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6296672..0fc84aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -553,8 +553,8 @@
<carbon.platform.package.export.version>4.2.0</carbon.platform.package.export.version>
<axis2.osgi.version>1.6.1.wso2v10</axis2.osgi.version>
<jclouds.version>1.8.1</jclouds.version>
- <project.jclouds.stratos.version>1.8.1-stratos</project.jclouds.stratos.version>
+ <project.jclouds.stratos.version>1.8.1-stratosv1-SNAPSHOT</project.jclouds.stratos.version>
<kubernetes.api.version>2.2.16</kubernetes.api.version>
- <kubernetes.api.stratos.version>2.2.16-stratosv1</kubernetes.api.stratos.version>
+ <kubernetes.api.stratos.version>2.2.16-stratosv1-SNAPSHOT</kubernetes.api.stratos.version>
</properties>
</project>
[09/50] [abbrv] stratos git commit: fixing intellij idea suggestions
Posted by la...@apache.org.
fixing intellij idea suggestions
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/08b9696b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/08b9696b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/08b9696b
Branch: refs/heads/data-publisher-integration
Commit: 08b9696b409c475cb6750fda8dcfb9e99e83f73d
Parents: f995fb3
Author: reka <rt...@gmail.com>
Authored: Wed Aug 5 14:26:33 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Aug 6 19:33:43 2015 +0530
----------------------------------------------------------------------
.../tests/ApplicationPolicyTest.java | 3 +-
.../integration/tests/ApplicationTest.java | 3 +-
.../tests/AutoscalingPolicyTest.java | 3 +-
.../integration/tests/CartridgeGroupTest.java | 3 +-
.../integration/tests/CartridgeTest.java | 3 +-
.../integration/tests/DeploymentPolicyTest.java | 3 +-
.../integration/tests/NetworkPartitionTest.java | 3 +-
.../integration/tests/rest/RestClient.java | 50 +++++++++++++-------
8 files changed, 41 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/08b9696b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
index ec5bf04..dafa36e 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
@@ -41,10 +41,9 @@ public class ApplicationPolicyTest {
public ApplicationPolicyBean getApplicationPolicy(String applicationPolicyId, RestClient restClient) {
- ApplicationPolicyBean bean = (ApplicationPolicyBean) restClient.
+ return (ApplicationPolicyBean) restClient.
getEntity(RestConstants.APPLICATION_POLICIES, applicationPolicyId,
ApplicationPolicyBean.class, entityName);
- return bean;
}
public boolean updateApplicationPolicy(String applicationPolicyId, RestClient restClient) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/08b9696b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
index af18163..c886644 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
@@ -40,10 +40,9 @@ public class ApplicationTest {
public ApplicationBean getApplication(String applicationId,
RestClient restClient) {
- ApplicationBean bean = (ApplicationBean) restClient.
+ return (ApplicationBean) restClient.
getEntity(RestConstants.APPLICATIONS, applicationId,
ApplicationBean.class, entityName);
- return bean;
}
public boolean updateApplication(String applicationId, RestClient restClient) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/08b9696b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
index 7c04d92..1c99cad 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
@@ -39,10 +39,9 @@ public class AutoscalingPolicyTest {
}
public AutoscalePolicyBean getAutoscalingPolicy(String autoscalingPolicyName, RestClient restClient) {
- AutoscalePolicyBean bean = (AutoscalePolicyBean) restClient.
+ return (AutoscalePolicyBean) restClient.
getEntity(RestConstants.AUTOSCALING_POLICIES, autoscalingPolicyName,
AutoscalePolicyBean.class, entityName);
- return bean;
}
public boolean updateAutoscalingPolicy(String autoscalingPolicyName, RestClient restClient) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/08b9696b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
index caf2838..9aae646 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
@@ -39,10 +39,9 @@ public class CartridgeGroupTest {
}
public CartridgeGroupBean getCartridgeGroup(String groupName, RestClient restClient) {
- CartridgeGroupBean bean = (CartridgeGroupBean) restClient.
+ return (CartridgeGroupBean) restClient.
getEntity(RestConstants.CARTRIDGE_GROUPS, groupName,
CartridgeGroupBean.class, entityName);
- return bean;
}
public boolean updateCartridgeGroup(String groupName, RestClient restClient) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/08b9696b/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 fc5cfa0..1d135dd 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
@@ -42,10 +42,9 @@ public class CartridgeTest {
public CartridgeBean getCartridge(String cartridgeType,
RestClient restClient) {
- CartridgeBean bean = (CartridgeBean) restClient.
+ return (CartridgeBean) restClient.
getEntity(RestConstants.CARTRIDGES, cartridgeType,
CartridgeBean.class, entityName);
- return bean;
}
public boolean updateCartridge(String cartridgeType, RestClient restClient) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/08b9696b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
index 707f750..eeb3ed9 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
@@ -40,10 +40,9 @@ public class DeploymentPolicyTest {
public DeploymentPolicyBean getDeploymentPolicy(String deploymentPolicyId,
RestClient restClient) {
- DeploymentPolicyBean bean = (DeploymentPolicyBean) restClient.
+ return (DeploymentPolicyBean) restClient.
getEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId,
DeploymentPolicyBean.class, entityName);
- return bean;
}
public boolean updateDeploymentPolicy(String deploymentPolicyId, RestClient restClient) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/08b9696b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
index ff27ea6..8593a09 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
@@ -40,10 +40,9 @@ public class NetworkPartitionTest {
public NetworkPartitionBean getNetworkPartition(String networkPartitionId,
RestClient restClient) {
- NetworkPartitionBean bean = (NetworkPartitionBean) restClient.
+ return (NetworkPartitionBean) restClient.
getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId,
NetworkPartitionBean.class, entityName);
- return bean;
}
public boolean updateNetworkPartition(String networkPartitionId, RestClient restClient) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/08b9696b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
index a1b07e1..5ff8fd3 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
@@ -80,7 +80,7 @@ public class RestClient {
input.setContentType("application/json");
postRequest.setEntity(input);
- String userPass = "admin" + ":" + "admin";
+ String userPass = getUsernamePassword();
String basicAuth = "Basic " + javax.xml.bind.DatatypeConverter.printBase64Binary(userPass.getBytes("UTF-8"));
postRequest.addHeader("Authorization", basicAuth);
@@ -103,7 +103,7 @@ public class RestClient {
try {
getRequest = new HttpGet(resourcePath);
getRequest.addHeader("Content-Type", "application/json");
- String userPass = "admin" + ":" + "admin";
+ String userPass = getUsernamePassword();
String basicAuth = "Basic " + javax.xml.bind.DatatypeConverter.printBase64Binary(userPass.getBytes("UTF-8"));
getRequest.addHeader("Authorization", basicAuth);
@@ -118,7 +118,7 @@ public class RestClient {
try {
httpDelete = new HttpDelete(resourcePath);
httpDelete.addHeader("Content-Type", "application/json");
- String userPass = "admin" + ":" + "admin";
+ String userPass = getUsernamePassword();
String basicAuth = "Basic " + javax.xml.bind.DatatypeConverter.printBase64Binary(userPass.getBytes("UTF-8"));
httpDelete.addHeader("Authorization", basicAuth);
return httpClient.execute(httpDelete, new HttpResponseHandler());
@@ -136,7 +136,7 @@ public class RestClient {
StringEntity input = new StringEntity(jsonParamString);
input.setContentType("application/json");
putRequest.setEntity(input);
- String userPass = "admin" + ":" + "admin";
+ String userPass = getUsernamePassword();
String basicAuth = "Basic " + javax.xml.bind.DatatypeConverter.printBase64Binary(userPass.getBytes("UTF-8"));
putRequest.addHeader("Authorization", basicAuth);
return httpClient.execute(putRequest, new HttpResponseHandler());
@@ -169,8 +169,9 @@ public class RestClient {
}
}
}
- log.error("An unknown error occurred while trying to add " + entityName);
- throw new RuntimeException("An unknown error occurred while trying to add" + entityName);
+ String msg = "An unknown error occurred while trying to add ";
+ log.error(msg + entityName);
+ throw new RuntimeException(msg + entityName);
} catch (Exception e) {
String message = "Could not add " + entityName;
log.error(message, e);
@@ -195,8 +196,9 @@ public class RestClient {
}
}
}
- log.error("An unknown error occurred while trying to deploy " + entityName);
- throw new RuntimeException("An unknown error occurred while trying to deploy " + entityName);
+ String msg = "An unknown error occurred while trying to deploy ";
+ log.error(msg + entityName);
+ throw new RuntimeException(msg + entityName);
} catch (Exception e) {
String message = "Could not deploy " + entityName;
log.error(message, e);
@@ -221,8 +223,9 @@ public class RestClient {
}
}
}
- log.error("An unknown error occurred while trying to deploy " + entityName);
- throw new RuntimeException("An unknown error occurred while trying to deploy " + entityName);
+ String msg = "An unknown error occurred while trying to undeploy ";
+ log.error(msg + entityName);
+ throw new RuntimeException(msg + entityName);
} catch (Exception e) {
String message = "Could not deploy " + entityName;
log.error(message, e);
@@ -308,8 +311,9 @@ public class RestClient {
}
}
}
- log.error("An unknown error occurred while trying to update " + entityName);
- throw new RuntimeException("An unknown error occurred while trying to update" + entityName);
+ String msg = "An unknown error occurred while trying to update ";
+ log.error(msg + entityName);
+ throw new RuntimeException(msg + entityName);
} catch (Exception e) {
String message = "Could not add " + entityName;
log.error(message, e);
@@ -317,23 +321,37 @@ public class RestClient {
}
}
+ /**
+ * Get the json string from the artifacts directory
+ *
+ * @param filePath path of the artifacts
+ * @return json string of the relevant artifact
+ * @throws FileNotFoundException
+ */
public String getJsonStringFromFile(String filePath) throws FileNotFoundException {
JsonParser parser = new JsonParser();
Object object = parser.parse(new FileReader(getResourcesFolderPath() + filePath));
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.create();
- String content = gson.toJson(object);
- return content;
-
+ return gson.toJson(object);
}
/**
* Get resources folder path
*
- * @return
+ * @return the resource path
*/
private String getResourcesFolderPath() {
String path = getClass().getResource("/").getPath();
return StringUtils.removeEnd(path, File.separator);
}
+
+ /**
+ * Get the username and password
+ *
+ * @return username:password
+ */
+ private String getUsernamePassword() {
+ return this.userName + ":" + this.password;
+ }
}
[16/50] [abbrv] stratos git commit: refining the resources to have
the samples with the reference of the test case
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v2.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v2.json
new file mode 100644
index 0000000..6f827c2
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v2.json
@@ -0,0 +1,86 @@
+{
+ "alias": "g-sc-G123-1",
+ "applicationId": "g-sc-G123-1",
+ "components": {
+ "cartridges": [],
+ "groups": [
+ {
+ "name": "G1",
+ "groupMaxInstances": 5,
+ "groupMinInstances": 2,
+ "alias": "group1",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c1",
+ "subscribableInfo": {
+ "alias": "c1-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G2",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group2",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 4,
+ "type": "c2",
+ "subscribableInfo": {
+ "alias": "c2-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G3",
+ "groupMaxInstances": 3,
+ "groupMinInstances": 2,
+ "deploymentPolicy": "static-1",
+ "alias": "group3",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c3",
+ "subscribableInfo": {
+ "alias": "c3-1x0",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v3.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v3.json
new file mode 100644
index 0000000..a6e5fd7
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v3.json
@@ -0,0 +1,86 @@
+{
+ "alias": "g-sc-G123-1",
+ "applicationId": "g-sc-G123-1",
+ "components": {
+ "cartridges": [],
+ "groups": [
+ {
+ "name": "G1",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group1",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c1",
+ "subscribableInfo": {
+ "alias": "c1-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G2",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group2",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 4,
+ "type": "c2",
+ "subscribableInfo": {
+ "alias": "c2-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G3",
+ "groupMaxInstances": 4,
+ "groupMinInstances": 3,
+ "deploymentPolicy": "static-1",
+ "alias": "group3",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c3",
+ "subscribableInfo": {
+ "alias": "c3-1x0",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1.json
new file mode 100644
index 0000000..76d72c8
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1.json
@@ -0,0 +1,86 @@
+{
+ "alias": "g-sc-G123-1",
+ "applicationId": "g-sc-G123-1",
+ "components": {
+ "cartridges": [],
+ "groups": [
+ {
+ "name": "G1",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group1",
+ "cartridges": [
+ {
+ "cartridgeMin": 1,
+ "cartridgeMax": 2,
+ "type": "c1",
+ "subscribableInfo": {
+ "alias": "c1-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G2",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group2",
+ "cartridges": [
+ {
+ "cartridgeMin": 1,
+ "cartridgeMax": 2,
+ "type": "c2",
+ "subscribableInfo": {
+ "alias": "c2-1x0",
+ "deploymentPolicy": "deployment-policy-1",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G3",
+ "groupMaxInstances": 2,
+ "groupMinInstances": 1,
+ "deploymentPolicy": "deployment-policy-1",
+ "alias": "group3",
+ "cartridges": [
+ {
+ "cartridgeMin": 1,
+ "cartridgeMax": 2,
+ "type": "c3",
+ "subscribableInfo": {
+ "alias": "c3-1x0",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-1"
+ }
+ }
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-1.json
new file mode 100644
index 0000000..f82403b
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-1.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-1",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "threshold": 35
+ },
+ "memoryConsumption": {
+ "threshold": 45
+ },
+ "loadAverage": {
+ "threshold": 25
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-v1.json
new file mode 100644
index 0000000..6020e1e
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-v1.json
@@ -0,0 +1,50 @@
+{
+ "name": "G1",
+ "dependencies": {
+ "terminationBehaviour": "terminate-none",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group2",
+ "cartridge.c1-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c1"
+ ],
+ "groups": [
+ {
+ "name": "G2",
+ "dependencies": {
+ "terminationBehaviour": "terminate-dependents",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group3",
+ "cartridge.c2-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c2"
+ ],
+ "groups": [
+ {
+ "name": "G3",
+ "dependencies": {
+ "terminationBehaviour": "terminate-all",
+ "startupOrders": []
+ },
+ "cartridges": [
+ "c3"
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested.json
new file mode 100644
index 0000000..6020e1e
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested.json
@@ -0,0 +1,50 @@
+{
+ "name": "G1",
+ "dependencies": {
+ "terminationBehaviour": "terminate-none",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group2",
+ "cartridge.c1-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c1"
+ ],
+ "groups": [
+ {
+ "name": "G2",
+ "dependencies": {
+ "terminationBehaviour": "terminate-dependents",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group3",
+ "cartridge.c2-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c2"
+ ],
+ "groups": [
+ {
+ "name": "G3",
+ "dependencies": {
+ "terminationBehaviour": "terminate-all",
+ "startupOrders": []
+ },
+ "cartridges": [
+ "c3"
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1.json
new file mode 100755
index 0000000..145e2ce
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1.json
@@ -0,0 +1,45 @@
+{
+ "type": "c1",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c1",
+ "description": "c1 Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "vishanth-key"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2.json
new file mode 100755
index 0000000..fd85892
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2.json
@@ -0,0 +1,45 @@
+{
+ "type": "c2",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c2",
+ "description": "c2 Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "vishanth-key"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3.json
new file mode 100755
index 0000000..937e8d3
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3.json
@@ -0,0 +1,45 @@
+{
+ "type": "c3",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c3",
+ "description": "c3 Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "vishanth-key"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1-v1.json
new file mode 100644
index 0000000..2ba5eb3
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1-v1.json
@@ -0,0 +1,36 @@
+{
+ "id": "deployment-policy-1",
+ "networkPartitions": [
+ {
+ "id": "network-partition-1",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "partitionMax": 25
+ },
+ {
+ "id": "partition-2",
+ "partitionMax": 20
+ }
+ ]
+ },
+ {
+ "id": "network-partition-2",
+ "partitionAlgo": "round-robin",
+ "partitions": [
+ {
+ "id": "network-partition-2-partition-1",
+ "partitionMax": 15
+ },
+ {
+ "id": "network-partition-2-partition-2",
+ "partitionMax": 5
+ }
+ ]
+ }
+ ]
+}
+
+
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1.json
new file mode 100644
index 0000000..e186690
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1.json
@@ -0,0 +1,32 @@
+{
+ "id": "deployment-policy-1",
+ "networkPartitions": [
+ {
+ "id": "network-partition-1",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "partitionMax": 20
+ }
+ ]
+ },
+ {
+ "id": "network-partition-2",
+ "partitionAlgo": "round-robin",
+ "partitions": [
+ {
+ "id": "network-partition-2-partition-1",
+ "partitionMax": 10
+ },
+ {
+ "id": "network-partition-2-partition-2",
+ "partitionMax": 9
+ }
+ ]
+ }
+ ]
+}
+
+
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1-v1.json
new file mode 100644
index 0000000..054265a
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1-v1.json
@@ -0,0 +1,28 @@
+{
+ "id": "network-partition-1",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ },
+ {
+ "id": "partition-2",
+ "property": [
+ {
+ "name": "region",
+ "value": "default1"
+ },
+ {
+ "name": "zone",
+ "value": "z1"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1.json
new file mode 100644
index 0000000..466da28
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-1",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-2.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-2.json
new file mode 100644
index 0000000..23236e2
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-2.json
@@ -0,0 +1,24 @@
+{
+ "id": "network-partition-2",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "network-partition-2-partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ },
+ {
+ "id": "network-partition-2-partition-2",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/testng.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/testng.xml b/products/stratos/modules/integration/src/test/resources/testng.xml
index c450bf0..3ea5a01 100644
--- a/products/stratos/modules/integration/src/test/resources/testng.xml
+++ b/products/stratos/modules/integration/src/test/resources/testng.xml
@@ -57,5 +57,10 @@
<class name="org.apache.stratos.integration.tests.SampleApplicationsTest" />
</classes>
</test>
+ <!--test name="ApplicationBurstingTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.ApplicationBurstingTest" />
+ </classes>
+ </test-->
</suite>
[27/50] [abbrv] stratos git commit: Cleaning and Formatting Code
Posted by la...@apache.org.
Cleaning and Formatting Code
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f105f333
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f105f333
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f105f333
Branch: refs/heads/data-publisher-integration
Commit: f105f333f948063c157ecbdef718bc6a596e7242
Parents: 6d1bfc5
Author: Thanuja <th...@wso2.com>
Authored: Fri Aug 7 17:46:29 2015 +0530
Committer: Thanuja <th...@wso2.com>
Committed: Fri Aug 7 17:46:29 2015 +0530
----------------------------------------------------------------------
.../rest/endpoint/api/StratosApiV41.java | 36 ++++++---
.../rest/endpoint/api/StratosApiV41Utils.java | 49 +++++--------
.../util/converter/ObjectConverter.java | 77 +++++++++++++-------
3 files changed, 93 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f105f333/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index a16a3e5..581c8ab 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -445,7 +445,8 @@ public class StratosApiV41 extends AbstractApi {
.build();
} catch (CloudControllerServiceCartridgeNotFoundExceptionException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, e.getFaultMessage().getCartridgeNotFoundException().getMessage())).build();
+ ResponseMessageBean.ERROR,
+ e.getFaultMessage().getCartridgeNotFoundException().getMessage())).build();
}
}
@@ -480,10 +481,12 @@ public class StratosApiV41 extends AbstractApi {
ResponseMessageBean.ERROR, e.getMessage())).build();
} catch (AutoscalerServiceInvalidServiceGroupExceptionException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, e.getFaultMessage().getInvalidServiceGroupException().getMessage())).build();
+ ResponseMessageBean.ERROR,
+ e.getFaultMessage().getInvalidServiceGroupException().getMessage())).build();
} catch (CloudControllerServiceCartridgeNotFoundExceptionException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, e.getFaultMessage().getCartridgeNotFoundException().getMessage())).build();
+ ResponseMessageBean.ERROR,
+ e.getFaultMessage().getCartridgeNotFoundException().getMessage())).build();
}
}
@@ -1252,7 +1255,8 @@ public class StratosApiV41 extends AbstractApi {
}
StratosApiV41Utils.undeployApplication(applicationId, force);
return Response.accepted().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
- String.format("Application undeploy process started successfully: [application-id] %s", applicationId))).build();
+ String.format("Application undeploy process started successfully: [application-id] %s",
+ applicationId))).build();
}
/**
@@ -1305,7 +1309,8 @@ public class StratosApiV41 extends AbstractApi {
if (!applicationDefinition.getStatus().equalsIgnoreCase(StratosApiV41Utils.APPLICATION_STATUS_CREATED)) {
return Response.status(Response.Status.CONFLICT).entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
String.format("Could not delete since application is not in CREATED state :" +
- " [application] %s [current-status] %S", applicationId, applicationDefinition.getStatus()))).build();
+ " [application] %s [current-status] %S", applicationId,
+ applicationDefinition.getStatus()))).build();
}
StratosApiV41Utils.removeApplication(applicationId);
@@ -1501,10 +1506,12 @@ public class StratosApiV41 extends AbstractApi {
} catch (InvalidEmailException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, String.format("Invalid email: [email] %s", tenantInfoBean.getEmail()))).build();
+ ResponseMessageBean.ERROR, String.format("Invalid email: [email] %s",
+ tenantInfoBean.getEmail()))).build();
} catch (InvalidDomainException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, String.format("Invalid domain: [domain] %s", tenantInfoBean.getTenantDomain()))).build();
+ ResponseMessageBean.ERROR, String.format("Invalid domain: [domain] %s",
+ tenantInfoBean.getTenantDomain()))).build();
}
}
@@ -1527,16 +1534,19 @@ public class StratosApiV41 extends AbstractApi {
try {
StratosApiV41Utils.updateExistingTenant(tenantInfoBean);
return Response.ok().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
- String.format("Tenant updated successfully: [tenant] %s", tenantInfoBean.getTenantDomain()))).build();
+ String.format("Tenant updated successfully: [tenant] %s",
+ tenantInfoBean.getTenantDomain()))).build();
} catch (TenantNotFoundException ex) {
return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, "Tenant not found")).build();
} catch (InvalidEmailException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, String.format("Invalid email [email] %s", tenantInfoBean.getEmail()))).build();
+ ResponseMessageBean.ERROR, String.format("Invalid email [email] %s",
+ tenantInfoBean.getEmail()))).build();
} catch (InvalidDomainException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, String.format("Invalid Domain [Domain] %s", tenantInfoBean.getTenantDomain()))).build();
+ ResponseMessageBean.ERROR, String.format("Invalid Domain [Domain] %s",
+ tenantInfoBean.getTenantDomain()))).build();
} catch (Exception e) {
String msg = "Error in updating tenant " + tenantInfoBean.getTenantDomain();
log.error(msg, e);
@@ -1643,13 +1653,15 @@ public class StratosApiV41 extends AbstractApi {
@PathParam("tenantDomain") String tenantDomain) throws RestAPIException {
try {
- List<org.apache.stratos.common.beans.TenantInfoBean> tenantList = StratosApiV41Utils.searchPartialTenantsDomains(tenantDomain);
+ List<org.apache.stratos.common.beans.TenantInfoBean> tenantList =
+ StratosApiV41Utils.searchPartialTenantsDomains(tenantDomain);
if (tenantList == null || tenantList.isEmpty()) {
return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, "No tenants found")).build();
}
- return Response.ok().entity(tenantList.toArray(new org.apache.stratos.common.beans.TenantInfoBean[tenantList.size()])).build();
+ return Response.ok().entity(tenantList.toArray(
+ new org.apache.stratos.common.beans.TenantInfoBean[tenantList.size()])).build();
} catch (Exception e) {
String msg = "Error in getting information for tenant " + tenantDomain;
log.error(msg, e);
http://git-wip-us.apache.org/repos/asf/stratos/blob/f105f333/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 716076d..74397d4 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -56,17 +56,16 @@ import org.apache.stratos.common.beans.topology.GroupInstanceBean;
import org.apache.stratos.common.client.AutoscalerServiceClient;
import org.apache.stratos.common.client.CloudControllerServiceClient;
import org.apache.stratos.common.client.StratosManagerServiceClient;
-import org.apache.stratos.common.exception.ApacheStratosException;
import org.apache.stratos.common.exception.InvalidEmailException;
import org.apache.stratos.common.util.ClaimsMgtUtil;
import org.apache.stratos.common.util.CommonUtil;
+import org.apache.stratos.kubernetes.client.KubernetesConstants;
import org.apache.stratos.manager.service.stub.StratosManagerServiceApplicationSignUpExceptionException;
import org.apache.stratos.manager.service.stub.StratosManagerServiceDomainMappingExceptionException;
import org.apache.stratos.manager.service.stub.domain.application.signup.ApplicationSignUp;
import org.apache.stratos.manager.service.stub.domain.application.signup.ArtifactRepository;
import org.apache.stratos.manager.service.stub.domain.application.signup.DomainMapping;
import org.apache.stratos.manager.user.management.StratosUserManagerUtils;
-import org.apache.stratos.manager.user.management.TenantUserRoleManager;
import org.apache.stratos.manager.user.management.exception.UserManagerException;
import org.apache.stratos.manager.utils.ApplicationManagementUtil;
import org.apache.stratos.messaging.domain.application.Application;
@@ -93,7 +92,6 @@ import org.wso2.carbon.user.api.UserStoreManager;
import org.wso2.carbon.user.core.tenant.Tenant;
import org.wso2.carbon.user.core.tenant.TenantManager;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
-import org.apache.stratos.kubernetes.client.KubernetesConstants;
import java.rmi.RemoteException;
import java.util.*;
@@ -102,13 +100,13 @@ import java.util.regex.Pattern;
public class StratosApiV41Utils {
+ private static final Log log = LogFactory.getLog(StratosApiV41Utils.class);
+
public static final String APPLICATION_STATUS_DEPLOYED = "Deployed";
public static final String APPLICATION_STATUS_CREATED = "Created";
public static final String APPLICATION_STATUS_UNDEPLOYING = "Undeploying";
public static final String KUBERNETES_IAAS_PROVIDER = "kubernetes";
- private static final Log log = LogFactory.getLog(StratosApiV41Utils.class);
-
/**
* Add New Cartridge
*
@@ -973,7 +971,6 @@ public class StratosApiV41Utils {
List<String> cartridgeTypes = new ArrayList<String>();
String[] cartridgeNames = null;
List<String> groupNames;
- String[] cartridgeGroupNames;
if (log.isDebugEnabled()) {
log.debug("Checking cartridges in cartridge group " + serviceGroupDefinition.getName());
@@ -1018,11 +1015,10 @@ public class StratosApiV41Utils {
List<CartridgeGroupBean> groupDefinitions = serviceGroupDefinition.getGroups();
groupNames = new ArrayList<String>();
- cartridgeGroupNames = new String[groupDefinitions.size()];
+
int i = 0;
for (CartridgeGroupBean groupList : groupDefinitions) {
groupNames.add(groupList.getName());
- cartridgeGroupNames[i] = groupList.getName();
i++;
}
@@ -1102,29 +1098,24 @@ public class StratosApiV41Utils {
List<String> cartridgesToRemove = new ArrayList<String>();
List<String> cartridgesToAdd = new ArrayList<String>();
- if (cartridgesBeforeUpdating != null) {
- if (!cartridgesBeforeUpdating.isEmpty()) {
- cartridgesToRemove.addAll(cartridgesBeforeUpdating);
- }
+
+ if (!cartridgesBeforeUpdating.isEmpty()) {
+ cartridgesToRemove.addAll(cartridgesBeforeUpdating);
}
- if (cartridgesAfterUpdating != null) {
- if (!cartridgesAfterUpdating.isEmpty()) {
- cartridgesToAdd.addAll(cartridgesAfterUpdating);
- }
+ if (!cartridgesAfterUpdating.isEmpty()) {
+ cartridgesToAdd.addAll(cartridgesAfterUpdating);
}
- if ((cartridgesBeforeUpdating != null) && (cartridgesAfterUpdating != null)) {
- if ((!cartridgesBeforeUpdating.isEmpty()) && (!cartridgesAfterUpdating.isEmpty())) {
- for (String before : cartridgesBeforeUpdating) {
- for (String after : cartridgesAfterUpdating) {
- if (before.toLowerCase().equals(after.toLowerCase())) {
- if (cartridgesToRemove.contains(after)) {
- cartridgesToRemove.remove(after);
- }
- if (cartridgesToAdd.contains(after)) {
- cartridgesToAdd.remove(after);
- }
+ if ((!cartridgesBeforeUpdating.isEmpty()) && (!cartridgesAfterUpdating.isEmpty())) {
+ for (String before : cartridgesBeforeUpdating) {
+ for (String after : cartridgesAfterUpdating) {
+ if (before.toLowerCase().equals(after.toLowerCase())) {
+ if (cartridgesToRemove.contains(after)) {
+ cartridgesToRemove.remove(after);
+ }
+ if (cartridgesToAdd.contains(after)) {
+ cartridgesToAdd.remove(after);
}
}
}
@@ -1941,10 +1932,6 @@ public class StratosApiV41Utils {
if (application.getInstanceContextCount() > 0
|| (applicationContext != null &&
applicationContext.getStatus().equals("Deployed"))) {
-
- if (application == null) {
- return null;
- }
applicationBean = ObjectConverter.convertApplicationToApplicationInstanceBean(application);
for (ApplicationInstanceBean instanceBean : applicationBean.getApplicationInstances()) {
addClustersInstancesToApplicationInstanceBean(instanceBean, application);
http://git-wip-us.apache.org/repos/asf/stratos/blob/f105f333/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index 798882e..ac32305 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -288,7 +288,8 @@ public class ObjectConverter {
org.apache.stratos.cloud.controller.stub.Properties stubProperties
= new org.apache.stratos.cloud.controller.stub.Properties();
org.apache.stratos.cloud.controller.stub.Property[] stubPropertiesArray =
- stubPropertiesList.toArray(new org.apache.stratos.cloud.controller.stub.Property[stubPropertiesList.size()]);
+ stubPropertiesList.toArray(
+ new org.apache.stratos.cloud.controller.stub.Property[stubPropertiesList.size()]);
stubProperties.setProperties(stubPropertiesArray);
return stubProperties;
@@ -457,7 +458,8 @@ public class ObjectConverter {
networkPartition.setProvider(stubNetworkPartition.getProvider());
if (stubNetworkPartition.getPartitions() != null) {
List<PartitionBean> partitionList = new ArrayList<PartitionBean>();
- for (org.apache.stratos.cloud.controller.stub.domain.Partition stubPartition : stubNetworkPartition.getPartitions()) {
+ for (org.apache.stratos.cloud.controller.stub.domain.Partition stubPartition :
+ stubNetworkPartition.getPartitions()) {
if (stubPartition != null) {
partitionList.add(convertCCStubPartitionToPartition(stubPartition));
}
@@ -484,7 +486,8 @@ public class ObjectConverter {
return networkPartition;
}
- public static ApplicationPolicyBean convertASStubApplicationPolicyToApplicationPolicy(ApplicationPolicy applicationPolicy) {
+ public static ApplicationPolicyBean convertASStubApplicationPolicyToApplicationPolicy(
+ ApplicationPolicy applicationPolicy) {
if (applicationPolicy == null) {
return null;
@@ -498,7 +501,8 @@ public class ObjectConverter {
if (applicationPolicy.getProperties() != null) {
List<org.apache.stratos.common.beans.PropertyBean> propertyBeanList
= new ArrayList<org.apache.stratos.common.beans.PropertyBean>();
- for (org.apache.stratos.autoscaler.stub.Property stubProperty : applicationPolicy.getProperties().getProperties()) {
+ for (org.apache.stratos.autoscaler.stub.Property stubProperty :
+ applicationPolicy.getProperties().getProperties()) {
if (stubProperty != null) {
org.apache.stratos.common.beans.PropertyBean propertyBean
= new org.apache.stratos.common.beans.PropertyBean();
@@ -555,7 +559,8 @@ public class ObjectConverter {
return properties;
}
- private static PartitionBean convertCCStubPartitionToPartition(org.apache.stratos.cloud.controller.stub.domain.Partition stubPartition) {
+ private static PartitionBean convertCCStubPartitionToPartition(
+ org.apache.stratos.cloud.controller.stub.domain.Partition stubPartition) {
if (stubPartition == null) {
return null;
@@ -793,7 +798,8 @@ public class ObjectConverter {
return partitionBeans;
}
- public static PartitionBean populatePartitionPojo(org.apache.stratos.cloud.controller.stub.domain.Partition partition) {
+ public static PartitionBean populatePartitionPojo(
+ org.apache.stratos.cloud.controller.stub.domain.Partition partition) {
PartitionBean partitionBeans = new PartitionBean();
if (partition == null) {
@@ -860,7 +866,8 @@ public class ObjectConverter {
autoscalePolicyBean.setDisplayName(autoscalePolicy.getDisplayName());
autoscalePolicyBean.setDescription(autoscalePolicy.getDescription());
if (autoscalePolicy.getLoadThresholds() != null) {
- autoscalePolicyBean.setLoadThresholds(convertStubLoadThresholdsToLoadThresholds(autoscalePolicy.getLoadThresholds()));
+ autoscalePolicyBean.setLoadThresholds(convertStubLoadThresholdsToLoadThresholds(
+ autoscalePolicy.getLoadThresholds()));
}
return autoscalePolicyBean;
@@ -1011,7 +1018,8 @@ public class ObjectConverter {
kubernetesClusterBean.setClusterId(kubernetesCluster.getClusterId());
kubernetesClusterBean.setDescription(kubernetesCluster.getDescription());
kubernetesClusterBean.setPortRange(convertStubPortRangeToPortRange(kubernetesCluster.getPortRange()));
- kubernetesClusterBean.setKubernetesHosts(convertStubKubernetesHostsToKubernetesHosts(kubernetesCluster.getKubernetesHosts()));
+ kubernetesClusterBean.setKubernetesHosts(convertStubKubernetesHostsToKubernetesHosts(
+ kubernetesCluster.getKubernetesHosts()));
kubernetesClusterBean.setKubernetesMaster(convertStubKubernetesMasterToKubernetesMaster(
kubernetesCluster.getKubernetesMaster()));
kubernetesClusterBean.setProperty(convertCCStubPropertiesToPropertyBeans(kubernetesCluster.getProperties()));
@@ -1038,7 +1046,8 @@ public class ObjectConverter {
return null;
}
List<KubernetesHostBean> kubernetesHostList = new ArrayList<KubernetesHostBean>();
- for (org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost kubernetesHost : kubernetesHosts) {
+ for (org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost kubernetesHost :
+ kubernetesHosts) {
kubernetesHostList.add(convertStubKubernetesHostToKubernetesHost(kubernetesHost));
}
return kubernetesHostList;
@@ -1119,12 +1128,14 @@ public class ObjectConverter {
// top level dependency information
if (applicationDefinition.getComponents().getDependencies() != null) {
componentContext.setDependencyContext(
- convertDependencyDefinitionsToDependencyContexts(applicationDefinition.getComponents().getDependencies()));
+ convertDependencyDefinitionsToDependencyContexts(applicationDefinition.getComponents().
+ getDependencies()));
}
// top level cartridge context information
if (applicationDefinition.getComponents().getCartridges() != null) {
componentContext.setCartridgeContexts(
- convertCartridgeReferenceBeansToStubCartridgeContexts(applicationDefinition.getComponents().getCartridges()));
+ convertCartridgeReferenceBeansToStubCartridgeContexts(applicationDefinition.getComponents().
+ getCartridges()));
}
applicationContext.setComponents(componentContext);
}
@@ -1151,23 +1162,27 @@ public class ObjectConverter {
// top level Groups
if (applicationContext.getComponents().getGroupContexts() != null) {
applicationDefinition.getComponents().setGroups(
- convertStubGroupContextsToGroupDefinitions(applicationContext.getComponents().getGroupContexts()));
+ convertStubGroupContextsToGroupDefinitions(applicationContext.getComponents().
+ getGroupContexts()));
}
// top level dependency information
if (applicationContext.getComponents().getDependencyContext() != null) {
applicationDefinition.getComponents().setDependencies(
- convertStubDependencyContextsToDependencyDefinitions(applicationContext.getComponents().getDependencyContext()));
+ convertStubDependencyContextsToDependencyDefinitions(applicationContext.getComponents().
+ getDependencyContext()));
}
// top level cartridge context information
if (applicationContext.getComponents().getCartridgeContexts() != null) {
applicationDefinition.getComponents().setCartridges(
- convertStubCartridgeContextsToCartridgeReferenceBeans(applicationContext.getComponents().getCartridgeContexts()));
+ convertStubCartridgeContextsToCartridgeReferenceBeans(applicationContext.getComponents().
+ getCartridgeContexts()));
}
}
return applicationDefinition;
}
- private static List<CartridgeGroupReferenceBean> convertStubGroupContextsToGroupDefinitions(GroupContext[] groupContexts) {
+ private static List<CartridgeGroupReferenceBean> convertStubGroupContextsToGroupDefinitions(
+ GroupContext[] groupContexts) {
List<CartridgeGroupReferenceBean> groupDefinitions = new ArrayList<CartridgeGroupReferenceBean>();
if (groupContexts != null) {
for (GroupContext groupContext : groupContexts) {
@@ -1177,7 +1192,8 @@ public class ObjectConverter {
groupDefinition.setGroupMaxInstances(groupContext.getGroupMaxInstances());
groupDefinition.setGroupMinInstances(groupContext.getGroupMinInstances());
groupDefinition.setName(groupContext.getName());
- groupDefinition.setGroups(convertStubGroupContextsToGroupDefinitions(groupContext.getGroupContexts()));
+ groupDefinition.setGroups(convertStubGroupContextsToGroupDefinitions(
+ groupContext.getGroupContexts()));
groupDefinition.setCartridges(convertStubCartridgeContextsToCartridgeReferenceBeans(
groupContext.getCartridgeContexts()));
groupDefinitions.add(groupDefinition);
@@ -1187,7 +1203,8 @@ public class ObjectConverter {
return groupDefinitions;
}
- private static DependencyBean convertStubDependencyContextsToDependencyDefinitions(DependencyContext dependencyContext) {
+ private static DependencyBean convertStubDependencyContextsToDependencyDefinitions(
+ DependencyContext dependencyContext) {
DependencyBean dependencyBean = new DependencyBean();
dependencyBean.setTerminationBehaviour(dependencyContext.getTerminationBehaviour());
@@ -1389,7 +1406,7 @@ public class ObjectConverter {
infoContext.setDeploymentPolicy(subscribableInfo.getDeploymentPolicy());
infoContext.setMaxMembers(subscribableInfo.getMaxMembers());
infoContext.setMinMembers(subscribableInfo.getMinMembers());
- infoContext.setLvsVirtualIP(subscribableInfo.getLvsVirtualIP());
+ infoContext.setLvsVirtualIP(subscribableInfo.getLvsVirtualIP());
if (subscribableInfo.getArtifactRepository() != null) {
ArtifactRepositoryBean artifactRepository = subscribableInfo.getArtifactRepository();
@@ -1472,13 +1489,15 @@ public class ObjectConverter {
dependencyContext.setStartupOrdersContexts(startupOrders.toArray(new String[startupOrders.size()]));
}
if (dependencyBean.getScalingDependents() != null) {
- List<String> scalingDependents = convertScalingDependentsBeansToStringList(dependencyBean.getScalingDependents());
+ List<String> scalingDependents = convertScalingDependentsBeansToStringList(
+ dependencyBean.getScalingDependents());
dependencyContext.setScalingDependents(scalingDependents.toArray(new String[scalingDependents.size()]));
}
return dependencyContext;
}
- private static List<String> convertScalingDependentsBeansToStringList(List<ScalingDependentsBean> scalingDependentsBeans) {
+ private static List<String> convertScalingDependentsBeansToStringList(
+ List<ScalingDependentsBean> scalingDependentsBeans) {
List<String> scalingDependents = new ArrayList<String>();
if (scalingDependentsBeans != null) {
for (ScalingDependentsBean scalingDependentsBean : scalingDependentsBeans) {
@@ -1519,7 +1538,8 @@ public class ObjectConverter {
// Cartridges
if (groupDefinition.getCartridges() != null) {
- groupContext.setCartridgeContexts(convertCartridgeReferenceBeansToStubCartridgeContexts(groupDefinition.getCartridges()));
+ groupContext.setCartridgeContexts(convertCartridgeReferenceBeansToStubCartridgeContexts(
+ groupDefinition.getCartridges()));
}
groupContexts[i++] = groupContext;
}
@@ -1805,7 +1825,8 @@ public class ObjectConverter {
validateTerminationBehavior(dependencyBean.getTerminationBehaviour());
dependencies.setTerminationBehaviour(dependencyBean.getTerminationBehaviour());
if (dependencyBean.getScalingDependents() != null) {
- List<String> scalingDependents = convertScalingDependentsBeansToStringList(dependencyBean.getScalingDependents());
+ List<String> scalingDependents = convertScalingDependentsBeansToStringList(
+ dependencyBean.getScalingDependents());
dependencies.setScalingDependants(scalingDependents.toArray(new String[scalingDependents.size()]));
}
servicegroup.setDependencies(dependencies);
@@ -1920,7 +1941,8 @@ public class ObjectConverter {
return applicationSignUp;
}
- public static ApplicationSignUpBean convertStubApplicationSignUpToApplicationSignUpBean(ApplicationSignUp applicationSignUp) {
+ public static ApplicationSignUpBean convertStubApplicationSignUpToApplicationSignUpBean(
+ ApplicationSignUp applicationSignUp) {
if (applicationSignUp == null) {
return null;
@@ -1971,7 +1993,8 @@ public class ObjectConverter {
return domainMappingBean;
}
- public static DeploymentPolicyBean convertCCStubDeploymentPolicyToDeploymentPolicy(DeploymentPolicy deploymentPolicy) {
+ public static DeploymentPolicyBean convertCCStubDeploymentPolicyToDeploymentPolicy(
+ DeploymentPolicy deploymentPolicy) {
if (deploymentPolicy == null) {
return null;
@@ -1997,7 +2020,8 @@ public class ObjectConverter {
applicationPolicy.setNetworkPartitions(applicationPolicyBean.getNetworkPartitions());
if (applicationPolicyBean.getProperties() != null) {
if (!applicationPolicyBean.getProperties().isEmpty()) {
- applicationPolicy.setProperties(getASPropertiesFromCommonProperties(applicationPolicyBean.getProperties()));
+ applicationPolicy.setProperties(getASPropertiesFromCommonProperties(
+ applicationPolicyBean.getProperties()));
}
}
return applicationPolicy;
@@ -2038,7 +2062,8 @@ public class ObjectConverter {
}
- private static DeploymentPolicyBean convertASStubDeploymentPolicyToDeploymentPolicy(DeploymentPolicy deploymentPolicy) {
+ private static DeploymentPolicyBean convertASStubDeploymentPolicyToDeploymentPolicy(
+ DeploymentPolicy deploymentPolicy) {
if (deploymentPolicy == null) {
return null;
[38/50] [abbrv] stratos git commit: Preparing for next development
iteration: updating pom version to 4.1.2-SNAPSHOT
Posted by la...@apache.org.
Preparing for next development iteration: updating pom version to 4.1.2-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1e0d3bdf
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1e0d3bdf
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1e0d3bdf
Branch: refs/heads/data-publisher-integration
Commit: 1e0d3bdfbb8a53c70b10ceded6694cb6f99bb678
Parents: ba06d09
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Aug 11 12:29:50 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Aug 11 12:30:40 2015 +0530
----------------------------------------------------------------------
components/org.apache.stratos.autoscaler/pom.xml | 2 +-
components/org.apache.stratos.cartridge.agent/pom.xml | 2 +-
.../stratos/cartridge/agent/test/JavaCartridgeAgentTest.java | 4 ++--
components/org.apache.stratos.cli/pom.xml | 2 +-
components/org.apache.stratos.cloud.controller/pom.xml | 2 +-
components/org.apache.stratos.common/pom.xml | 2 +-
components/org.apache.stratos.custom.handlers/pom.xml | 2 +-
components/org.apache.stratos.deployment/pom.xml | 2 +-
components/org.apache.stratos.email.sender/pom.xml | 2 +-
components/org.apache.stratos.kubernetes.client/pom.xml | 2 +-
components/org.apache.stratos.load.balancer.common/pom.xml | 2 +-
.../org.apache.stratos.load.balancer.extension.api/pom.xml | 2 +-
components/org.apache.stratos.load.balancer/pom.xml | 2 +-
components/org.apache.stratos.logging.view.ui/pom.xml | 2 +-
components/org.apache.stratos.manager.styles/pom.xml | 2 +-
components/org.apache.stratos.manager/pom.xml | 2 +-
components/org.apache.stratos.messaging/pom.xml | 2 +-
components/org.apache.stratos.metadata.client/pom.xml | 2 +-
components/org.apache.stratos.metadata.service/pom.xml | 2 +-
components/org.apache.stratos.mock.iaas.api/pom.xml | 2 +-
components/org.apache.stratos.mock.iaas.client/pom.xml | 2 +-
components/org.apache.stratos.mock.iaas/pom.xml | 2 +-
components/org.apache.stratos.python.cartridge.agent/pom.xml | 2 +-
components/org.apache.stratos.rest.endpoint/pom.xml | 2 +-
components/org.apache.stratos.sso.redirector.ui/pom.xml | 2 +-
components/org.apache.stratos.tenant.activity/pom.xml | 2 +-
components/pom.xml | 2 +-
dependencies/fabric8/kubernetes-api/pom.xml | 2 +-
dependencies/fabric8/pom.xml | 2 +-
dependencies/org.wso2.carbon.ui/pom.xml | 2 +-
dependencies/pom.xml | 2 +-
extensions/cep/distribution/pom.xml | 2 +-
extensions/cep/stratos-cep-extension/pom.xml | 2 +-
extensions/load-balancer/haproxy-extension/pom.xml | 2 +-
extensions/load-balancer/lvs-extension/pom.xml | 2 +-
extensions/load-balancer/nginx-extension/pom.xml | 2 +-
extensions/load-balancer/pom.xml | 2 +-
extensions/pom.xml | 2 +-
.../autoscaler/org.apache.stratos.autoscaler.feature/pom.xml | 2 +-
features/autoscaler/pom.xml | 2 +-
features/cep/org.apache.stratos.event.processor.feature/pom.xml | 2 +-
.../org.apache.stratos.event.processor.server.feature/pom.xml | 2 +-
features/cep/pom.xml | 2 +-
.../org.apache.stratos.cloud.controller.feature/pom.xml | 2 +-
features/cloud-controller/pom.xml | 2 +-
features/common/org.apache.stratos.common.feature/pom.xml | 2 +-
features/common/org.apache.stratos.common.server.feature/pom.xml | 2 +-
features/common/org.apache.stratos.common.ui.feature/pom.xml | 2 +-
.../common/org.apache.stratos.custom.handlers.feature/pom.xml | 2 +-
features/common/pom.xml | 2 +-
.../org.apache.stratos.load.balancer.common.feature/pom.xml | 2 +-
.../org.apache.stratos.load.balancer.feature/pom.xml | 2 +-
features/load-balancer/pom.xml | 2 +-
features/manager/deployment/pom.xml | 2 +-
.../logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml | 2 +-
features/manager/logging-mgt/pom.xml | 2 +-
.../org.apache.stratos.metadata.client.feature/pom.xml | 2 +-
.../org.apache.stratos.metadata.service.feature/pom.xml | 2 +-
features/manager/pom.xml | 2 +-
.../org.apache.stratos.rest.endpoint.feature/pom.xml | 2 +-
.../stratos-mgt/org.apache.stratos.manager.feature/pom.xml | 2 +-
.../org.apache.stratos.manager.server.feature/pom.xml | 2 +-
features/manager/stratos-mgt/pom.xml | 2 +-
.../styles/org.apache.stratos.manager.styles.feature/pom.xml | 2 +-
.../org.apache.stratos.tenant.activity.server.feature/pom.xml | 2 +-
features/manager/tenant-activity/pom.xml | 2 +-
features/messaging/org.apache.stratos.messaging.feature/pom.xml | 2 +-
features/messaging/pom.xml | 2 +-
.../mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml | 2 +-
features/mock-iaas/pom.xml | 2 +-
features/pom.xml | 2 +-
pom.xml | 4 ++--
products/cartridge-agent/modules/distribution/pom.xml | 2 +-
products/cartridge-agent/pom.xml | 2 +-
products/load-balancer/modules/distribution/pom.xml | 2 +-
products/load-balancer/modules/p2-profile/pom.xml | 2 +-
products/load-balancer/pom.xml | 2 +-
products/pom.xml | 2 +-
products/python-cartridge-agent/distribution/pom.xml | 2 +-
products/python-cartridge-agent/pom.xml | 2 +-
products/stratos-cli/distribution/pom.xml | 2 +-
products/stratos-cli/pom.xml | 2 +-
products/stratos/modules/distribution/pom.xml | 2 +-
products/stratos/modules/integration/pom.xml | 2 +-
.../stratos/integration/tests/StratosTestServerManager.java | 2 +-
products/stratos/modules/p2-profile-gen/pom.xml | 2 +-
products/stratos/pom.xml | 2 +-
service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml | 2 +-
.../org.apache.stratos.cloud.controller.service.stub/pom.xml | 2 +-
service-stubs/org.apache.stratos.manager.service.stub/pom.xml | 2 +-
service-stubs/pom.xml | 2 +-
tools/pom.xml | 2 +-
tools/puppet3/modules/agent/manifests/init.pp | 4 ++--
tools/puppet3/modules/haproxy/manifests/init.pp | 2 +-
tools/puppet3/modules/lb/manifests/init.pp | 2 +-
tools/puppet3/modules/python_agent/manifests/init.pp | 2 +-
96 files changed, 99 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.autoscaler/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/pom.xml b/components/org.apache.stratos.autoscaler/pom.xml
index 8a72701..3c927bd 100644
--- a/components/org.apache.stratos.autoscaler/pom.xml
+++ b/components/org.apache.stratos.autoscaler/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/pom.xml b/components/org.apache.stratos.cartridge.agent/pom.xml
index 7343bbd..256c6bc 100644
--- a/components/org.apache.stratos.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.cartridge.agent/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
index d92d806..b286066 100644
--- a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
+++ b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
@@ -77,7 +77,7 @@ public class JavaCartridgeAgentTest {
private static final String PARTITION_ID = "partition-1";
private static final String TENANT_ID = "-1234";
private static final String SERVICE_NAME = "php";
- public static final String AGENT_NAME = "apache-stratos-cartridge-agent-4.1.1";
+ public static final String AGENT_NAME = "apache-stratos-cartridge-agent-4.1.2-SNAPSHOT";
private static HashMap<String, Executor> executorList;
private static ArrayList<ServerSocket> serverSocketList;
private final ArtifactUpdatedEvent artifactUpdatedEvent;
@@ -249,7 +249,7 @@ public class JavaCartridgeAgentTest {
}
log.info("Copying agent jar");
- String agentJar = "org.apache.stratos.cartridge.agent-4.1.1.jar";
+ String agentJar = "org.apache.stratos.cartridge.agent-4.1.2-SNAPSHOT.jar";
String agentJarSource = getResourcesFolderPath() + "/../" + agentJar;
String agentJarDest = agentHome.getCanonicalPath() + "/lib/" + agentJar;
FileUtils.copyFile(new File(agentJarSource), new File(agentJarDest));
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.cli/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/pom.xml b/components/org.apache.stratos.cli/pom.xml
index afd63d2..b66e7c3 100644
--- a/components/org.apache.stratos.cli/pom.xml
+++ b/components/org.apache.stratos.cli/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.cloud.controller/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml
index 791ae4c..3c5869c 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/pom.xml b/components/org.apache.stratos.common/pom.xml
index 578cc50..2d6d547 100644
--- a/components/org.apache.stratos.common/pom.xml
+++ b/components/org.apache.stratos.common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.custom.handlers/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.custom.handlers/pom.xml b/components/org.apache.stratos.custom.handlers/pom.xml
index 157b375..5102ec1 100644
--- a/components/org.apache.stratos.custom.handlers/pom.xml
+++ b/components/org.apache.stratos.custom.handlers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.deployment/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.deployment/pom.xml b/components/org.apache.stratos.deployment/pom.xml
index 42f86f1..a37b2e8 100644
--- a/components/org.apache.stratos.deployment/pom.xml
+++ b/components/org.apache.stratos.deployment/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.email.sender/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.email.sender/pom.xml b/components/org.apache.stratos.email.sender/pom.xml
index a5b07fc..2036cb1 100644
--- a/components/org.apache.stratos.email.sender/pom.xml
+++ b/components/org.apache.stratos.email.sender/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.kubernetes.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/pom.xml b/components/org.apache.stratos.kubernetes.client/pom.xml
index d65e7cd..f2a03fd 100644
--- a/components/org.apache.stratos.kubernetes.client/pom.xml
+++ b/components/org.apache.stratos.kubernetes.client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.load.balancer.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/pom.xml b/components/org.apache.stratos.load.balancer.common/pom.xml
index 77ddcbb..8320060 100644
--- a/components/org.apache.stratos.load.balancer.common/pom.xml
+++ b/components/org.apache.stratos.load.balancer.common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.load.balancer.extension.api/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/pom.xml b/components/org.apache.stratos.load.balancer.extension.api/pom.xml
index 8604405..d9ba41f 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/pom.xml
+++ b/components/org.apache.stratos.load.balancer.extension.api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<artifactId>org.apache.stratos.load.balancer.extension.api</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.load.balancer/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/pom.xml b/components/org.apache.stratos.load.balancer/pom.xml
index ef8aafe..f9033a3 100644
--- a/components/org.apache.stratos.load.balancer/pom.xml
+++ b/components/org.apache.stratos.load.balancer/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.logging.view.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/pom.xml b/components/org.apache.stratos.logging.view.ui/pom.xml
index f721050..d510e8a 100644
--- a/components/org.apache.stratos.logging.view.ui/pom.xml
+++ b/components/org.apache.stratos.logging.view.ui/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.manager.styles/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.styles/pom.xml b/components/org.apache.stratos.manager.styles/pom.xml
index c8b1e50..cf5343a 100644
--- a/components/org.apache.stratos.manager.styles/pom.xml
+++ b/components/org.apache.stratos.manager.styles/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.manager/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/pom.xml b/components/org.apache.stratos.manager/pom.xml
index aa357a4..6f397a3 100644
--- a/components/org.apache.stratos.manager/pom.xml
+++ b/components/org.apache.stratos.manager/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.messaging/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/pom.xml b/components/org.apache.stratos.messaging/pom.xml
index 22bb2af..3c4175d 100644
--- a/components/org.apache.stratos.messaging/pom.xml
+++ b/components/org.apache.stratos.messaging/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.metadata.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.client/pom.xml b/components/org.apache.stratos.metadata.client/pom.xml
index cdacc02..831931d 100644
--- a/components/org.apache.stratos.metadata.client/pom.xml
+++ b/components/org.apache.stratos.metadata.client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<artifactId>org.apache.stratos.metadata.client</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.metadata.service/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/pom.xml b/components/org.apache.stratos.metadata.service/pom.xml
index 88b323d..7ec6cff 100644
--- a/components/org.apache.stratos.metadata.service/pom.xml
+++ b/components/org.apache.stratos.metadata.service/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.mock.iaas.api/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.api/pom.xml b/components/org.apache.stratos.mock.iaas.api/pom.xml
index df155ef..1bfa338 100644
--- a/components/org.apache.stratos.mock.iaas.api/pom.xml
+++ b/components/org.apache.stratos.mock.iaas.api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.mock.iaas.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.client/pom.xml b/components/org.apache.stratos.mock.iaas.client/pom.xml
index c472360..e420088 100644
--- a/components/org.apache.stratos.mock.iaas.client/pom.xml
+++ b/components/org.apache.stratos.mock.iaas.client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>stratos-components-parent</artifactId>
<groupId>org.apache.stratos</groupId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.mock.iaas/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/pom.xml b/components/org.apache.stratos.mock.iaas/pom.xml
index f91daaf..8a76d60 100644
--- a/components/org.apache.stratos.mock.iaas/pom.xml
+++ b/components/org.apache.stratos.mock.iaas/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>stratos-components-parent</artifactId>
<groupId>org.apache.stratos</groupId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.python.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/pom.xml b/components/org.apache.stratos.python.cartridge.agent/pom.xml
index d366264..d1e85b7 100644
--- a/components/org.apache.stratos.python.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.python.cartridge.agent/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.rest.endpoint/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/pom.xml b/components/org.apache.stratos.rest.endpoint/pom.xml
index e1b1e6f..fc62724 100644
--- a/components/org.apache.stratos.rest.endpoint/pom.xml
+++ b/components/org.apache.stratos.rest.endpoint/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.sso.redirector.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/pom.xml b/components/org.apache.stratos.sso.redirector.ui/pom.xml
index fd04f53..72e96b9 100644
--- a/components/org.apache.stratos.sso.redirector.ui/pom.xml
+++ b/components/org.apache.stratos.sso.redirector.ui/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/org.apache.stratos.tenant.activity/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/pom.xml b/components/org.apache.stratos.tenant.activity/pom.xml
index e706592..6562af9 100644
--- a/components/org.apache.stratos.tenant.activity/pom.xml
+++ b/components/org.apache.stratos.tenant.activity/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index cfa7d23..a2c3eac 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/dependencies/fabric8/kubernetes-api/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-api/pom.xml b/dependencies/fabric8/kubernetes-api/pom.xml
index bc967d0..baddfa2 100644
--- a/dependencies/fabric8/kubernetes-api/pom.xml
+++ b/dependencies/fabric8/kubernetes-api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-dependencies-fabric8</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/dependencies/fabric8/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/pom.xml b/dependencies/fabric8/pom.xml
index adef03f..4667c82 100644
--- a/dependencies/fabric8/pom.xml
+++ b/dependencies/fabric8/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-dependents</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/dependencies/org.wso2.carbon.ui/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/org.wso2.carbon.ui/pom.xml b/dependencies/org.wso2.carbon.ui/pom.xml
index 09565b0..0b03b2c 100644
--- a/dependencies/org.wso2.carbon.ui/pom.xml
+++ b/dependencies/org.wso2.carbon.ui/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-dependents</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 076efed..2643a95 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/extensions/cep/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/distribution/pom.xml b/extensions/cep/distribution/pom.xml
index 6536bea..e9f03fd 100644
--- a/extensions/cep/distribution/pom.xml
+++ b/extensions/cep/distribution/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-extensions</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/extensions/cep/stratos-cep-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/stratos-cep-extension/pom.xml b/extensions/cep/stratos-cep-extension/pom.xml
index 81ef64a..e28697a 100644
--- a/extensions/cep/stratos-cep-extension/pom.xml
+++ b/extensions/cep/stratos-cep-extension/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-extensions</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/extensions/load-balancer/haproxy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/pom.xml b/extensions/load-balancer/haproxy-extension/pom.xml
index 1807ce6..3b67477 100644
--- a/extensions/load-balancer/haproxy-extension/pom.xml
+++ b/extensions/load-balancer/haproxy-extension/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-load-balancer-extensions</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<artifactId>apache-stratos-haproxy-extension</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/extensions/load-balancer/lvs-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/lvs-extension/pom.xml b/extensions/load-balancer/lvs-extension/pom.xml
index 905db60..07196e2 100644
--- a/extensions/load-balancer/lvs-extension/pom.xml
+++ b/extensions/load-balancer/lvs-extension/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-load-balancer-extensions</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<artifactId>apache-stratos-lvs-extension</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/extensions/load-balancer/nginx-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/nginx-extension/pom.xml b/extensions/load-balancer/nginx-extension/pom.xml
index 7e35062..22b4223 100644
--- a/extensions/load-balancer/nginx-extension/pom.xml
+++ b/extensions/load-balancer/nginx-extension/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-load-balancer-extensions</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<artifactId>apache-stratos-nginx-extension</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/extensions/load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/pom.xml b/extensions/load-balancer/pom.xml
index e2528db..cb4bf56 100644
--- a/extensions/load-balancer/pom.xml
+++ b/extensions/load-balancer/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-extensions</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index c1c9867..d5f0702 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml b/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
index f213343..b30d2ff 100644
--- a/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
+++ b/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>autoscaler-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/autoscaler/pom.xml
----------------------------------------------------------------------
diff --git a/features/autoscaler/pom.xml b/features/autoscaler/pom.xml
index a15d538..e454856 100644
--- a/features/autoscaler/pom.xml
+++ b/features/autoscaler/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/cep/org.apache.stratos.event.processor.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/org.apache.stratos.event.processor.feature/pom.xml b/features/cep/org.apache.stratos.event.processor.feature/pom.xml
index 9bbaf5f..6ff90b9 100644
--- a/features/cep/org.apache.stratos.event.processor.feature/pom.xml
+++ b/features/cep/org.apache.stratos.event.processor.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>cep-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml b/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
index cdfdb3c..3d4d913 100644
--- a/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
+++ b/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>cep-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/cep/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/pom.xml b/features/cep/pom.xml
index eaf63a8..5809edf 100644
--- a/features/cep/pom.xml
+++ b/features/cep/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
index 3d42857..a9c535c 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>cloud-controller-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/cloud-controller/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/pom.xml b/features/cloud-controller/pom.xml
index 638bfb2..d0862ef 100644
--- a/features/cloud-controller/pom.xml
+++ b/features/cloud-controller/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/common/org.apache.stratos.common.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.common.feature/pom.xml b/features/common/org.apache.stratos.common.feature/pom.xml
index 534d2ad..25e86b9 100644
--- a/features/common/org.apache.stratos.common.feature/pom.xml
+++ b/features/common/org.apache.stratos.common.feature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>common-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/common/org.apache.stratos.common.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.common.server.feature/pom.xml b/features/common/org.apache.stratos.common.server.feature/pom.xml
index 736b990..5c4aa1e 100644
--- a/features/common/org.apache.stratos.common.server.feature/pom.xml
+++ b/features/common/org.apache.stratos.common.server.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>common-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/common/org.apache.stratos.common.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.common.ui.feature/pom.xml b/features/common/org.apache.stratos.common.ui.feature/pom.xml
index a3ec17b..fab8faf 100644
--- a/features/common/org.apache.stratos.common.ui.feature/pom.xml
+++ b/features/common/org.apache.stratos.common.ui.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>common-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.custom.handlers.feature/pom.xml b/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
index 4e8483f..37297d9 100644
--- a/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
+++ b/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>common-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/common/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/pom.xml b/features/common/pom.xml
index 66d3c5a..bfcd589 100644
--- a/features/common/pom.xml
+++ b/features/common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml b/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
index 30841d1..885155c 100644
--- a/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
+++ b/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>loadbalancer-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml b/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
index fd051e4..f580347 100644
--- a/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
+++ b/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>loadbalancer-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/pom.xml b/features/load-balancer/pom.xml
index adc88b8..813e6ce 100644
--- a/features/load-balancer/pom.xml
+++ b/features/load-balancer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/manager/deployment/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/deployment/pom.xml b/features/manager/deployment/pom.xml
index e8d928b..d0b0eee 100644
--- a/features/manager/deployment/pom.xml
+++ b/features/manager/deployment/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml b/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml
index 545924b..ad37e05 100644
--- a/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml
+++ b/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>logging-mgt-feature</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/manager/logging-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/logging-mgt/pom.xml b/features/manager/logging-mgt/pom.xml
index 6e76a93..11b0710 100644
--- a/features/manager/logging-mgt/pom.xml
+++ b/features/manager/logging-mgt/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>logging-mgt-feature</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml b/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
index 178a340..f7fd973 100644
--- a/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
+++ b/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
index fbe7b1b..e0427b4 100644
--- a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
+++ b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/manager/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/pom.xml b/features/manager/pom.xml
index 7d0e9ed..818d89d 100644
--- a/features/manager/pom.xml
+++ b/features/manager/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
index 46108b6..1de9117 100644
--- a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
+++ b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml b/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml
index c809a72..96cbec8 100644
--- a/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml
+++ b/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-mgt-parent-feature</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
index 254a4a6..9ce4307 100644
--- a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
+++ b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-mgt-parent-feature</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/manager/stratos-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/stratos-mgt/pom.xml b/features/manager/stratos-mgt/pom.xml
index 61096ae..8acd9ac 100644
--- a/features/manager/stratos-mgt/pom.xml
+++ b/features/manager/stratos-mgt/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml b/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
index 3140c52..20ecbdd 100644
--- a/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
+++ b/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
index 984a196..890a2f6 100644
--- a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
+++ b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>tenant-activity-feature</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/manager/tenant-activity/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-activity/pom.xml b/features/manager/tenant-activity/pom.xml
index a8d4bc1..f7ed884 100644
--- a/features/manager/tenant-activity/pom.xml
+++ b/features/manager/tenant-activity/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tenant-activity-feature</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/messaging/org.apache.stratos.messaging.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/messaging/org.apache.stratos.messaging.feature/pom.xml b/features/messaging/org.apache.stratos.messaging.feature/pom.xml
index eb50503..11b0c1b 100644
--- a/features/messaging/org.apache.stratos.messaging.feature/pom.xml
+++ b/features/messaging/org.apache.stratos.messaging.feature/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>messaging-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/features/messaging/pom.xml b/features/messaging/pom.xml
index 8b9b5ab..42d7dfa 100644
--- a/features/messaging/pom.xml
+++ b/features/messaging/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml
index 67feeae..d28a5da 100644
--- a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml
+++ b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>mock-iaas-features</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/mock-iaas/pom.xml
----------------------------------------------------------------------
diff --git a/features/mock-iaas/pom.xml b/features/mock-iaas/pom.xml
index 11a917a..4a91343 100644
--- a/features/mock-iaas/pom.xml
+++ b/features/mock-iaas/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index 89c4451..5d13d0f 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3cc30ac..555130e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
<packaging>pom</packaging>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<name>Apache Stratos</name>
<description>Apache Stratos is an open source polyglot Platform as a Service (PaaS) framework</description>
<url>http://stratos.apache.org</url>
@@ -75,7 +75,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/stratos.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/stratos.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=stratos.git</url>
- <tag>4.1.1</tag>
+ <tag>4.1.2-SNAPSHOT</tag>
</scm>
<modules>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/cartridge-agent/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/pom.xml b/products/cartridge-agent/modules/distribution/pom.xml
index 2acf11a..09849e0 100644
--- a/products/cartridge-agent/modules/distribution/pom.xml
+++ b/products/cartridge-agent/modules/distribution/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>cartidge-agent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/cartridge-agent/pom.xml
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/pom.xml b/products/cartridge-agent/pom.xml
index e9be982..f9b42bb 100644
--- a/products/cartridge-agent/pom.xml
+++ b/products/cartridge-agent/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-products-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/load-balancer/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/pom.xml b/products/load-balancer/modules/distribution/pom.xml
index db2ae71..6517f68 100755
--- a/products/load-balancer/modules/distribution/pom.xml
+++ b/products/load-balancer/modules/distribution/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos.load.balancer</groupId>
<artifactId>load-balancer-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/load-balancer/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/p2-profile/pom.xml b/products/load-balancer/modules/p2-profile/pom.xml
index 1705573..ca2c7ae 100755
--- a/products/load-balancer/modules/p2-profile/pom.xml
+++ b/products/load-balancer/modules/p2-profile/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos.load.balancer</groupId>
<artifactId>load-balancer-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/pom.xml b/products/load-balancer/pom.xml
index 82441e1..78eac02 100755
--- a/products/load-balancer/pom.xml
+++ b/products/load-balancer/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/pom.xml
----------------------------------------------------------------------
diff --git a/products/pom.xml b/products/pom.xml
index 5985a46..ca02007 100644
--- a/products/pom.xml
+++ b/products/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/python-cartridge-agent/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/distribution/pom.xml b/products/python-cartridge-agent/distribution/pom.xml
index 5fd93e1..a7a36b3 100644
--- a/products/python-cartridge-agent/distribution/pom.xml
+++ b/products/python-cartridge-agent/distribution/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>python-cartridge-agent-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/python-cartridge-agent/pom.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/pom.xml b/products/python-cartridge-agent/pom.xml
index 85a4d0f..0b32dff 100644
--- a/products/python-cartridge-agent/pom.xml
+++ b/products/python-cartridge-agent/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-products-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/stratos-cli/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-cli/distribution/pom.xml b/products/stratos-cli/distribution/pom.xml
index 09f32b5..2d14858 100644
--- a/products/stratos-cli/distribution/pom.xml
+++ b/products/stratos-cli/distribution/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>apache-stratos-cli-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/stratos-cli/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-cli/pom.xml b/products/stratos-cli/pom.xml
index 0886240..37e2eed 100644
--- a/products/stratos-cli/pom.xml
+++ b/products/stratos-cli/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-products-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/stratos/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml
index af7c9d6..add0975 100755
--- a/products/stratos/modules/distribution/pom.xml
+++ b/products/stratos/modules/distribution/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/stratos/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/pom.xml b/products/stratos/modules/integration/pom.xml
index ba5aa31..fc1592d 100755
--- a/products/stratos/modules/integration/pom.xml
+++ b/products/stratos/modules/integration/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
index 10e47ab..aba5911 100755
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
@@ -49,7 +49,7 @@ public class StratosTestServerManager extends TestServerManager {
private static final Log log = LogFactory.getLog(StratosTestServerManager.class);
private final static String CARBON_ZIP = SampleApplicationsTest.class.getResource("/").getPath() +
- "/../../../distribution/target/apache-stratos-4.1.1.zip";
+ "/../../../distribution/target/apache-stratos-4.1.2-SNAPSHOT.zip";
private final static int PORT_OFFSET = 0;
private static final String ACTIVEMQ_BIND_ADDRESS = "tcp://localhost:61617";
private static final String MOCK_IAAS_XML_FILE = "mock-iaas.xml";
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index 9cfba3e..a0fd23b 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/products/stratos/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/pom.xml b/products/stratos/pom.xml
index b8658cc..728990f 100755
--- a/products/stratos/pom.xml
+++ b/products/stratos/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-products-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
index cd58e0c..4d66803 100644
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-service-stubs-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
index 6087a80..2e1248b 100644
--- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-service-stubs-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/service-stubs/org.apache.stratos.manager.service.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.manager.service.stub/pom.xml b/service-stubs/org.apache.stratos.manager.service.stub/pom.xml
index 7603876..7b7b1ba 100644
--- a/service-stubs/org.apache.stratos.manager.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.manager.service.stub/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-service-stubs-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/service-stubs/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml
index fa85d9b..13a7b3c 100644
--- a/service-stubs/pom.xml
+++ b/service-stubs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index b9bd999..0d04e62 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/tools/puppet3/modules/agent/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/manifests/init.pp b/tools/puppet3/modules/agent/manifests/init.pp
index 66ec38b..c08af84 100644
--- a/tools/puppet3/modules/agent/manifests/init.pp
+++ b/tools/puppet3/modules/agent/manifests/init.pp
@@ -16,7 +16,7 @@
# under the License.
class agent(
- $version = '4.1.1',
+ $version = undef,
$owner = 'root',
$group = 'root',
$target = "/mnt",
@@ -24,7 +24,7 @@ class agent(
$enable_artifact_update = true,
$auto_commit = false,
$auto_checkout = true,
- $module = 'undef',
+ $module = undef,
$custom_templates = [],
$exclude_templates = []
){
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/tools/puppet3/modules/haproxy/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/haproxy/manifests/init.pp b/tools/puppet3/modules/haproxy/manifests/init.pp
index 2ba14e4..50de733 100755
--- a/tools/puppet3/modules/haproxy/manifests/init.pp
+++ b/tools/puppet3/modules/haproxy/manifests/init.pp
@@ -25,7 +25,7 @@ class haproxy(
$cluster_id = $stratos_cluster_id,
$service_name = $stratos_instance_data_service_name,
$lb_service_type = $stratos_instance_data_lb_service_type,
- $version = '4.1.1',
+ $version = undef,
$owner = 'root',
$group = 'root',
$target = '/mnt',
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/tools/puppet3/modules/lb/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/lb/manifests/init.pp b/tools/puppet3/modules/lb/manifests/init.pp
index 3c4c329..cde4a11 100755
--- a/tools/puppet3/modules/lb/manifests/init.pp
+++ b/tools/puppet3/modules/lb/manifests/init.pp
@@ -29,7 +29,7 @@
#
class lb (
- $version = '4.1.1',
+ $version = undef,
$offset = 0,
$tribes_port = 4000,
$maintenance_mode = true,
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e0d3bdf/tools/puppet3/modules/python_agent/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/python_agent/manifests/init.pp b/tools/puppet3/modules/python_agent/manifests/init.pp
index a43d6b0..7ce7d77 100644
--- a/tools/puppet3/modules/python_agent/manifests/init.pp
+++ b/tools/puppet3/modules/python_agent/manifests/init.pp
@@ -16,7 +16,7 @@
# under the License.
class python_agent(
- $version = '4.1.1',
+ $version = undef,
$owner = 'root',
$group = 'root',
$target = "/mnt",
[19/50] [abbrv] stratos git commit: fixing path issue for test cases
Posted by la...@apache.org.
fixing path issue for test cases
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5bdc2f8b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5bdc2f8b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5bdc2f8b
Branch: refs/heads/data-publisher-integration
Commit: 5bdc2f8b1903e64c9c5d7ea8ed32526019e63197
Parents: ce00b95
Author: reka <rt...@gmail.com>
Authored: Thu Aug 6 19:08:20 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Aug 6 19:33:43 2015 +0530
----------------------------------------------------------------------
.../stratos/integration/tests/ApplicationPolicyTest.java | 6 +++---
.../stratos/integration/tests/AutoscalingPolicyTest.java | 4 ++--
.../org/apache/stratos/integration/tests/CartridgeTest.java | 4 ++--
.../stratos/modules/integration/src/test/resources/testng.xml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5bdc2f8b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
index cc9f976..635931e 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
@@ -43,17 +43,17 @@ public class ApplicationPolicyTest extends StratosTestServerManager {
String applicationPolicyId = "application-policy-2";
log.info("Started Application policy test case**************************************");
- boolean addedN1 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
"network-partition-7" + ".json",
RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(addedN1, true);
- boolean addedN2 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
"network-partition-8" + ".json",
RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(addedN2, true);
- boolean addedDep = restClient.addEntity(RestConstants.APPLICATION_POLICIES_PATH + "/" +
+ boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.APPLICATION_POLICIES_PATH + "/" +
applicationPolicyId + ".json",
RestConstants.APPLICATION_POLICIES, RestConstants.APPLICATION_POLICIES_NAME);
assertEquals(addedDep, true);
http://git-wip-us.apache.org/repos/asf/stratos/blob/5bdc2f8b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
index bcacfc8..c4b52f6 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
@@ -39,7 +39,7 @@ public class AutoscalingPolicyTest extends StratosTestServerManager {
log.info("Started autoscaling policy test case**************************************");
String policyId = "autoscaling-policy-c0";
try {
- boolean added = restClient.addEntity(RestConstants.AUTOSCALING_POLICIES_PATH + "/" + policyId + ".json",
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH + "/" + policyId + ".json",
RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
assertEquals(String.format("Autoscaling policy did not added: [autoscaling-policy-id] %s", policyId), added, true);
@@ -56,7 +56,7 @@ public class AutoscalingPolicyTest extends StratosTestServerManager {
assertEquals(String.format("[autoscaling-policy-id] %s Load is not correct", policyId),
bean.getLoadThresholds().getLoadAverage().getThreshold(), 25.0, 0.0);
- boolean updated = restClient.updateEntity(RestConstants.AUTOSCALING_POLICIES_PATH + "/" + policyId + "-v1.json",
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH + "/" + policyId + "-v1.json",
RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
assertEquals(String.format("[autoscaling-policy-id] %s update failed", policyId), updated, true);
http://git-wip-us.apache.org/repos/asf/stratos/blob/5bdc2f8b/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 638d742..21171ff 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
@@ -42,7 +42,7 @@ public class CartridgeTest extends StratosTestServerManager {
try {
String cartridgeType = "c0";
- boolean added = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" +
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" +
cartridgeType + ".json",
RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(added, true);
@@ -76,7 +76,7 @@ public class CartridgeTest extends StratosTestServerManager {
}
- boolean updated = restClient.updateEntity(RestConstants.CARTRIDGES_PATH + "/" +
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" +
cartridgeType + "-v1.json",
RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(updated, true);
http://git-wip-us.apache.org/repos/asf/stratos/blob/5bdc2f8b/products/stratos/modules/integration/src/test/resources/testng.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/testng.xml b/products/stratos/modules/integration/src/test/resources/testng.xml
index 3ea5a01..849a282 100644
--- a/products/stratos/modules/integration/src/test/resources/testng.xml
+++ b/products/stratos/modules/integration/src/test/resources/testng.xml
@@ -57,10 +57,10 @@
<class name="org.apache.stratos.integration.tests.SampleApplicationsTest" />
</classes>
</test>
- <!--test name="ApplicationBurstingTest">
+ <test name="ApplicationBurstingTest">
<classes>
<class name="org.apache.stratos.integration.tests.ApplicationBurstingTest" />
</classes>
- </test-->
+ </test>
</suite>
[12/50] [abbrv] stratos git commit: Introducing stratos integration
test suite for the artifacts
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-4.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-4.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-4.json
deleted file mode 100644
index fb0cb9c..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-4.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-4",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5-v1.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5-v1.json
new file mode 100644
index 0000000..275b536
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5-v1.json
@@ -0,0 +1,28 @@
+{
+ "id": "network-partition-5",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ },
+ {
+ "id": "partition-2",
+ "property": [
+ {
+ "name": "region",
+ "value": "default1"
+ },
+ {
+ "name": "zone",
+ "value": "z1"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5.json
new file mode 100644
index 0000000..5464aa9
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-5.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-5",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-6.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-6.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-6.json
new file mode 100644
index 0000000..d200b70
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-6.json
@@ -0,0 +1,24 @@
+{
+ "id": "network-partition-6",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "network-partition-6-partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ },
+ {
+ "id": "network-partition-6-partition-2",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-7.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-7.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-7.json
new file mode 100644
index 0000000..6250504
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/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/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-8.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-8.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/network-partition-8.json
new file mode 100644
index 0000000..354b837
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/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/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/mock/update/network-partition-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/update/network-partition-1.json b/products/stratos/modules/integration/src/test/resources/network-partitions/mock/update/network-partition-1.json
deleted file mode 100644
index 054265a..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/mock/update/network-partition-1.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "id": "network-partition-1",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- },
- {
- "id": "partition-2",
- "property": [
- {
- "name": "region",
- "value": "default1"
- },
- {
- "name": "zone",
- "value": "z1"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/multi/ap-southeast-1-nw-partition.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/multi/ap-southeast-1-nw-partition.json b/products/stratos/modules/integration/src/test/resources/network-partitions/multi/ap-southeast-1-nw-partition.json
deleted file mode 100644
index 061fc73..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/multi/ap-southeast-1-nw-partition.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "id": "ap-southeast-1-nw-partition",
- "provider": "ec2-singapore",
- "partitions": [
- {
- "id": "ap-southeast-1a-partition",
- "property": [
- {
- "name": "region",
- "value": "ap-southeast-1"
- },
- {
- "name": "zone",
- "value": "ap-southeast-1a"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/multi/ap-southeast-2-nw-partition.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/multi/ap-southeast-2-nw-partition.json b/products/stratos/modules/integration/src/test/resources/network-partitions/multi/ap-southeast-2-nw-partition.json
deleted file mode 100644
index 435d2f0..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/multi/ap-southeast-2-nw-partition.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "id": "ap-southeast-2-nw-partition",
- "provider": "ec2-sydney",
- "partitions": [
- {
- "id": "ap-southeast-2b-partition",
- "property": [
- {
- "name": "region",
- "value": "ap-southeast-2"
- },
- {
- "name": "zone",
- "value": "ap-southeast-2b"
- }
- ]
- }
- ],
- "properties": [
- {
- "name": "payload_parameter.PUPPET_IP",
- "value": "172.31.9.64"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/multi/openstack-nw-partition.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/multi/openstack-nw-partition.json b/products/stratos/modules/integration/src/test/resources/network-partitions/multi/openstack-nw-partition.json
deleted file mode 100644
index c95a987..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/multi/openstack-nw-partition.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "id": "openstack-nw-partition",
- "provider": "openstack",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "RegionOne"
- }
- ]
- }
- ],
- "properties": [
- {
- "name": "payload_parameter.PUPPET_IP",
- "value": "192.168.60.16"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/openstack/network-partition-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/openstack/network-partition-1.json b/products/stratos/modules/integration/src/test/resources/network-partitions/openstack/network-partition-1.json
deleted file mode 100644
index aa14c0f..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/openstack/network-partition-1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-1",
- "provider": "openstack",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "RegionOne"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/network-partitions/openstack/network-partition-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/network-partitions/openstack/network-partition-2.json b/products/stratos/modules/integration/src/test/resources/network-partitions/openstack/network-partition-2.json
deleted file mode 100644
index c4db4a5..0000000
--- a/products/stratos/modules/integration/src/test/resources/network-partitions/openstack/network-partition-2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-2",
- "provider": "openstack",
- "partitions": [
- {
- "id": "partition-2",
- "property": [
- {
- "name": "region",
- "value": "RegionOne"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/resources/testng.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/testng.xml b/products/stratos/modules/integration/src/test/resources/testng.xml
new file mode 100644
index 0000000..c450bf0
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/testng.xml
@@ -0,0 +1,61 @@
+<?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="StratosIntegrationSuite">
+
+ <test name="CartridgeTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.CartridgeTest" />
+ </classes>
+ </test>
+ <test name="CartridgeGroupTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.CartridgeGroupTest" />
+ </classes>
+ </test>
+ <test name="NetworkPartitionTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.NetworkPartitionTest" />
+ </classes>
+ </test>
+ <test name="ApplicationPolicyTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.ApplicationPolicyTest" />
+ </classes>
+ </test>
+ <test name="DeploymentPolicyTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.DeploymentPolicyTest" />
+ </classes>
+ </test>
+ <test name="AutoscalingPolicyTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.AutoscalingPolicyTest" />
+ </classes>
+ </test>
+ <test name="SampleApplicationsTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.SampleApplicationsTest" />
+ </classes>
+ </test>
+
+</suite>
[48/50] [abbrv] stratos git commit: Removing unnecessary features,
artifacts and restructuring distribution artifacts
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-password-reset.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-password-reset.xml b/products/stratos/conf/email-password-reset.xml
deleted file mode 100755
index d5a0937..0000000
--- a/products/stratos/conf/email-password-reset.xml
+++ /dev/null
@@ -1,43 +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.
- -->
-
-<!--
- Contains the body of the mail that to be sent when the tenant admin's password is reset, mostly
- by a service administrator, known as the super-tenant in Stratos-world.
- -->
-
-<configuration>
- <subject>WSO2 Cloud Services - Password Reset</subject>
- <body>
-Hi {first-name},
-
-Your password for the WSO2 Cloud Services has been reset by the Service Administrator.
-
-Admin Name: {user-name}
-Domain: {domain-name}
-
-Your New Password: {password}
-
-Please use this password along with your existing username to log in to your account. You are adviced to change the password once you logged in to your account using this password.
-
-Best Regards,
-WSO2 Cloud Services Team
-http://stratoslive.wso2.com
- </body>
-</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-payment-received-customer.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-payment-received-customer.xml b/products/stratos/conf/email-payment-received-customer.xml
deleted file mode 100755
index dff13bc..0000000
--- a/products/stratos/conf/email-payment-received-customer.xml
+++ /dev/null
@@ -1,39 +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.
- -->
-
-<!--
- Contains the body of the mail that to be sent when a payment is received.
- -->
-
-<configuration>
- <subject>[Payment Received] WSO2 Cloud Services</subject>
- <body>
-Hi {customer-name},
-
-Thank you for your payment done on {date}. Following are the payment details.
-
-Transaction ID : {transaction-id}
-Amount : {amount}
-Invoice ID : {invoice-id}
-
-Best Regards,
-WSO2 Cloud Services
-http://stratoslive.wso2.com
- </body>
-</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-payment-received-wso2.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-payment-received-wso2.xml b/products/stratos/conf/email-payment-received-wso2.xml
deleted file mode 100755
index c81b5f4..0000000
--- a/products/stratos/conf/email-payment-received-wso2.xml
+++ /dev/null
@@ -1,39 +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.
- -->
-
-<!--
- Contains the body of the mail that to be sent when a payment is received.
- -->
-
-<configuration>
- <subject>[Payment Received] WSO2 Cloud Services</subject>
- <body>
-Hi Finance Team,
-
-A payment was recived from customer {customer-name} on {date}. Following are the payment details.
-
-Transaction ID : {transaction-id}
-Amount : {amount}
-Invoice ID : {invoice-id}
-
-Best Regards,
-WSO2 Cloud Services
-http://stratoslive.wso2.com
- </body>
-</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-registration-complete.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-registration-complete.xml b/products/stratos/conf/email-registration-complete.xml
deleted file mode 100755
index 02565ec..0000000
--- a/products/stratos/conf/email-registration-complete.xml
+++ /dev/null
@@ -1,38 +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.
- -->
-
-<!--
- The mail that to be sent upon successful registration and the successful validation
- of the email.
- -->
-
-<configuration>
- <subject>WSO2 Cloud Services - Registration completed</subject>
- <body>
-Hi {first-name},
-
-Congratulations! You have successfully created an account in WSO2 Cloud Services. Now you can access your account by visiting the following URL. Please bookmark this URL to visit your account later.
-
-Your account url: https://stratoslive.wso2.com/t/{domain-name}
-
-Best Regards,
-WSO2 Cloud Services Team
-http://stratoslive.wso2.com
- </body>
-</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-registration-moderation.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-registration-moderation.xml b/products/stratos/conf/email-registration-moderation.xml
deleted file mode 100755
index 73fb689..0000000
--- a/products/stratos/conf/email-registration-moderation.xml
+++ /dev/null
@@ -1,47 +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.
- -->
-
-<!--
- The mail to be sent for the tenant registration validation.
- This mail has the registration validation link to validate the email too.
- -->
-
-<configuration>
- <targetEpr>https://stratoslive.wso2.com/carbon/email-verification/validator_ajaxprocessor.jsp</targetEpr>
- <subject>WSO2 StratosLive - A New Tenant Awaits Approval</subject>
- <body>
-Hi,
-
-A new tenant has registered an account in WSO2 StratosLive.
-
-Admin Name: {user-name}
-Domain: {domain-name}
-
-User Name: {user-name}@{domain-name}
-
-Please click the following link to complete the registration request. The registered tenant will not be able to
-log in or use their account till then.
- </body>
- <footer>
-Best Regards,
-WSO2 Stratos Team
-http://stratoslive.wso2.com
- </footer>
- <redirectPath>../account-mgt/update_verifier_redirector_ajaxprocessor.jsp</redirectPath>
-</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-registration-payment-received-customer.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-registration-payment-received-customer.xml b/products/stratos/conf/email-registration-payment-received-customer.xml
deleted file mode 100755
index 8e1951e..0000000
--- a/products/stratos/conf/email-registration-payment-received-customer.xml
+++ /dev/null
@@ -1,39 +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.
- -->
-
-<!--
- Contains the body of the mail that to be sent when a payment is received.
- -->
-
-<configuration>
- <subject>[Registration Payment] WSO2 Cloud Services</subject>
- <body>
-Hi {customer-name},
-
-Thank you for your payment done on {date} for StratosLive registration. Following are the payment details.
-
-Transaction ID : {transaction-id}
-Amount : {amount}
-Registered domain : {tenant-domain}
-
-Best Regards,
-WSO2 Cloud Services
-http://stratoslive.wso2.com
- </body>
-</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-registration.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-registration.xml b/products/stratos/conf/email-registration.xml
deleted file mode 100755
index c789bc0..0000000
--- a/products/stratos/conf/email-registration.xml
+++ /dev/null
@@ -1,46 +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.
- -->
-
-<!--
- The mail to be sent for the tenant registration validation.
- This mail has the registration validation link to validate the email too.
- -->
-
-<configuration>
- <targetEpr>https://localhost:9443/carbon/email-verification/validator_ajaxprocessor.jsp</targetEpr>
- <subject>WSO2 Cloud Services - Email validation instructions</subject>
- <body>
-Hi {first-name},
-
-Thank you for registering an account in WSO2 Cloud Services.
-
-Your Admin Name: {user-name}
-Your Domain: {domain-name}
-
-Your User Name: {user-name}@{domain-name}
-
-Please click the following link to verify your email address.
- </body>
- <footer>
-Best Regards,
-WSO2 Cloud Services Team
-http://stratoslive.wso2.com
- </footer>
- <redirectPath>../account-mgt/update_verifier_redirector_ajaxprocessor.jsp</redirectPath>
-</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-update.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-update.xml b/products/stratos/conf/email-update.xml
deleted file mode 100755
index 4036900..0000000
--- a/products/stratos/conf/email-update.xml
+++ /dev/null
@@ -1,39 +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.
- -->
-
-<!--
- The mail that to be sent upon receiving an email change request from the account management.
- The new email address will be notified of this change.
- -->
-
-<configuration>
- <targetEpr>https://localhost:9443/carbon/email-verification/validator_ajaxprocessor.jsp</targetEpr>
- <subject>WSO2 Cloud Services - Updating the contact email address</subject>
- <body>
-Hi {first-name},
-
-We got a request from you or some one to associate this email address, as the contact email address of your WSO2 cloud services account. Please click the following link to verify your email address.
- </body>
- <footer>
-Best Regards,
-WSO2 Cloud Services Team
-http://stratoslive.wso2.com
- </footer>
- <redirectPath>../account-mgt/update_verifier_redirector_ajaxprocessor.jsp</redirectPath>
-</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/embedded-ldap.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/embedded-ldap.xml b/products/stratos/conf/embedded-ldap.xml
deleted file mode 100644
index 144628e..0000000
--- a/products/stratos/conf/embedded-ldap.xml
+++ /dev/null
@@ -1,165 +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.
- -->
-
-<!--
- All carbon based products comes with a LDAP user store.
- For this we use an embedded LDAP in carbon based products.
- This file contains necessary configurations to control the behavior of embedded LDAP.
- You may use this file to enable, disable LDAP server, configure connection admin password, etc ...
- In addition to embedded-ldap server configurations this file also has Kerberos KDC (Key Distribution Center)
- specific configurations.
--->
-
-<EmbeddedLDAPConfig>
-
- <!--
- LDAP server configurations
- ==========================
- This section contains LDAP server specific configurations.
-
- Property Usage
- ======= ====
- enable If true the embedded LDAP server will start when server starts up.
- Else embedded LDAP server will not start. Thus user has to use a different
- user store.
- instanceid An id given to the LDAP server instance.
- connectionPassword The password of the admin. (uid=admin,ou=system)
- workingDirectory Location where LDAP will store its schema files.
- AdminEntryObjectClass Object class which encapsulate attributes needed by claims.
- allowAnonymousAccess Should allow users to access LDAP server without credentials. Default false.
- accessControlEnabled Should access control be enabled among partitions. Default true.
- saslHostName Default host name to be used in SASL (Simple Authentication and Security Layer).
- This property comes from apacheds implementation itself.
- saslPrincipalName Default SASL principal name. Again this property also comes from apacheds implementation
- itself.
- -->
- <EmbeddedLDAP>
- <Property name="enable">false</Property>
- <Property name="port">${Ports.EmbeddedLDAP.LDAPServerPort}</Property>
- <Property name="instanceId">default</Property>
- <Property name="connectionPassword">admin</Property>
- <Property name="workingDirectory">.</Property>
- <Property name="AdminEntryObjectClass">wso2Person</Property>
- <Property name="allowAnonymousAccess">false</Property>
- <Property name="accessControlEnabled">true</Property>
- <Property name="denormalizeOpAttrsEnabled">false</Property>
- <Property name="maxPDUSize">2000000</Property>
- <Property name="saslHostName">localhost</Property>
- <Property name="saslPrincipalName">ldap/localhost@EXAMPLE.COM</Property>
- </EmbeddedLDAP>
-
- <!--
- Default partition configurations
- ================================
- When embedded LDAP server starts for the first time it will create a default partition.
- Following properties configure values for the default partition.
-
- Property Usage
- ======= =====
- id Each partition is given an id. The id given to the default paritition.
- realm Realm is the place where we store user principals and service principals.
- The name of the realm for default partition.
- kdcPassword This parameter is used when KDC (Key Distribution Center) is enabled. In apacheds
- KDC also has a server principal. This defines a password for KDC server principal.
- ldapServerPrinciplePassword If LDAP server is also defined as a server principal, this will be the password.
-
- -->
- <DefaultPartition>
- <Property name="id">root</Property>
- <Property name="realm">wso2.org</Property>
- <Property name="kdcPassword">secret</Property>
- <Property name="ldapServerPrinciplePassword">randall</Property>
- </DefaultPartition>
-
- <!--
- Default partition admin configurations
- ======================================
- In a multi-tenant scenario each tenant will have a separate partition. Thus tenant admin will be the partition admin.
- Following configurations define admin attributes for above created default partition.
-
- Property Usage
- ======== =====
- uid UID attribute for partition admin.
- commonName The cn attribute for admin
- lastName The sn attribute for admin
- email The email attribute for admin
- passwordType The password hashing mechanism. Following hashing mechanisms are available, "SHA", "MD5".
- "Plaintext" is also a valid value. If KDC is enabled password type will be enforced to be
- plain text.
- -->
- <PartitionAdmin>
- <Property name="uid">admin</Property>
- <Property name="firstName">admin</Property>
- <Property name="lastName">admin</Property>
- <Property name="email">admin@wso2.com</Property>
- <Property name="password">admin</Property>
- <Property name="passwordType">SHA</Property>
- </PartitionAdmin>
-
- <!--
- Default partition admin's group configuration
- =============================================
- Embedded LDAP is capable of keeping group information also.
- If LDAP groups are enabled in user store (usr-mgt.xml) group information will be
- recorded in a separate sub-context. Following configuration defines the group
- properties.
-
- Property Usage
- ======= =====
- adminRoleName The name of the role/group that admin should be included.
- groupNameAttribute The attribute which group name will be recorded.
- memberNameAttribute The attribute which memebers are recorded.
- -->
- <PartitionAdminGroup>
- <Property name="adminRoleName">admin</Property>
- <Property name="groupNameAttribute">cn</Property>
- <Property name="memberNameAttribute">member</Property>
- </PartitionAdminGroup>
-
- <!--
- KDC configurations
- =================
- Following configurations are applicable to KDC server. Generally, the KDC is only enabled in
- Identity Server. You may enable KDC server if you wish to do so. But if you dont have any Kerberos specific
- programs, it is recommended to disable KDC server.
-
- Property Usage
- ======= =====
- name Name given to default KDC server.
- enabled If true a KDC server will start when starting LDAP server.
- Else a KDC server will not start with a LDAP server.
- protocol Default protocol to be used in KDC communication. Default is UDP.
- maximumTicketLifeTime The maximum life time of a ticket issued by the KDC.
- maximumRenewableLifeTime Life time which a ticket can be used by renewing it several times.
- preAuthenticationTimeStampEnabled Pre-authentication is a feature in latest Kerberos protocol.
- This property says whether to enable it or disable it.
- -->
- <KDCServer>
- <Property name="name">defaultKDC</Property>
- <Property name="enabled">false</Property>
- <Property name="protocol">UDP</Property>
- <Property name="host">localhost</Property>
- <Property name="port">${Ports.EmbeddedLDAP.KDCServerPort}</Property>
- <Property name="maximumTicketLifeTime">8640000</Property>
- <Property name="maximumRenewableLifeTime">604800000</Property>
- <Property name="preAuthenticationTimeStampEnabled">true</Property>
- </KDCServer>
-
-</EmbeddedLDAPConfig>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/event-broker.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/event-broker.xml b/products/stratos/conf/event-broker.xml
deleted file mode 100644
index 296c7cd..0000000
--- a/products/stratos/conf/event-broker.xml
+++ /dev/null
@@ -1,63 +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.
- -->
-
-<!--
-this is the configuration file for the carbon event broker component. this configuration file configures the various subsystems of the event
-broker compoent and parameters.
--->
-<eventBrokerConfig xmlns="http://wso2.org/carbon/event/broker">
- <eventBroker name="carbonEventBroker" class = "org.wso2.carbon.event.core.internal.CarbonEventBrokerFactory">
- <!-- topic manager implemenation class.-->
- <topicManager name="TopicManager" class="org.wso2.carbon.event.core.internal.topic.registry.RegisistryTopicManagerFactory">
- <!-- root node of the topic tree -->
- <topicStoragePath>event/topics</topicStoragePath>
- </topicManager>
- <!-- subscriptionmnager implementaion. subscription manager persits the
- subscriptions at the registry. users can configure the topics root node and the topicIndex path -->
- <subscriptionManager name="subscriptionManager"
- class="org.wso2.carbon.event.core.internal.subscription.registry.RegistrySubscriptionManagerFactory">
- <topicStoragePath>event/topics</topicStoragePath>
- <indexStoragePath>event/topicIndex</indexStoragePath>
- </subscriptionManager>
-
- <!-- delivary manager inmplementation. delivary manager does actual delivary part of the event broker -->
- <deliveryManager name="deliveryManager"
- class="org.wso2.carbon.event.core.internal.delivery.jms.QpidJMSDeliveryManagerFactory"
- type="local">
- <!-- <remoteMessageBroker>
- <hostName>localhost</hostName>
- <servicePort>9443</servicePort>
- <webContext>/</webContext>
- <userName>admin</userName>
- <password>admin</password>
- <qpidPort>5672</qpidPort>
- <clientID>clientID</clientID>
- <virtualHostName>carbon</virtualHostName>
- </remoteMessageBroker> -->
- </deliveryManager>
-
- <!-- when publising an event event broker uses a seperate thread pool with an executor. following parameters configure different parameters of that -->
- <eventPublisher>
- <minSpareThreads>5</minSpareThreads>
- <maxThreads>50</maxThreads>
- <maxQueuedRequests>1000</maxQueuedRequests>
- <keepAliveTime>1000</keepAliveTime>
- </eventPublisher>
- </eventBroker>
-</eventBrokerConfig>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/features-dashboard.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/features-dashboard.xml b/products/stratos/conf/features-dashboard.xml
deleted file mode 100755
index df1118b..0000000
--- a/products/stratos/conf/features-dashboard.xml
+++ /dev/null
@@ -1,66 +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.
- -->
-
-<data>
- <service name="Cloud Services" link="" key="manager">
- <story title="Metering">
- <story-content>Metering measures levels of resource utilization, such
- as network bandwidth usage and
- data storage volume, consumed by the
- cloud services subscribers, aka
- tenants.
- Resource utilization's
- (bandwidth and storage usage) are measured on the fly
- and the
- measured data is stored for summarizing and analyzing.
- </story-content>
- <story-links>
- <link url="/carbon/tenant-usage/tenant_usage.jsp">Go to Metering....</link>
- <link url="/carbon/tenant-usage/docs/userguide.html">Read more (docs)...</link>
- </story-links>
- </story>
- <story title="Account Management">
- <story-content>Account management allows a tenant to update and
- validate contact information,
- update the usage plan, validate the
- account and even de-activate the
- account.
- </story-content>
- <story-links>
- <link url="/carbon/account-mgt/account_mgt.jsp">Manage Account...</link>
- <link url="/carbon/account-mgt/docs/userguide.html">Read more (docs)...</link>
- </story-links>
- </story>
- <story title="Users and Roles">
- <story-content>You can add users and define your own roles for a
- tenant. The permission model is
- role based. So a tenant admin can
- define what actions a role can perform
- by
- configuring permissions for
- that role.</story-content>
- <story-links>
- <link url="/carbon/userstore/index.jsp">Manage users/roles...</link>
- <link url="/carbon/userstore/docs/userguide.html">Read more (docs)...</link>
- </story-links>
- </story>
- </service>
-</data>
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/identity.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/identity.xml b/products/stratos/conf/identity.xml
deleted file mode 100755
index 1a20f09..0000000
--- a/products/stratos/conf/identity.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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.
- -->
-
-<Server xmlns="http://wso2.org/projects/carbon/carbon.xml">
-
- <OpenIDServerUrl>https://localhost:9443/openidserver</OpenIDServerUrl>
-
- <OpenIDUserPattern>https://localhost:9443/openid/</OpenIDUserPattern>
-
- <JDBCPersistenceManager>
- <DataSource>
- <!-- Include a data source name (jndiConfigName) from the set of data sources defined in master-datasources.xml -->
- <Name>jdbc/WSO2CarbonDB</Name>
- </DataSource>
- <!-- If the identity database is created from another place and if it is required to skip schema initialization during the server start up, set the following
- property to "true". -->
- <!-- <SkipDBSchemaCreation>false</SkipDBSchemaCreation> -->
- </JDBCPersistenceManager>
-
- <!--
- Security configurations
- -->
- <Security>
- <UserTrustedRPStore>
- <Location>${carbon.home}/repository/resources/security/userRP.jks</Location>
- <!-- Keystore type (JKS/PKCS12 etc.)-->
- <Type>JKS</Type>
- <!-- Keystore password-->
- <Password>wso2carbon</Password>
- <!-- Private Key password-->
- <KeyPassword>wso2carbon</KeyPassword>
- </UserTrustedRPStore>
-
- <!--
- The directory under which all other KeyStore files will be stored
- -->
- <KeyStoresDir>${carbon.home}/conf/keystores</KeyStoresDir>
- </Security>
-
- <Identity>
- <IssuerPolicy>SelfAndManaged</IssuerPolicy>
- <TokenValidationPolicy>CertValidate</TokenValidationPolicy>
- <BlackList></BlackList>
- <WhiteList></WhiteList>
- <System>
- <KeyStore></KeyStore>
- <StorePass></StorePass>
- </System>
- </Identity>
-
- <OAuth>
- <RequestTokenUrl>https://localhost:9443/oauth/request-token</RequestTokenUrl>
- <AccessTokenUrl>https://localhost:9443/oauth/access-token</AccessTokenUrl>
- <AuthorizeUrl>https://localhost:9443/oauth/authorize-url</AuthorizeUrl>
- <!-- Default validity period for Authorization Code in seconds -->
- <AuthorizationCodeDefaultValidityPeriod>300</AuthorizationCodeDefaultValidityPeriod>
- <!-- Default validity period for Access Token in seconds -->
- <AccessTokenDefaultValidityPeriod>3600</AccessTokenDefaultValidityPeriod>
- <!-- Timestamp skew in seconds -->
- <TimestampSkew>300</TimestampSkew>
- <!-- Enable OAuth caching. This cache has the replication support. -->
- <EnableOAuthCache>true</EnableOAuthCache>
- <!-- Configure the security measures needs to be done prior to store the token in the database,
- such as hashing, encrypting, etc.-->
- <TokenPersistencePreprocessor>org.wso2.carbon.identity.oauth.preprocessor.PlainTextTokenPersistencePreprocessor</TokenPersistencePreprocessor>
- <!-- Supported Response Types -->
- <SupportedResponseTypes>token,code</SupportedResponseTypes>
- <!-- Supported Grant Types -->
- <SupportedGrantTypes>authorization_code,password,refresh_token,client_credentials</SupportedGrantTypes>
- <OAuthCallbackHandlers>
- <OAuthCallbackHandler Class="org.wso2.carbon.identity.oauth.callback.DefaultCallbackHandler"/>
- </OAuthCallbackHandlers>
- </OAuth>
-
- <MultifactorAuthentication>
- <XMPPSettings>
- <XMPPConfig>
- <XMPPProvider>gtalk</XMPPProvider>
- <XMPPServer>talk.google.com</XMPPServer>
- <XMPPPort>5222</XMPPPort>
- <XMPPExt>gmail.com</XMPPExt>
- <XMPPUserName>multifactor1@gmail.com</XMPPUserName>
- <XMPPPassword>wso2carbon</XMPPPassword>
- </XMPPConfig>
- </XMPPSettings>
- </MultifactorAuthentication>
-
- <SSOService>
- <IdentityProviderURL>https://localhost:9443/samlsso</IdentityProviderURL>
- </SSOService>
-</Server>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/jaas.conf
----------------------------------------------------------------------
diff --git a/products/stratos/conf/jaas.conf b/products/stratos/conf/jaas.conf
deleted file mode 100644
index b560cba..0000000
--- a/products/stratos/conf/jaas.conf
+++ /dev/null
@@ -1,30 +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.
-#
-
-Server {
- org.apache.zookeeper.server.auth.DigestLoginModule required
- user_super="admin"
- user_admin="admin";
-};
-Client {
- org.apache.zookeeper.server.auth.DigestLoginModule required
- username="admin"
- password="admin";
-};
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/jndi.properties
----------------------------------------------------------------------
diff --git a/products/stratos/conf/jndi.properties b/products/stratos/conf/jndi.properties
deleted file mode 100644
index 5a20434..0000000
--- a/products/stratos/conf/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:61616
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/metering-config-non-manager.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/metering-config-non-manager.xml b/products/stratos/conf/metering-config-non-manager.xml
deleted file mode 100755
index 6f642a3..0000000
--- a/products/stratos/conf/metering-config-non-manager.xml
+++ /dev/null
@@ -1,104 +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.
- -->
-<meteringConfig xmlns="http://wso2.com/carbon/multitenancy/metering/config">
- <tasks>
- <task service="org.apache.stratos.metering.agent.task.PerRegistryRequestTask">
- <preHandlers>
- <handler service="org.apache.stratos.metering.agent.handlers.ValidationInfoRetriever">
- </handler>
- <handler service="org.apache.stratos.metering.agent.handlers.RegistryActionValidator">
- </handler>
- </preHandlers>
- <postHandlers>
- <handler service="org.apache.stratos.metering.agent.handlers.RemoteTaskInvoker"
- async="true" frequency="1"><!-- trigger per each request-->
- <parameter name="taskServiceUrl">https://localhost:9443/services/</parameter>
- <parameter name="userName">admin</parameter>
- <parameter name="password">admin</parameter>
- <parameter name="taskName">org.apache.stratos.metering.manager.task.PerRegistryRequestRemoteTask</parameter>
- </handler>
- </postHandlers>
- </task>
- <task service="org.apache.stratos.metering.agent.task.PerUserAddRequestTask">
- <preHandlers>
- <handler service="org.apache.stratos.metering.agent.handlers.RemoteTaskInvoker"
- async="false" frequency="1"><!-- trigger per each request-->
- <parameter name="taskServiceUrl">https://localhost:9443/services/</parameter>
- <parameter name="userName">admin</parameter>
- <parameter name="password">admin</parameter>
- <parameter name="taskName">org.apache.stratos.metering.manager.task.PerUserAddRequestRemoteTask</parameter>
- </handler>
- <handler service="org.apache.stratos.metering.agent.handlers.ValidationInfoRetriever">
- </handler>
- <handler service="org.apache.stratos.metering.agent.handlers.AddUserActionValidator">
- </handler>
- </preHandlers>
- </task>
- <task service="org.apache.stratos.metering.manager.task.PerRegistryRequestRemoteTask">
- <postHandlers>
- <handler service="org.apache.stratos.metering.agent.handlers.ValidationInfoRetriever">
- </handler>
- <handler service="org.apache.stratos.metering.manager.handlers.DBContentVolumeRetriever"><!-- trigger per each registry request-->
- </handler>
- <handler service="org.apache.stratos.metering.manager.handlers.BandwidthDataRetriever" async="true" frequency="5"><!-- trigger per 5 registry request-->
- </handler>
- <handler service="org.apache.stratos.metering.manager.handlers.BandwidthDataStorer">
- </handler>
- <handler service="org.apache.stratos.metering.manager.handlers.BillingDataRetriever"><!-- trigger per each registry request-->
- </handler>
- <handler service="org.apache.stratos.metering.manager.handlers.RuleInvoker">
- <parameter name="rule-file">restriction-rules.drl</parameter>
- </handler>
- <handler service="org.apache.stratos.metering.agent.handlers.ValidationInfoStorer">
- </handler>
- </postHandlers>
- </task>
- <task service="org.apache.stratos.metering.manager.task.PerUserAddRequestRemoteTask">
- <postHandlers>
- <handler service="org.apache.stratos.metering.manager.handlers.UsersCountRetriever"><!-- trigger per each user add request-->
- </handler>
- <handler service="org.apache.stratos.metering.agent.handlers.ValidationInfoRetriever">
- </handler>
- <handler service="org.apache.stratos.metering.manager.handlers.BillingDataRetriever"><!-- trigger per each user add request-->
- </handler>
- <handler service="org.apache.stratos.metering.manager.handlers.RuleInvoker">
- <parameter name="rule-file">restriction-rules.drl</parameter>
- </handler>
- <handler service="org.apache.stratos.metering.agent.handlers.ValidationInfoStorer">
- </handler>
- </postHandlers>
- </task>
- <!-- to be implemented -->
- <!--
- <task service="org.apache.stratos.metering.manager.task.ScheduledTask">
- <parameters>
- <parameter name="period">1Month</parameter>
- <parameter name="dayToTriggerOn">1</parameter>
- <parameter name="hourToTriggerOn">0</parameter>
- <parameter name="timeZone">GMT-8:00</parameter>
- </parameters>
- <hanldlers>
- <handler service="org.apache.stratos.metering.manager.handler.RuleInvoker">
- <parameter name="rule-file">restriction-rules.drl</parameter>
- </handler>
- </handlers>
- </task>
- -->
- </tasks>
-</meteringConfig>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/mqtttopic.properties
----------------------------------------------------------------------
diff --git a/products/stratos/conf/mqtttopic.properties b/products/stratos/conf/mqtttopic.properties
deleted file mode 100644
index 823c1a9..0000000
--- a/products/stratos/conf/mqtttopic.properties
+++ /dev/null
@@ -1,21 +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.
-#
-
-mqtturl=tcp://localhost:1883
-clientID=stratos
-tempfilelocation=/tmp
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/nhttp.properties
----------------------------------------------------------------------
diff --git a/products/stratos/conf/nhttp.properties b/products/stratos/conf/nhttp.properties
deleted file mode 100644
index 40c3bfc..0000000
--- a/products/stratos/conf/nhttp.properties
+++ /dev/null
@@ -1,42 +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.
-#
-
-# This file contains the configuration parameters used by the Non-blocking HTTP transport
-
-#http.socket.timeout=60000
-#nhttp_buffer_size=8192
-#http.tcp.nodelay=1
-#http.connection.stalecheck=0
-
-# Uncomment the following property for an AIX based deployment
-#http.nio.interest-ops-queueing=true
-
-# HTTP Sender thread pool parameters
-#snd_t_core=20
-#snd_t_max=100
-#snd_alive_sec=5
-#snd_qlen=-1
-#snd_io_threads=2
-
-# HTTP Listener thread pool parameters
-#lst_t_core=20
-#lst_t_max=100
-#lst_alive_sec=5
-#lst_qlen=-1
-#lst_io_threads=2
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/passthru-http.properties
----------------------------------------------------------------------
diff --git a/products/stratos/conf/passthru-http.properties b/products/stratos/conf/passthru-http.properties
deleted file mode 100644
index 21cd1ab..0000000
--- a/products/stratos/conf/passthru-http.properties
+++ /dev/null
@@ -1,34 +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.
-#
-
-## This file contains the configuration parameters used by the Pass-through HTTP transport
-
-## Pass-through HTTP transport specific tuning parameters
-#worker_pool_size_core=40
-#worker_pool_size_max=200
-#worker_thread_keepalive_sec=60
-#worker_pool_queue_length=-1
-#io_threads_per_reactor=2
-#io_buffer_size=8192
-#http.max.connection.per.host.port=32767
-
-## Other parameters
-#http.user.agent.preserve=false
-#http.server.preserve=true
-#http.connection.disable.keepalive=false
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/registry.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/registry.xml b/products/stratos/conf/registry.xml
deleted file mode 100644
index a395610..0000000
--- a/products/stratos/conf/registry.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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.
- -->
-<wso2registry>
-
- <!--
- For details on configuring different config & governance registries see;
- http://wso2.org/library/tutorials/2010/04/sharing-registry-space-across-multiple-product-instances
- -->
-
- <currentDBConfig>wso2registry</currentDBConfig>
- <readOnly>false</readOnly>
- <enableCache>true</enableCache>
- <registryRoot>/</registryRoot>
-
- <dbConfig name="wso2registry">
- <dataSource>jdbc/WSO2CarbonDB</dataSource>
- </dbConfig>
-
- <!--<handler class="org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler">
- <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
- <property name="mediaType">application/vnd.apache.synapse</property>
- </filter>
- </handler>
-
- <handler class="org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler">
- <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
- <property name="mediaType">application/vnd.apache.esb</property>
- </filter>
- </handler>
-
- <handler class="org.wso2.carbon.registry.extensions.handlers.Axis2RepositoryHandler">
- <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
- <property name="mediaType">application/vnd.apache.axis2</property>
- </filter>
- </handler>
-
- <handler class="org.wso2.carbon.registry.extensions.handlers.Axis2RepositoryHandler">
- <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
- <property name="mediaType">application/vnd.apache.wsas</property>
- </filter>
- </handler>
-
- <handler class="org.wso2.carbon.registry.extensions.handlers.WSDLMediaTypeHandler">
- <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
- <property name="mediaType">application/wsdl+xml</property>
- </filter>
- </handler>
-
- <handler class="org.wso2.carbon.registry.extensions.handlers.XSDMediaTypeHandler">
- <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
- <property name="mediaType">application/x-xsd+xml</property>
- </filter>
- </handler> -->
-
- <!--remoteInstance url="https://localhost:9443/registry">
- <id>instanceid</id>
- <username>username</username>
- <password>password</password>
- </remoteInstance-->
-
- <!--remoteInstance url="https://localhost:9443/registry">
- <id>instanceid</id>
- <dbConfig>wso2registry</dbConfig>
- <readOnly>false</readOnly>
- <enableCache>true</enableCache>
- <registryRoot>/</registryRoot>
- </remoteInstance-->
-
- <!--mount path="/_system/config" overwrite="true|false|virtual">
- <instanceId>instanceid</instanceId>
- <targetPath>/_system/nodes</targetPath>
- </mount-->
-
-
- <versionResourcesOnChange>false</versionResourcesOnChange>
-
- <!-- NOTE: You can edit the options under "StaticConfiguration" only before the
- startup. -->
- <staticConfiguration>
- <versioningProperties>true</versioningProperties>
- <versioningComments>true</versioningComments>
- <versioningTags>true</versioningTags>
- <versioningRatings>true</versioningRatings>
- </staticConfiguration>
-</wso2registry>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/rule-component.conf
----------------------------------------------------------------------
diff --git a/products/stratos/conf/rule-component.conf b/products/stratos/conf/rule-component.conf
deleted file mode 100644
index 7ee068e..0000000
--- a/products/stratos/conf/rule-component.conf
+++ /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.
--->
-
-<RuleServer>
- <RuleEngineProvider class="org.wso2.carbon.rule.engine.jsr94.JSR94BackendRuntimeFactory"/>
-</RuleServer>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/samples-desc.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/samples-desc.xml b/products/stratos/conf/samples-desc.xml
deleted file mode 100755
index 580f9b0..0000000
--- a/products/stratos/conf/samples-desc.xml
+++ /dev/null
@@ -1,33 +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.
- -->
-<samples xmlns="http://wso2.com/stratos/samples">
- <sample name="Shopping Cart">
- <cloudServices>
- <cloudService name="Application Server"/>
- <!--cloudService name="WSO2 Stratos Governance"/>
- <cloudService name="WSO2 Stratos Application Server"/>
- <cloudService name="WSO2 Stratos Gadget Server"/>
- <cloudService name="WSO2 Stratos Mashup Server"/>
- <cloudService name="WSO2 Stratos Enterprise Service Bus"/>
- <cloudService name="WSO2 Stratos Data Services Server"/>
- <cloudService name="WSO2 Stratos Business Process Server"/-->
- </cloudServices>
- <fileName>GlobalShoppingCartSample-${shoppingcart.global.version}</fileName>
- </sample>
-</samples>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/sso-idp-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/sso-idp-config.xml b/products/stratos/conf/sso-idp-config.xml
deleted file mode 100644
index 902c8fa..0000000
--- a/products/stratos/conf/sso-idp-config.xml
+++ /dev/null
@@ -1,39 +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.
- -->
-<SSOIdentityProviderConfig>
- <ServiceProviders>
- <ServiceProvider>
- <Issuer>console</Issuer>
- <AssertionConsumerService>https://localhost:9443/console/controllers/acs.jag</AssertionConsumerService>
- <UseFullyQualifiedUsernameInNameID>true</UseFullyQualifiedUsernameInNameID>
- <SignResponse>true</SignResponse>
- <SignAssertion>true</SignAssertion>
- <EnableAttributeProfile>true</EnableAttributeProfile>
- <IncludeAttributeByDefault>true</IncludeAttributeByDefault>
- <Claims>
- <Claim>http://wso2.org/claims/role</Claim>
- </Claims>
- <EnableAudienceRestriction>true</EnableAudienceRestriction>
- <AudiencesList>
- <Audience>https://localhost:9445/oauth2/token</Audience>
- </AudiencesList>
- <ConsumingServiceIndex>123456</ConsumingServiceIndex>
- </ServiceProvider>
- </ServiceProviders>
-</SSOIdentityProviderConfig>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/status-monitor-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/status-monitor-config.xml b/products/stratos/conf/status-monitor-config.xml
deleted file mode 100755
index 91bf5a3..0000000
--- a/products/stratos/conf/status-monitor-config.xml
+++ /dev/null
@@ -1,53 +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.
- -->
-
-<!--
- Defines the database and related params that to be used for the services status
- monitoring. Status Monitor Agent writes to the database defined here, and the
- Status Monitor reads it.
- -->
-
-<serviceStatusConfig xmlns="http://wso2.com/carbon/status/monitor/config">
- <authConfig>
- <jksLocation>../../repository/resources/security/wso2carbon.jks</jksLocation> <!--location to the jks file-->
-
- <!--The tenant credentials that to be used to login to the Stratos
- services. Make sure the correct credentials are given to avoid
- false positives.-->
- <userName>admin@wso2-heartbeat-checker.org</userName>
- <password>password</password>
- <tenantDomain>wso2-heartbeat-checker.org</tenantDomain>
- </authConfig>
-
- <platformSample>
- <!--The tenant that has the webapps and services to monitor.
- This can of course be the same tenant given above as tenantDomain-->
- <tenantDomain>wso2.org</tenantDomain>
- </platformSample>
-
- <dbConfig>
- <url>jdbc:mysql://localhost:3306/stratos_status</url>
- <userName>monitor</userName>
- <password>monitor</password>
- <driverName>com.mysql.jdbc.Driver</driverName>
- <maxActive>80</maxActive>
- <maxWait>60000</maxWait>
- <minIdle>5</minIdle>
- </dbConfig>
-</serviceStatusConfig>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/stratos-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/stratos-config.xml b/products/stratos/conf/stratos-config.xml
deleted file mode 100644
index 47b84ce..0000000
--- a/products/stratos/conf/stratos-config.xml
+++ /dev/null
@@ -1,30 +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.
- ~ */
- -->
-<configuration>
- <threadPool>
- <autoscaler>
- <identifier>Autoscaler</identifier>
- <threadPoolSize>10</threadPoolSize>
- </autoscaler>
- </threadPool>
-</configuration>
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/stratos-datasources.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/stratos-datasources.xml b/products/stratos/conf/stratos-datasources.xml
deleted file mode 100755
index 4969870..0000000
--- a/products/stratos/conf/stratos-datasources.xml
+++ /dev/null
@@ -1,69 +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.
- -->
-
-<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
-
- <providers>
- <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
- </providers>
-
- <datasources>
- <datasource>
- <name>WSO2BillingDS</name>
- <description>The datasource used for registry and user manager</description>
- <jndiConfig>
- <name>jdbc/WSO2BillingDS</name>
- </jndiConfig>
- <definition type="RDBMS">
- <configuration>
- <url>jdbc:h2:repository/database/WSO2BILLING_DB;DB_CLOSE_ON_EXIT=FALSE</url>
- <username>wso2carbon</username>
- <password>wso2carbon</password>
- <driverClassName>org.h2.Driver</driverClassName>
- <maxActive>50</maxActive>
- <maxWait>60000</maxWait>
- <testOnBorrow>true</testOnBorrow>
- <validationQuery>SELECT 1</validationQuery>
- <validationInterval>30000</validationInterval>
- </configuration>
- </definition>
- </datasource>
-
- <datasource>
- <name>WSO2S2DS</name>
- <description>The datasource used for s2</description>
- <jndiConfig>
- <name>jdbc/WSO2S2DS</name>
- </jndiConfig>
- <definition type="RDBMS">
- <configuration>
- <url>jdbc:h2:repository/database/WSO2S2_DB;DB_CLOSE_ON_EXIT=FALSE</url>
- <username>wso2carbon</username>
- <password>wso2carbon</password>
- <driverClassName>org.h2.Driver</driverClassName>
- <maxActive>50</maxActive>
- <maxWait>60000</maxWait>
- <testOnBorrow>true</testOnBorrow>
- <validationQuery>SELECT 1</validationQuery>
- <validationInterval>30000</validationInterval>
- </configuration>
- </definition>
- </datasource>
- </datasources>
-</datasources-configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/synapse-configs/default/registry.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/synapse-configs/default/registry.xml b/products/stratos/conf/synapse-configs/default/registry.xml
deleted file mode 100644
index f259c7a..0000000
--- a/products/stratos/conf/synapse-configs/default/registry.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
- -->
-
-<!-- Registry declaration of the WSO2 ESB -->
-<registry xmlns="http://ws.apache.org/ns/synapse" provider="org.wso2.carbon.mediation.registry.WSO2Registry">
- <!--all resources loaded from the URL registry would be
- cached for this number of milliseconds -->
- <parameter name="cachableDuration">15000</parameter>
-</registry>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/synapse-configs/default/sequences/errorHandler.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/synapse-configs/default/sequences/errorHandler.xml b/products/stratos/conf/synapse-configs/default/sequences/errorHandler.xml
deleted file mode 100644
index 8621bee..0000000
--- a/products/stratos/conf/synapse-configs/default/sequences/errorHandler.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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.
- -->
- <sequence name="errorHandler" xmlns="http://ws.apache.org/ns/synapse">
- <log level="full">
- <property name="MESSAGE" value="Executing default 'fault' sequence"/>
- <property name="ERROR_CODE" expression="get-property('ERROR_CODE')"/>
- <property name="ERROR_MESSAGE" expression="get-property('ERROR_MESSAGE')"/>
- </log>
- <makefault response="true">
- <code value="tns:Receiver" xmlns:tns="http://www.w3.org/2003/05/soap-envelope"/>
- <reason value="COULDN'T SEND THE MESSAGE TO THE SERVER."/>
- </makefault>
- <send/>
- </sequence>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/synapse-configs/default/sequences/fault.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/synapse-configs/default/sequences/fault.xml b/products/stratos/conf/synapse-configs/default/sequences/fault.xml
deleted file mode 100644
index 9d2d8f7..0000000
--- a/products/stratos/conf/synapse-configs/default/sequences/fault.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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.
- -->
-
-<!-- Default fault sequence shipped with the Apache Synapse -->
-<sequence xmlns="http://ws.apache.org/ns/synapse" name="fault">
-
- <!-- Log the message at the full log level with the ERROR_MESSAGE and the ERROR_CODE-->
- <!-- log level="full">
- <property name="MESSAGE" value="Executing default 'fault' sequence"/>
- <property name="ERROR_CODE" expression="get-property('ERROR_CODE')"/>
- <property name="ERROR_MESSAGE" expression="get-property('ERROR_MESSAGE')"/>
- </log -->
-
- <!-- Drops the messages by default if there is a fault -->
- <script language="js"><![CDATA[
- mc.setPayloadXML(
- <{mc.getProperty("SERVICENAME")}Response xmlns="org.wso2.gateway">
- <Timestamp>{new Date()}</Timestamp>
- <Ack>Failure</Ack>
- <Errors>
- <ShortMessage>Gateway Error</ShortMessage>
- <LongMessage>{mc.getProperty("ERROR_MESSAGE")}</LongMessage>
- <ErrorCode>500</ErrorCode>
- <SeverityCode>Error</SeverityCode>
- <ErrorClassification>RequestError</ErrorClassification>
- </Errors>
- <ServiceName>{mc.getProperty("SERVICENAME")}</ServiceName>
- <ResponseCode>{mc.getProperty("HTTP_SC")}</ResponseCode>
- <ContentType>{mc.getProperty("Content-Type")}</ContentType>
- <Version>1.5.1</Version>
- </{mc.getProperty("SERVICENAME")}Response>
- );
- ]]></script>
- <switch source="get-property('ERROR_CODE')">
- <case regex="101504"> <!-- TIMEOUT ERROR -->
- <property name="HTTP_SC" value="504" scope="axis2"/>
- <sequence key="seq_timeout"/>
- </case>
- <case regex="303001">
- <property name="HTTP_SC" value="503" scope="axis2"/>
- <sequence key="seq_endpoint_down"/>
- </case>
- <case regex="111503">
- <property name="HTTP_SC" value="503" scope="axis2"/>
- <sequence key="seq_endpoint_down"/>
- </case>
- <default>
- <property name="HTTP_SC" value="500" scope="axis2"/>
- </default>
- </switch>
- <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
- <header name="To" action="remove"/>
- <property name="RESPONSE" value="true"/>
- <property name="messageType" value="text/xml" scope="axis2"/>
- <property name="ContentType" value="text/xml" scope="axis2"/>
-
- <send/>
-
-</sequence>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/synapse-configs/default/sequences/main.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/synapse-configs/default/sequences/main.xml b/products/stratos/conf/synapse-configs/default/sequences/main.xml
deleted file mode 100644
index c4dbf5b..0000000
--- a/products/stratos/conf/synapse-configs/default/sequences/main.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?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.
- -->
-
-<!-- Default main sequence shipped with the WSO2 ESB -->
-<sequence xmlns="http://ws.apache.org/ns/synapse" name="main" onError="fault">
- <description>The main sequence for the message mediation</description>
-
- <in>
- <property name="REQUEST_HOST_HEADER" expression="$trp:host" scope="axis2"/>
- <property name="SERVICE_PREFIX" expression="$axis2:SERVICE_PREFIX"/>
- <send>
- <!--endpoint name="sdlbEndpoint">
- <session type="http">-->
- <!-- Session timout is 15mins-->
- <!--sessionTimeout>900000</sessionTimeout>
- </session>
- <serviceDynamicLoadbalance failover="true"
- algorithm="org.apache.synapse.endpoints.algorithms.RoundRobin"
- configuration="$system:loadbalancer.xml"/>
- </endpoint>
- -->
- <!--endpoint name="tenantAwareLBEndpoint">
- <class name ="org.wso2.carbon.lb.endpoint.endpoint.TenantAwareLoadBalanceEndpoint">
- <parameter name="algorithm"> org.apache.synapse.endpoints.algorithms.RoundRobin</parameter>
- <parameter name="configuration">$system:loadbalancer.conf</parameter>
- <parameter name="failover">true</parameter>
- <parameter name="sessionTimeout">900000</parameter>
- </class>
- </endpoint-->
- </send>
- <drop/>
- </in>
-
- <out>
- <!-- Handling status codes: 301, 302 Redirection -->
- <filter source="$trp:Location" regex=".+">
- <property name="LB_SP_Host" expression="$ctx:SERVICE_PREFIX"
- pattern="(^http.?://\b)(.*):(\d*)(.*)" group="2"/>
-
- <property name="LB_Location_Protocol" expression="$trp:Location"
- pattern="(^http.?://\b)(.*):(\d*)(.*)" group="1"/>
- <property name="LB_Location_Host" expression="$trp:Location"
- pattern="(^http.?://\b)(.*):(\d*)(.*)" group="2"/>
- <property name="LB_Location_Path" expression="$trp:Location"
- pattern="(^http.?://\b)(.*):(\d*)(.*)" group="4"/>
-
- <!--<log level="custom">
- <property name="ameera-ocation" expression="$trp:Location"/>
- <property name="ameera-sprefix" expression="$ctx:SERVICE_PREFIX"/>
- </log>-->
-
- <filter xpath="fn:lower-case($ctx:LB_SP_Host)=fn:lower-case($ctx:LB_Location_Host)">
- <then>
- <switch source="fn:lower-case($ctx:LB_Location_Protocol)">
- <case regex="https://">
- <property name="Location"
- expression="fn:concat($ctx:LB_Location_Protocol,$ctx:LB_REQUEST_HOST,$ctx:LB_Location_Path)"
- scope="transport"/>
- </case>
- <case regex="http://">
- <property name="Location"
- expression="fn:concat($ctx:LB_Location_Protocol,$ctx:LB_REQUEST_HOST,$ctx:LB_Location_Path)"
- scope="transport"/>
- </case>
- </switch>
- </then>
-
- <else>
- <filter xpath="$ctx:LB_REQUEST_HOST=fn:lower-case($ctx:LB_Location_Host)">
- <switch source="fn:lower-case($ctx:LB_Location_Protocol)">
- <case regex="https://">
- <property name="Location"
- expression="fn:concat($ctx:LB_Location_Protocol,$ctx:LB_REQUEST_HOST,$ctx:LB_Location_Path)"
- scope="transport"/>
- </case>
- <case regex="http://">
- <property name="Location"
- expression="fn:concat($ctx:LB_Location_Protocol,$ctx:LB_REQUEST_HOST,$ctx:LB_Location_Path)"
- scope="transport"/>
- </case>
- </switch>
- </filter>
- </else>
- </filter>
- </filter>
-
- <!-- Send the messages where they have been sent (i.e. implicit To EPR) -->
- <property name="messageType" value="text/html" scope="axis2"/>
- <send/>
- <drop/>
- </out>
-
-</sequence>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/synapse-configs/default/synapse.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/synapse-configs/default/synapse.xml b/products/stratos/conf/synapse-configs/default/synapse.xml
deleted file mode 100755
index d8ad52d..0000000
--- a/products/stratos/conf/synapse-configs/default/synapse.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.
- -->
-
-<!-- The default synapse configuration shipped with the WSO2 Elastic Load Balancer
- -->
-
-<definitions xmlns="http://ws.apache.org/ns/synapse">
-</definitions>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/synapse.properties
----------------------------------------------------------------------
diff --git a/products/stratos/conf/synapse.properties b/products/stratos/conf/synapse.properties
deleted file mode 100755
index c3cbdb4..0000000
--- a/products/stratos/conf/synapse.properties
+++ /dev/null
@@ -1,38 +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.
-#
-
-#synapse.threads.core = 20
-#synapse.threads.max = 100
-#synapse.threads.keepalive = 5
-#synapse.threads.qlen = 10
-#synapse.threads.group = synapse-thread-group
-#synapse.threads.idprefix = SynapseWorker
-
-synapse.sal.endpoints.sesssion.timeout.default=600000
-
-#In memory statistics cleaning state
-statistics.clean.enable=false
-
-# Dependency tracking Synapse observer
-# Comment out to disable dependency management
-synapse.observers=org.wso2.carbon.mediation.dependency.mgt.DependencyTracker
-
-# User defined wsdlLocator/Schema Resolver Implementations.
-# synapse.wsdl.resolver=org.wso2.carbon.mediation.initializer.RegistryWSDLLocator
-# synapse.schema.resolver=org.wso2.carbon.mediation.initializer.RegistryXmlSchemaURIResolver
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/temp-artifacts/carbon/module.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/temp-artifacts/carbon/module.xml b/products/stratos/conf/temp-artifacts/carbon/module.xml
deleted file mode 100644
index 2cb5634..0000000
--- a/products/stratos/conf/temp-artifacts/carbon/module.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version='1.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.
-
--->
-
-<module name="carbon" xmlns="http://wso2.org/projects/jaggery/module.xml">
- <!-- scripts -->
- <script>
- <name>osgi</name>
- <path>scripts/server/osgi.js</path>
- </script>
- <script>
- <name>tenant</name>
- <path>scripts/server/tenant.js</path>
- </script>
- <script>
- <name>server</name>
- <path>scripts/server/server.js</path>
- </script>
- <script>
- <name>config</name>
- <path>scripts/server/config.js</path>
- </script>
- <script>
- <name>user</name>
- <path>scripts/user/user.js</path>
- </script>
- <script>
- <name>registry</name>
- <path>scripts/registry/registry.js</path>
- </script>
- <script>
- <name>registry-osgi</name>
- <path>scripts/registry/registry-osgi.js</path>
- </script>
- <script>
- <name>artifacts</name>
- <path>scripts/registry/artifacts.js</path>
- </script>
- <script>
- <name>space</name>
- <path>scripts/user/space.js</path>
- </script>
- <script>
- <name>registry-space</name>
- <path>scripts/user/registry-space.js</path>
- </script>
- <script>
- <name>user-manager</name>
- <path>scripts/user/user-manager.js</path>
- </script>
-</module>
[14/50] [abbrv] stratos git commit: Introducing stratos integration
test suite for the artifacts
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
index 096dd60..7641b18 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
@@ -19,266 +19,78 @@
package org.apache.stratos.integration.tests;
-import org.apache.commons.exec.CommandLine;
-import org.apache.commons.exec.DefaultExecutor;
-import org.apache.commons.exec.PumpStreamHandler;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext;
-import org.apache.stratos.common.beans.PropertyBean;
import org.apache.stratos.common.beans.application.ApplicationBean;
-import org.apache.stratos.common.beans.cartridge.CartridgeBean;
import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
-import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
-import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
-import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
-import org.apache.stratos.common.client.AutoscalerServiceClient;
-import org.apache.stratos.common.threading.StratosThreadPool;
-import org.apache.stratos.integration.tests.rest.RestClient;
-import org.apache.stratos.messaging.domain.application.*;
-import org.apache.stratos.messaging.domain.instance.ClusterInstance;
-import org.apache.stratos.messaging.domain.instance.GroupInstance;
-import org.apache.stratos.messaging.domain.topology.Cluster;
-import org.apache.stratos.messaging.domain.topology.Member;
-import org.apache.stratos.messaging.domain.topology.MemberStatus;
-import org.apache.stratos.messaging.domain.topology.Service;
-import org.apache.stratos.messaging.message.receiver.application.ApplicationManager;
-import org.apache.stratos.messaging.message.receiver.application.ApplicationsEventReceiver;
-import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver;
-import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.rmi.RemoteException;
-import java.util.Collection;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-
-import static junit.framework.Assert.*;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
/**
- * Sample application tests.
+ * Sample application tests with application add, .
*/
public class SampleApplicationsTest extends StratosTestServerManager {
+ private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
- private static final Log log = LogFactory.getLog(StratosTestServerManager.class);
-
- public static final int APPLICATION_ACTIVATION_TIMEOUT = 120000;
- public static final String APPLICATION_STATUS_CREATED = "Created";
- public static final String APPLICATION_STATUS_UNDEPLOYING = "Undeploying";
- private String endpoint = "https://localhost:9443";
-
- private ApplicationsEventReceiver applicationsEventReceiver;
- private TopologyEventReceiver topologyEventReceiver;
- private RestClient restClient;
- private AutoscalingPolicyTest autoscalingPolicyTest;
- private NetworkPartitionTest networkPartitionTest;
- private CartridgeTest cartridgeTest;
- private DeploymentPolicyTest deploymentPolicyTest;
- private CartridgeGroupTest cartridgeGroupTest;
- private ApplicationTest applicationTest;
- private ApplicationPolicyTest applicationPolicyTest;
-
-
- @BeforeClass
- public void setUp() {
- // Set jndi.properties.dir system property for initializing event receivers
- System.setProperty("jndi.properties.dir", getResourcesFolderPath());
- System.setProperty("autoscaler.service.url", "https://localhost:9443/services/AutoscalerService");
- restClient = new RestClient(endpoint, "admin", "admin");
- autoscalingPolicyTest = new AutoscalingPolicyTest();
- networkPartitionTest = new NetworkPartitionTest();
- cartridgeTest = new CartridgeTest();
- deploymentPolicyTest = new DeploymentPolicyTest();
- cartridgeGroupTest = new CartridgeGroupTest();
- applicationTest = new ApplicationTest();
- applicationPolicyTest = new ApplicationPolicyTest();
- }
-
- @Test
- public void testSingleCartridgeApplication() {
- try {
- initializeApplicationEventReceiver();
- //runApplicationTest("simple/single-cartridge-app", "single-cartridge-app");
- } catch (Exception e) {
- log.error(e);
- assertTrue("An error occurred", false);
- }
- }
-
- @Test
- public void testAutoscalingPolicy() {
- log.info("Started autoscaling policy test case**************************************");
- String policyId = "autoscaling-policy-c0";
- try {
- boolean added = autoscalingPolicyTest.addAutoscalingPolicy(policyId + ".json",
- restClient);
- assertEquals(String.format("Autoscaling policy did not added: [autoscaling-policy-id] %s", policyId), added, true);
- AutoscalePolicyBean bean = autoscalingPolicyTest.getAutoscalingPolicy(policyId,
- restClient);
- assertEquals(String.format("[autoscaling-policy-id] %s is not correct", bean.getId()),
- bean.getId(), policyId);
- assertEquals(String.format("[autoscaling-policy-id] %s RIF is not correct", policyId),
- bean.getLoadThresholds().getRequestsInFlight().getThreshold(), 35.0, 0.0);
- assertEquals(String.format("[autoscaling-policy-id] %s Memory is not correct", policyId),
- bean.getLoadThresholds().getMemoryConsumption().getThreshold(), 45.0, 0.0);
- assertEquals(String.format("[autoscaling-policy-id] %s Load is not correct", policyId),
- bean.getLoadThresholds().getLoadAverage().getThreshold(), 25.0, 0.0);
-
- boolean updated = autoscalingPolicyTest.updateAutoscalingPolicy(policyId + ".json",
- restClient);
- assertEquals(String.format("[autoscaling-policy-id] %s update failed", policyId), updated, true);
- AutoscalePolicyBean updatedBean = autoscalingPolicyTest.getAutoscalingPolicy(policyId,
- restClient);
- assertEquals(String.format("[autoscaling-policy-id] %s RIF is not correct", policyId),
- updatedBean.getLoadThresholds().getRequestsInFlight().getThreshold(), 30.0, 0.0);
- assertEquals(String.format("[autoscaling-policy-id] %s Load is not correct", policyId),
- updatedBean.getLoadThresholds().getMemoryConsumption().getThreshold(), 40.0, 0.0);
- assertEquals(String.format("[autoscaling-policy-id] %s Memory is not correct", policyId),
- updatedBean.getLoadThresholds().getLoadAverage().getThreshold(), 20.0, 0.0);
-
- boolean removed = autoscalingPolicyTest.removeAutoscalingPolicy(policyId,
- restClient);
- assertEquals(String.format("[autoscaling-policy-id] %s couldn't be removed", policyId),
- removed, true);
-
- AutoscalePolicyBean beanRemoved = autoscalingPolicyTest.getAutoscalingPolicy(policyId,
- restClient);
- assertEquals(String.format("[autoscaling-policy-id] %s didn't get removed successfully",
- policyId), beanRemoved, null);
- log.info("Ended autoscaling policy test case**************************************");
- } catch (Exception e) {
- log.error("An error occurred while handling [autoscaling policy] " + policyId, e);
- assertTrue("An error occurred while handling [autoscaling policy] " + policyId, false);
- }
- }
-
- @Test
- public void testCartridgeGroup() {
- try {
- log.info("Started Cartridge group test case**************************************");
-
- boolean addedC1 = cartridgeTest.addCartridge("c1.json", restClient);
- assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c1"), addedC1, true);
-
- boolean addedC2 = cartridgeTest.addCartridge("c2.json", restClient);
- assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c2"), addedC2, true);
-
- boolean addedC3 = cartridgeTest.addCartridge("c3.json", restClient);
- assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c3"), addedC3, true);
-
- boolean added = cartridgeGroupTest.addCartridgeGroup("cartrdige-nested.json",
- restClient);
- assertEquals(String.format("Cartridge Group did not added: [cartridge-group-name] %s",
- "cartrdige-nested"), added, true);
- CartridgeGroupBean bean = cartridgeGroupTest.getCartridgeGroup("G1",
- restClient);
- assertEquals(String.format("Cartridge Group name did not match: [cartridge-group-name] %s",
- "cartrdige-nested"), bean.getName(), "G1");
-
- boolean updated = cartridgeGroupTest.updateCartridgeGroup("cartrdige-nested.json",
- restClient);
- assertEquals(String.format("Cartridge Group did not updated: [cartridge-group-name] %s",
- "cartrdige-nested"), updated, true);
- CartridgeGroupBean updatedBean = cartridgeGroupTest.getCartridgeGroup("G1",
- restClient);
- assertEquals(String.format("Updated Cartridge Group didn't match: [cartridge-group-name] %s",
- "cartrdige-nested"), updatedBean.getName(), "G1");
-
- boolean removedC1 = cartridgeTest.removeCartridge("c1",
- restClient);
- assertEquals(String.format("Cartridge can be removed while it is used in cartridge group: [cartridge-name] %s",
- "c1"), removedC1, false);
-
- boolean removedC2 = cartridgeTest.removeCartridge("c2",
- restClient);
- assertEquals(String.format("Cartridge can be removed while it is used in cartridge group: [cartridge-name] %s",
- "c2"), removedC2, false);
-
- boolean removedC3 = cartridgeTest.removeCartridge("c3",
- restClient);
- assertEquals(String.format("Cartridge can be removed while it is used in cartridge group: [cartridge-name] %s",
- "c2"), removedC3, false);
-
- boolean removed = cartridgeGroupTest.removeCartridgeGroup("G1",
- restClient);
- assertEquals(String.format("Cartridge Group did not removed: [cartridge-group-name] %s",
- "cartrdige-nested"), removed, true);
-
- CartridgeGroupBean beanRemoved = cartridgeGroupTest.getCartridgeGroup("G1",
- restClient);
- assertEquals(String.format("Cartridge Group did not removed completely: [cartridge-group-name] %s",
- "cartrdige-nested"), beanRemoved, null);
-
- removedC1 = cartridgeTest.removeCartridge("c1",
- restClient);
- assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
- "c1"), removedC1, true);
-
- removedC2 = cartridgeTest.removeCartridge("c2",
- restClient);
- assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
- "c2"), removedC2, true);
-
- removedC3 = cartridgeTest.removeCartridge("c3",
- restClient);
- assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
- "c3"), removedC3, true);
-
- log.info("Ended Cartridge group test case**************************************");
-
- } catch (Exception e) {
- log.error("An error occurred while handling Cartridge group test case", e);
- assertTrue("An error occurred while handling Cartridge group test case", false);
- }
- }
@Test
public void testApplication() {
log.info("Started application test case**************************************");
+ String autoscalingPolicyId = "autoscaling-policy-1";
try {
- boolean addedScalingPolicy = autoscalingPolicyTest.addAutoscalingPolicy("autoscaling-policy-1.json",
- restClient);
+ boolean addedScalingPolicy = restClient.addEntity(RestConstants.AUTOSCALING_POLICIES_PATH
+ + "/" + autoscalingPolicyId + ".json",
+ RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
assertEquals(addedScalingPolicy, true);
- boolean addedC1 = cartridgeTest.addCartridge("c1.json", restClient);
+ boolean addedC1 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c1.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(addedC1, true);
- boolean addedC2 = cartridgeTest.addCartridge("c2.json", restClient);
+ boolean addedC2 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c2.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(addedC2, true);
- boolean addedC3 = cartridgeTest.addCartridge("c3.json", restClient);
+ boolean addedC3 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c3.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(addedC3, true);
- boolean addedG1 = cartridgeGroupTest.addCartridgeGroup("cartrdige-nested.json",
- restClient);
+ boolean addedG1 = restClient.addEntity(RestConstants.CARTRIDGE_GROUPS_PATH +
+ "/" + "cartrdige-nested.json", RestConstants.CARTRIDGE_GROUPS,
+ RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(addedG1, true);
- CartridgeGroupBean beanG1 = cartridgeGroupTest.getCartridgeGroup("G1",
- restClient);
+
+ CartridgeGroupBean beanG1 = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
+ CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(beanG1.getName(), "G1");
- boolean addedN1 = networkPartitionTest.addNetworkPartition("network-partition-1.json",
- restClient);
+ boolean addedN1 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-1.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(addedN1, true);
- boolean addedN2 = networkPartitionTest.addNetworkPartition("network-partition-2.json",
- restClient);
+ boolean addedN2 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-2.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(addedN2, true);
- boolean addedDep = deploymentPolicyTest.addDeploymentPolicy("deployment-policy-1.json",
- restClient);
+ boolean addedDep = restClient.addEntity(RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
+ "deployment-policy-1.json",
+ RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
assertEquals(addedDep, true);
- boolean added = applicationTest.addApplication("g-sc-G123-1.json",
- restClient);
+ boolean added = restClient.addEntity(RestConstants.APPLICATIONS_PATH + "/" +
+ "g-sc-G123-1.json", RestConstants.APPLICATIONS,
+ RestConstants.APPLICATIONS_NAME);
assertEquals(added, true);
- ApplicationBean bean = applicationTest.getApplication("g-sc-G123-1",
- restClient);
+
+ ApplicationBean bean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
assertEquals(bean.getApplicationId(), "g-sc-G123-1");
assertEquals(bean.getComponents().getGroups().get(0).getName(), "G1");
@@ -308,12 +120,12 @@ public class SampleApplicationsTest extends StratosTestServerManager {
assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 1);
assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 2);
- boolean updated = applicationTest.updateApplication("g-sc-G123-1.json",
- restClient);
+ boolean updated = restClient.updateEntity(RestConstants.APPLICATIONS_PATH + "/g-sc-G123-1-v1.json",
+ RestConstants.APPLICATIONS, RestConstants.APPLICATIONS_NAME);
assertEquals(updated, true);
- ApplicationBean updatedBean = applicationTest.getApplication("g-sc-G123-1",
- restClient);
+ ApplicationBean updatedBean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
assertEquals(bean.getApplicationId(), "g-sc-G123-1");
assertEquals(updatedBean.getComponents().getGroups().get(0).getName(), "G1");
@@ -344,61 +156,62 @@ public class SampleApplicationsTest extends StratosTestServerManager {
assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 3);
- boolean removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1",
- restClient);
+ boolean removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(removedGroup, false);
- boolean removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1",
- restClient);
+ boolean removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
assertEquals(removedAuto, false);
- boolean removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1",
- restClient);
+ boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-1",
+ RestConstants.NETWORK_PARTITIONS_NAME);
//Trying to remove the used network partition
assertEquals(removedNet, false);
- boolean removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1",
- restClient);
+ boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-1", RestConstants.DEPLOYMENT_POLICIES_NAME);
assertEquals(removedDep, false);
- boolean removed = applicationTest.removeApplication("g-sc-G123-1",
- restClient);
+ boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "g-sc-G123-1",
+ RestConstants.APPLICATIONS_NAME);
assertEquals(removed, true);
- ApplicationBean beanRemoved = applicationTest.getApplication("g-sc-G123-1",
- restClient);
+ ApplicationBean beanRemoved = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
assertEquals(beanRemoved, null);
- removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1",
- restClient);
+ removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(removedGroup, true);
- boolean removedC1 = cartridgeTest.removeCartridge("c1",
- restClient);
+ boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "c1",
+ RestConstants.CARTRIDGES_NAME);
assertEquals(removedC1, true);
- boolean removedC2 = cartridgeTest.removeCartridge("c2",
- restClient);
+ boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "c2",
+ RestConstants.CARTRIDGES_NAME);
assertEquals(removedC2, true);
- boolean removedC3 = cartridgeTest.removeCartridge("c3",
- restClient);
+ boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "c3",
+ RestConstants.CARTRIDGES_NAME);
assertEquals(removedC3, true);
- removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1",
- restClient);
+ removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
assertEquals(removedAuto, true);
- removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1",
- restClient);
+ removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-1", RestConstants.DEPLOYMENT_POLICIES_NAME);
assertEquals(removedDep, true);
- removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1",
- restClient);
+ removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-1", RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(removedNet, true);
- boolean removedN2 = networkPartitionTest.removeNetworkPartition("network-partition-2",
- restClient);
+ boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-2", RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(removedN2, true);
log.info("Ended application test case**************************************");
@@ -409,167 +222,194 @@ public class SampleApplicationsTest extends StratosTestServerManager {
}
}
- @Test
+ @Test(dependsOnMethods = {"testApplication"})
public void testDeployApplication() {
try {
log.info("Started application deploy/undeploy test case**************************************");
- //Initializing event Receivers
- initializeApplicationEventReceiver();
- initializeTopologyEventReceiver();
-
- //Verifying whether the relevant Topologies are initialized
- assertApplicationTopologyInitialized();
- assertTopologyInitialized();
+ String autoscalingPolicyId = "autoscaling-policy-1";
- boolean addedScalingPolicy = autoscalingPolicyTest.addAutoscalingPolicy("autoscaling-policy-1.json",
- restClient);
+ boolean addedScalingPolicy = restClient.addEntity(RestConstants.AUTOSCALING_POLICIES_PATH
+ + "/" + autoscalingPolicyId + ".json",
+ RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
assertEquals(addedScalingPolicy, true);
- boolean addedC1 = cartridgeTest.addCartridge("c1.json", restClient);
+ boolean addedC1 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c1.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(addedC1, true);
- boolean addedC2 = cartridgeTest.addCartridge("c2.json", restClient);
+ boolean addedC2 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c2.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(addedC2, true);
- boolean addedC3 = cartridgeTest.addCartridge("c3.json", restClient);
+ boolean addedC3 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c3.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(addedC3, true);
- boolean addedG1 = cartridgeGroupTest.addCartridgeGroup("cartrdige-nested.json",
- restClient);
+ boolean addedG1 = restClient.addEntity(RestConstants.CARTRIDGE_GROUPS_PATH +
+ "/" + "cartrdige-nested.json", RestConstants.CARTRIDGE_GROUPS,
+ RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(addedG1, true);
- CartridgeGroupBean beanG1 = cartridgeGroupTest.getCartridgeGroup("G1",
- restClient);
+
+ CartridgeGroupBean beanG1 = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
+ CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(beanG1.getName(), "G1");
- boolean addedN1 = networkPartitionTest.addNetworkPartition("network-partition-1.json",
- restClient);
+ boolean addedN1 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-1.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(addedN1, true);
- boolean addedN2 = networkPartitionTest.addNetworkPartition("network-partition-2.json",
- restClient);
+ boolean addedN2 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-2.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(addedN2, true);
- boolean addedDep = deploymentPolicyTest.addDeploymentPolicy("deployment-policy-1.json",
- restClient);
+ boolean addedDep = restClient.addEntity(RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
+ "deployment-policy-1.json",
+ RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
assertEquals(addedDep, true);
- boolean added = applicationTest.addApplication("g-sc-G123-1.json",
- restClient);
+ boolean added = restClient.addEntity(RestConstants.APPLICATIONS_PATH + "/" +
+ "g-sc-G123-1.json", RestConstants.APPLICATIONS,
+ RestConstants.APPLICATIONS_NAME);
assertEquals(added, true);
- ApplicationBean bean = applicationTest.getApplication("g-sc-G123-1",
- restClient);
+
+ ApplicationBean bean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
assertEquals(bean.getApplicationId(), "g-sc-G123-1");
- boolean addAppPolicy = applicationPolicyTest.addApplicationPolicy(
- "application-policy-1.json", restClient);
+ boolean addAppPolicy = restClient.addEntity(RestConstants.APPLICATION_POLICIES_PATH + "/" +
+ "application-policy-1.json", RestConstants.APPLICATION_POLICIES,
+ RestConstants.APPLICATION_POLICIES_NAME);
assertEquals(addAppPolicy, true);
- ApplicationPolicyBean policyBean = applicationPolicyTest.getApplicationPolicy(
- "application-policy-1", restClient);
+ ApplicationPolicyBean policyBean = (ApplicationPolicyBean) restClient.getEntity(
+ RestConstants.APPLICATION_POLICIES,
+ "application-policy-1", ApplicationPolicyBean.class,
+ RestConstants.APPLICATION_POLICIES_NAME);
//deploy the application
- boolean deployed = applicationTest.deployApplication(bean.getApplicationId(),
- policyBean.getId(), restClient);
+ String resourcePath = RestConstants.APPLICATIONS + "/" + "g-sc-G123-1" +
+ RestConstants.APPLICATIONS_DEPLOY + "/" + "application-policy-1";
+ boolean deployed = restClient.deployEntity(resourcePath,
+ RestConstants.APPLICATIONS_NAME);
assertEquals(deployed, true);
//Application active handling
- assertApplicationActivation(bean.getApplicationId());
+ TopologyHandler.getInstance().assertApplicationActivation(bean.getApplicationId());
//Group active handling
- assertGroupActivation(bean.getApplicationId());
+ TopologyHandler.getInstance().assertGroupActivation(bean.getApplicationId());
//Cluster active handling
- assertClusterActivation(bean.getApplicationId());
+ TopologyHandler.getInstance().assertClusterActivation(bean.getApplicationId());
//Updating application
- boolean updated = applicationTest.updateApplication("g-sc-G123-1.json",
- restClient);
+ boolean updated = restClient.updateEntity(RestConstants.APPLICATIONS_PATH + "/" +
+ "g-sc-G123-1-v1.json", RestConstants.APPLICATIONS,
+ RestConstants.APPLICATIONS_NAME);
assertEquals(updated, true);
- assertGroupInstanceCount(bean.getApplicationId(), "group3", 2);
+ TopologyHandler.getInstance().assertGroupInstanceCount(bean.getApplicationId(), "group3", 2);
- assertClusterMinMemberCount(bean.getApplicationId(), 2);
+ TopologyHandler.getInstance().assertClusterMinMemberCount(bean.getApplicationId(), 2);
- ApplicationBean updatedBean = applicationTest.getApplication("g-sc-G123-1",
- restClient);
+ ApplicationBean updatedBean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
assertEquals(updatedBean.getApplicationId(), "g-sc-G123-1");
- boolean removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1",
- restClient);
+ boolean removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(removedGroup, false);
- boolean removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1",
- restClient);
+ boolean removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
assertEquals(removedAuto, false);
- boolean removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1",
- restClient);
+ boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-1",
+ RestConstants.NETWORK_PARTITIONS_NAME);
//Trying to remove the used network partition
assertEquals(removedNet, false);
- boolean removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1",
- restClient);
+ boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-1", RestConstants.DEPLOYMENT_POLICIES_NAME);
assertEquals(removedDep, false);
//Un-deploying the application
- boolean unDeployed = applicationTest.undeployApplication("g-sc-G123-1",
- restClient);
+ String resourcePathUndeploy = RestConstants.APPLICATIONS + "/" + "g-sc-G123-1" +
+ RestConstants.APPLICATIONS_UNDEPLOY;
+
+ boolean unDeployed = restClient.undeployEntity(resourcePathUndeploy,
+ RestConstants.APPLICATIONS_NAME);
assertEquals(unDeployed, true);
- assertApplicationUndeploy("g-sc-G123-1");
+ boolean undeploy = TopologyHandler.getInstance().assertApplicationUndeploy("g-sc-G123-1");
+ if (!undeploy) {
+ //Need to forcefully undeploy the application
+ log.info("Force undeployment is going to start for the [application] " + "g-sc-G123-1");
+
+ restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + "g-sc-G123-1" +
+ RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS);
+
+ boolean forceUndeployed = TopologyHandler.getInstance().assertApplicationUndeploy("g-sc-G123-1");
+ assertEquals(String.format("Forceful undeployment failed for the application %s",
+ "g-sc-G123-1"), forceUndeployed, true);
- boolean removed = applicationTest.removeApplication("g-sc-G123-1",
- restClient);
+ }
+
+ boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "g-sc-G123-1",
+ RestConstants.APPLICATIONS_NAME);
assertEquals(removed, true);
- ApplicationBean beanRemoved = applicationTest.getApplication("g-sc-G123-1",
- restClient);
+ ApplicationBean beanRemoved = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
assertEquals(beanRemoved, null);
- removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1",
- restClient);
+ removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(removedGroup, true);
- boolean removedC1 = cartridgeTest.removeCartridge("c1",
- restClient);
+ boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "c1",
+ RestConstants.CARTRIDGES_NAME);
assertEquals(removedC1, true);
- boolean removedC2 = cartridgeTest.removeCartridge("c2",
- restClient);
+ boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "c2",
+ RestConstants.CARTRIDGES_NAME);
assertEquals(removedC2, true);
- boolean removedC3 = cartridgeTest.removeCartridge("c3",
- restClient);
+ boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "c3",
+ RestConstants.CARTRIDGES_NAME);
assertEquals(removedC3, true);
- removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1",
- restClient);
+ removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
assertEquals(removedAuto, true);
- removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1",
- restClient);
+ removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-1", RestConstants.DEPLOYMENT_POLICIES_NAME);
assertEquals(removedDep, true);
- //Remove network partition used by application policy
- removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1",
- restClient);
+ removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-1", RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(removedNet, false);
- boolean removedN2 = networkPartitionTest.removeNetworkPartition("network-partition-2",
- restClient);
+ boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-2", RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(removedN2, false);
- boolean removeAppPolicy = applicationPolicyTest.removeApplicationPolicy("application-policy-1",
- restClient);
+ boolean removeAppPolicy = restClient.removeEntity(RestConstants.APPLICATION_POLICIES,
+ "application-policy-1", RestConstants.APPLICATION_POLICIES_NAME);
assertEquals(removeAppPolicy, true);
- removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1",
- restClient);
+ removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-1", RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(removedNet, true);
- removedN2 = networkPartitionTest.removeNetworkPartition("network-partition-2",
- restClient);
+ removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-2", RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(removedN2, true);
log.info("Ended application deploy/undeploy test case**************************************");
@@ -580,604 +420,5 @@ public class SampleApplicationsTest extends StratosTestServerManager {
}
}
- @Test
- public void testNetworkPartition() {
- try {
- log.info("Started network partition test case**************************************");
-
- boolean added = networkPartitionTest.addNetworkPartition("network-partition-1.json",
- restClient);
- assertEquals(added, true);
- NetworkPartitionBean bean = networkPartitionTest.getNetworkPartition("network-partition-1",
- restClient);
- assertEquals(bean.getId(), "network-partition-1");
- assertEquals(bean.getPartitions().size(), 1);
- assertEquals(bean.getPartitions().get(0).getId(), "partition-1");
- assertEquals(bean.getPartitions().get(0).getProperty().get(0).getName(), "region");
- assertEquals(bean.getPartitions().get(0).getProperty().get(0).getValue(), "default");
-
- boolean updated = networkPartitionTest.updateNetworkPartition("network-partition-1.json",
- restClient);
- assertEquals(updated, true);
- NetworkPartitionBean updatedBean = networkPartitionTest.getNetworkPartition("network-partition-1",
- restClient);
- assertEquals(updatedBean.getId(), "network-partition-1");
- assertEquals(updatedBean.getPartitions().size(), 2);
- assertEquals(updatedBean.getPartitions().get(1).getId(), "partition-2");
- assertEquals(updatedBean.getPartitions().get(1).getProperty().get(0).getName(), "region");
- assertEquals(updatedBean.getPartitions().get(1).getProperty().get(0).getValue(), "default1");
- assertEquals(updatedBean.getPartitions().get(1).getProperty().get(1).getName(), "zone");
- assertEquals(updatedBean.getPartitions().get(1).getProperty().get(1).getValue(), "z1");
-
- boolean removed = networkPartitionTest.removeNetworkPartition("network-partition-1",
- restClient);
- assertEquals(removed, true);
-
- NetworkPartitionBean beanRemoved = networkPartitionTest.getNetworkPartition("network-partition-1",
- restClient);
- assertEquals(beanRemoved, null);
-
- log.info("Ended network partition test case**************************************");
- } catch (Exception e) {
- log.error("An error occurred while handling network partitions",e);
- assertTrue("An error occurred while handling network partitions", false);
- }
- }
-
- @Test
- public void testDeploymentPolicy() {
- try {
- log.info("Started deployment policy test case**************************************");
-
- boolean addedN1 = networkPartitionTest.addNetworkPartition("network-partition-1.json",
- restClient);
- assertEquals(addedN1, true);
-
- boolean addedN2 = networkPartitionTest.addNetworkPartition("network-partition-2.json",
- restClient);
- assertEquals(addedN2, true);
-
- boolean addedDep = deploymentPolicyTest.addDeploymentPolicy("deployment-policy-1.json",
- restClient);
- assertEquals(addedDep, true);
-
- DeploymentPolicyBean bean = deploymentPolicyTest.getDeploymentPolicy(
- "deployment-policy-1", restClient);
- assertEquals(bean.getId(), "deployment-policy-1");
- assertEquals(bean.getNetworkPartitions().size(), 2);
- assertEquals(bean.getNetworkPartitions().get(0).getId(), "network-partition-1");
- assertEquals(bean.getNetworkPartitions().get(0).getPartitionAlgo(), "one-after-another");
- assertEquals(bean.getNetworkPartitions().get(0).getPartitions().size(), 1);
- assertEquals(bean.getNetworkPartitions().get(0).getPartitions().get(0).getId(), "partition-1");
- assertEquals(bean.getNetworkPartitions().get(0).getPartitions().get(0).getPartitionMax(), 20);
-
- assertEquals(bean.getNetworkPartitions().get(1).getId(), "network-partition-2");
- assertEquals(bean.getNetworkPartitions().get(1).getPartitionAlgo(), "round-robin");
- assertEquals(bean.getNetworkPartitions().get(1).getPartitions().size(), 2);
- assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(0).getId(),
- "network-partition-2-partition-1");
- assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(0).getPartitionMax(), 10);
- assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(1).getId(),
- "network-partition-2-partition-2");
- assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(1).getPartitionMax(), 9);
-
- //update network partition
- boolean updated = networkPartitionTest.updateNetworkPartition("network-partition-1.json",
- restClient);
- assertEquals(updated, true);
-
- //update deployment policy with new partition and max values
- boolean updatedDep = deploymentPolicyTest.updateDeploymentPolicy("deployment-policy-1.json",
- restClient);
- assertEquals(updatedDep, true);
-
- DeploymentPolicyBean updatedBean = deploymentPolicyTest.getDeploymentPolicy(
- "deployment-policy-1", restClient);
- assertEquals(updatedBean.getId(), "deployment-policy-1");
- assertEquals(updatedBean.getNetworkPartitions().size(), 2);
- assertEquals(updatedBean.getNetworkPartitions().get(0).getId(), "network-partition-1");
- assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitionAlgo(), "one-after-another");
- assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().size(), 2);
- assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(0).getId(), "partition-1");
- assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(0).getPartitionMax(), 25);
- assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(1).getId(), "partition-2");
- assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(1).getPartitionMax(), 20);
-
- assertEquals(updatedBean.getNetworkPartitions().get(1).getId(), "network-partition-2");
- assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitionAlgo(), "round-robin");
- assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().size(), 2);
- assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(0).getId(),
- "network-partition-2-partition-1");
- assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(0).getPartitionMax(), 15);
- assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(1).getId(),
- "network-partition-2-partition-2");
- assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(1).getPartitionMax(), 5);
-
- boolean removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1",
- restClient);
- //Trying to remove the used network partition
- assertEquals(removedNet, false);
-
- boolean removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1",
- restClient);
- assertEquals(removedDep, true);
-
- DeploymentPolicyBean beanRemovedDep = deploymentPolicyTest.getDeploymentPolicy("deployment-policy-1",
- restClient);
- assertEquals(beanRemovedDep, null);
-
- boolean removedN1 = networkPartitionTest.removeNetworkPartition("network-partition-1",
- restClient);
- assertEquals(removedN1, true);
-
- NetworkPartitionBean beanRemovedN1 = networkPartitionTest.getNetworkPartition("network-partition-1",
- restClient);
- assertEquals(beanRemovedN1, null);
-
- boolean removedN2 = networkPartitionTest.removeNetworkPartition("network-partition-2",
- restClient);
- assertEquals(removedN2, true);
-
- NetworkPartitionBean beanRemovedN2 = networkPartitionTest.getNetworkPartition("network-partition-2",
- restClient);
- assertEquals(beanRemovedN2, null);
-
- log.info("Ended deployment policy test case**************************************");
-
- } catch (Exception e) {
- log.error("An error occurred while handling deployment policy", e);
- assertTrue("An error occurred while handling deployment policy", false);
- }
- }
-
- @Test
- public void testCartridge() {
- log.info("Started Cartridge test case**************************************");
-
- try {
- boolean added = cartridgeTest.addCartridge("c0.json", restClient);
- assertEquals(added, true);
- CartridgeBean bean = cartridgeTest.getCartridge("c0", restClient);
- assertEquals(bean.getType(), "c0");
- assertEquals(bean.getCategory(), "Application");
- assertEquals(bean.getHost(), "qmog.cisco.com");
- for (PropertyBean property : bean.getProperty()) {
- if (property.getName().equals("payload_parameter.CEP_IP")) {
- assertEquals(property.getValue(), "octl.qmog.cisco.com");
- } else if (property.getName().equals("payload_parameter.CEP_ADMIN_PASSWORD")) {
- assertEquals(property.getValue(), "admin");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_IP")) {
- assertEquals(property.getValue(), "octl.qmog.cisco.com");
- } else if (property.getName().equals("payload_parameter.QTCM_NETWORK_COUNT")) {
- assertEquals(property.getValue(), "1");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD")) {
- assertEquals(property.getValue(), "admin");
- } else if (property.getName().equals("payload_parameter.QTCM_DNS_SEGMENT")) {
- assertEquals(property.getValue(), "test");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_SECURE_PORT")) {
- assertEquals(property.getValue(), "7711");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_PORT")) {
- assertEquals(property.getValue(), "7611");
- } else if (property.getName().equals("payload_parameter.CEP_PORT")) {
- assertEquals(property.getValue(), "7611");
- } else if (property.getName().equals("payload_parameter.MB_PORT")) {
- assertEquals(property.getValue(), "61616");
- }
- }
-
- boolean updated = cartridgeTest.updateCartridge("c0.json",
- restClient);
- assertEquals(updated, true);
- CartridgeBean updatedBean = cartridgeTest.getCartridge("c0",
- restClient);
- assertEquals(updatedBean.getType(), "c0");
- assertEquals(updatedBean.getCategory(), "Data");
- assertEquals(updatedBean.getHost(), "qmog.cisco.com12");
- for (PropertyBean property : updatedBean.getProperty()) {
- if (property.getName().equals("payload_parameter.CEP_IP")) {
- assertEquals(property.getValue(), "octl.qmog.cisco.com123");
- } else if (property.getName().equals("payload_parameter.CEP_ADMIN_PASSWORD")) {
- assertEquals(property.getValue(), "admin123");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_IP")) {
- assertEquals(property.getValue(), "octl.qmog.cisco.com123");
- } else if (property.getName().equals("payload_parameter.QTCM_NETWORK_COUNT")) {
- assertEquals(property.getValue(), "3");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD")) {
- assertEquals(property.getValue(), "admin123");
- } else if (property.getName().equals("payload_parameter.QTCM_DNS_SEGMENT")) {
- assertEquals(property.getValue(), "test123");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_SECURE_PORT")) {
- assertEquals(property.getValue(), "7712");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_PORT")) {
- assertEquals(property.getValue(), "7612");
- } else if (property.getName().equals("payload_parameter.CEP_PORT")) {
- assertEquals(property.getValue(), "7612");
- } else if (property.getName().equals("payload_parameter.MB_PORT")) {
- assertEquals(property.getValue(), "61617");
- }
- }
-
- boolean removed = cartridgeTest.removeCartridge("c0",
- restClient);
- assertEquals(removed, true);
-
- CartridgeBean beanRemoved = cartridgeTest.getCartridge("c0",
- restClient);
- assertEquals(beanRemoved, null);
-
- log.info("Ended Cartridge test case**************************************");
- } catch (Exception e) {
- log.error("An error occurred while handling cartridges", e);
- assertTrue("An error occurred while handling cartridges", false);
- }
- }
-
-
- private void runApplicationTest(String applicationId) {
- runApplicationTest(applicationId, applicationId);
- }
-
- private void runApplicationTest(String applicationFolderName, String applicationId) {
- executeCommand(getApplicationsPath() + "/" + applicationFolderName + "/scripts/mock/deploy.sh");
- assertApplicationActivation(applicationId);
- executeCommand(getApplicationsPath() + "/" + applicationFolderName + "/scripts/mock/undeploy.sh");
- assertApplicationNotExists(applicationId);
- }
-
- /**
- * Initialize application event receiver
- */
- private void initializeApplicationEventReceiver() {
- if (applicationsEventReceiver == null) {
- applicationsEventReceiver = new ApplicationsEventReceiver();
- ExecutorService executorService = StratosThreadPool.getExecutorService("STRATOS_TEST_SERVER", 1);
- applicationsEventReceiver.setExecutorService(executorService);
- applicationsEventReceiver.execute();
- }
- }
-
- /**
- * Initialize Topology event receiver
- */
- private void initializeTopologyEventReceiver() {
- if (topologyEventReceiver == null) {
- topologyEventReceiver = new TopologyEventReceiver();
- ExecutorService executorService = StratosThreadPool.getExecutorService("STRATOS_TEST_SERVER1", 1);
- topologyEventReceiver.setExecutorService(executorService);
- topologyEventReceiver.execute();
- }
- }
-
- /**
- * Execute shell command
- *
- * @param commandText
- */
- private void executeCommand(String commandText) {
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- try {
- CommandLine commandline = CommandLine.parse(commandText);
- DefaultExecutor exec = new DefaultExecutor();
- PumpStreamHandler streamHandler = new PumpStreamHandler(outputStream);
- exec.setStreamHandler(streamHandler);
- exec.execute(commandline);
- log.info(outputStream.toString());
- } catch (Exception e) {
- log.error(outputStream.toString(), e);
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Assert application Topology initialization
- *
- */
- private void assertApplicationTopologyInitialized() {
- long startTime = System.currentTimeMillis();
- boolean applicationTopologyInitialized = ApplicationManager.getApplications().isInitialized();
- while (!applicationTopologyInitialized) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ignore) {
- }
- applicationTopologyInitialized = ApplicationManager.getApplications().isInitialized();
- if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
- break;
- }
- }
- assertEquals(String.format("Application Topology didn't get initialized "), applicationTopologyInitialized, true);
- }
-
- /**
- * Assert Topology initialization
- *
- */
- private void assertTopologyInitialized() {
- long startTime = System.currentTimeMillis();
- boolean topologyInitialized = TopologyManager.getTopology().isInitialized();
- while (!topologyInitialized) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ignore) {
- }
- topologyInitialized = TopologyManager.getTopology().isInitialized();
- if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
- break;
- }
- }
- assertEquals(String.format("Topology didn't get initialized "), topologyInitialized, true);
- }
-
- /**
- * Assert application activation
- *
- * @param applicationName
- */
- private void assertApplicationActivation(String applicationName) {
- long startTime = System.currentTimeMillis();
- Application application = ApplicationManager.getApplications().getApplication(applicationName);
- while (!((application != null) && (application.getStatus() == ApplicationStatus.Active))) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ignore) {
- }
- application = ApplicationManager.getApplications().getApplication(applicationName);
- if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
- break;
- }
- }
- assertNotNull(String.format("Application is not found: [application-id] %s", applicationName), application);
- assertEquals(String.format("Application status did not change to active: [application-id] %s", applicationName),
- ApplicationStatus.Active, application.getStatus());
- }
-
- /**
- * Assert application activation
- *
- * @param applicationName
- */
- private void assertGroupActivation(String applicationName) {
- Application application = ApplicationManager.getApplications().getApplication(applicationName);
- assertNotNull(String.format("Application is not found: [application-id] %s",
- applicationName), application);
-
- Collection<Group> groups = application.getAllGroupsRecursively();
- for (Group group : groups) {
- assertEquals(group.getInstanceContextCount() >= group.getGroupMinInstances(), true);
- }
- }
-
- /**
- * Assert application activation
- *
- * @param applicationName
- */
- private void assertClusterActivation(String applicationName) {
- Application application = ApplicationManager.getApplications().getApplication(applicationName);
- assertNotNull(String.format("Application is not found: [application-id] %s",
- applicationName), application);
-
- Set<ClusterDataHolder> clusterDataHolderSet = application.getClusterDataRecursively();
- for (ClusterDataHolder clusterDataHolder : clusterDataHolderSet) {
- String serviceName = clusterDataHolder.getServiceType();
- String clusterId = clusterDataHolder.getClusterId();
- Service service = TopologyManager.getTopology().getService(serviceName);
- assertNotNull(String.format("Service is not found: [application-id] %s [service] %s",
- applicationName, serviceName), service);
-
- Cluster cluster = service.getCluster(clusterId);
- assertNotNull(String.format("Cluster is not found: [application-id] %s [service] %s [cluster-id] %s",
- applicationName, serviceName, clusterId), cluster);
- boolean clusterActive = false;
-
- for (ClusterInstance instance : cluster.getInstanceIdToInstanceContextMap().values()) {
- int activeInstances = 0;
- for (Member member : cluster.getMembers()) {
- if (member.getClusterInstanceId().equals(instance.getInstanceId())) {
- if (member.getStatus().equals(MemberStatus.Active)) {
- activeInstances++;
- }
- }
- }
- clusterActive = activeInstances >= clusterDataHolder.getMinInstances();
-
- if (!clusterActive) {
- break;
- }
- }
- assertEquals(String.format("Cluster status did not change to active: [cluster-id] %s", clusterId),
- clusterActive, true);
- }
-
- }
-
- private void assertClusterMinMemberCount(String applicationName, int minMembers) {
- long startTime = System.currentTimeMillis();
-
- Application application = ApplicationManager.getApplications().getApplication(applicationName);
- assertNotNull(String.format("Application is not found: [application-id] %s",
- applicationName), application);
-
- Set<ClusterDataHolder> clusterDataHolderSet = application.getClusterDataRecursively();
- for (ClusterDataHolder clusterDataHolder : clusterDataHolderSet) {
- String serviceName = clusterDataHolder.getServiceType();
- String clusterId = clusterDataHolder.getClusterId();
- Service service = TopologyManager.getTopology().getService(serviceName);
- assertNotNull(String.format("Service is not found: [application-id] %s [service] %s",
- applicationName, serviceName), service);
-
- Cluster cluster = service.getCluster(clusterId);
- assertNotNull(String.format("Cluster is not found: [application-id] %s [service] %s [cluster-id] %s",
- applicationName, serviceName, clusterId), cluster);
- boolean clusterActive = false;
-
- for (ClusterInstance instance : cluster.getInstanceIdToInstanceContextMap().values()) {
- int activeInstances = 0;
- for (Member member : cluster.getMembers()) {
- if (member.getClusterInstanceId().equals(instance.getInstanceId())) {
- if (member.getStatus().equals(MemberStatus.Active)) {
- activeInstances++;
- }
- }
- }
- clusterActive = activeInstances >= minMembers;
-
- while (!clusterActive) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ignore) {
- }
- service = TopologyManager.getTopology().getService(serviceName);
- assertNotNull(String.format("Service is not found: [application-id] %s [service] %s",
- applicationName, serviceName), service);
-
- cluster = service.getCluster(clusterId);
- activeInstances = 0;
- for (Member member : cluster.getMembers()) {
- if (member.getClusterInstanceId().equals(instance.getInstanceId())) {
- if (member.getStatus().equals(MemberStatus.Active)) {
- activeInstances++;
- }
- }
- }
- clusterActive = activeInstances >= minMembers;
- assertNotNull(String.format("Cluster is not found: [application-id] %s [service] %s [cluster-id] %s",
- applicationName, serviceName, clusterId), cluster);
-
- if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
- break;
- }
- }
- }
- assertEquals(String.format("Cluster status did not change to active: [cluster-id] %s", clusterId),
- clusterActive, true);
- }
-
- }
-
-
- /**
- * Assert application activation
- *
- * @param applicationName
- */
- private void assertApplicationUndeploy(String applicationName) {
- long startTime = System.currentTimeMillis();
- Application application = ApplicationManager.getApplications().getApplication(applicationName);
- ApplicationContext applicationContext = null;
- try {
- applicationContext = AutoscalerServiceClient.getInstance().getApplication(applicationName);
- } catch (RemoteException e) {
- log.error("Error while getting the application context for [application] " + applicationName);
- }
- while (((application != null) && application.getInstanceContextCount() > 0) ||
- (applicationContext == null || applicationContext.getStatus().equals(APPLICATION_STATUS_UNDEPLOYING))) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ignore) {
- }
- application = ApplicationManager.getApplications().getApplication(applicationName);
- try {
- applicationContext = AutoscalerServiceClient.getInstance().getApplication(applicationName);
- } catch (RemoteException e) {
- log.error("Error while getting the application context for [application] " + applicationName);
- }
- if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
- break;
- }
- }
-
- assertNotNull(String.format("Application is not found: [application-id] %s",
- applicationName), application);
- assertNotNull(String.format("Application Context is not found: [application-id] %s",
- applicationName), applicationContext);
-
- //Force undeployment after the graceful deployment
- if (application.getInstanceContextCount() > 0 ||
- applicationContext.getStatus().equals(APPLICATION_STATUS_UNDEPLOYING)) {
- log.info("Force undeployment is going to start for the [application] " + applicationName);
-
- applicationTest.forceUndeployApplication(applicationName, restClient);
- while (application.getInstanceContextCount() > 0 ||
- applicationContext.getStatus().equals(APPLICATION_STATUS_UNDEPLOYING)) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ignore) {
- }
- application = ApplicationManager.getApplications().getApplication(applicationName);
- if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
- break;
- }
- }
- }
- assertEquals(String.format("Application status did not change to Created: [application-id] %s", applicationName),
- APPLICATION_STATUS_CREATED, applicationContext.getStatus());
-
- }
-
- /**
- * Assert application activation
- *
- * @param applicationName
- */
- private void assertGroupInstanceCount(String applicationName, String groupAlias, int count) {
- long startTime = System.currentTimeMillis();
- Application application = ApplicationManager.getApplications().getApplication(applicationName);
- if (application != null) {
- Group group = application.getGroupRecursively(groupAlias);
- while (group.getInstanceContextCount() != count) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ignore) {
- }
- if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
- break;
- }
- }
- for (GroupInstance instance : group.getInstanceIdToInstanceContextMap().values()) {
- while (!instance.getStatus().equals(GroupStatus.Active)) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ignore) {
- }
- if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
- break;
- }
- }
- }
- assertEquals(String.format("Application status did not change to active: [application-id] %s", applicationName),
- group.getInstanceContextCount(), count);
- }
- assertNotNull(String.format("Application is not found: [application-id] %s", applicationName), application);
-
- }
-
- private void assertApplicationNotExists(String applicationName) {
- Application application = ApplicationManager.getApplications().getApplication(applicationName);
- assertNull(String.format("Application is found in the topology : [application-id] %s", applicationName), application);
- }
-
- /**
- * Get applications folder path
- *
- * @return
- */
- private String getApplicationsPath() {
- return getResourcesFolderPath() + "/../../../../../../samples/applications";
- }
-
- /**
- * Get resources folder path
- *
- * @return
- */
- private String getResourcesFolderPath() {
- String path = getClass().getResource("/").getPath();
- return StringUtils.removeEnd(path, File.separator);
- }
-
- private String getArtifactsPath() {
- return getResourcesFolderPath() + "/../../src/test/resources";
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
index 020ce41..5453bbd 100755
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
@@ -26,6 +26,9 @@ import org.apache.commons.logging.LogFactory;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.stratos.common.test.TestLogAppender;
+import org.apache.stratos.integration.tests.rest.RestClient;
+import org.apache.stratos.messaging.message.receiver.application.ApplicationsEventReceiver;
+import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeSuite;
import org.wso2.carbon.integration.framework.TestServerManager;
@@ -53,6 +56,8 @@ public class StratosTestServerManager extends TestServerManager {
private static final String MOCK_IAAS_XML_FILE = "mock-iaas.xml";
private static final String JNDI_PROPERTIES_FILE = "jndi.properties";
private static final String JMS_OUTPUT_ADAPTER_FILE = "JMSOutputAdaptor.xml";
+ protected RestClient restClient;
+ private String endpoint = "https://localhost:9443";
private BrokerService broker = new BrokerService();
private TestLogAppender testLogAppender = new TestLogAppender();
@@ -62,6 +67,7 @@ public class StratosTestServerManager extends TestServerManager {
public StratosTestServerManager() {
super(CARBON_ZIP, PORT_OFFSET);
serverUtils = new ServerUtils();
+ restClient = new RestClient(endpoint, "admin", "admin");
}
@Override
[18/50] [abbrv] stratos git commit: refining the resources to have
the samples with the reference of the test case
Posted by la...@apache.org.
refining the resources to have the samples with the reference of the test case
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ce00b955
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ce00b955
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ce00b955
Branch: refs/heads/data-publisher-integration
Commit: ce00b955b73cf45a7386f5faa6bf69ed6242d391
Parents: 5b84404
Author: reka <rt...@gmail.com>
Authored: Thu Aug 6 19:02:26 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Aug 6 19:33:43 2015 +0530
----------------------------------------------------------------------
.../tests/ApplicationBurstingTest.java | 190 ++++++++++++++++++-
.../tests/ApplicationPolicyTest.java | 2 +
.../integration/tests/ApplicationTest.java | 29 ---
.../tests/AutoscalingPolicyTest.java | 2 +
.../integration/tests/CartridgeGroupTest.java | 11 +-
.../integration/tests/CartridgeTest.java | 2 +
.../integration/tests/DeploymentPolicyTest.java | 12 +-
.../integration/tests/NetworkPartitionTest.java | 6 +-
.../integration/tests/RestConstants.java | 2 +-
.../tests/SampleApplicationsTest.java | 44 ++---
.../application-policy-3.json | 18 ++
.../app-bursting-single-cartriddge-group.json | 70 +++++++
.../autoscaling-policy-2.json | 14 ++
.../cartridges-groups/esb-php-group.json | 19 ++
.../cartridges/mock/esb.json | 50 +++++
.../cartridges/mock/php.json | 51 +++++
.../cartridges/mock/tomcat.json | 53 ++++++
.../deployment-policy-4.json | 32 ++++
.../mock/network-partition-10.json | 24 +++
.../mock/network-partition-9.json | 15 ++
.../application-policy-1.json | 18 --
.../application-policy-2.json | 18 --
.../application-policy-3.json | 18 ++
.../mock/network-partition-10.json | 24 +++
.../mock/network-partition-9.json | 15 ++
.../simple/single-cartridge-app/README.md | 25 ---
.../single-cartridge-app/g-sc-G123-1-v1.json | 86 ---------
.../single-cartridge-app/g-sc-G123-1-v2.json | 86 ---------
.../single-cartridge-app/g-sc-G123-1-v3.json | 86 ---------
.../single-cartridge-app/g-sc-G123-1.json | 86 ---------
.../autoscaling-policy-1.json | 14 --
.../autoscaling-policy-c0-v1.json | 14 --
.../autoscaling-policy-c0.json | 14 --
.../autoscaling-policy-c0-v1.json | 14 ++
.../autoscaling-policy-c0.json | 14 ++
.../cartridges-groups/g4-g5-g6-v1.json | 50 +++++
.../cartridges-groups/g4-g5-g6.json | 50 +++++
.../cartridges/mock/c4.json | 45 +++++
.../cartridges/mock/c5.json | 124 ++++++++++++
.../cartridges/mock/c6.json | 45 +++++
.../cartridge-test/cartridges/mock/c0-v1.json | 124 ++++++++++++
.../cartridge-test/cartridges/mock/c0.json | 124 ++++++++++++
.../cartridges-groups/cartrdige-nested-v1.json | 50 -----
.../cartridges-groups/cartrdige-nested.json | 50 -----
.../cartridges-groups/g4-g5-g6-v1.json | 50 -----
.../resources/cartridges-groups/g4-g5-g6.json | 50 -----
.../test/resources/cartridges/mock/c0-v1.json | 124 ------------
.../src/test/resources/cartridges/mock/c0.json | 124 ------------
.../src/test/resources/cartridges/mock/c1.json | 45 -----
.../src/test/resources/cartridges/mock/c2.json | 45 -----
.../src/test/resources/cartridges/mock/c3.json | 45 -----
.../src/test/resources/cartridges/mock/c4.json | 45 -----
.../src/test/resources/cartridges/mock/c5.json | 124 ------------
.../src/test/resources/cartridges/mock/c6.json | 45 -----
.../deployment-policy-1-v1.json | 36 ----
.../deployment-policy-1.json | 32 ----
.../deployment-policy-2-v1.json | 36 ----
.../deployment-policy-2.json | 32 ----
.../deployment-policy-3.json | 32 ----
.../deployment-policy-2-v1.json | 36 ++++
.../deployment-policy-2.json | 32 ++++
.../mock/network-partition-5-v1.json | 28 +++
.../mock/network-partition-5.json | 15 ++
.../mock/network-partition-6.json | 24 +++
.../mock/network-partition-3-v1.json | 28 +++
.../mock/network-partition-3.json | 15 ++
.../mock/network-partition-1-v1.json | 28 ---
.../mock/network-partition-1.json | 15 --
.../mock/network-partition-2.json | 24 ---
.../mock/network-partition-3-v1.json | 28 ---
.../mock/network-partition-3.json | 15 --
.../mock/network-partition-5-v1.json | 28 ---
.../mock/network-partition-5.json | 15 --
.../mock/network-partition-6.json | 24 ---
.../mock/network-partition-7.json | 15 --
.../mock/network-partition-8.json | 24 ---
.../application-policy-1.json | 18 ++
.../applications/g-sc-G123-1-v1.json | 86 +++++++++
.../applications/g-sc-G123-1-v2.json | 86 +++++++++
.../applications/g-sc-G123-1-v3.json | 86 +++++++++
.../applications/g-sc-G123-1.json | 86 +++++++++
.../autoscaling-policy-1.json | 14 ++
.../cartridges-groups/cartrdige-nested-v1.json | 50 +++++
.../cartridges-groups/cartrdige-nested.json | 50 +++++
.../cartridges/mock/c1.json | 45 +++++
.../cartridges/mock/c2.json | 45 +++++
.../cartridges/mock/c3.json | 45 +++++
.../deployment-policy-1-v1.json | 36 ++++
.../deployment-policy-1.json | 32 ++++
.../mock/network-partition-1-v1.json | 28 +++
.../mock/network-partition-1.json | 15 ++
.../mock/network-partition-2.json | 24 +++
.../integration/src/test/resources/testng.xml | 5 +
93 files changed, 2156 insertions(+), 1694 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java
index cefd786..518c7cb 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java
@@ -18,8 +18,11 @@
*/
package org.apache.stratos.integration.tests;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.beans.application.ApplicationBean;
import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
+import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
import org.testng.annotations.Test;
import static junit.framework.Assert.assertEquals;
@@ -29,9 +32,192 @@ import static junit.framework.Assert.assertTrue;
* This will handle the application bursting test cases
*/
public class ApplicationBurstingTest extends StratosTestServerManager {
+ private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
+ private static final String TEST_PATH = "/application-bursting-test";
+
@Test
- public void testApplication() {
- assertTrue("test passes", true);
+ public void testDeployApplication() {
+ try {
+ log.info("Started application Bursting test case**************************************");
+
+ String autoscalingPolicyId = "autoscaling-policy-2";
+
+ boolean addedScalingPolicy = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH
+ + "/" + autoscalingPolicyId + ".json",
+ RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(addedScalingPolicy, true);
+
+ boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "esb.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC1, true);
+
+ boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "php.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC2, true);
+
+ boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "tomcat.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(addedC3, true);
+
+ boolean addedG1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
+ "/" + "esb-php-group.json", RestConstants.CARTRIDGE_GROUPS,
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(addedG1, true);
+
+ CartridgeGroupBean beanG1 = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group",
+ CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(beanG1.getName(), "esb-php-group");
+
+ boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-9.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN1, true);
+
+ boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-10.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN2, true);
+
+ boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
+ "deployment-policy-4.json",
+ RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(addedDep, true);
+
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" +
+ "app-bursting-single-cartriddge-group.json", RestConstants.APPLICATIONS,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(added, true);
+
+ ApplicationBean bean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "cartridge-group-app", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
+ assertEquals(bean.getApplicationId(), "cartridge-group-app");
+
+ boolean addAppPolicy = restClient.addEntity(TEST_PATH + RestConstants.APPLICATION_POLICIES_PATH + "/" +
+ "application-policy-3.json", RestConstants.APPLICATION_POLICIES,
+ RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(addAppPolicy, true);
+
+ ApplicationPolicyBean policyBean = (ApplicationPolicyBean) restClient.getEntity(
+ RestConstants.APPLICATION_POLICIES,
+ "application-policy-3", ApplicationPolicyBean.class,
+ RestConstants.APPLICATION_POLICIES_NAME);
+
+ //deploy the application
+ String resourcePath = RestConstants.APPLICATIONS + "/" + "cartridge-group-app" +
+ RestConstants.APPLICATIONS_DEPLOY + "/" + "application-policy-3";
+ boolean deployed = restClient.deployEntity(resourcePath,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(deployed, true);
+
+ //Application active handling
+ TopologyHandler.getInstance().assertApplicationActivation(bean.getApplicationId());
+
+ //Group active handling
+ TopologyHandler.getInstance().assertGroupActivation(bean.getApplicationId());
+
+ //Cluster active handling
+ TopologyHandler.getInstance().assertClusterActivation(bean.getApplicationId());
+
+ boolean removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(removedGroup, false);
+
+ boolean removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(removedAuto, false);
+
+ boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-9",
+ RestConstants.NETWORK_PARTITIONS_NAME);
+ //Trying to remove the used network partition
+ assertEquals(removedNet, false);
+
+ boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-4", RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(removedDep, false);
+
+ //Un-deploying the application
+ String resourcePathUndeploy = RestConstants.APPLICATIONS + "/" + "cartridge-group-app" +
+ RestConstants.APPLICATIONS_UNDEPLOY;
+
+ boolean unDeployed = restClient.undeployEntity(resourcePathUndeploy,
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(unDeployed, true);
+
+ boolean undeploy = TopologyHandler.getInstance().assertApplicationUndeploy("cartridge-group-app");
+ if (!undeploy) {
+ //Need to forcefully undeploy the application
+ log.info("Force undeployment is going to start for the [application] " + "cartridge-group-app");
+
+ restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + "cartridge-group-app" +
+ RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS);
+
+ boolean forceUndeployed = TopologyHandler.getInstance().assertApplicationUndeploy("cartridge-group-app");
+ assertEquals(String.format("Forceful undeployment failed for the application %s",
+ "cartridge-group-app"), forceUndeployed, true);
+
+ }
+
+ boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "cartridge-group-app",
+ RestConstants.APPLICATIONS_NAME);
+ assertEquals(removed, true);
+
+ ApplicationBean beanRemoved = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
+ "cartridge-group-app", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
+ assertEquals(beanRemoved, null);
+
+ removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(removedGroup, true);
+
+ boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "esb",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC1, true);
+
+ boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "php",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC2, true);
+
+ boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "tomcat",
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removedC3, true);
+
+ removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(removedAuto, true);
+
+ removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ "deployment-policy-4", RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(removedDep, true);
+
+ removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-9", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedNet, false);
+
+ boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-10", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN2, false);
+
+ boolean removeAppPolicy = restClient.removeEntity(RestConstants.APPLICATION_POLICIES,
+ "application-policy-3", RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(removeAppPolicy, true);
+
+ removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-9", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedNet, true);
+
+ removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-10", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN2, true);
+
+ log.info("Ended application bursting test case**************************************");
+
+ } catch (Exception e) {
+ log.error("An error occurred while handling application bursting", e);
+ assertTrue("An error occurred while handling application bursting", false);
+ }
}
}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
index b727e82..cc9f976 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
@@ -34,6 +34,8 @@ import static junit.framework.Assert.assertTrue;
*/
public class ApplicationPolicyTest extends StratosTestServerManager {
private static final Log log = LogFactory.getLog(ApplicationPolicyTest.class);
+ private static final String TEST_PATH = "/application-policy-test";
+
@Test
public void testApplicationPolicy() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
deleted file mode 100644
index 8ceec4d..0000000
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.integration.tests;
-
-import org.apache.stratos.messaging.message.receiver.application.ApplicationsEventReceiver;
-import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver;
-
-/**
- * Super class for application test cases
- */
-public class ApplicationTest extends StratosTestServerManager {
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
index d841552..bcacfc8 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
@@ -31,6 +31,8 @@ import static junit.framework.Assert.assertTrue;
*/
public class AutoscalingPolicyTest extends StratosTestServerManager {
private static final Log log = LogFactory.getLog(AutoscalingPolicyTest.class);
+ private static final String TEST_PATH = "/autoscaling-policy-test";
+
@Test
public void testAutoscalingPolicy() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
index 8bc3a9e..873fa5a 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
@@ -32,25 +32,26 @@ import static junit.framework.Assert.assertTrue;
*/
public class CartridgeGroupTest extends StratosTestServerManager {
private static final Log log = LogFactory.getLog(CartridgeGroupTest.class);
+ private static final String TEST_PATH = "/cartridge-group-test";
@Test
public void testCartridgeGroup() {
try {
log.info("Started Cartridge group test case**************************************");
- boolean addedC1 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c4.json",
+ boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c4.json",
RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c4"), addedC1, true);
- boolean addedC2 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c5.json",
+ boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c5.json",
RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c5"), addedC2, true);
- boolean addedC3 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c6.json",
+ boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c6.json",
RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c6"), addedC3, true);
- boolean added = restClient.addEntity(RestConstants.CARTRIDGE_GROUPS_PATH +
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
"/" + "g4-g5-g6.json", RestConstants.CARTRIDGE_GROUPS,
RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(String.format("Cartridge Group did not added: [cartridge-group-name] %s",
@@ -61,7 +62,7 @@ public class CartridgeGroupTest extends StratosTestServerManager {
assertEquals(String.format("Cartridge Group name did not match: [cartridge-group-name] %s",
"g4-g5-g6.json"), bean.getName(), "G4");
- boolean updated = restClient.updateEntity(RestConstants.CARTRIDGE_GROUPS_PATH +
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
"/" + "g4-g5-g6-v1.json",
RestConstants.CARTRIDGE_GROUPS, RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(String.format("Cartridge Group did not updated: [cartridge-group-name] %s",
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/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 26eb881..638d742 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,6 +33,8 @@ 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";
+
@Test
public void testCartridge() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
index 6c1f4e0..b384e46 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
@@ -33,6 +33,8 @@ import static junit.framework.Assert.assertTrue;
*/
public class DeploymentPolicyTest extends StratosTestServerManager {
private static final Log log = LogFactory.getLog(DeploymentPolicyTest.class);
+ private static final String TEST_PATH = "/deployment-policy-test";
+
@Test
public void testDeploymentPolicy() {
@@ -40,17 +42,17 @@ public class DeploymentPolicyTest extends StratosTestServerManager {
String deploymentPolicyId = "deployment-policy-2";
log.info("Started deployment policy test case**************************************");
- boolean addedN1 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
"network-partition-5" + ".json",
RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(addedN1, true);
- boolean addedN2 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
"network-partition-6" + ".json",
RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(addedN2, true);
- boolean addedDep = restClient.addEntity(RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
+ boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
deploymentPolicyId + ".json",
RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
assertEquals(addedDep, true);
@@ -77,13 +79,13 @@ public class DeploymentPolicyTest extends StratosTestServerManager {
assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(1).getPartitionMax(), 9);
//update network partition
- boolean updated = restClient.updateEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
"network-partition-5-v1.json",
RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(updated, true);
//update deployment policy with new partition and max values
- boolean updatedDep = restClient.updateEntity(RestConstants.DEPLOYMENT_POLICIES_PATH +
+ boolean updatedDep = restClient.updateEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH +
"/" + deploymentPolicyId + "-v1.json", RestConstants.DEPLOYMENT_POLICIES,
RestConstants.DEPLOYMENT_POLICIES_NAME);
assertEquals(updatedDep, true);
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
index a2ec9dc..741d8be 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
@@ -32,6 +32,8 @@ import static junit.framework.Assert.assertTrue;
*/
public class NetworkPartitionTest extends StratosTestServerManager {
private static final Log log = LogFactory.getLog(NetworkPartitionTest.class);
+ private static final String TEST_PATH = "/network-partition-test";
+
@Test
public void testNetworkPartition() {
@@ -39,7 +41,7 @@ public class NetworkPartitionTest extends StratosTestServerManager {
String networkPartitionId = "network-partition-3";
log.info("Started network partition test case**************************************");
- boolean added = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
networkPartitionId + ".json",
RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
@@ -54,7 +56,7 @@ public class NetworkPartitionTest extends StratosTestServerManager {
assertEquals(bean.getPartitions().get(0).getProperty().get(0).getName(), "region");
assertEquals(bean.getPartitions().get(0).getProperty().get(0).getValue(), "default");
- boolean updated = restClient.updateEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
networkPartitionId + "-v1.json",
RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java
index 181aaa5..bf7de6c 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java
@@ -44,7 +44,7 @@ public class RestConstants {
public static final String NETWORK_PARTITIONS_NAME = "networkPartition";
public static final String DEPLOYMENT_POLICIES_PATH = "/deployment-policies/";
public static final String DEPLOYMENT_POLICIES_NAME = "deploymentPolicy";
- public static final String APPLICATIONS_PATH = "/applications/simple/single-cartridge-app/";
+ public static final String APPLICATIONS_PATH = "/applications/";
public static final String APPLICATIONS_NAME = "application";
public static final String APPLICATION_POLICIES_PATH = "/application-policies/";
public static final String APPLICATION_POLICIES_NAME = "applicationPolicy";
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
index 7641b18..b2960e2 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
@@ -34,7 +34,7 @@ import static junit.framework.Assert.assertTrue;
*/
public class SampleApplicationsTest extends StratosTestServerManager {
private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
-
+ private static final String TEST_PATH = "/sample-applications-test";
@Test
public void testApplication() {
@@ -42,24 +42,24 @@ public class SampleApplicationsTest extends StratosTestServerManager {
String autoscalingPolicyId = "autoscaling-policy-1";
try {
- boolean addedScalingPolicy = restClient.addEntity(RestConstants.AUTOSCALING_POLICIES_PATH
+ boolean addedScalingPolicy = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH
+ "/" + autoscalingPolicyId + ".json",
RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
assertEquals(addedScalingPolicy, true);
- boolean addedC1 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c1.json",
+ boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c1.json",
RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(addedC1, true);
- boolean addedC2 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c2.json",
+ boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c2.json",
RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(addedC2, true);
- boolean addedC3 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c3.json",
+ boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c3.json",
RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(addedC3, true);
- boolean addedG1 = restClient.addEntity(RestConstants.CARTRIDGE_GROUPS_PATH +
+ boolean addedG1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
"/" + "cartrdige-nested.json", RestConstants.CARTRIDGE_GROUPS,
RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(addedG1, true);
@@ -69,22 +69,22 @@ public class SampleApplicationsTest extends StratosTestServerManager {
CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(beanG1.getName(), "G1");
- boolean addedN1 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
"network-partition-1.json",
RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(addedN1, true);
- boolean addedN2 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
"network-partition-2.json",
RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(addedN2, true);
- boolean addedDep = restClient.addEntity(RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
+ boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
"deployment-policy-1.json",
RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
assertEquals(addedDep, true);
- boolean added = restClient.addEntity(RestConstants.APPLICATIONS_PATH + "/" +
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" +
"g-sc-G123-1.json", RestConstants.APPLICATIONS,
RestConstants.APPLICATIONS_NAME);
assertEquals(added, true);
@@ -120,7 +120,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 1);
assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 2);
- boolean updated = restClient.updateEntity(RestConstants.APPLICATIONS_PATH + "/g-sc-G123-1-v1.json",
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/g-sc-G123-1-v1.json",
RestConstants.APPLICATIONS, RestConstants.APPLICATIONS_NAME);
assertEquals(updated, true);
@@ -229,24 +229,24 @@ public class SampleApplicationsTest extends StratosTestServerManager {
String autoscalingPolicyId = "autoscaling-policy-1";
- boolean addedScalingPolicy = restClient.addEntity(RestConstants.AUTOSCALING_POLICIES_PATH
+ boolean addedScalingPolicy = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH
+ "/" + autoscalingPolicyId + ".json",
RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
assertEquals(addedScalingPolicy, true);
- boolean addedC1 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c1.json",
+ boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c1.json",
RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(addedC1, true);
- boolean addedC2 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c2.json",
+ boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c2.json",
RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(addedC2, true);
- boolean addedC3 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c3.json",
+ boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c3.json",
RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
assertEquals(addedC3, true);
- boolean addedG1 = restClient.addEntity(RestConstants.CARTRIDGE_GROUPS_PATH +
+ boolean addedG1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
"/" + "cartrdige-nested.json", RestConstants.CARTRIDGE_GROUPS,
RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(addedG1, true);
@@ -256,22 +256,22 @@ public class SampleApplicationsTest extends StratosTestServerManager {
CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
assertEquals(beanG1.getName(), "G1");
- boolean addedN1 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
"network-partition-1.json",
RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(addedN1, true);
- boolean addedN2 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
"network-partition-2.json",
RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertEquals(addedN2, true);
- boolean addedDep = restClient.addEntity(RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
+ boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
"deployment-policy-1.json",
RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
assertEquals(addedDep, true);
- boolean added = restClient.addEntity(RestConstants.APPLICATIONS_PATH + "/" +
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" +
"g-sc-G123-1.json", RestConstants.APPLICATIONS,
RestConstants.APPLICATIONS_NAME);
assertEquals(added, true);
@@ -280,7 +280,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
"g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
assertEquals(bean.getApplicationId(), "g-sc-G123-1");
- boolean addAppPolicy = restClient.addEntity(RestConstants.APPLICATION_POLICIES_PATH + "/" +
+ boolean addAppPolicy = restClient.addEntity(TEST_PATH + RestConstants.APPLICATION_POLICIES_PATH + "/" +
"application-policy-1.json", RestConstants.APPLICATION_POLICIES,
RestConstants.APPLICATION_POLICIES_NAME);
assertEquals(addAppPolicy, true);
@@ -307,7 +307,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
TopologyHandler.getInstance().assertClusterActivation(bean.getApplicationId());
//Updating application
- boolean updated = restClient.updateEntity(RestConstants.APPLICATIONS_PATH + "/" +
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" +
"g-sc-G123-1-v1.json", RestConstants.APPLICATIONS,
RestConstants.APPLICATIONS_NAME);
assertEquals(updated, true);
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-3.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-3.json
new file mode 100644
index 0000000..2cecc06
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-3.json
@@ -0,0 +1,18 @@
+{
+ "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/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json
new file mode 100644
index 0000000..4e00d60
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json
@@ -0,0 +1,70 @@
+{
+ "applicationId": "cartridge-group-app",
+ "alias": "my-cartridge-group-app",
+ "components": {
+ "groups": [
+ {
+ "name": "esb-php-group",
+ "alias": "my-esb-php-group",
+ "deploymentPolicy": "deployment-policy-4",
+ "groupMinInstances": 1,
+ "groupMaxInstances": 2,
+ "cartridges": [
+ {
+ "type": "esb",
+ "cartridgeMin": 1,
+ "cartridgeMax": 2,
+ "subscribableInfo": {
+ "alias": "my-esb",
+ "autoscalingPolicy": "autoscaling-policy-2",
+ "artifactRepository": {
+ "privateRepo": false,
+ "repoUrl": "https://github.com/imesh/stratos-esb-applications.git",
+ "repoUsername": "",
+ "repoPassword": ""
+ }
+ }
+ },
+ {
+ "type": "php",
+ "cartridgeMin": 2,
+ "cartridgeMax": 4,
+ "lvsVirtualIP": "192.168.56.50|255.255.255.0",
+ "subscribableInfo": {
+ "alias": "my-php",
+ "autoscalingPolicy": "autoscaling-policy-2",
+ "artifactRepository": {
+ "privateRepo": false,
+ "repoUrl": "https://github.com/imesh/stratos-php-applications.git",
+ "repoUsername": "",
+ "repoPassword": ""
+ }
+ }
+ }
+ ]
+ }
+ ],
+ "cartridges": [
+ {
+ "type": "tomcat",
+ "cartridgeMin": 2,
+ "cartridgeMax": 4,
+ "subscribableInfo": {
+ "alias": "my-tomcat",
+ "autoscalingPolicy": "autoscaling-policy-2",
+ "deploymentPolicy": "deployment-policy-4",
+ "artifactRepository": {
+ "privateRepo": false,
+ "repoUrl": "https://github.com/imesh/stratos-tomcat-applications.git",
+ "repoUsername": "",
+ "repoPassword": ""
+ }
+ }
+ }
+ ],
+ "dependencies": {
+ "terminationBehaviour": "terminate-none"
+ }
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-2.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-2.json
new file mode 100644
index 0000000..944aa82
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-2.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-2",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "threshold": 35
+ },
+ "memoryConsumption": {
+ "threshold": 45
+ },
+ "loadAverage": {
+ "threshold": 25
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group.json
new file mode 100644
index 0000000..008c735
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group.json
@@ -0,0 +1,19 @@
+{
+ "name": "esb-php-group",
+ "cartridges": [
+ "esb",
+ "php"
+ ],
+ "dependencies": {
+ "startupOrders": [
+ {
+ "aliases": [
+ "cartridge.my-esb",
+ "cartridge.my-php"
+ ]
+ }
+ ],
+ "terminationBehaviour": "terminate-none"
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb.json
new file mode 100755
index 0000000..571e7e1
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb.json
@@ -0,0 +1,50 @@
+{
+ "type": "esb",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "framework",
+ "displayName": "esb",
+ "description": "esb Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "vishanth-key"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ],
+ "metadataKeys": [
+ "server_ip",
+ "username",
+ "password"
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php.json
new file mode 100755
index 0000000..5d53e3a
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php.json
@@ -0,0 +1,51 @@
+{
+ "type": "php",
+ "provider": "apache",
+ "category": "framework",
+ "host": "php.stratos.org",
+ "displayName": "php",
+ "description": "php Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-80",
+ "protocol": "http",
+ "port": "8080",
+ "proxyPort": "8280"
+ },
+ {
+ "name": "http-22",
+ "protocol": "tcp",
+ "port": "22",
+ "proxyPort": "8222"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "reka"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat.json
new file mode 100755
index 0000000..395687d
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat.json
@@ -0,0 +1,53 @@
+{
+ "type": "tomcat",
+ "provider": "apache",
+ "host": "tomcat.stratos.org",
+ "category": "framework",
+ "displayName": "tomcat",
+ "description": "tomcat Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ },
+ {
+ "protocol": "http",
+ "port": "8080",
+ "proxyPort": "80"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "vishanth-key"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ],
+ "metadataKeys": [
+ "url"
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-4.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-4.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-4.json
new file mode 100644
index 0000000..f9935d7
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-4.json
@@ -0,0 +1,32 @@
+{
+ "id": "deployment-policy-4",
+ "networkPartitions": [
+ {
+ "id": "network-partition-9",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "partitionMax": 4
+ }
+ ]
+ },
+ {
+ "id": "network-partition-10",
+ "partitionAlgo": "round-robin",
+ "partitions": [
+ {
+ "id": "network-partition-10-partition-1",
+ "partitionMax": 4
+ },
+ {
+ "id": "network-partition-10-partition-2",
+ "partitionMax": 4
+ }
+ ]
+ }
+ ]
+}
+
+
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-10.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-10.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-10.json
new file mode 100644
index 0000000..1e1ec23
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-10.json
@@ -0,0 +1,24 @@
+{
+ "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/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-9.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-9.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-9.json
new file mode 100644
index 0000000..9f12343
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-9.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-9",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json b/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json
deleted file mode 100644
index 17858bb..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "id": "application-policy-1",
- "algorithm": "one-after-another",
- "networkPartitions": [
- "network-partition-1",
- "network-partition-2"
- ],
- "properties": [
- {
- "name": "networkPartitionGroups",
- "value": "network-partition-1,network-partition-2"
- },
- {
- "name": "key-2",
- "value": "value-2"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-2.json b/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-2.json
deleted file mode 100644
index 1137942..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-2.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "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/ce00b955/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
new file mode 100644
index 0000000..2cecc06
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-3.json
@@ -0,0 +1,18 @@
+{
+ "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/ce00b955/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
new file mode 100644
index 0000000..1e1ec23
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-10.json
@@ -0,0 +1,24 @@
+{
+ "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/ce00b955/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
new file mode 100644
index 0000000..9f12343
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-9.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-9",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/README.md
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/README.md b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/README.md
deleted file mode 100644
index 4e092ea..0000000
--- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Single Cartridge Application
-============================
-A simple application with a php cartridge.
-
-Application view
-----------------
-single-cartridge-app <br />
--- single-cartridge-app-1 <br />
--- -- my-php <br />
-
-Application folder structure
-----------------------------
--- artifacts/[iaas]/ IaaS specific artifacts <br />
--- scripts/common/ Common scripts for all iaases <br />
--- scripts/[iaas] IaaS specific scripts <br />
-
-How to run
-----------
-cd scripts/[iaas]/ <br />
-./deploy.sh <br />
-
-How to undeploy
----------------
-cd scripts/[iaas]/ <br />
-./undeploy.sh <br />
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v1.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v1.json
deleted file mode 100644
index ff332c0..0000000
--- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v1.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
- "alias": "g-sc-G123-1",
- "applicationId": "g-sc-G123-1",
- "components": {
- "cartridges": [],
- "groups": [
- {
- "name": "G1",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group1",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 3,
- "type": "c1",
- "subscribableInfo": {
- "alias": "c1-1x0",
- "deploymentPolicy": "deployment-policy-1",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": [
- {
- "name": "G2",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group2",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 4,
- "type": "c2",
- "subscribableInfo": {
- "alias": "c2-1x0",
- "deploymentPolicy": "deployment-policy-1",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": [
- {
- "name": "G3",
- "groupMaxInstances": 3,
- "groupMinInstances": 2,
- "deploymentPolicy": "static-1",
- "alias": "group3",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 3,
- "type": "c3",
- "subscribableInfo": {
- "alias": "c3-1x0",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": []
- }
- ]
- }
- ]
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v2.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v2.json
deleted file mode 100644
index 6f827c2..0000000
--- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v2.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
- "alias": "g-sc-G123-1",
- "applicationId": "g-sc-G123-1",
- "components": {
- "cartridges": [],
- "groups": [
- {
- "name": "G1",
- "groupMaxInstances": 5,
- "groupMinInstances": 2,
- "alias": "group1",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 3,
- "type": "c1",
- "subscribableInfo": {
- "alias": "c1-1x0",
- "deploymentPolicy": "deployment-policy-1",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": [
- {
- "name": "G2",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group2",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 4,
- "type": "c2",
- "subscribableInfo": {
- "alias": "c2-1x0",
- "deploymentPolicy": "deployment-policy-1",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": [
- {
- "name": "G3",
- "groupMaxInstances": 3,
- "groupMinInstances": 2,
- "deploymentPolicy": "static-1",
- "alias": "group3",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 3,
- "type": "c3",
- "subscribableInfo": {
- "alias": "c3-1x0",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": []
- }
- ]
- }
- ]
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v3.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v3.json
deleted file mode 100644
index a6e5fd7..0000000
--- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v3.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
- "alias": "g-sc-G123-1",
- "applicationId": "g-sc-G123-1",
- "components": {
- "cartridges": [],
- "groups": [
- {
- "name": "G1",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group1",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 3,
- "type": "c1",
- "subscribableInfo": {
- "alias": "c1-1x0",
- "deploymentPolicy": "deployment-policy-1",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": [
- {
- "name": "G2",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group2",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 4,
- "type": "c2",
- "subscribableInfo": {
- "alias": "c2-1x0",
- "deploymentPolicy": "deployment-policy-1",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": [
- {
- "name": "G3",
- "groupMaxInstances": 4,
- "groupMinInstances": 3,
- "deploymentPolicy": "static-1",
- "alias": "group3",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 3,
- "type": "c3",
- "subscribableInfo": {
- "alias": "c3-1x0",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": []
- }
- ]
- }
- ]
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1.json
deleted file mode 100644
index 76d72c8..0000000
--- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
- "alias": "g-sc-G123-1",
- "applicationId": "g-sc-G123-1",
- "components": {
- "cartridges": [],
- "groups": [
- {
- "name": "G1",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group1",
- "cartridges": [
- {
- "cartridgeMin": 1,
- "cartridgeMax": 2,
- "type": "c1",
- "subscribableInfo": {
- "alias": "c1-1x0",
- "deploymentPolicy": "deployment-policy-1",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": [
- {
- "name": "G2",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group2",
- "cartridges": [
- {
- "cartridgeMin": 1,
- "cartridgeMax": 2,
- "type": "c2",
- "subscribableInfo": {
- "alias": "c2-1x0",
- "deploymentPolicy": "deployment-policy-1",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": [
- {
- "name": "G3",
- "groupMaxInstances": 2,
- "groupMinInstances": 1,
- "deploymentPolicy": "deployment-policy-1",
- "alias": "group3",
- "cartridges": [
- {
- "cartridgeMin": 1,
- "cartridgeMax": 2,
- "type": "c3",
- "subscribableInfo": {
- "alias": "c3-1x0",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-1"
- }
- }
- ],
- "groups": []
- }
- ]
- }
- ]
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-1.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-1.json
deleted file mode 100644
index f82403b..0000000
--- a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-1.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-1",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 35
- },
- "memoryConsumption": {
- "threshold": 45
- },
- "loadAverage": {
- "threshold": 25
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0-v1.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0-v1.json
deleted file mode 100644
index 31c2b84..0000000
--- a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0-v1.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-c0",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 30
- },
- "memoryConsumption": {
- "threshold": 40
- },
- "loadAverage": {
- "threshold": 20
- }
- }
-}
[34/50] [abbrv] stratos git commit: Merge branch 'master' of
https://github.com/Thanu/stratos
Posted by la...@apache.org.
Merge branch 'master' of https://github.com/Thanu/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0f24238e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0f24238e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0f24238e
Branch: refs/heads/data-publisher-integration
Commit: 0f24238e1e494184be74504783f1e72134247a31
Parents: 3a50768 f105f33
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Mon Aug 10 11:32:46 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Mon Aug 10 11:32:46 2015 +0530
----------------------------------------------------------------------
.../rest/endpoint/api/StratosApiV41.java | 36 ++++++---
.../rest/endpoint/api/StratosApiV41Utils.java | 49 +++++--------
.../util/converter/ObjectConverter.java | 77 +++++++++++++-------
3 files changed, 93 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0f24238e/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
[36/50] [abbrv] stratos git commit: Fix to accept payload parameter
values with equal sign
Posted by la...@apache.org.
Fix to accept payload parameter values with equal sign
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ee1ca9a2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ee1ca9a2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ee1ca9a2
Branch: refs/heads/data-publisher-integration
Commit: ee1ca9a2480b355a7f388bce8ee939168777a8cb
Parents: 63060cf
Author: lasinducharith <la...@gmail.com>
Authored: Mon Aug 10 19:19:05 2015 +0530
Committer: lasinducharith <la...@gmail.com>
Committed: Mon Aug 10 19:19:05 2015 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ee1ca9a2/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
index 5904346..820140b 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
@@ -107,7 +107,7 @@ public class KubernetesIaas extends Iaas {
if (parameterArray != null) {
for (String parameter : parameterArray) {
if (parameter != null) {
- String[] nameValueArray = parameter.split(PAYLOAD_PARAMETER_NAME_VALUE_SEPARATOR);
+ String[] nameValueArray = parameter.split(PAYLOAD_PARAMETER_NAME_VALUE_SEPARATOR, 2);
if ((nameValueArray != null) && (nameValueArray.length == 2)) {
NameValuePair nameValuePair = new NameValuePair(nameValueArray[0], nameValueArray[1]);
payload.add(nameValuePair);
[29/50] [abbrv] stratos git commit: Preparing for 4.1.1-RC1 release
Posted by la...@apache.org.
Preparing for 4.1.1-RC1 release
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c98a0074
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c98a0074
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c98a0074
Branch: refs/heads/data-publisher-integration
Commit: c98a0074678e1302a5e941710fdba89a1054c485
Parents: 6d1bfc5
Author: Akila Perera <ra...@gmail.com>
Authored: Fri Aug 7 21:00:59 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Fri Aug 7 21:00:59 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.autoscaler/pom.xml | 2 +-
.../org.apache.stratos.cartridge.agent/pom.xml | 2 +-
.../agent/test/JavaCartridgeAgentTest.java | 4 +-
components/org.apache.stratos.cli/pom.xml | 2 +-
.../org.apache.stratos.cloud.controller/pom.xml | 2 +-
components/org.apache.stratos.common/pom.xml | 2 +-
.../org.apache.stratos.custom.handlers/pom.xml | 2 +-
.../org.apache.stratos.deployment/pom.xml | 2 +-
.../org.apache.stratos.email.sender/pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../org.apache.stratos.load.balancer/pom.xml | 2 +-
.../org.apache.stratos.logging.view.ui/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 +-
.../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/StratosApiV41.java | 2 +-
.../pom.xml | 2 +-
.../org.apache.stratos.tenant.activity/pom.xml | 2 +-
components/pom.xml | 87 +-------------------
dependencies/fabric8/kubernetes-api/pom.xml | 2 +-
dependencies/fabric8/pom.xml | 2 +-
dependencies/org.wso2.carbon.ui/pom.xml | 2 +-
dependencies/pom.xml | 2 +-
extensions/cep/distribution/pom.xml | 2 +-
extensions/cep/stratos-cep-extension/pom.xml | 2 +-
.../load-balancer/haproxy-extension/README.md | 21 +++++
.../load-balancer/haproxy-extension/pom.xml | 2 +-
.../haproxy-extension/src/main/license/LICENSE | 8 +-
.../load-balancer/lvs-extension/INSTALL.md | 21 +++++
.../load-balancer/lvs-extension/README.md | 22 +++++
extensions/load-balancer/lvs-extension/pom.xml | 2 +-
.../src/main/templates/keepalived.conf.template | 22 +++++
.../load-balancer/nginx-extension/README.md | 21 +++++
.../load-balancer/nginx-extension/pom.xml | 2 +-
.../nginx-extension/src/main/license/LICENSE | 8 +-
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 +-
.../pom.xml | 2 +-
features/common/pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
features/load-balancer/pom.xml | 2 +-
features/manager/deployment/pom.xml | 2 +-
.../pom.xml | 2 +-
features/manager/logging-mgt/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/manager/tenant-activity/pom.xml | 2 +-
.../pom.xml | 2 +-
features/messaging/pom.xml | 2 +-
.../pom.xml | 2 +-
features/mock-iaas/pom.xml | 2 +-
features/pom.xml | 35 ++++----
pom.xml | 22 ++---
.../modules/distribution/INSTALL.txt | 2 +-
.../modules/distribution/README.txt | 2 +-
.../modules/distribution/pom.xml | 2 +-
.../distribution/src/main/license/LICENSE | 14 ++--
products/cartridge-agent/pom.xml | 2 +-
.../load-balancer/modules/distribution/pom.xml | 2 +-
.../src/main/assembly/filter.properties | 5 +-
.../distribution/src/main/license/LICENSE | 8 +-
.../load-balancer/modules/p2-profile/pom.xml | 2 +-
products/load-balancer/pom.xml | 4 +-
products/pom.xml | 2 +-
.../python-cartridge-agent/distribution/pom.xml | 2 +-
products/python-cartridge-agent/pom.xml | 2 +-
products/stratos-cli/distribution/pom.xml | 2 +-
.../distribution/src/main/license/LICENSE | 14 ++--
products/stratos-cli/pom.xml | 2 +-
.../stratos/modules/distribution/README.txt | 21 +++++
products/stratos/modules/distribution/pom.xml | 2 +-
.../distribution/src/assembly/filter.properties | 2 +-
.../distribution/src/main/license/LICENSE | 34 ++++----
products/stratos/modules/integration/pom.xml | 2 +-
.../tests/StratosTestServerManager.java | 2 +-
products/stratos/modules/p2-profile-gen/pom.xml | 2 +-
products/stratos/pom.xml | 2 +-
samples/cartridges/kubernetes/esb.json | 2 +-
samples/cartridges/kubernetes/php.json | 2 +-
samples/cartridges/kubernetes/tomcat.json | 2 +-
samples/cartridges/kubernetes/tomcat1.json | 2 +-
samples/cartridges/kubernetes/tomcat2.json | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
service-stubs/pom.xml | 2 +-
tools/config-scripts/ec2/config.sh | 2 +-
tools/config-scripts/gce/config.sh | 2 +-
tools/config-scripts/openstack/config.sh | 2 +-
.../base-image/Dockerfile | 10 +--
.../base-image/files/run | 2 +-
.../cartridge-docker-images/build.sh | 2 +-
.../stratos-docker-images/run-example.sh | 2 +-
tools/pom.xml | 2 +-
tools/puppet3/modules/agent/files/README.txt | 2 +-
tools/puppet3/modules/agent/manifests/init.pp | 2 +-
tools/puppet3/modules/haproxy/files/README.txt | 2 +-
tools/puppet3/modules/haproxy/manifests/init.pp | 2 +-
tools/puppet3/modules/lb/files/README.txt | 2 +-
tools/puppet3/modules/lb/manifests/init.pp | 2 +-
.../modules/python_agent/files/README.txt | 2 +-
.../modules/python_agent/manifests/init.pp | 2 +-
tools/stratos-installer/conf/setup.conf | 2 +-
130 files changed, 322 insertions(+), 281 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.autoscaler/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/pom.xml b/components/org.apache.stratos.autoscaler/pom.xml
index 47bf0d4..8a72701 100644
--- a/components/org.apache.stratos.autoscaler/pom.xml
+++ b/components/org.apache.stratos.autoscaler/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/pom.xml b/components/org.apache.stratos.cartridge.agent/pom.xml
index 9938ca5..7343bbd 100644
--- a/components/org.apache.stratos.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.cartridge.agent/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
index 27db6cc..d92d806 100644
--- a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
+++ b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
@@ -77,7 +77,7 @@ public class JavaCartridgeAgentTest {
private static final String PARTITION_ID = "partition-1";
private static final String TENANT_ID = "-1234";
private static final String SERVICE_NAME = "php";
- public static final String AGENT_NAME = "apache-stratos-cartridge-agent-4.1.0";
+ public static final String AGENT_NAME = "apache-stratos-cartridge-agent-4.1.1";
private static HashMap<String, Executor> executorList;
private static ArrayList<ServerSocket> serverSocketList;
private final ArtifactUpdatedEvent artifactUpdatedEvent;
@@ -249,7 +249,7 @@ public class JavaCartridgeAgentTest {
}
log.info("Copying agent jar");
- String agentJar = "org.apache.stratos.cartridge.agent-4.1.0.jar";
+ String agentJar = "org.apache.stratos.cartridge.agent-4.1.1.jar";
String agentJarSource = getResourcesFolderPath() + "/../" + agentJar;
String agentJarDest = agentHome.getCanonicalPath() + "/lib/" + agentJar;
FileUtils.copyFile(new File(agentJarSource), new File(agentJarDest));
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.cli/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/pom.xml b/components/org.apache.stratos.cli/pom.xml
index 099dab1..afd63d2 100644
--- a/components/org.apache.stratos.cli/pom.xml
+++ b/components/org.apache.stratos.cli/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.cloud.controller/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml
index d2b79f0..791ae4c 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/pom.xml b/components/org.apache.stratos.common/pom.xml
index 387c69a..578cc50 100644
--- a/components/org.apache.stratos.common/pom.xml
+++ b/components/org.apache.stratos.common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.custom.handlers/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.custom.handlers/pom.xml b/components/org.apache.stratos.custom.handlers/pom.xml
index 7f10c24..157b375 100644
--- a/components/org.apache.stratos.custom.handlers/pom.xml
+++ b/components/org.apache.stratos.custom.handlers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.deployment/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.deployment/pom.xml b/components/org.apache.stratos.deployment/pom.xml
index 5d3c9bd..42f86f1 100644
--- a/components/org.apache.stratos.deployment/pom.xml
+++ b/components/org.apache.stratos.deployment/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.email.sender/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.email.sender/pom.xml b/components/org.apache.stratos.email.sender/pom.xml
index 4b99b08..a5b07fc 100644
--- a/components/org.apache.stratos.email.sender/pom.xml
+++ b/components/org.apache.stratos.email.sender/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.kubernetes.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/pom.xml b/components/org.apache.stratos.kubernetes.client/pom.xml
index 26a6dee..d65e7cd 100644
--- a/components/org.apache.stratos.kubernetes.client/pom.xml
+++ b/components/org.apache.stratos.kubernetes.client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.load.balancer.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/pom.xml b/components/org.apache.stratos.load.balancer.common/pom.xml
index a3e6b3f..77ddcbb 100644
--- a/components/org.apache.stratos.load.balancer.common/pom.xml
+++ b/components/org.apache.stratos.load.balancer.common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.load.balancer.extension.api/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/pom.xml b/components/org.apache.stratos.load.balancer.extension.api/pom.xml
index 802e953..8604405 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/pom.xml
+++ b/components/org.apache.stratos.load.balancer.extension.api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<artifactId>org.apache.stratos.load.balancer.extension.api</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.load.balancer/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/pom.xml b/components/org.apache.stratos.load.balancer/pom.xml
index dd84872..ef8aafe 100644
--- a/components/org.apache.stratos.load.balancer/pom.xml
+++ b/components/org.apache.stratos.load.balancer/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.logging.view.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/pom.xml b/components/org.apache.stratos.logging.view.ui/pom.xml
index de6cda3..f721050 100644
--- a/components/org.apache.stratos.logging.view.ui/pom.xml
+++ b/components/org.apache.stratos.logging.view.ui/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.manager.styles/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.styles/pom.xml b/components/org.apache.stratos.manager.styles/pom.xml
index f732159..c8b1e50 100644
--- a/components/org.apache.stratos.manager.styles/pom.xml
+++ b/components/org.apache.stratos.manager.styles/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.manager/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/pom.xml b/components/org.apache.stratos.manager/pom.xml
index f160da3..aa357a4 100644
--- a/components/org.apache.stratos.manager/pom.xml
+++ b/components/org.apache.stratos.manager/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.messaging/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/pom.xml b/components/org.apache.stratos.messaging/pom.xml
index 72ae3e9..22bb2af 100644
--- a/components/org.apache.stratos.messaging/pom.xml
+++ b/components/org.apache.stratos.messaging/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.metadata.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.client/pom.xml b/components/org.apache.stratos.metadata.client/pom.xml
index 5b7b0c5..cdacc02 100644
--- a/components/org.apache.stratos.metadata.client/pom.xml
+++ b/components/org.apache.stratos.metadata.client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<artifactId>org.apache.stratos.metadata.client</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.metadata.service/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/pom.xml b/components/org.apache.stratos.metadata.service/pom.xml
index 8a2b58e..88b323d 100644
--- a/components/org.apache.stratos.metadata.service/pom.xml
+++ b/components/org.apache.stratos.metadata.service/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.mock.iaas.api/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.api/pom.xml b/components/org.apache.stratos.mock.iaas.api/pom.xml
index 41eeda4..df155ef 100644
--- a/components/org.apache.stratos.mock.iaas.api/pom.xml
+++ b/components/org.apache.stratos.mock.iaas.api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.mock.iaas.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.client/pom.xml b/components/org.apache.stratos.mock.iaas.client/pom.xml
index 58bfa36..c472360 100644
--- a/components/org.apache.stratos.mock.iaas.client/pom.xml
+++ b/components/org.apache.stratos.mock.iaas.client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>stratos-components-parent</artifactId>
<groupId>org.apache.stratos</groupId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.mock.iaas/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/pom.xml b/components/org.apache.stratos.mock.iaas/pom.xml
index 770c243..f91daaf 100644
--- a/components/org.apache.stratos.mock.iaas/pom.xml
+++ b/components/org.apache.stratos.mock.iaas/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>stratos-components-parent</artifactId>
<groupId>org.apache.stratos</groupId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.python.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/pom.xml b/components/org.apache.stratos.python.cartridge.agent/pom.xml
index e1226b9..d366264 100644
--- a/components/org.apache.stratos.python.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.python.cartridge.agent/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.rest.endpoint/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/pom.xml b/components/org.apache.stratos.rest.endpoint/pom.xml
index c3372a3..e1b1e6f 100644
--- a/components/org.apache.stratos.rest.endpoint/pom.xml
+++ b/components/org.apache.stratos.rest.endpoint/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index a16a3e5..631e38c 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -65,7 +65,7 @@ import java.util.ArrayList;
import java.util.List;
/**
- * Stratos API v4.1 for Stratos 4.1.0 release.
+ * Stratos API v4.1 for Stratos 4.1.1 release.
*/
@Path("/")
public class StratosApiV41 extends AbstractApi {
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.sso.redirector.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/pom.xml b/components/org.apache.stratos.sso.redirector.ui/pom.xml
index 49d94c8..fd04f53 100644
--- a/components/org.apache.stratos.sso.redirector.ui/pom.xml
+++ b/components/org.apache.stratos.sso.redirector.ui/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/org.apache.stratos.tenant.activity/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/pom.xml b/components/org.apache.stratos.tenant.activity/pom.xml
index d26bf7c..e706592 100644
--- a/components/org.apache.stratos.tenant.activity/pom.xml
+++ b/components/org.apache.stratos.tenant.activity/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 94badb4..cfa7d23 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -285,88 +285,5 @@
<neethi.wso2.version>2.0.4.wso2v4</neethi.wso2.version>
<imp.pkg.version.javax.servlet>[2.6.0, 3.0.0)</imp.pkg.version.javax.servlet>
<rampart.wso2.version>1.6.1.wso2v9</rampart.wso2.version>
- <!--eclipse.osgi.version>3.5.0.v20090520</eclipse.osgi.version>
- <eclipse.osgi.services.version>3.2.0.v20090520-1800</eclipse.osgi.services.version>
- <equinox.commons.logging.version>1.0.4.v200706111724</equinox.commons.logging.version>
- <synapse.version>2.1.1-wso2v3</synapse.version>
- <wsdl4j.wso2.version>1.6.2.wso2v2</wsdl4j.wso2.version>
- <geronimo.stax.api.wso2.version>1.0.1.wso2v1</geronimo.stax.api.wso2.version>
- <xmlschema.version>1.4.3</xmlschema.version>
- <addressing.version>1.6.1-wso2v1</addressing.version>
- <rampart.version>1.6.1-wso2v9</rampart.version>
- <wss4j.version>1.5.11.wso2v1</wss4j.version>
- <gdata-core.wso2.version>1.47.0.wso2v1</gdata-core.wso2.version>
- <gdata-spreadsheet.wso2.version>3.0.0.wso2v1</gdata-spreadsheet.wso2.version>
- <poi.wso2.version>3.5.0.wso2v1</poi.wso2.version>
- <rhino.wso2.version>1.7.0.R1-wso2v2</rhino.wso2.version>
- <xercesImpl.version>2.8.1</xercesImpl.version>
- <xercesImpl.wso2.version>2.8.1.wso2v1</xercesImpl.wso2.version>
- <uddi4j.version>1.0.1</uddi4j.version>
- <wsdl-validator.version>1.2.0.wso2v1</wsdl-validator.version>
- <wsdl4j.version>1.6.2</wsdl4j.version>
- <jetty.version>6.1.5</jetty.version>
- <hsqldb.version>1.8.0</hsqldb.version>
- <xml-apis.version>1.3.04</xml-apis.version>
- <jaxen.version>1.1.1</jaxen.version>
- <woodstox.version>3.2.9</woodstox.version>
- <stax.version>1.0.1</stax.version>
- <axiom.version>1.2.11-wso2v2</axiom.version>
- <commons-dbcp.version>1.2.2</commons-dbcp.version>
- <commons-logging.version>1.1</commons-logging.version>
- <commons-pool.version>1.5.0.wso2v1</commons-pool.version>
- <commons-beanutils.version>1.8.0</commons-beanutils.version>
- <commons-collections.version>3.2</commons-collections.version>
- <commons-digester.version>1.8</commons-digester.version>
- <authenticator.version>0.5</authenticator.version>
- <javamail.version>1.4</javamail.version>
- <activation.version>1.1</activation.version>
- <commons-fileupload.version>1.1.1</commons-fileupload.version>
- <commons-httpclient.version>3.0.1</commons-httpclient.version>
- <commons-httpclient.wso2.version>${orbit.version.commons.httpclient}</commons-httpclient.wso2.version>
- <validateutility.version>0.95</validateutility.version>
- <derby.version>10.4.2.0</derby.version>
- <axis2-transports.version>1.1.0-wso2v4</axis2-transports.version-->
- <!--derby.wso2.version>${version.wso2.derby}</derby.wso2.version--><!-- derby orbit version need to be updated -->
- <!--commons-fileupload.wso2.version>1.2.2.wso2v1</commons-fileupload.wso2.version>
- <geronimo-stax-api.wso2.version>1.0.1.wso2v1</geronimo-stax-api.wso2.version>
- <neethi.wso2.version>${neethi.osgi.version}</neethi.wso2.version>
- <commons-lang.wso2.version>2.6.0.wso2v1</commons-lang.wso2.version>
- <wso2mex.version>2.2</wso2mex.version>
- <rampart.wso2.version>1.6.1.wso2v9</rampart.wso2.version>
- <sandesha2.version>1.6.1-wso2v1</sandesha2.version>
- <jasperreports.wso2.version>3.7.1.wso2v1</jasperreports.wso2.version>
- <wso2throttle.version>3.3.0</wso2throttle.version>
- <wso2xfer.version>3.2.0</wso2xfer.version>
- <jxl.wso2.version>2.6.8.wso2v1</jxl.wso2.version>
- <wso2.h2.orbit.version>1.2.140.wso2v3</wso2.h2.orbit.version>
- <commons-io.wso2.version>2.0.0.wso2v1</commons-io.wso2.version>
- <juddi.wso2.version>3.0.3.wso2v2</juddi.wso2.version>
- <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
- <smackx.wso2.version>3.0.4.wso2v1</smackx.wso2.version>
- <sun-xacml.wso2.version>2.0.1.wso2v1</sun-xacml.wso2.version>
- <opensaml.wso2.version>1.1.0.wso2v1</opensaml.wso2.version>
- <opensaml2.wso2.version>2.4.1.wso2v1</opensaml2.wso2.version>
- <openid4java.wso2.version>0.9.6.wso2v1</openid4java.wso2.version>
- <httpcomponents-httpclient.wso2.version>4.1.1-wso2v1</httpcomponents-httpclient.wso2.version>
- <scxml.version>0.9.0.wso2v1</scxml.version>
- <google.step2.wso2.version>1.0.wso2v1</google.step2.wso2.version>
- <google.guice.wso2.version>3.0.wso2v1</google.guice.wso2.version>
- <version.solr>1.4.1.wso2v1</version.solr>
- <shindig.version>1.1.0.wso2v6</shindig.version>
- <batik.version>1.7.0.wso2v1</batik.version>
- <google.guava.wso2.version>12.0.0.wso2v1</google.guava.wso2.version>
- <orbit.version.json>2.0.0.wso2v1</orbit.version.json>
- <orbit.version.json-simple>1.1.wso2v1</orbit.version.json-simple>
- <orbit.version.woden>1.0.0.M8-wso2v1</orbit.version.woden>
- <orbit.version.commons-configuration>1.6.0.wso2v1</orbit.version.commons-configuration>
- <orbit.version.infinispan>5.1.2.wso2v1</orbit.version.infinispan>
- <zookeeper.orbit.version>3.3.5.wso2v1</zookeeper.orbit.version>
- <quartz2.orbit.version>2.1.1.wso2v1</quartz2.orbit.version>
- <mvel2.orbit.version>2.0.19.wso2v1</mvel2.orbit.version>
- <antlr-runtime.orbit.version>3.2.0.wso2v1</antlr-runtime.orbit.version>
- <siddhi.orbit.version>1.0.0.wso2v1</siddhi.orbit.version>
- <gson.version>2.1</gson.version>
- -->
</properties>
-
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/dependencies/fabric8/kubernetes-api/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-api/pom.xml b/dependencies/fabric8/kubernetes-api/pom.xml
index 57989a3..4e837a6 100644
--- a/dependencies/fabric8/kubernetes-api/pom.xml
+++ b/dependencies/fabric8/kubernetes-api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-dependencies-fabric8</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/dependencies/fabric8/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/pom.xml b/dependencies/fabric8/pom.xml
index 6f504b8..adef03f 100644
--- a/dependencies/fabric8/pom.xml
+++ b/dependencies/fabric8/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-dependents</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/dependencies/org.wso2.carbon.ui/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/org.wso2.carbon.ui/pom.xml b/dependencies/org.wso2.carbon.ui/pom.xml
index e1e5c17..f4a64ba 100644
--- a/dependencies/org.wso2.carbon.ui/pom.xml
+++ b/dependencies/org.wso2.carbon.ui/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-dependents</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index df890b9..076efed 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/cep/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/distribution/pom.xml b/extensions/cep/distribution/pom.xml
index 3d208d5..6536bea 100644
--- a/extensions/cep/distribution/pom.xml
+++ b/extensions/cep/distribution/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-extensions</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/cep/stratos-cep-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/stratos-cep-extension/pom.xml b/extensions/cep/stratos-cep-extension/pom.xml
index 945c170..81ef64a 100644
--- a/extensions/cep/stratos-cep-extension/pom.xml
+++ b/extensions/cep/stratos-cep-extension/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-extensions</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/load-balancer/haproxy-extension/README.md
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/README.md b/extensions/load-balancer/haproxy-extension/README.md
index 50a49a1..45f93c1 100644
--- a/extensions/load-balancer/haproxy-extension/README.md
+++ b/extensions/load-balancer/haproxy-extension/README.md
@@ -1,3 +1,24 @@
+# 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.
+#
+# This is a generated file and will be overwritten at the next load balancer startup.
+# Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template
+# file for updating other configurations.
+#
# Apache Stratos HAProxy Extension
Apache Stratos HAProxy extension is a load balancer extension for HAProxy. It is an executable program
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/load-balancer/haproxy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/pom.xml b/extensions/load-balancer/haproxy-extension/pom.xml
index 79a565c..1807ce6 100644
--- a/extensions/load-balancer/haproxy-extension/pom.xml
+++ b/extensions/load-balancer/haproxy-extension/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-load-balancer-extensions</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<artifactId>apache-stratos-haproxy-extension</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/load-balancer/haproxy-extension/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/src/main/license/LICENSE b/extensions/load-balancer/haproxy-extension/src/main/license/LICENSE
index 7f14067..2d48842 100644
--- a/extensions/load-balancer/haproxy-extension/src/main/license/LICENSE
+++ b/extensions/load-balancer/haproxy-extension/src/main/license/LICENSE
@@ -291,10 +291,10 @@ neethi-2.0.4.wso2v4.jar
not-yet-commons-ssl-0.3.9.jar
opencsv-1.8.wso2v1.jar
org.apache.log4j-1.2.13.v200706111418.jar
-org.apache.stratos.common-4.1.0.jar
-org.apache.stratos.load.balancer.common-4.1.0.jar
-org.apache.stratos.load.balancer.extension.api-4.1.0.jar
-org.apache.stratos.messaging-4.1.0.jar
+org.apache.stratos.common-4.1.1.jar
+org.apache.stratos.load.balancer.common-4.1.1.jar
+org.apache.stratos.load.balancer.extension.api-4.1.1.jar
+org.apache.stratos.messaging-4.1.1.jar
poi-3.9.jar
poi-ooxml-3.9.0.wso2v1.jar
poi-ooxml-3.9.jar
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/load-balancer/lvs-extension/INSTALL.md
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/lvs-extension/INSTALL.md b/extensions/load-balancer/lvs-extension/INSTALL.md
index a6679b4..c85c6f8 100644
--- a/extensions/load-balancer/lvs-extension/INSTALL.md
+++ b/extensions/load-balancer/lvs-extension/INSTALL.md
@@ -1,3 +1,24 @@
+# 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.
+#
+# This is a generated file and will be overwritten at the next load balancer startup.
+# Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template
+# file for updating other configurations.
+#
# Installing Apache Stratos LVS Extension
Apache Stratos LVS Extension could be used for integrating LVS load balancer with Apache Stratos. Please follow
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/load-balancer/lvs-extension/README.md
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/lvs-extension/README.md b/extensions/load-balancer/lvs-extension/README.md
index 13de2e0..56c5f16 100644
--- a/extensions/load-balancer/lvs-extension/README.md
+++ b/extensions/load-balancer/lvs-extension/README.md
@@ -1,3 +1,25 @@
+# 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.
+#
+# This is a generated file and will be overwritten at the next load balancer startup.
+# Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template
+# file for updating other configurations.
+#
+
# Apache Stratos LVS Extension
Apache Stratos LVS extension is a load balancer extension for LVS. It is an executable program
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/load-balancer/lvs-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/lvs-extension/pom.xml b/extensions/load-balancer/lvs-extension/pom.xml
index 1b50823..1478c04 100644
--- a/extensions/load-balancer/lvs-extension/pom.xml
+++ b/extensions/load-balancer/lvs-extension/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-load-balancer-extensions</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<artifactId>org.apache.stratos.lvs.extension</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/load-balancer/lvs-extension/src/main/templates/keepalived.conf.template
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/lvs-extension/src/main/templates/keepalived.conf.template b/extensions/load-balancer/lvs-extension/src/main/templates/keepalived.conf.template
index 840ca3d..682598f 100644
--- a/extensions/load-balancer/lvs-extension/src/main/templates/keepalived.conf.template
+++ b/extensions/load-balancer/lvs-extension/src/main/templates/keepalived.conf.template
@@ -1,3 +1,25 @@
+! 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.
+!
+! This is a generated file and will be overwritten at the next load balancer startup.
+! Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template
+! file for updating other configurations.
+!
+
! Configuration File for keepalived
global_defs {
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/load-balancer/nginx-extension/README.md
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/nginx-extension/README.md b/extensions/load-balancer/nginx-extension/README.md
index cfbe2a3..5798542 100644
--- a/extensions/load-balancer/nginx-extension/README.md
+++ b/extensions/load-balancer/nginx-extension/README.md
@@ -1,3 +1,24 @@
+# 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.
+#
+# This is a generated file and will be overwritten at the next load balancer startup.
+# Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template
+# file for updating other configurations.
+#
# Apache Stratos Nginx Extension
Apache Stratos Nginx extension is a load balancer extension for Nginx. It is an executable program
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/load-balancer/nginx-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/nginx-extension/pom.xml b/extensions/load-balancer/nginx-extension/pom.xml
index 2865bc0..7e35062 100644
--- a/extensions/load-balancer/nginx-extension/pom.xml
+++ b/extensions/load-balancer/nginx-extension/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-load-balancer-extensions</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<artifactId>apache-stratos-nginx-extension</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/load-balancer/nginx-extension/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/nginx-extension/src/main/license/LICENSE b/extensions/load-balancer/nginx-extension/src/main/license/LICENSE
index 7f14067..2d48842 100644
--- a/extensions/load-balancer/nginx-extension/src/main/license/LICENSE
+++ b/extensions/load-balancer/nginx-extension/src/main/license/LICENSE
@@ -291,10 +291,10 @@ neethi-2.0.4.wso2v4.jar
not-yet-commons-ssl-0.3.9.jar
opencsv-1.8.wso2v1.jar
org.apache.log4j-1.2.13.v200706111418.jar
-org.apache.stratos.common-4.1.0.jar
-org.apache.stratos.load.balancer.common-4.1.0.jar
-org.apache.stratos.load.balancer.extension.api-4.1.0.jar
-org.apache.stratos.messaging-4.1.0.jar
+org.apache.stratos.common-4.1.1.jar
+org.apache.stratos.load.balancer.common-4.1.1.jar
+org.apache.stratos.load.balancer.extension.api-4.1.1.jar
+org.apache.stratos.messaging-4.1.1.jar
poi-3.9.jar
poi-ooxml-3.9.0.wso2v1.jar
poi-ooxml-3.9.jar
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/pom.xml b/extensions/load-balancer/pom.xml
index cf48d85..e2528db 100644
--- a/extensions/load-balancer/pom.xml
+++ b/extensions/load-balancer/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-extensions</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 1c78d2b..c1c9867 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml b/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
index 325f493..f213343 100644
--- a/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
+++ b/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>autoscaler-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/autoscaler/pom.xml
----------------------------------------------------------------------
diff --git a/features/autoscaler/pom.xml b/features/autoscaler/pom.xml
index 3359a5d..a15d538 100644
--- a/features/autoscaler/pom.xml
+++ b/features/autoscaler/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/cep/org.apache.stratos.event.processor.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/org.apache.stratos.event.processor.feature/pom.xml b/features/cep/org.apache.stratos.event.processor.feature/pom.xml
index eb72059..9bbaf5f 100644
--- a/features/cep/org.apache.stratos.event.processor.feature/pom.xml
+++ b/features/cep/org.apache.stratos.event.processor.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>cep-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml b/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
index 48d013d..cdfdb3c 100644
--- a/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
+++ b/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>cep-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/cep/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/pom.xml b/features/cep/pom.xml
index c01bf33..eaf63a8 100644
--- a/features/cep/pom.xml
+++ b/features/cep/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
index 3fbee6b..3d42857 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>cloud-controller-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/cloud-controller/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/pom.xml b/features/cloud-controller/pom.xml
index eaa4bfd..638bfb2 100644
--- a/features/cloud-controller/pom.xml
+++ b/features/cloud-controller/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/common/org.apache.stratos.common.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.common.feature/pom.xml b/features/common/org.apache.stratos.common.feature/pom.xml
index 5c94562..534d2ad 100644
--- a/features/common/org.apache.stratos.common.feature/pom.xml
+++ b/features/common/org.apache.stratos.common.feature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>common-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/common/org.apache.stratos.common.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.common.server.feature/pom.xml b/features/common/org.apache.stratos.common.server.feature/pom.xml
index 81f9663..736b990 100644
--- a/features/common/org.apache.stratos.common.server.feature/pom.xml
+++ b/features/common/org.apache.stratos.common.server.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>common-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/common/org.apache.stratos.common.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.common.ui.feature/pom.xml b/features/common/org.apache.stratos.common.ui.feature/pom.xml
index df7b799..a3ec17b 100644
--- a/features/common/org.apache.stratos.common.ui.feature/pom.xml
+++ b/features/common/org.apache.stratos.common.ui.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>common-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.custom.handlers.feature/pom.xml b/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
index 86ddd13..4e8483f 100644
--- a/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
+++ b/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>common-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/common/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/pom.xml b/features/common/pom.xml
index 0016840..66d3c5a 100644
--- a/features/common/pom.xml
+++ b/features/common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml b/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
index de91061..30841d1 100644
--- a/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
+++ b/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>loadbalancer-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml b/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
index 60c5d6b..fd051e4 100644
--- a/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
+++ b/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>loadbalancer-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/pom.xml b/features/load-balancer/pom.xml
index e73e623..adc88b8 100644
--- a/features/load-balancer/pom.xml
+++ b/features/load-balancer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/manager/deployment/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/deployment/pom.xml b/features/manager/deployment/pom.xml
index c25f839..e8d928b 100644
--- a/features/manager/deployment/pom.xml
+++ b/features/manager/deployment/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml b/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml
index e4cb7d8..545924b 100644
--- a/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml
+++ b/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>logging-mgt-feature</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/manager/logging-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/logging-mgt/pom.xml b/features/manager/logging-mgt/pom.xml
index 68c812a..6e76a93 100644
--- a/features/manager/logging-mgt/pom.xml
+++ b/features/manager/logging-mgt/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>logging-mgt-feature</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml b/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
index 315b453..178a340 100644
--- a/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
+++ b/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
index f9c3725..fbe7b1b 100644
--- a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
+++ b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/manager/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/pom.xml b/features/manager/pom.xml
index 0b8c7f2..7d0e9ed 100644
--- a/features/manager/pom.xml
+++ b/features/manager/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
index 2899c29..46108b6 100644
--- a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
+++ b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml b/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml
index 5f8e1bd..c809a72 100644
--- a/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml
+++ b/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-mgt-parent-feature</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
index 71ebf8a..254a4a6 100644
--- a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
+++ b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-mgt-parent-feature</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/manager/stratos-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/stratos-mgt/pom.xml b/features/manager/stratos-mgt/pom.xml
index 723c6dd..61096ae 100644
--- a/features/manager/stratos-mgt/pom.xml
+++ b/features/manager/stratos-mgt/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml b/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
index 171ff25..3140c52 100644
--- a/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
+++ b/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
index 5003962..984a196 100644
--- a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
+++ b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>tenant-activity-feature</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/manager/tenant-activity/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-activity/pom.xml b/features/manager/tenant-activity/pom.xml
index 06c8eb9..a8d4bc1 100644
--- a/features/manager/tenant-activity/pom.xml
+++ b/features/manager/tenant-activity/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tenant-activity-feature</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/messaging/org.apache.stratos.messaging.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/messaging/org.apache.stratos.messaging.feature/pom.xml b/features/messaging/org.apache.stratos.messaging.feature/pom.xml
index 16d43dc..eb50503 100644
--- a/features/messaging/org.apache.stratos.messaging.feature/pom.xml
+++ b/features/messaging/org.apache.stratos.messaging.feature/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>messaging-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/features/messaging/pom.xml b/features/messaging/pom.xml
index e3e004e..8b9b5ab 100644
--- a/features/messaging/pom.xml
+++ b/features/messaging/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml
index b8e92f7..67feeae 100644
--- a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml
+++ b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>mock-iaas-features</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/mock-iaas/pom.xml
----------------------------------------------------------------------
diff --git a/features/mock-iaas/pom.xml b/features/mock-iaas/pom.xml
index 6d22341..11a917a 100644
--- a/features/mock-iaas/pom.xml
+++ b/features/mock-iaas/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-features-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index 5e35760..89c4451 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -18,12 +18,13 @@
~ 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">
+<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">
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -46,26 +47,24 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
</plugin>
</plugins>
</build>
<properties>
<wso2carbon.version>4.2.0</wso2carbon.version>
- <!--carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1-->
- <carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version>
- <synapse.wso2.version>2.1.1-wso2v4</synapse.wso2.version>
- <google.guava.wso2.version>12.0.0.wso2v1</google.guava.wso2.version>
- <google.guice.wso2.version>3.0.wso2v1</google.guice.wso2.version>
- <com.google.guice.assistedinject.wso2.version>3.0.wso2v1</com.google.guice.assistedinject.wso2.version>
- <com.google.guice.assistedinject.wso2.version>3.0.wso2v1</com.google.guice.assistedinject.wso2.version>
- <sun.jersey.version>1.12</sun.jersey.version>
- <gson2.version>2.2</gson2.version>
- <google.collect.osgi.version>1.0.0.wso2v2</google.collect.osgi.version>
- <axis2.wso2.version>1.6.1.wso2v10</axis2.wso2.version>
- <axiom.wso2.version>1.2.11.wso2v4</axiom.wso2.version>
+ <carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version>
+ <synapse.wso2.version>2.1.1-wso2v4</synapse.wso2.version>
+ <google.guava.wso2.version>12.0.0.wso2v1</google.guava.wso2.version>
+ <google.guice.wso2.version>3.0.wso2v1</google.guice.wso2.version>
+ <com.google.guice.assistedinject.wso2.version>3.0.wso2v1</com.google.guice.assistedinject.wso2.version>
+ <com.google.guice.assistedinject.wso2.version>3.0.wso2v1</com.google.guice.assistedinject.wso2.version>
+ <sun.jersey.version>1.12</sun.jersey.version>
+ <gson2.version>2.2</gson2.version>
+ <google.collect.osgi.version>1.0.0.wso2v2</google.collect.osgi.version>
+ <axis2.wso2.version>1.6.1.wso2v10</axis2.wso2.version>
+ <axiom.wso2.version>1.2.11.wso2v4</axiom.wso2.version>
</properties>
-
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0fc84aa..a3808ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
<packaging>pom</packaging>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<name>Apache Stratos</name>
<description>Apache Stratos is an open source polyglot Platform as a Service (PaaS) framework</description>
<url>http://stratos.apache.org</url>
@@ -75,7 +75,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/stratos.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/stratos.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=stratos.git</url>
- <tag>4.1.1-SNAPSHOT</tag>
+ <tag>4.1.1</tag>
</scm>
<modules>
@@ -169,8 +169,8 @@
<exclude>**/scriptaculous/**/*</exclude>
<exclude>**/prototype-1.6.js</exclude>
<exclude>**/prototype.js</exclude>
- <exclude>**/.gitmodules</exclude>
-
+ <exclude>**/*.log</exclude>
+ <exclude>**/.gitmodules</exclude>
<!-- Added following based on jclouds -->
<exclude>**/src/test/resources/**/*.xml</exclude>
<!-- META-INF/services files -->
@@ -178,13 +178,13 @@
<exclude>**/services/*ApiMetadata</exclude>
<exclude>**/services/*ProviderMetadata</exclude>
<exclude>**/dhtmlHistory.js</exclude>
-
- <!-- for ActivMQ test broker -->
+
+ <!-- for ActivMQ test broker -->
<exclude>**/db.data</exclude>
-
- <!-- WSDLs -->
- <exclude>**/*.wsdl</exclude>
-
+
+ <!-- WSDLs -->
+ <exclude>**/*.wsdl</exclude>
+
</excludes>
<excludeSubProjects>false</excludeSubProjects>
</configuration>
@@ -557,4 +557,4 @@
<kubernetes.api.version>2.2.16</kubernetes.api.version>
<kubernetes.api.stratos.version>2.2.16-stratosv1-SNAPSHOT</kubernetes.api.stratos.version>
</properties>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/cartridge-agent/modules/distribution/INSTALL.txt
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/INSTALL.txt b/products/cartridge-agent/modules/distribution/INSTALL.txt
index ed71a89..611fe89 100644
--- a/products/cartridge-agent/modules/distribution/INSTALL.txt
+++ b/products/cartridge-agent/modules/distribution/INSTALL.txt
@@ -26,4 +26,4 @@ properties="-Dmb.ip=MB-IP
Please refer following link for more information:
-https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Installation+Guide
\ No newline at end of file
+https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Installation+Guide
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/cartridge-agent/modules/distribution/README.txt
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/README.txt b/products/cartridge-agent/modules/distribution/README.txt
index c399842..b170522 100644
--- a/products/cartridge-agent/modules/distribution/README.txt
+++ b/products/cartridge-agent/modules/distribution/README.txt
@@ -13,7 +13,7 @@ Synchronizer and Instance Status Event Publisher.
Please refer below link for more information:
-https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Cartridge+Agent
+https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Cartridge+Agent
Thank you for using Apache Stratos!
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/cartridge-agent/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/pom.xml b/products/cartridge-agent/modules/distribution/pom.xml
index f0a145f..2acf11a 100644
--- a/products/cartridge-agent/modules/distribution/pom.xml
+++ b/products/cartridge-agent/modules/distribution/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>cartidge-agent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/cartridge-agent/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/license/LICENSE b/products/cartridge-agent/modules/distribution/src/main/license/LICENSE
index 9be3ea3..f2dafb6 100644
--- a/products/cartridge-agent/modules/distribution/src/main/license/LICENSE
+++ b/products/cartridge-agent/modules/distribution/src/main/license/LICENSE
@@ -218,7 +218,7 @@ activemq-client-5.10.0.jar,
ant-1.7.0.jar,
ant-1.7.0.wso2v1.jar,
ant-launcher-1.7.0.jar,
-apache-stratos-cartridge-agent-4.1.0.jar,
+apache-stratos-cartridge-agent-4.1.1.jar,
axiom-1.2.11.wso2v4.jar,
axiom-api-1.2.11.jar,
axiom-impl-1.2.11.jar,
@@ -272,12 +272,12 @@ neethi-2.0.4.wso2v4.jar
not-yet-commons-ssl-0.3.9.jar
opencsv-1.8.wso2v1.jar
org.apache.log4j-1.2.13.v200706111418.jar
-org.apache.stratos.cartridge.agent-4.1.0.jar
-org.apache.stratos.common-4.1.0.jar
-org.apache.stratos.messaging-4.1.0.jar
-org.apache.stratos.autoscaler.service.stub-4.1.0.jar
-org.apache.stratos.cloud.controller.service.stub-4.1.0.jar
-org.apache.stratos.manager.service.stub-4.1.0.jar
+org.apache.stratos.cartridge.agent-4.1.1.jar
+org.apache.stratos.common-4.1.1.jar
+org.apache.stratos.messaging-4.1.1.jar
+org.apache.stratos.autoscaler.service.stub-4.1.1.jar
+org.apache.stratos.cloud.controller.service.stub-4.1.1.jar
+org.apache.stratos.manager.service.stub-4.1.1.jar
org.wso2.carbon.base-4.2.0.jar
org.wso2.carbon.bootstrap-4.2.0.jar
org.wso2.carbon.core-4.2.0.jar
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/cartridge-agent/pom.xml
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/pom.xml b/products/cartridge-agent/pom.xml
index 16c1ab8..e9be982 100644
--- a/products/cartridge-agent/pom.xml
+++ b/products/cartridge-agent/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-products-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/load-balancer/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/pom.xml b/products/load-balancer/modules/distribution/pom.xml
index 0f69d65..db2ae71 100755
--- a/products/load-balancer/modules/distribution/pom.xml
+++ b/products/load-balancer/modules/distribution/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos.load.balancer</groupId>
<artifactId>load-balancer-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c98a0074/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/assembly/filter.properties b/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
index 8432fab..8a78112 100644
--- a/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
+++ b/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
@@ -19,8 +19,7 @@
product.name=Apache Stratos Load Balancer
product.key=LB
-product.version=4.1.0
-
+product.version=4.1.1
lb.version=2.0.5
default.server.role=LoadBalancer
-bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
+bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
\ No newline at end of file
[22/50] [abbrv] stratos git commit: Re-organizing the package
structure
Posted by la...@apache.org.
Re-organizing the package structure
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/66487b24
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/66487b24
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/66487b24
Branch: refs/heads/data-publisher-integration
Commit: 66487b24f9eeb5ba71709bd55bbf6f0504c78b33
Parents: 955c37a
Author: reka <rt...@gmail.com>
Authored: Fri Aug 7 11:37:15 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Fri Aug 7 11:37:15 2015 +0530
----------------------------------------------------------------------
.../tests/ApplicationBurstingTest.java | 223 ----------
.../tests/ApplicationPolicyTest.java | 131 ------
.../tests/AutoscalingPolicyTest.java | 89 ----
.../integration/tests/CartridgeGroupTest.java | 127 ------
.../integration/tests/CartridgeTest.java | 128 ------
.../integration/tests/DeploymentPolicyTest.java | 155 -------
.../integration/tests/NetworkPartitionTest.java | 90 ----
.../tests/SampleApplicationsTest.java | 424 ------------------
.../tests/StratosTestServerManager.java | 3 +-
.../integration/tests/TopologyHandler.java | 5 +-
.../application/ApplicationBurstingTest.java | 226 ++++++++++
.../application/SampleApplicationsTest.java | 427 +++++++++++++++++++
.../application/SingleClusterScalingTest.java | 233 ++++++++++
.../tests/group/CartridgeGroupTest.java | 129 ++++++
.../integration/tests/group/CartridgeTest.java | 130 ++++++
.../tests/policies/ApplicationPolicyTest.java | 133 ++++++
.../tests/policies/AutoscalingPolicyTest.java | 91 ++++
.../tests/policies/DeploymentPolicyTest.java | 157 +++++++
.../tests/policies/NetworkPartitionTest.java | 92 ++++
.../integration/src/test/resources/testng.xml | 16 +-
20 files changed, 1631 insertions(+), 1378 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java
deleted file mode 100644
index 518c7cb..0000000
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.integration.tests;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.beans.application.ApplicationBean;
-import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
-import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
-import org.testng.annotations.Test;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-/**
- * This will handle the application bursting test cases
- */
-public class ApplicationBurstingTest extends StratosTestServerManager {
- private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
- private static final String TEST_PATH = "/application-bursting-test";
-
-
- @Test
- public void testDeployApplication() {
- try {
- log.info("Started application Bursting test case**************************************");
-
- String autoscalingPolicyId = "autoscaling-policy-2";
-
- boolean addedScalingPolicy = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH
- + "/" + autoscalingPolicyId + ".json",
- RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
- assertEquals(addedScalingPolicy, true);
-
- boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "esb.json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(addedC1, true);
-
- boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "php.json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(addedC2, true);
-
- boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "tomcat.json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(addedC3, true);
-
- boolean addedG1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
- "/" + "esb-php-group.json", RestConstants.CARTRIDGE_GROUPS,
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(addedG1, true);
-
- CartridgeGroupBean beanG1 = (CartridgeGroupBean) restClient.
- getEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group",
- CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(beanG1.getName(), "esb-php-group");
-
- boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
- "network-partition-9.json",
- RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(addedN1, true);
-
- boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
- "network-partition-10.json",
- RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(addedN2, true);
-
- boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
- "deployment-policy-4.json",
- RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(addedDep, true);
-
- boolean added = restClient.addEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" +
- "app-bursting-single-cartriddge-group.json", RestConstants.APPLICATIONS,
- RestConstants.APPLICATIONS_NAME);
- assertEquals(added, true);
-
- ApplicationBean bean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
- "cartridge-group-app", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
- assertEquals(bean.getApplicationId(), "cartridge-group-app");
-
- boolean addAppPolicy = restClient.addEntity(TEST_PATH + RestConstants.APPLICATION_POLICIES_PATH + "/" +
- "application-policy-3.json", RestConstants.APPLICATION_POLICIES,
- RestConstants.APPLICATION_POLICIES_NAME);
- assertEquals(addAppPolicy, true);
-
- ApplicationPolicyBean policyBean = (ApplicationPolicyBean) restClient.getEntity(
- RestConstants.APPLICATION_POLICIES,
- "application-policy-3", ApplicationPolicyBean.class,
- RestConstants.APPLICATION_POLICIES_NAME);
-
- //deploy the application
- String resourcePath = RestConstants.APPLICATIONS + "/" + "cartridge-group-app" +
- RestConstants.APPLICATIONS_DEPLOY + "/" + "application-policy-3";
- boolean deployed = restClient.deployEntity(resourcePath,
- RestConstants.APPLICATIONS_NAME);
- assertEquals(deployed, true);
-
- //Application active handling
- TopologyHandler.getInstance().assertApplicationActivation(bean.getApplicationId());
-
- //Group active handling
- TopologyHandler.getInstance().assertGroupActivation(bean.getApplicationId());
-
- //Cluster active handling
- TopologyHandler.getInstance().assertClusterActivation(bean.getApplicationId());
-
- boolean removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group",
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(removedGroup, false);
-
- boolean removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
- autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
- assertEquals(removedAuto, false);
-
- boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-9",
- RestConstants.NETWORK_PARTITIONS_NAME);
- //Trying to remove the used network partition
- assertEquals(removedNet, false);
-
- boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
- "deployment-policy-4", RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(removedDep, false);
-
- //Un-deploying the application
- String resourcePathUndeploy = RestConstants.APPLICATIONS + "/" + "cartridge-group-app" +
- RestConstants.APPLICATIONS_UNDEPLOY;
-
- boolean unDeployed = restClient.undeployEntity(resourcePathUndeploy,
- RestConstants.APPLICATIONS_NAME);
- assertEquals(unDeployed, true);
-
- boolean undeploy = TopologyHandler.getInstance().assertApplicationUndeploy("cartridge-group-app");
- if (!undeploy) {
- //Need to forcefully undeploy the application
- log.info("Force undeployment is going to start for the [application] " + "cartridge-group-app");
-
- restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + "cartridge-group-app" +
- RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS);
-
- boolean forceUndeployed = TopologyHandler.getInstance().assertApplicationUndeploy("cartridge-group-app");
- assertEquals(String.format("Forceful undeployment failed for the application %s",
- "cartridge-group-app"), forceUndeployed, true);
-
- }
-
- boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "cartridge-group-app",
- RestConstants.APPLICATIONS_NAME);
- assertEquals(removed, true);
-
- ApplicationBean beanRemoved = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
- "cartridge-group-app", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
- assertEquals(beanRemoved, null);
-
- removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group",
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(removedGroup, true);
-
- boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "esb",
- RestConstants.CARTRIDGES_NAME);
- assertEquals(removedC1, true);
-
- boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "php",
- RestConstants.CARTRIDGES_NAME);
- assertEquals(removedC2, true);
-
- boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "tomcat",
- RestConstants.CARTRIDGES_NAME);
- assertEquals(removedC3, true);
-
- removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
- autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
- assertEquals(removedAuto, true);
-
- removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
- "deployment-policy-4", RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(removedDep, true);
-
- removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-9", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedNet, false);
-
- boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-10", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedN2, false);
-
- boolean removeAppPolicy = restClient.removeEntity(RestConstants.APPLICATION_POLICIES,
- "application-policy-3", RestConstants.APPLICATION_POLICIES_NAME);
- assertEquals(removeAppPolicy, true);
-
- removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-9", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedNet, true);
-
- removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-10", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedN2, true);
-
- log.info("Ended application bursting test case**************************************");
-
- } catch (Exception e) {
- log.error("An error occurred while handling application bursting", e);
- assertTrue("An error occurred while handling application bursting", false);
- }
- }
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
deleted file mode 100644
index 635931e..0000000
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.integration.tests;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.beans.PropertyBean;
-import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
-import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
-import org.testng.annotations.Test;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-/**
- * Test to handle Network partition CRUD operations
- */
-public class ApplicationPolicyTest extends StratosTestServerManager {
- private static final Log log = LogFactory.getLog(ApplicationPolicyTest.class);
- private static final String TEST_PATH = "/application-policy-test";
-
-
- @Test
- public void testApplicationPolicy() {
- try {
- String applicationPolicyId = "application-policy-2";
- log.info("Started Application policy test case**************************************");
-
- boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
- "network-partition-7" + ".json",
- RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(addedN1, true);
-
- boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
- "network-partition-8" + ".json",
- RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(addedN2, true);
-
- boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.APPLICATION_POLICIES_PATH + "/" +
- applicationPolicyId + ".json",
- RestConstants.APPLICATION_POLICIES, RestConstants.APPLICATION_POLICIES_NAME);
- assertEquals(addedDep, true);
-
- ApplicationPolicyBean bean = (ApplicationPolicyBean) restClient.
- getEntity(RestConstants.APPLICATION_POLICIES, applicationPolicyId,
- ApplicationPolicyBean.class, RestConstants.APPLICATION_POLICIES_NAME);
- assertEquals(bean.getId(), applicationPolicyId);
- assertEquals(String.format("The expected algorithm %s is not found in %s",
- "one-after-another", applicationPolicyId), bean.getAlgorithm(), "one-after-another");
- assertEquals(String.format("The expected id %s is not found",
- applicationPolicyId), bean.getId(), applicationPolicyId);
- assertEquals(String.format("The expected networkpartitions size %s is not found in %s",
- 2, applicationPolicyId), bean.getNetworkPartitions().length, 2);
- assertEquals(String.format("The first network partition is not %s in %s",
- "network-partition-7", applicationPolicyId), bean.getNetworkPartitions()[0],
- "network-partition-7");
- assertEquals(String.format("The Second network partition is not %s in %s",
- "network-partition-8", applicationPolicyId), bean.getNetworkPartitions()[1],
- "network-partition-8");
- boolean algoFound = false;
- for (PropertyBean propertyBean : bean.getProperties()) {
- if (propertyBean.getName().equals("networkPartitionGroups")) {
- assertEquals(String.format("The networkPartitionGroups algorithm %s is not found in %s",
- "network-partition-7,network-partition-8", applicationPolicyId),
- propertyBean.getValue(), "network-partition-7,network-partition-8");
- algoFound = true;
-
- }
- }
- if (!algoFound) {
- assertTrue(String.format("The networkPartitionGroups property is not found in %s",
- applicationPolicyId), false);
- }
-
- boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-7", RestConstants.NETWORK_PARTITIONS_NAME);
- //Trying to remove the used network partition
- assertEquals(removedNet, false);
-
- boolean removedDep = restClient.removeEntity(RestConstants.APPLICATION_POLICIES,
- applicationPolicyId, RestConstants.APPLICATION_POLICIES_NAME);
- assertEquals(removedDep, true);
-
- ApplicationPolicyBean beanRemovedDep = (ApplicationPolicyBean) restClient.
- getEntity(RestConstants.APPLICATION_POLICIES, applicationPolicyId,
- ApplicationPolicyBean.class, RestConstants.APPLICATION_POLICIES_NAME);
- assertEquals(beanRemovedDep, null);
-
- boolean removedN1 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-7", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedN1, true);
-
- NetworkPartitionBean beanRemovedN1 = (NetworkPartitionBean) restClient.
- getEntity(RestConstants.NETWORK_PARTITIONS, "network-partition-7",
- NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(beanRemovedN1, null);
-
- boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-8", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedN2, true);
-
- NetworkPartitionBean beanRemovedN2 = (NetworkPartitionBean) restClient.
- getEntity(RestConstants.NETWORK_PARTITIONS, "network-partition-8",
- NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(beanRemovedN2, null);
-
- log.info("Ended deployment policy test case**************************************");
-
- } catch (Exception e) {
- log.error("An error occurred while handling deployment policy", e);
- assertTrue("An error occurred while handling deployment policy", false);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
deleted file mode 100644
index c4b52f6..0000000
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.integration.tests;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
-import org.testng.annotations.Test;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-/**
- * Test to handle autoscaling policy CRUD operations
- */
-public class AutoscalingPolicyTest extends StratosTestServerManager {
- private static final Log log = LogFactory.getLog(AutoscalingPolicyTest.class);
- private static final String TEST_PATH = "/autoscaling-policy-test";
-
-
- @Test
- public void testAutoscalingPolicy() {
- log.info("Started autoscaling policy test case**************************************");
- String policyId = "autoscaling-policy-c0";
- try {
- boolean added = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH + "/" + policyId + ".json",
- RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
-
- assertEquals(String.format("Autoscaling policy did not added: [autoscaling-policy-id] %s", policyId), added, true);
- AutoscalePolicyBean bean = (AutoscalePolicyBean) restClient.
- getEntity(RestConstants.AUTOSCALING_POLICIES, policyId,
- AutoscalePolicyBean.class, RestConstants.AUTOSCALING_POLICIES_NAME);
-
- assertEquals(String.format("[autoscaling-policy-id] %s is not correct", bean.getId()),
- bean.getId(), policyId);
- assertEquals(String.format("[autoscaling-policy-id] %s RIF is not correct", policyId),
- bean.getLoadThresholds().getRequestsInFlight().getThreshold(), 35.0, 0.0);
- assertEquals(String.format("[autoscaling-policy-id] %s Memory is not correct", policyId),
- bean.getLoadThresholds().getMemoryConsumption().getThreshold(), 45.0, 0.0);
- assertEquals(String.format("[autoscaling-policy-id] %s Load is not correct", policyId),
- bean.getLoadThresholds().getLoadAverage().getThreshold(), 25.0, 0.0);
-
- boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH + "/" + policyId + "-v1.json",
- RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
-
- assertEquals(String.format("[autoscaling-policy-id] %s update failed", policyId), updated, true);
- AutoscalePolicyBean updatedBean = (AutoscalePolicyBean) restClient.getEntity(
- RestConstants.AUTOSCALING_POLICIES, policyId,
- AutoscalePolicyBean.class, RestConstants.AUTOSCALING_POLICIES_NAME);
- assertEquals(String.format("[autoscaling-policy-id] %s RIF is not correct", policyId),
- updatedBean.getLoadThresholds().getRequestsInFlight().getThreshold(), 30.0, 0.0);
- assertEquals(String.format("[autoscaling-policy-id] %s Load is not correct", policyId),
- updatedBean.getLoadThresholds().getMemoryConsumption().getThreshold(), 40.0, 0.0);
- assertEquals(String.format("[autoscaling-policy-id] %s Memory is not correct", policyId),
- updatedBean.getLoadThresholds().getLoadAverage().getThreshold(), 20.0, 0.0);
-
- boolean removed = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
- policyId, RestConstants.AUTOSCALING_POLICIES_NAME);
- assertEquals(String.format("[autoscaling-policy-id] %s couldn't be removed", policyId),
- removed, true);
-
- AutoscalePolicyBean beanRemoved = (AutoscalePolicyBean) restClient.getEntity(
- RestConstants.AUTOSCALING_POLICIES, policyId,
- AutoscalePolicyBean.class, RestConstants.AUTOSCALING_POLICIES_NAME);
- assertEquals(String.format("[autoscaling-policy-id] %s didn't get removed successfully",
- policyId), beanRemoved, null);
- log.info("Ended autoscaling policy test case**************************************");
- } catch (Exception e) {
- log.error("An error occurred while handling [autoscaling policy] " + policyId, e);
- assertTrue("An error occurred while handling [autoscaling policy] " + policyId, false);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
deleted file mode 100644
index 873fa5a..0000000
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.integration.tests;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
-import org.testng.annotations.Test;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-/**
- * Test to handle Cartridge group CRUD operations
- */
-public class CartridgeGroupTest extends StratosTestServerManager {
- private static final Log log = LogFactory.getLog(CartridgeGroupTest.class);
- private static final String TEST_PATH = "/cartridge-group-test";
-
- @Test
- public void testCartridgeGroup() {
- try {
- log.info("Started Cartridge group test case**************************************");
-
- boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c4.json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c4"), addedC1, true);
-
- boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c5.json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c5"), addedC2, true);
-
- boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c6.json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c6"), addedC3, true);
-
- boolean added = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
- "/" + "g4-g5-g6.json", RestConstants.CARTRIDGE_GROUPS,
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(String.format("Cartridge Group did not added: [cartridge-group-name] %s",
- "g4-g5-g6"), added, true);
- CartridgeGroupBean bean = (CartridgeGroupBean) restClient.
- getEntity(RestConstants.CARTRIDGE_GROUPS, "G4",
- CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(String.format("Cartridge Group name did not match: [cartridge-group-name] %s",
- "g4-g5-g6.json"), bean.getName(), "G4");
-
- boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
- "/" + "g4-g5-g6-v1.json",
- RestConstants.CARTRIDGE_GROUPS, RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(String.format("Cartridge Group did not updated: [cartridge-group-name] %s",
- "g4-g5-g6"), updated, true);
- CartridgeGroupBean updatedBean = (CartridgeGroupBean) restClient.
- getEntity(RestConstants.CARTRIDGE_GROUPS, "G4",
- CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(String.format("Updated Cartridge Group didn't match: [cartridge-group-name] %s",
- "g4-g5-g6"), updatedBean.getName(), "G4");
-
- boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "c4",
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(String.format("Cartridge can be removed while it is used in " +
- "cartridge group: [cartridge-name] %s", "c4"), removedC1, false);
-
- boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "c5",
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(String.format("Cartridge can be removed while it is used in " +
- "cartridge group: [cartridge-name] %s",
- "c5"), removedC2, false);
-
- boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "c6",
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(String.format("Cartridge can be removed while it is used in " +
- "cartridge group: [cartridge-name] %s",
- "c6"), removedC3, false);
-
- boolean removed = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G4",
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(String.format("Cartridge Group did not removed: [cartridge-group-name] %s",
- "g4-g5-g6"), removed, true);
-
- CartridgeGroupBean beanRemoved = (CartridgeGroupBean) restClient.
- getEntity(RestConstants.CARTRIDGE_GROUPS, "G4",
- CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(String.format("Cartridge Group did not removed completely: " +
- "[cartridge-group-name] %s",
- "g4-g5-g6"), beanRemoved, null);
-
- removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "c4",
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
- "c4"), removedC1, true);
-
- removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "c5",
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
- "c5"), removedC2, true);
-
- removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "c6",
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
- "c6"), removedC3, true);
-
- log.info("Ended Cartridge group test case**************************************");
-
- } catch (Exception e) {
- log.error("An error occurred while handling Cartridge group test case", e);
- assertTrue("An error occurred while handling Cartridge group test case", false);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/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
deleted file mode 100644
index f3456a4..0000000
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.integration.tests;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.beans.PropertyBean;
-import org.apache.stratos.common.beans.cartridge.CartridgeBean;
-import org.testng.annotations.Test;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-/**
- * Test to handle Cartridge CRUD operations
- */
-public class CartridgeTest extends StratosTestServerManager {
- private static final Log log = LogFactory.getLog(CartridgeTest.class);
- private static final String TEST_PATH = "/cartridge-test";
-
-
- @Test
- public void testCartridge() {
- log.info("Started Cartridge test case**************************************");
-
- try {
- String cartridgeType = "c0";
- boolean added = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" +
- cartridgeType + ".json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(added, true);
- CartridgeBean bean = (CartridgeBean) restClient.
- getEntity(RestConstants.CARTRIDGES, cartridgeType,
- CartridgeBean.class, RestConstants.CARTRIDGES_NAME);
- assertEquals(bean.getCategory(), "Application");
- assertEquals(bean.getHost(), "qmog.cisco.com");
- for (PropertyBean property : bean.getProperty()) {
- if (property.getName().equals("payload_parameter.CEP_IP")) {
- assertEquals(property.getValue(), "octl.qmog.cisco.com");
- } else if (property.getName().equals("payload_parameter.CEP_ADMIN_PASSWORD")) {
- assertEquals(property.getValue(), "admin");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_IP")) {
- assertEquals(property.getValue(), "octl.qmog.cisco.com");
- } else if (property.getName().equals("payload_parameter.QTCM_NETWORK_COUNT")) {
- assertEquals(property.getValue(), "1");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD")) {
- assertEquals(property.getValue(), "admin");
- } else if (property.getName().equals("payload_parameter.QTCM_DNS_SEGMENT")) {
- assertEquals(property.getValue(), "test");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_SECURE_PORT")) {
- assertEquals(property.getValue(), "7711");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_PORT")) {
- assertEquals(property.getValue(), "7611");
- } else if (property.getName().equals("payload_parameter.CEP_PORT")) {
- assertEquals(property.getValue(), "7611");
- } else if (property.getName().equals("payload_parameter.MB_PORT")) {
- assertEquals(property.getValue(), "61616");
- }
- }
-
-
- boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" +
- cartridgeType + "-v1.json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(updated, true);
- CartridgeBean updatedBean = (CartridgeBean) restClient.
- getEntity(RestConstants.CARTRIDGES, cartridgeType,
- CartridgeBean.class, RestConstants.CARTRIDGES_NAME);
- assertEquals(updatedBean.getType(), "c0");
- assertEquals(updatedBean.getCategory(), "Data");
- assertEquals(updatedBean.getHost(), "qmog.cisco.com12");
- for (PropertyBean property : updatedBean.getProperty()) {
- if (property.getName().equals("payload_parameter.CEP_IP")) {
- assertEquals(property.getValue(), "octl.qmog.cisco.com123");
- } else if (property.getName().equals("payload_parameter.CEP_ADMIN_PASSWORD")) {
- assertEquals(property.getValue(), "admin123");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_IP")) {
- assertEquals(property.getValue(), "octl.qmog.cisco.com123");
- } else if (property.getName().equals("payload_parameter.QTCM_NETWORK_COUNT")) {
- assertEquals(property.getValue(), "3");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD")) {
- assertEquals(property.getValue(), "admin123");
- } else if (property.getName().equals("payload_parameter.QTCM_DNS_SEGMENT")) {
- assertEquals(property.getValue(), "test123");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_SECURE_PORT")) {
- assertEquals(property.getValue(), "7712");
- } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_PORT")) {
- assertEquals(property.getValue(), "7612");
- } else if (property.getName().equals("payload_parameter.CEP_PORT")) {
- assertEquals(property.getValue(), "7612");
- } else if (property.getName().equals("payload_parameter.MB_PORT")) {
- assertEquals(property.getValue(), "61617");
- }
- }
-
- boolean removed = restClient.removeEntity(RestConstants.CARTRIDGES, cartridgeType,
- RestConstants.CARTRIDGES_NAME);
- assertEquals(removed, true);
-
- CartridgeBean beanRemoved = (CartridgeBean) restClient.
- getEntity(RestConstants.CARTRIDGES, cartridgeType,
- CartridgeBean.class, RestConstants.CARTRIDGES_NAME);
- assertEquals(beanRemoved, null);
-
- log.info("Ended Cartridge test case**************************************");
- } catch (Exception e) {
- log.error("An error occurred while handling RESTConstants.CARTRIDGES_PATH", e);
- assertTrue("An error occurred while handling RESTConstants.CARTRIDGES_PATH", false);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
deleted file mode 100644
index b384e46..0000000
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.integration.tests;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
-import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
-import org.testng.annotations.Test;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-/**
- * Test to handle Deployment policy CRUD operations
- */
-public class DeploymentPolicyTest extends StratosTestServerManager {
- private static final Log log = LogFactory.getLog(DeploymentPolicyTest.class);
- private static final String TEST_PATH = "/deployment-policy-test";
-
-
- @Test
- public void testDeploymentPolicy() {
- try {
- String deploymentPolicyId = "deployment-policy-2";
- log.info("Started deployment policy test case**************************************");
-
- boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
- "network-partition-5" + ".json",
- RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(addedN1, true);
-
- boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
- "network-partition-6" + ".json",
- RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(addedN2, true);
-
- boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
- deploymentPolicyId + ".json",
- RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(addedDep, true);
-
- DeploymentPolicyBean bean = (DeploymentPolicyBean) restClient.
- getEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId,
- DeploymentPolicyBean.class, RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(bean.getId(), "deployment-policy-2");
- assertEquals(bean.getNetworkPartitions().size(), 2);
- assertEquals(bean.getNetworkPartitions().get(0).getId(), "network-partition-5");
- assertEquals(bean.getNetworkPartitions().get(0).getPartitionAlgo(), "one-after-another");
- assertEquals(bean.getNetworkPartitions().get(0).getPartitions().size(), 1);
- assertEquals(bean.getNetworkPartitions().get(0).getPartitions().get(0).getId(), "partition-1");
- assertEquals(bean.getNetworkPartitions().get(0).getPartitions().get(0).getPartitionMax(), 20);
-
- assertEquals(bean.getNetworkPartitions().get(1).getId(), "network-partition-6");
- assertEquals(bean.getNetworkPartitions().get(1).getPartitionAlgo(), "round-robin");
- assertEquals(bean.getNetworkPartitions().get(1).getPartitions().size(), 2);
- assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(0).getId(),
- "network-partition-6-partition-1");
- assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(0).getPartitionMax(), 10);
- assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(1).getId(),
- "network-partition-6-partition-2");
- assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(1).getPartitionMax(), 9);
-
- //update network partition
- boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
- "network-partition-5-v1.json",
- RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(updated, true);
-
- //update deployment policy with new partition and max values
- boolean updatedDep = restClient.updateEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH +
- "/" + deploymentPolicyId + "-v1.json", RestConstants.DEPLOYMENT_POLICIES,
- RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(updatedDep, true);
-
- DeploymentPolicyBean updatedBean = (DeploymentPolicyBean) restClient.
- getEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId,
- DeploymentPolicyBean.class, RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(updatedBean.getId(), "deployment-policy-2");
- assertEquals(updatedBean.getNetworkPartitions().size(), 2);
- assertEquals(updatedBean.getNetworkPartitions().get(0).getId(), "network-partition-5");
- assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitionAlgo(), "one-after-another");
- assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().size(), 2);
- assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(0).getId(), "partition-1");
- assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(0).getPartitionMax(), 25);
- assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(1).getId(), "partition-2");
- assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(1).getPartitionMax(), 20);
-
- assertEquals(updatedBean.getNetworkPartitions().get(1).getId(), "network-partition-6");
- assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitionAlgo(), "round-robin");
- assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().size(), 2);
- assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(0).getId(),
- "network-partition-6-partition-1");
- assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(0).getPartitionMax(), 15);
- assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(1).getId(),
- "network-partition-6-partition-2");
- assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(1).getPartitionMax(), 5);
-
- boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-5", RestConstants.NETWORK_PARTITIONS_NAME);
- //Trying to remove the used network partition
- assertEquals(removedNet, false);
-
- boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
- deploymentPolicyId, RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(removedDep, true);
-
- DeploymentPolicyBean beanRemovedDep = (DeploymentPolicyBean) restClient.
- getEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId,
- DeploymentPolicyBean.class, RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(beanRemovedDep, null);
-
- boolean removedN1 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-5", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedN1, true);
-
- NetworkPartitionBean beanRemovedN1 = (NetworkPartitionBean) restClient.
- getEntity(RestConstants.NETWORK_PARTITIONS, "network-partition-5",
- NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(beanRemovedN1, null);
-
- boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-6", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedN2, true);
-
- NetworkPartitionBean beanRemovedN2 = (NetworkPartitionBean) restClient.
- getEntity(RestConstants.NETWORK_PARTITIONS, "network-partition-6",
- NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(beanRemovedN2, null);
-
- log.info("Ended deployment policy test case**************************************");
-
- } catch (Exception e) {
- log.error("An error occurred while handling deployment policy", e);
- assertTrue("An error occurred while handling deployment policy", false);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
deleted file mode 100644
index 741d8be..0000000
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.integration.tests;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
-import org.testng.annotations.Test;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-/**
- * Test to handle Network partition CRUD operations
- */
-public class NetworkPartitionTest extends StratosTestServerManager {
- private static final Log log = LogFactory.getLog(NetworkPartitionTest.class);
- private static final String TEST_PATH = "/network-partition-test";
-
-
- @Test
- public void testNetworkPartition() {
- try {
- String networkPartitionId = "network-partition-3";
- log.info("Started network partition test case**************************************");
-
- boolean added = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
- networkPartitionId + ".json",
- RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
-
- assertEquals(added, true);
- NetworkPartitionBean bean = (NetworkPartitionBean) restClient.
- getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId,
- NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
-
- assertEquals(bean.getId(), "network-partition-3");
- assertEquals(bean.getPartitions().size(), 1);
- assertEquals(bean.getPartitions().get(0).getId(), "partition-1");
- assertEquals(bean.getPartitions().get(0).getProperty().get(0).getName(), "region");
- assertEquals(bean.getPartitions().get(0).getProperty().get(0).getValue(), "default");
-
- boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
- networkPartitionId + "-v1.json",
- RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
-
- assertEquals(updated, true);
- NetworkPartitionBean updatedBean = (NetworkPartitionBean) restClient.
- getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId,
- NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(updatedBean.getId(), "network-partition-3");
- assertEquals(updatedBean.getPartitions().size(), 2);
- assertEquals(updatedBean.getPartitions().get(1).getId(), "partition-2");
- assertEquals(updatedBean.getPartitions().get(1).getProperty().get(0).getName(), "region");
- assertEquals(updatedBean.getPartitions().get(1).getProperty().get(0).getValue(), "default1");
- assertEquals(updatedBean.getPartitions().get(1).getProperty().get(1).getName(), "zone");
- assertEquals(updatedBean.getPartitions().get(1).getProperty().get(1).getValue(), "z1");
-
- boolean removed = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- networkPartitionId, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removed, true);
-
- NetworkPartitionBean beanRemoved = (NetworkPartitionBean) restClient.
- getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId,
- NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(beanRemoved, null);
-
- log.info("Ended network partition test case**************************************");
- } catch (Exception e) {
- log.error("An error occurred while handling network partitions", e);
- assertTrue("An error occurred while handling network partitions", false);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
deleted file mode 100644
index b2960e2..0000000
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.integration.tests;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.beans.application.ApplicationBean;
-import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
-import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
-import org.testng.annotations.Test;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-/**
- * Sample application tests with application add, .
- */
-public class SampleApplicationsTest extends StratosTestServerManager {
- private static final Log log = LogFactory.getLog(SampleApplicationsTest.class);
- private static final String TEST_PATH = "/sample-applications-test";
-
- @Test
- public void testApplication() {
- log.info("Started application test case**************************************");
- String autoscalingPolicyId = "autoscaling-policy-1";
-
- try {
- boolean addedScalingPolicy = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH
- + "/" + autoscalingPolicyId + ".json",
- RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
- assertEquals(addedScalingPolicy, true);
-
- boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c1.json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(addedC1, true);
-
- boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c2.json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(addedC2, true);
-
- boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c3.json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(addedC3, true);
-
- boolean addedG1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
- "/" + "cartrdige-nested.json", RestConstants.CARTRIDGE_GROUPS,
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(addedG1, true);
-
- CartridgeGroupBean beanG1 = (CartridgeGroupBean) restClient.
- getEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
- CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(beanG1.getName(), "G1");
-
- boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
- "network-partition-1.json",
- RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(addedN1, true);
-
- boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
- "network-partition-2.json",
- RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(addedN2, true);
-
- boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
- "deployment-policy-1.json",
- RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(addedDep, true);
-
- boolean added = restClient.addEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" +
- "g-sc-G123-1.json", RestConstants.APPLICATIONS,
- RestConstants.APPLICATIONS_NAME);
- assertEquals(added, true);
-
- ApplicationBean bean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
- "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
- assertEquals(bean.getApplicationId(), "g-sc-G123-1");
-
- assertEquals(bean.getComponents().getGroups().get(0).getName(), "G1");
- assertEquals(bean.getComponents().getGroups().get(0).getAlias(), "group1");
- assertEquals(bean.getComponents().getGroups().get(0).getGroupMaxInstances(), 1);
- assertEquals(bean.getComponents().getGroups().get(0).getGroupMinInstances(), 1);
-
- assertEquals(bean.getComponents().getGroups().get(0).getCartridges().get(0).getType(), "c1");
- assertEquals(bean.getComponents().getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 1);
- assertEquals(bean.getComponents().getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 2);
-
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getAlias(), "group2");
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getName(), "G2");
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroupMaxInstances(), 1);
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroupMinInstances(), 1);
-
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getCartridges().get(0).getType(), "c2");
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 1);
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 2);
-
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getAlias(), "group3");
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getName(), "G3");
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getGroupMaxInstances(), 2);
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getGroupMinInstances(), 1);
-
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getType(), "c3");
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 1);
- assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 2);
-
- boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/g-sc-G123-1-v1.json",
- RestConstants.APPLICATIONS, RestConstants.APPLICATIONS_NAME);
- assertEquals(updated, true);
-
- ApplicationBean updatedBean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
- "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
-
- assertEquals(bean.getApplicationId(), "g-sc-G123-1");
- assertEquals(updatedBean.getComponents().getGroups().get(0).getName(), "G1");
- assertEquals(updatedBean.getComponents().getGroups().get(0).getAlias(), "group1");
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroupMaxInstances(), 1);
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroupMinInstances(), 1);
-
- assertEquals(updatedBean.getComponents().getGroups().get(0).getCartridges().get(0).getType(), "c1");
- assertEquals(updatedBean.getComponents().getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 2);
- assertEquals(updatedBean.getComponents().getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 3);
-
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getAlias(), "group2");
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getName(), "G2");
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroupMaxInstances(), 1);
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroupMinInstances(), 1);
-
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getCartridges().get(0).getType(), "c2");
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 2);
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 4);
-
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getAlias(), "group3");
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getName(), "G3");
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getGroupMaxInstances(), 3);
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getGroupMinInstances(), 2);
-
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getType(), "c3");
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 2);
- assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 3);
-
-
- boolean removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(removedGroup, false);
-
- boolean removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
- autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
- assertEquals(removedAuto, false);
-
- boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-1",
- RestConstants.NETWORK_PARTITIONS_NAME);
- //Trying to remove the used network partition
- assertEquals(removedNet, false);
-
- boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
- "deployment-policy-1", RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(removedDep, false);
-
- boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "g-sc-G123-1",
- RestConstants.APPLICATIONS_NAME);
- assertEquals(removed, true);
-
- ApplicationBean beanRemoved = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
- "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
- assertEquals(beanRemoved, null);
-
- removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(removedGroup, true);
-
- boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "c1",
- RestConstants.CARTRIDGES_NAME);
- assertEquals(removedC1, true);
-
- boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "c2",
- RestConstants.CARTRIDGES_NAME);
- assertEquals(removedC2, true);
-
- boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "c3",
- RestConstants.CARTRIDGES_NAME);
- assertEquals(removedC3, true);
-
- removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
- autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
- assertEquals(removedAuto, true);
-
- removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
- "deployment-policy-1", RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(removedDep, true);
-
- removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-1", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedNet, true);
-
- boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-2", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedN2, true);
-
- log.info("Ended application test case**************************************");
-
- } catch (Exception e) {
- log.error("An error occurred while handling application test case", e);
- assertTrue("An error occurred while handling application test case", false);
- }
- }
-
- @Test(dependsOnMethods = {"testApplication"})
- public void testDeployApplication() {
- try {
- log.info("Started application deploy/undeploy test case**************************************");
-
- String autoscalingPolicyId = "autoscaling-policy-1";
-
- boolean addedScalingPolicy = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH
- + "/" + autoscalingPolicyId + ".json",
- RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
- assertEquals(addedScalingPolicy, true);
-
- boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c1.json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(addedC1, true);
-
- boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c2.json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(addedC2, true);
-
- boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c3.json",
- RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
- assertEquals(addedC3, true);
-
- boolean addedG1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH +
- "/" + "cartrdige-nested.json", RestConstants.CARTRIDGE_GROUPS,
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(addedG1, true);
-
- CartridgeGroupBean beanG1 = (CartridgeGroupBean) restClient.
- getEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
- CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(beanG1.getName(), "G1");
-
- boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
- "network-partition-1.json",
- RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(addedN1, true);
-
- boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
- "network-partition-2.json",
- RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(addedN2, true);
-
- boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
- "deployment-policy-1.json",
- RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(addedDep, true);
-
- boolean added = restClient.addEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" +
- "g-sc-G123-1.json", RestConstants.APPLICATIONS,
- RestConstants.APPLICATIONS_NAME);
- assertEquals(added, true);
-
- ApplicationBean bean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
- "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
- assertEquals(bean.getApplicationId(), "g-sc-G123-1");
-
- boolean addAppPolicy = restClient.addEntity(TEST_PATH + RestConstants.APPLICATION_POLICIES_PATH + "/" +
- "application-policy-1.json", RestConstants.APPLICATION_POLICIES,
- RestConstants.APPLICATION_POLICIES_NAME);
- assertEquals(addAppPolicy, true);
-
- ApplicationPolicyBean policyBean = (ApplicationPolicyBean) restClient.getEntity(
- RestConstants.APPLICATION_POLICIES,
- "application-policy-1", ApplicationPolicyBean.class,
- RestConstants.APPLICATION_POLICIES_NAME);
-
- //deploy the application
- String resourcePath = RestConstants.APPLICATIONS + "/" + "g-sc-G123-1" +
- RestConstants.APPLICATIONS_DEPLOY + "/" + "application-policy-1";
- boolean deployed = restClient.deployEntity(resourcePath,
- RestConstants.APPLICATIONS_NAME);
- assertEquals(deployed, true);
-
- //Application active handling
- TopologyHandler.getInstance().assertApplicationActivation(bean.getApplicationId());
-
- //Group active handling
- TopologyHandler.getInstance().assertGroupActivation(bean.getApplicationId());
-
- //Cluster active handling
- TopologyHandler.getInstance().assertClusterActivation(bean.getApplicationId());
-
- //Updating application
- boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" +
- "g-sc-G123-1-v1.json", RestConstants.APPLICATIONS,
- RestConstants.APPLICATIONS_NAME);
- assertEquals(updated, true);
-
- TopologyHandler.getInstance().assertGroupInstanceCount(bean.getApplicationId(), "group3", 2);
-
- TopologyHandler.getInstance().assertClusterMinMemberCount(bean.getApplicationId(), 2);
-
- ApplicationBean updatedBean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
- "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
- assertEquals(updatedBean.getApplicationId(), "g-sc-G123-1");
-
- boolean removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(removedGroup, false);
-
- boolean removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
- autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
- assertEquals(removedAuto, false);
-
- boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-1",
- RestConstants.NETWORK_PARTITIONS_NAME);
- //Trying to remove the used network partition
- assertEquals(removedNet, false);
-
- boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
- "deployment-policy-1", RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(removedDep, false);
-
- //Un-deploying the application
- String resourcePathUndeploy = RestConstants.APPLICATIONS + "/" + "g-sc-G123-1" +
- RestConstants.APPLICATIONS_UNDEPLOY;
-
- boolean unDeployed = restClient.undeployEntity(resourcePathUndeploy,
- RestConstants.APPLICATIONS_NAME);
- assertEquals(unDeployed, true);
-
- boolean undeploy = TopologyHandler.getInstance().assertApplicationUndeploy("g-sc-G123-1");
- if (!undeploy) {
- //Need to forcefully undeploy the application
- log.info("Force undeployment is going to start for the [application] " + "g-sc-G123-1");
-
- restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + "g-sc-G123-1" +
- RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS);
-
- boolean forceUndeployed = TopologyHandler.getInstance().assertApplicationUndeploy("g-sc-G123-1");
- assertEquals(String.format("Forceful undeployment failed for the application %s",
- "g-sc-G123-1"), forceUndeployed, true);
-
- }
-
- boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "g-sc-G123-1",
- RestConstants.APPLICATIONS_NAME);
- assertEquals(removed, true);
-
- ApplicationBean beanRemoved = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS,
- "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME);
- assertEquals(beanRemoved, null);
-
- removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G1",
- RestConstants.CARTRIDGE_GROUPS_NAME);
- assertEquals(removedGroup, true);
-
- boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "c1",
- RestConstants.CARTRIDGES_NAME);
- assertEquals(removedC1, true);
-
- boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "c2",
- RestConstants.CARTRIDGES_NAME);
- assertEquals(removedC2, true);
-
- boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "c3",
- RestConstants.CARTRIDGES_NAME);
- assertEquals(removedC3, true);
-
- removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
- autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME);
- assertEquals(removedAuto, true);
-
- removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
- "deployment-policy-1", RestConstants.DEPLOYMENT_POLICIES_NAME);
- assertEquals(removedDep, true);
-
- removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-1", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedNet, false);
-
- boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-2", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedN2, false);
-
- boolean removeAppPolicy = restClient.removeEntity(RestConstants.APPLICATION_POLICIES,
- "application-policy-1", RestConstants.APPLICATION_POLICIES_NAME);
- assertEquals(removeAppPolicy, true);
-
- removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-1", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedNet, true);
-
- removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
- "network-partition-2", RestConstants.NETWORK_PARTITIONS_NAME);
- assertEquals(removedN2, true);
-
- log.info("Ended application deploy/undeploy test case**************************************");
-
- } catch (Exception e) {
- log.error("An error occurred while handling application deployment/undeployment", e);
- assertTrue("An error occurred while handling application deployment/undeployment", false);
- }
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
index 5453bbd..57fe040 100755
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
@@ -26,9 +26,8 @@ import org.apache.commons.logging.LogFactory;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.stratos.common.test.TestLogAppender;
+import org.apache.stratos.integration.tests.application.SampleApplicationsTest;
import org.apache.stratos.integration.tests.rest.RestClient;
-import org.apache.stratos.messaging.message.receiver.application.ApplicationsEventReceiver;
-import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeSuite;
import org.wso2.carbon.integration.framework.TestServerManager;
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
index 7162cdf..846302b 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
@@ -31,6 +31,7 @@ import org.apache.stratos.messaging.domain.topology.Cluster;
import org.apache.stratos.messaging.domain.topology.Member;
import org.apache.stratos.messaging.domain.topology.MemberStatus;
import org.apache.stratos.messaging.domain.topology.Service;
+import org.apache.stratos.messaging.listener.topology.MemberInitializedEventListener;
import org.apache.stratos.messaging.message.receiver.application.ApplicationManager;
import org.apache.stratos.messaging.message.receiver.application.ApplicationsEventReceiver;
import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver;
@@ -390,5 +391,7 @@ public class TopologyHandler {
return StringUtils.removeEnd(path, File.separator);
}
-
+ private void addEventListeners() {
+ topologyEventReceiver.addEventListener(MemberInitializedEventListener );
+ }
}
[39/50] [abbrv] stratos git commit: Fixing registry browsing issue;
uplifting registry.core feature to 4.2.2
Posted by la...@apache.org.
Fixing registry browsing issue; uplifting registry.core feature to 4.2.2
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e5dbd777
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e5dbd777
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e5dbd777
Branch: refs/heads/data-publisher-integration
Commit: e5dbd7778b9f9daf3efb4ee6e2f1aa64e905b2bf
Parents: 1e0d3bd
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Aug 11 14:10:32 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Aug 11 14:10:32 2015 +0530
----------------------------------------------------------------------
products/stratos/modules/p2-profile-gen/pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e5dbd777/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index a0fd23b..86fdc71 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -265,7 +265,7 @@
org.wso2.carbon:org.wso2.carbon.ntask.feature:${carbon.platform.patch.version.4.2.1}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.platform.patch.version.4.2.1}
+ org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.platform.patch.version.4.2.2}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.resource.properties.feature:${carbon.platform.patch.version.4.2.1}
@@ -608,7 +608,7 @@
</feature>
<feature>
<id>org.wso2.carbon.registry.core.feature.group</id>
- <version>${carbon.platform.patch.version.4.2.1}</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.resource.properties.feature.group</id>
@@ -772,7 +772,7 @@
</feature>
<feature>
<id>org.wso2.carbon.registry.core.feature.group</id>
- <version>${carbon.platform.patch.version.4.2.1}</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.ui.menu.feature.group</id>
@@ -859,7 +859,7 @@
</feature>
<feature>
<id>org.wso2.carbon.registry.core.feature.group</id>
- <version>${carbon.platform.patch.version.4.2.1}</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.ui.menu.feature.group</id>
@@ -914,7 +914,7 @@
</feature>
<feature>
<id>org.wso2.carbon.registry.core.feature.group</id>
- <version>${carbon.platform.patch.version.4.2.1}</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.resource.properties.feature.group</id>
@@ -981,7 +981,7 @@
</feature>
<feature>
<id>org.wso2.carbon.registry.core.feature.group</id>
- <version>${carbon.platform.patch.version.4.2.1}</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.resource.properties.feature.group</id>
[20/50] [abbrv] stratos git commit: Re-organizing the package
structure
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/DeploymentPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/DeploymentPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/DeploymentPolicyTest.java
new file mode 100644
index 0000000..9d13ca4
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/DeploymentPolicyTest.java
@@ -0,0 +1,157 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.integration.tests.policies;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
+import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
+import org.apache.stratos.integration.tests.RestConstants;
+import org.apache.stratos.integration.tests.StratosTestServerManager;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
+/**
+ * Test to handle Deployment policy CRUD operations
+ */
+public class DeploymentPolicyTest extends StratosTestServerManager {
+ private static final Log log = LogFactory.getLog(DeploymentPolicyTest.class);
+ private static final String TEST_PATH = "/deployment-policy-test";
+
+
+ @Test
+ public void testDeploymentPolicy() {
+ try {
+ String deploymentPolicyId = "deployment-policy-2";
+ log.info("Started deployment policy test case**************************************");
+
+ boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-5" + ".json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN1, true);
+
+ boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-6" + ".json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN2, true);
+
+ boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
+ deploymentPolicyId + ".json",
+ RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(addedDep, true);
+
+ DeploymentPolicyBean bean = (DeploymentPolicyBean) restClient.
+ getEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId,
+ DeploymentPolicyBean.class, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(bean.getId(), "deployment-policy-2");
+ assertEquals(bean.getNetworkPartitions().size(), 2);
+ assertEquals(bean.getNetworkPartitions().get(0).getId(), "network-partition-5");
+ assertEquals(bean.getNetworkPartitions().get(0).getPartitionAlgo(), "one-after-another");
+ assertEquals(bean.getNetworkPartitions().get(0).getPartitions().size(), 1);
+ assertEquals(bean.getNetworkPartitions().get(0).getPartitions().get(0).getId(), "partition-1");
+ assertEquals(bean.getNetworkPartitions().get(0).getPartitions().get(0).getPartitionMax(), 20);
+
+ assertEquals(bean.getNetworkPartitions().get(1).getId(), "network-partition-6");
+ assertEquals(bean.getNetworkPartitions().get(1).getPartitionAlgo(), "round-robin");
+ assertEquals(bean.getNetworkPartitions().get(1).getPartitions().size(), 2);
+ assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(0).getId(),
+ "network-partition-6-partition-1");
+ assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(0).getPartitionMax(), 10);
+ assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(1).getId(),
+ "network-partition-6-partition-2");
+ assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(1).getPartitionMax(), 9);
+
+ //update network partition
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-5-v1.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(updated, true);
+
+ //update deployment policy with new partition and max values
+ boolean updatedDep = restClient.updateEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH +
+ "/" + deploymentPolicyId + "-v1.json", RestConstants.DEPLOYMENT_POLICIES,
+ RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(updatedDep, true);
+
+ DeploymentPolicyBean updatedBean = (DeploymentPolicyBean) restClient.
+ getEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId,
+ DeploymentPolicyBean.class, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(updatedBean.getId(), "deployment-policy-2");
+ assertEquals(updatedBean.getNetworkPartitions().size(), 2);
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getId(), "network-partition-5");
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitionAlgo(), "one-after-another");
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().size(), 2);
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(0).getId(), "partition-1");
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(0).getPartitionMax(), 25);
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(1).getId(), "partition-2");
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(1).getPartitionMax(), 20);
+
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getId(), "network-partition-6");
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitionAlgo(), "round-robin");
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().size(), 2);
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(0).getId(),
+ "network-partition-6-partition-1");
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(0).getPartitionMax(), 15);
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(1).getId(),
+ "network-partition-6-partition-2");
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(1).getPartitionMax(), 5);
+
+ boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-5", RestConstants.NETWORK_PARTITIONS_NAME);
+ //Trying to remove the used network partition
+ assertEquals(removedNet, false);
+
+ boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ deploymentPolicyId, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(removedDep, true);
+
+ DeploymentPolicyBean beanRemovedDep = (DeploymentPolicyBean) restClient.
+ getEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId,
+ DeploymentPolicyBean.class, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(beanRemovedDep, null);
+
+ boolean removedN1 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-5", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN1, true);
+
+ NetworkPartitionBean beanRemovedN1 = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, "network-partition-5",
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(beanRemovedN1, null);
+
+ boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-6", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN2, true);
+
+ NetworkPartitionBean beanRemovedN2 = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, "network-partition-6",
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(beanRemovedN2, null);
+
+ log.info("Ended deployment policy test case**************************************");
+
+ } catch (Exception e) {
+ log.error("An error occurred while handling deployment policy", e);
+ assertTrue("An error occurred while handling deployment policy", false);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java
new file mode 100644
index 0000000..5df2313
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.integration.tests.policies;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
+import org.apache.stratos.integration.tests.RestConstants;
+import org.apache.stratos.integration.tests.StratosTestServerManager;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
+/**
+ * Test to handle Network partition CRUD operations
+ */
+public class NetworkPartitionTest extends StratosTestServerManager {
+ private static final Log log = LogFactory.getLog(NetworkPartitionTest.class);
+ private static final String TEST_PATH = "/network-partition-test";
+
+
+ @Test
+ public void testNetworkPartition() {
+ try {
+ String networkPartitionId = "network-partition-3";
+ log.info("Started network partition test case**************************************");
+
+ boolean added = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ networkPartitionId + ".json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+
+ assertEquals(added, true);
+ NetworkPartitionBean bean = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId,
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+
+ assertEquals(bean.getId(), "network-partition-3");
+ assertEquals(bean.getPartitions().size(), 1);
+ assertEquals(bean.getPartitions().get(0).getId(), "partition-1");
+ assertEquals(bean.getPartitions().get(0).getProperty().get(0).getName(), "region");
+ assertEquals(bean.getPartitions().get(0).getProperty().get(0).getValue(), "default");
+
+ boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ networkPartitionId + "-v1.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+
+ assertEquals(updated, true);
+ NetworkPartitionBean updatedBean = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId,
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(updatedBean.getId(), "network-partition-3");
+ assertEquals(updatedBean.getPartitions().size(), 2);
+ assertEquals(updatedBean.getPartitions().get(1).getId(), "partition-2");
+ assertEquals(updatedBean.getPartitions().get(1).getProperty().get(0).getName(), "region");
+ assertEquals(updatedBean.getPartitions().get(1).getProperty().get(0).getValue(), "default1");
+ assertEquals(updatedBean.getPartitions().get(1).getProperty().get(1).getName(), "zone");
+ assertEquals(updatedBean.getPartitions().get(1).getProperty().get(1).getValue(), "z1");
+
+ boolean removed = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ networkPartitionId, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removed, true);
+
+ NetworkPartitionBean beanRemoved = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId,
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(beanRemoved, null);
+
+ log.info("Ended network partition test case**************************************");
+ } catch (Exception e) {
+ log.error("An error occurred while handling network partitions", e);
+ assertTrue("An error occurred while handling network partitions", false);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66487b24/products/stratos/modules/integration/src/test/resources/testng.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/testng.xml b/products/stratos/modules/integration/src/test/resources/testng.xml
index 849a282..356b5ec 100644
--- a/products/stratos/modules/integration/src/test/resources/testng.xml
+++ b/products/stratos/modules/integration/src/test/resources/testng.xml
@@ -24,42 +24,42 @@
<test name="CartridgeTest">
<classes>
- <class name="org.apache.stratos.integration.tests.CartridgeTest" />
+ <class name="org.apache.stratos.integration.tests.group.CartridgeTest" />
</classes>
</test>
<test name="CartridgeGroupTest">
<classes>
- <class name="org.apache.stratos.integration.tests.CartridgeGroupTest" />
+ <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest" />
</classes>
</test>
<test name="NetworkPartitionTest">
<classes>
- <class name="org.apache.stratos.integration.tests.NetworkPartitionTest" />
+ <class name="org.apache.stratos.integration.tests.policies.NetworkPartitionTest" />
</classes>
</test>
<test name="ApplicationPolicyTest">
<classes>
- <class name="org.apache.stratos.integration.tests.ApplicationPolicyTest" />
+ <class name="org.apache.stratos.integration.tests.policies.ApplicationPolicyTest" />
</classes>
</test>
<test name="DeploymentPolicyTest">
<classes>
- <class name="org.apache.stratos.integration.tests.DeploymentPolicyTest" />
+ <class name="org.apache.stratos.integration.tests.policies.DeploymentPolicyTest" />
</classes>
</test>
<test name="AutoscalingPolicyTest">
<classes>
- <class name="org.apache.stratos.integration.tests.AutoscalingPolicyTest" />
+ <class name="org.apache.stratos.integration.tests.policies.AutoscalingPolicyTest" />
</classes>
</test>
<test name="SampleApplicationsTest">
<classes>
- <class name="org.apache.stratos.integration.tests.SampleApplicationsTest" />
+ <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" />
</classes>
</test>
<test name="ApplicationBurstingTest">
<classes>
- <class name="org.apache.stratos.integration.tests.ApplicationBurstingTest" />
+ <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" />
</classes>
</test>
[37/50] [abbrv] stratos git commit: Updating os/php sample
Posted by la...@apache.org.
Updating os/php sample
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ba06d090
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ba06d090
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ba06d090
Branch: refs/heads/data-publisher-integration
Commit: ba06d09066f36cff26d9087cb58001556584c554
Parents: ee1ca9a
Author: lasinducharith <la...@gmail.com>
Authored: Tue Aug 11 10:48:33 2015 +0530
Committer: lasinducharith <la...@gmail.com>
Committed: Tue Aug 11 10:48:33 2015 +0530
----------------------------------------------------------------------
samples/cartridges/openstack/php.json | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ba06d090/samples/cartridges/openstack/php.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/openstack/php.json b/samples/cartridges/openstack/php.json
index 75be00d..9fe17d8 100755
--- a/samples/cartridges/openstack/php.json
+++ b/samples/cartridges/openstack/php.json
@@ -1,17 +1,17 @@
{
- "type": "esb",
- "provider": "wso2",
+ "type": "php",
+ "provider": "apache",
"category": "framework",
- "host": "esb.stratos.org",
- "displayName": "esb",
- "description": "esb Cartridge",
+ "host": "php.stratos.org",
+ "displayName": "php",
+ "description": "php Cartridge",
"version": "7",
"multiTenant": "false",
"portMapping": [
{
- "name": "http-22",
+ "name": "http-80",
"protocol": "http",
- "port": "22",
+ "port": "80",
"proxyPort": "8280"
}
],
@@ -20,7 +20,7 @@
"iaasProvider": [
{
"type": "openstack",
- "imageId": "RegionOne/a63609be-61df-436f-80bc-d2b6068a4c3a",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
"networkInterfaces": [
{
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
@@ -42,4 +42,4 @@
]
}
]
-}
+}
\ No newline at end of file
[33/50] [abbrv] stratos git commit: Remove SNAPSHOT versions in
dependencies
Posted by la...@apache.org.
Remove SNAPSHOT versions in dependencies
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3a50768a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3a50768a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3a50768a
Branch: refs/heads/data-publisher-integration
Commit: 3a50768a87ccf2668a4c08d36fde00b70260dd07
Parents: ad3066a
Author: Akila Perera <ra...@gmail.com>
Authored: Sat Aug 8 02:08:41 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Sat Aug 8 02:08:41 2015 +0530
----------------------------------------------------------------------
dependencies/fabric8/kubernetes-api/pom.xml | 2 +-
dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml | 2 +-
.../jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml | 2 +-
dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml | 2 +-
dependencies/jclouds/provider/aws-ec2/1.8.1-stratos/pom.xml | 2 +-
dependencies/org.wso2.carbon.ui/pom.xml | 2 +-
pom.xml | 4 ++--
7 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3a50768a/dependencies/fabric8/kubernetes-api/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-api/pom.xml b/dependencies/fabric8/kubernetes-api/pom.xml
index 4e837a6..bc967d0 100644
--- a/dependencies/fabric8/kubernetes-api/pom.xml
+++ b/dependencies/fabric8/kubernetes-api/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>kubernetes-api</artifactId>
- <version>2.2.16-stratosv1-SNAPSHOT</version>
+ <version>2.2.16-stratosv1</version>
<packaging>bundle</packaging>
<name>Fabric8 :: Kubernetes API</name>
http://git-wip-us.apache.org/repos/asf/stratos/blob/3a50768a/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml b/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
index 05af0a5..c1a7b9d 100644
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
+++ b/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
@@ -29,7 +29,7 @@
<!-- TODO: when out of labs, switch to org.jclouds.provider -->
<groupId>org.apache.stratos</groupId>
<artifactId>gce</artifactId>
- <version>1.8.1-stratosv1-SNAPSHOT</version>
+ <version>1.8.1-stratosv1</version>
<name>jclouds Google Compute Engine provider</name>
<description>jclouds components to access GoogleCompute</description>
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/stratos/blob/3a50768a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
index c65ab03..675323a 100644
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
+++ b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
@@ -29,7 +29,7 @@
<!-- TODO: when out of labs, switch to org.jclouds.api -->
<groupId>org.apache.stratos</groupId>
<artifactId>openstack-neutron</artifactId>
- <version>1.8.1-stratosv1-SNAPSHOT</version>
+ <version>1.8.1-stratosv1</version>
<name>jclouds openstack-neutron api</name>
<description>jclouds components to access an implementation of OpenStack Neutron</description>
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/stratos/blob/3a50768a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
index b7ee83a..bc8951a 100644
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
+++ b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.stratos</groupId>
<artifactId>vcloud</artifactId>
- <version>1.8.1-stratosv1-SNAPSHOT</version>
+ <version>1.8.1-stratosv1</version>
<name>jclouds vcloud api</name>
<description>jclouds components to access an implementation of VMWare vCloud</description>
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/stratos/blob/3a50768a/dependencies/jclouds/provider/aws-ec2/1.8.1-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/provider/aws-ec2/1.8.1-stratos/pom.xml b/dependencies/jclouds/provider/aws-ec2/1.8.1-stratos/pom.xml
index 6f1f859..d7f9ffe 100644
--- a/dependencies/jclouds/provider/aws-ec2/1.8.1-stratos/pom.xml
+++ b/dependencies/jclouds/provider/aws-ec2/1.8.1-stratos/pom.xml
@@ -26,7 +26,7 @@
</parent>
<groupId>org.apache.stratos</groupId>
<artifactId>aws-ec2</artifactId>
- <version>1.8.1-stratosv1-SNAPSHOT</version>
+ <version>1.8.1-stratosv1</version>
<name>jclouds Amazon EC2 provider</name>
<description>EC2 implementation targeted to Amazon Web Services</description>
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/stratos/blob/3a50768a/dependencies/org.wso2.carbon.ui/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/org.wso2.carbon.ui/pom.xml b/dependencies/org.wso2.carbon.ui/pom.xml
index f4a64ba..09565b0 100644
--- a/dependencies/org.wso2.carbon.ui/pom.xml
+++ b/dependencies/org.wso2.carbon.ui/pom.xml
@@ -32,7 +32,7 @@
<packaging>bundle</packaging>
<name>WSO2 Carbon - UI</name>
<description>org.wso2.carbon.ui patch version for apache stratos</description>
- <version>4.2.0-stratosv1-SNAPSHOT</version>
+ <version>4.2.0-stratosv1</version>
<url>http://wso2.org</url>
<repositories>
http://git-wip-us.apache.org/repos/asf/stratos/blob/3a50768a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a3808ca..3cc30ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -553,8 +553,8 @@
<carbon.platform.package.export.version>4.2.0</carbon.platform.package.export.version>
<axis2.osgi.version>1.6.1.wso2v10</axis2.osgi.version>
<jclouds.version>1.8.1</jclouds.version>
- <project.jclouds.stratos.version>1.8.1-stratosv1-SNAPSHOT</project.jclouds.stratos.version>
+ <project.jclouds.stratos.version>1.8.1-stratosv1</project.jclouds.stratos.version>
<kubernetes.api.version>2.2.16</kubernetes.api.version>
- <kubernetes.api.stratos.version>2.2.16-stratosv1-SNAPSHOT</kubernetes.api.stratos.version>
+ <kubernetes.api.stratos.version>2.2.16-stratosv1</kubernetes.api.stratos.version>
</properties>
</project>
\ No newline at end of file
[03/50] [abbrv] stratos git commit: Fixed Python agent live tests
with embedded mqtt, improved agent test cases
Posted by la...@apache.org.
Fixed Python agent live tests with embedded mqtt, improved agent test cases
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7f8fb760
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7f8fb760
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7f8fb760
Branch: refs/heads/data-publisher-integration
Commit: 7f8fb760687cd6332c2de363ae73097a93cc3f91
Parents: 1c7f635
Author: Akila Perera <ra...@gmail.com>
Authored: Wed Aug 5 12:42:49 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Wed Aug 5 12:42:49 2015 +0530
----------------------------------------------------------------------
.../pom.xml | 28 ++----
.../bash/ApplicationSignUpRemovedEvent.sh | 4 +-
.../extensions/bash/ArtifactUpdatedEvent.sh | 4 +-
.../extensions/bash/CompleteTenantEvent.sh | 6 +-
.../extensions/bash/CompleteTopologyEvent.sh | 10 +-
.../extensions/bash/CopyArtifacts.sh | 8 +-
.../extensions/bash/CreateLVSDummyInterface.sh | 31 -------
.../extensions/bash/DomainMappingAddedEvent.sh | 17 +---
.../bash/DomainMappingRemovedEvent.sh | 17 +---
.../extensions/bash/InstanceActivatedEvent.sh | 8 +-
.../extensions/bash/InstanceStartedEvent.sh | 7 +-
.../extensions/bash/MemberActivatedEvent.sh | 23 +----
.../extensions/bash/MemberStartedEvent.sh | 23 +----
.../extensions/bash/MemberSuspendedEvent.sh | 23 +----
.../extensions/bash/MemberTerminatedEvent.sh | 23 +----
.../extensions/bash/StartServers.sh | 19 +---
.../extensions/bash/TenantSubscribedEvent.sh | 28 ------
.../cartridge.agent/extensions/bash/clean.sh | 4 +-
.../test/PythonCartridgeAgentTest.java | 97 ++++++++++++++------
.../src/test/resources/jndi.properties | 2 +-
20 files changed, 106 insertions(+), 276 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/pom.xml b/components/org.apache.stratos.python.cartridge.agent/pom.xml
index 7299328..e1226b9 100644
--- a/components/org.apache.stratos.python.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.python.cartridge.agent/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.python.cartridge.agent</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache Stratos - Python Cartridge Agent</name>
<profiles>
@@ -68,23 +68,6 @@
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <DynamicImport-Package>*</DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -120,13 +103,16 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
<version>5.10.0</version>
- <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-mqtt</artifactId>
+ <version>5.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/ApplicationSignUpRemovedEvent.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/ApplicationSignUpRemovedEvent.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/ApplicationSignUpRemovedEvent.sh
index 651015d..04d15c3 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/ApplicationSignUpRemovedEvent.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/ApplicationSignUpRemovedEvent.sh
@@ -23,6 +23,4 @@
# event is received and they are copied to the given path.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-echo `date`": Tenant UnSubscribed Event" | tee -a $log
+echo `date`": Application signup removed event shell extension executed"
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/ArtifactUpdatedEvent.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/ArtifactUpdatedEvent.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/ArtifactUpdatedEvent.sh
index 16d1a6f..0a84528 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/ArtifactUpdatedEvent.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/ArtifactUpdatedEvent.sh
@@ -23,9 +23,7 @@
# event is received and they are copied to the given path.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-echo `date`": Artifacts Updated Event" | tee -a $log
+echo `date`": Artifacts updated event shell extension executed"
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CompleteTenantEvent.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CompleteTenantEvent.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CompleteTenantEvent.sh
index 2586474..d82f154 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CompleteTenantEvent.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CompleteTenantEvent.sh
@@ -23,8 +23,4 @@
# event is received.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-echo `date`": Complete Tenant Event: " | tee -a $log
-echo "Member List: ${STRATOS_MEMBER_LIST_JSON}" | tee -a $log
-echo "Tenant List: ${STRATOS_TENANT_LIST_JSON}" | tee -a $log
+echo `date`": Complete tenant event shell extension executed"
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CompleteTopologyEvent.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CompleteTopologyEvent.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CompleteTopologyEvent.sh
index ea2e941..c3d5659 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CompleteTopologyEvent.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CompleteTopologyEvent.sh
@@ -23,12 +23,4 @@
# event is received.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-echo `date`": Complete Topology Event: " | tee -a $log
-echo "LB IP: ${STRATOS_LB_IP}" | tee -a $log
-echo "LB PUBLIC IP: $STRATOS_LB_PUBLIC_IP}" | tee -a $log
-echo "STRATOS_PARAM_FILE_PATH: ${STRATOS_PARAM_FILE_PATH}"
-echo "Member List: ${STRATOS_MEMBER_LIST_JSON}" | tee -a $log
-echo "Complete Topology: ${STRATOS_TOPOLOGY_JSON}" | tee -a $log
-echo "Members in LB: ${STRATOS_MEMBERS_IN_LB_JSON}" | tee -a $log
+echo `date`": Complete topology event shell extension executed"
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CopyArtifacts.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CopyArtifacts.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CopyArtifacts.sh
index baa0aeb..dcb4b1b 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CopyArtifacts.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CopyArtifacts.sh
@@ -23,10 +23,4 @@
# event is received and they are copied to the given path.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-if [[ ! -d $2 ]]; then
- mkdir -p $2
-fi
-cp -rf $1* $2
-echo "Artifacts Copied" | tee -a $log
+echo `date`": Artifacts updated event shell extension executed"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CreateLVSDummyInterface.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CreateLVSDummyInterface.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CreateLVSDummyInterface.sh
deleted file mode 100755
index f734db3..0000000
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/CreateLVSDummyInterface.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-# --------------------------------------------------------------
-#
-# 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.
-#
-# --------------------------------------------------------------
-# This extension script will be executed once the update artifacts
-# event is received and they are copied to the given path.
-# --------------------------------------------------------------
-#
-
-
-sudo modprobe dummy numdummies=1
-sudo ifconfig dummy0 ${STRATOS_LVS_DUMMY_VIRTUAL_IP} netmask ${STRATOS_LVS_SUBNET_MASK}
-
-echo "update the dummy interface with ${STRATOS_LVS_DUMMY_VIRTUAL_IP} and ${STRATOS_LVS_SUBNET_MASK}"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/DomainMappingAddedEvent.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/DomainMappingAddedEvent.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/DomainMappingAddedEvent.sh
index 7f39472..7e5417f 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/DomainMappingAddedEvent.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/DomainMappingAddedEvent.sh
@@ -23,19 +23,4 @@
# event is received by the cartridge agent.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-
-echo "Domain mapping added: [tenant-id] $1 [tenant-domain] $2 [domain-name] $3 [application-context] $4" | tee -a $log
-OUTPUT=`date`": Subscription Domain Added Event"
-OUTPUT="$OUTPUT SUBSCRIPTION_APPLICATION_ID: ${SUBSCRIPTION_APPLICATION_ID},"
-OUTPUT="$OUTPUT STRATOS_SUBSCRIPTION_SERVICE_NAME: ${STRATOS_SUBSCRIPTION_SERVICE_NAME},"
-OUTPUT="$OUTPUT STRATOS_SUBSCRIPTION_DOMAIN_NAME: ${STRATOS_SUBSCRIPTION_DOMAIN_NAME},"
-OUTPUT="$OUTPUT SUBSCRIPTION_CLUSTER_ID: ${SUBSCRIPTION_CLUSTER_ID},"
-OUTPUT="$OUTPUT STRATOS_SUBSCRIPTION_TENANT_ID: ${STRATOS_SUBSCRIPTION_TENANT_ID},"
-OUTPUT="$OUTPUT STRATOS_SUBSCRIPTION_TENANT_DOMAIN: $STRATOS_SUBSCRIPTION_TENANT_DOMAIN},"
-OUTPUT="$OUTPUT APPLICATION_PATH: ${APPLICATION_PATH},"
-OUTPUT="$OUTPUT SUBSCRIPTION_CONTEXT_PATH: ${SUBSCRIPTION_CONTEXT_PATH}"
-echo $OUTPUT | tee -a $log
-
-curl -k -v -X POST -H "Content-Type:application/soap+xml;charset=UTF-8;action=urn:addWebAppToHost" -d "<?xml version=\"1.0\" encoding=\"UTF-8\"?><s:Envelope xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\" xmlns:wsa=\"http://www.w3.org/2005/08/addressing\"><s:Body><p:addWebAppToHost xmlns:p=\"http://mapper.url.carbon.wso2.org\"><xs:hostName xmlns:xs=\"http://mapper.url.carbon.wso2.org\">$STRATOS_SUBSCRIPTION_DOMAIN_NAME</xs:hostName><xs:uri xmlns:xs=\"http://mapper.url.carbon.wso2.org\">/t/$STRATOS_SUBSCRIPTION_TENANT_DOMAIN/webapps/$SUBSCRIPTION_CONTEXT_PATH/</xs:uri><xs:appType xmlns:xs=\"http://mapper.url.carbon.wso2.org\">webapp</xs:appType></p:addWebAppToHost></s:Body></s:Envelope>" https://localhost:9443/services/UrlMapperAdminService -u admin:admin
+echo `date`": Domain mapping added event shell extension executed"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/DomainMappingRemovedEvent.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/DomainMappingRemovedEvent.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/DomainMappingRemovedEvent.sh
index 3911ec6..b6775a0 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/DomainMappingRemovedEvent.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/DomainMappingRemovedEvent.sh
@@ -19,21 +19,8 @@
# under the License.
#
# --------------------------------------------------------------
-# This extension script will be executed when a subscription domain removed
+# This extension script will be executed when a subscription domain added
# event is received by the cartridge agent.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-OUTPUT=`date`": Domain Mapping Removed Event"
-OUTPUT="$OUTPUT SUBSCRIPTION_APPLICATION_ID: ${SUBSCRIPTION_APPLICATION_ID},"
-OUTPUT="$OUTPUT STRATOS_SUBSCRIPTION_SERVICE_NAME: ${STRATOS_SUBSCRIPTION_SERVICE_NAME},"
-OUTPUT="$OUTPUT STRATOS_SUBSCRIPTION_DOMAIN_NAME: ${STRATOS_SUBSCRIPTION_DOMAIN_NAME},"
-OUTPUT="$OUTPUT SUBSCRIPTION_CLUSTER_ID: ${SUBSCRIPTION_CLUSTER_ID},"
-OUTPUT="$OUTPUT STRATOS_SUBSCRIPTION_TENANT_ID: ${STRATOS_SUBSCRIPTION_TENANT_ID},"
-OUTPUT="$OUTPUT APPLICATION_PATH: ${APPLICATION_PATH},"
-OUTPUT="$OUTPUT STRATOS_SUBSCRIPTION_TENANT_DOMAIN: $STRATOS_SUBSCRIPTION_TENANT_DOMAIN}"
-echo $OUTPUT | tee -a $log
-
-curl -k -v -X POST -H "Content-Type:application/soap+xml;charset=UTF-8;action=urn:deleteHost" -d "<?xml version=\"1.0\" encoding=\"UTF-8\"?><s:Envelope xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\" xmlns:wsa=\"http://www.w3.org/2005/08/addressing\"><s:Body><p:deleteHost xmlns:p=\"http://mapper.url.carbon.wso2.org\"><xs:hostName xmlns:xs=\"http://mapper.url.carbon.wso2.org\">$STRATOS_SUBSCRIPTION_DOMAIN_NAME</xs:hostName></p:deleteHost></s:Body></s:Envelope>" https://localhost:9443/services/UrlMapperAdminService -u admin:admin
-
+echo `date`": Domain mapping removed event shell extension executed"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/InstanceActivatedEvent.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/InstanceActivatedEvent.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/InstanceActivatedEvent.sh
index f5d60e8..29d9bab 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/InstanceActivatedEvent.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/InstanceActivatedEvent.sh
@@ -19,10 +19,8 @@
# under the License.
#
# --------------------------------------------------------------
-# This extension script will be executed once the instance is
-# activated and ready to serve incoming requests.
+# This extension script will be executed when a subscription domain added
+# event is received by the cartridge agent.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-echo `date`": Instance activated" | tee -a $log
+echo `date`": Instance activated event shell extension executed"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/InstanceStartedEvent.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/InstanceStartedEvent.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/InstanceStartedEvent.sh
index 7b5aa6a..e7cd0a1 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/InstanceStartedEvent.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/InstanceStartedEvent.sh
@@ -19,9 +19,8 @@
# under the License.
#
# --------------------------------------------------------------
-# This extension script will be executed once the instance is started.
+# This extension script will be executed when a subscription domain added
+# event is received by the cartridge agent.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-echo `date`": Instance Started Event: " | tee -a $log
+echo `date`": Instance started event shell extension executed"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberActivatedEvent.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberActivatedEvent.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberActivatedEvent.sh
index e59b41e..1a84459 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberActivatedEvent.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberActivatedEvent.sh
@@ -19,25 +19,8 @@
# under the License.
#
# --------------------------------------------------------------
-# This extension script will be executed when member activated
-# event is received.
+# This extension script will be executed when a subscription domain added
+# event is received by the cartridge agent.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-OUTPUT=`date`": Member Activated Event: "
-OUTPUT="$OUTPUT MEMBER_ID: ${STRATOS_MEMBER_ID}, "
-OUTPUT="$OUTPUT MEMBER_IP: ${STRATOS_MEMBER_IP}, "
-OUTPUT="$OUTPUT CLUSTER_ID: ${STRATOS_CLUSTER_ID}, "
-OUTPUT="$OUTPUT LB_CLUSTER_ID: ${STRATOS_LB_CLUSTER_ID}, "
-OUTPUT="$OUTPUT NETWORK_PARTITION_ID: ${STRATOS_NETWORK_PARTITION_ID}, "
-OUTPUT="$OUTPUT SERVICE_NAME: ${STRATOS_SERVICE_NAME}, "
-OUTPUT="$OUTPUT PORTS: ${STRATOS_PORTS},"
-OUTPUT="$OUTPUT STRATOS_LB_IP: ${STRATOS_LB_IP},"
-OUTPUT="$OUTPUT STRATOS_LB_PUBLIC_IP: ${STRATOS_LB_PUBLIC_IP},"
-OUTPUT="$OUTPUT APPLICATION_PATH: ${APPLICATION_PATH},"
-OUTPUT="$OUTPUT STRATOS_PARAM_FILE_PATH: ${STRATOS_PARAM_FILE_PATH}"
-echo $OUTPUT | tee -a $log
-echo "Member List: ${STRATOS_MEMBER_LIST_JSON}" | tee -a $log
-echo "Topology: ${STRATOS_TOPOLOGY_JSON}" | tee -a $log
-echo "---------------" | tee -a $log
+echo `date`": Member activated event shell extension executed"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberStartedEvent.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberStartedEvent.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberStartedEvent.sh
index b750fd0..0ce73ce 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberStartedEvent.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberStartedEvent.sh
@@ -19,25 +19,8 @@
# under the License.
#
# --------------------------------------------------------------
-# This extension script will be executed when member suspended
-# event is received.
+# This extension script will be executed when a subscription domain added
+# event is received by the cartridge agent.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-OUTPUT=`date`": Member Started Event: "
-OUTPUT="$OUTPUT MEMBER_ID: ${STRATOS_MEMBER_ID}, "
-OUTPUT="$OUTPUT MEMBER_IP: ${STRATOS_MEMBER_IP}, "
-OUTPUT="$OUTPUT CLUSTER_ID: ${STRATOS_CLUSTER_ID}, "
-OUTPUT="$OUTPUT LB_CLUSTER_ID: ${STRATOS_LB_CLUSTER_ID}, "
-OUTPUT="$OUTPUT NETWORK_PARTITION_ID: ${STRATOS_NETWORK_PARTITION_ID}, "
-OUTPUT="$OUTPUT SERVICE_NAME: ${STRATOS_SERVICE_NAME}, "
-OUTPUT="$OUTPUT PORTS: ${STRATOS_PORTS},"
-OUTPUT="$OUTPUT STRATOS_LB_IP: ${STRATOS_LB_IP},"
-OUTPUT="$OUTPUT STRATOS_LB_PUBLIC_IP: ${STRATOS_LB_PUBLIC_IP},"
-OUTPUT="$OUTPUT APPLICATION_PATH: ${APPLICATION_PATH},"
-OUTPUT="$OUTPUT STRATOS_PARAM_FILE_PATH: ${STRATOS_PARAM_FILE_PATH}"
-echo $OUTPUT | tee -a $log
-echo "Member List: ${STRATOS_MEMBER_LIST_JSON}" | tee -a $log
-echo "Topology: ${STRATOS_TOPOLOGY_JSON}" | tee -a $log
-echo "---------------" | tee -a $log
+echo `date`": Member started event shell extension executed"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberSuspendedEvent.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberSuspendedEvent.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberSuspendedEvent.sh
index 103e8dd..5e058ba 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberSuspendedEvent.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberSuspendedEvent.sh
@@ -19,25 +19,8 @@
# under the License.
#
# --------------------------------------------------------------
-# This extension script will be executed when member suspended
-# event is received.
+# This extension script will be executed when a subscription domain added
+# event is received by the cartridge agent.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-OUTPUT=`date`": Member Suspended Event: "
-OUTPUT="$OUTPUT MEMBER_ID: ${STRATOS_MEMBER_ID}, "
-OUTPUT="$OUTPUT MEMBER_IP: ${STRATOS_MEMBER_IP}, "
-OUTPUT="$OUTPUT CLUSTER_ID: ${STRATOS_CLUSTER_ID}, "
-OUTPUT="$OUTPUT LB_CLUSTER_ID: ${STRATOS_LB_CLUSTER_ID}, "
-OUTPUT="$OUTPUT NETWORK_PARTITION_ID: ${STRATOS_NETWORK_PARTITION_ID}, "
-OUTPUT="$OUTPUT SERVICE_NAME: ${STRATOS_SERVICE_NAME}, "
-OUTPUT="$OUTPUT PORTS: ${STRATOS_PORTS},"
-OUTPUT="$OUTPUT STRATOS_LB_IP: ${STRATOS_LB_IP},"
-OUTPUT="$OUTPUT STRATOS_LB_PUBLIC_IP: ${STRATOS_LB_PUBLIC_IP},"
-OUTPUT="$OUTPUT APPLICATION_PATH: ${APPLICATION_PATH},"
-OUTPUT="$OUTPUT STRATOS_PARAM_FILE_PATH: ${STRATOS_PARAM_FILE_PATH}"
-echo $OUTPUT | tee -a $log
-echo "Member List: ${STRATOS_MEMBER_LIST_JSON}" | tee -a $log
-echo "Topology: ${STRATOS_TOPOLOGY_JSON}" | tee -a $log
-echo "---------------" | tee -a $log
+echo `date`": Member suspend event shell extension executed"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberTerminatedEvent.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberTerminatedEvent.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberTerminatedEvent.sh
index 37bbd84..637b06e 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberTerminatedEvent.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/MemberTerminatedEvent.sh
@@ -19,25 +19,8 @@
# under the License.
#
# --------------------------------------------------------------
-# This extension script will be executed when member terminated
-# event is received.
+# This extension script will be executed when a subscription domain added
+# event is received by the cartridge agent.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-OUTPUT=`date`": Member Terminated Event: "
-OUTPUT="$OUTPUT MEMBER_ID: ${STRATOS_MEMBER_ID}, "
-OUTPUT="$OUTPUT MEMBER_IP: ${STRATOS_MEMBER_IP}, "
-OUTPUT="$OUTPUT CLUSTER_ID: ${STRATOS_CLUSTER_ID}, "
-OUTPUT="$OUTPUT LB_CLUSTER_ID: ${STRATOS_LB_CLUSTER_ID}, "
-OUTPUT="$OUTPUT NETWORK_PARTITION_ID: ${STRATOS_NETWORK_PARTITION_ID}, "
-OUTPUT="$OUTPUT SERVICE_NAME: ${STRATOS_SERVICE_NAME}, "
-OUTPUT="$OUTPUT PORTS: ${STRATOS_PORTS},"
-OUTPUT="$OUTPUT STRATOS_LB_IP: ${STRATOS_LB_IP},"
-OUTPUT="$OUTPUT STRATOS_LB_PUBLIC_IP: ${STRATOS_LB_PUBLIC_IP},"
-OUTPUT="$OUTPUT APPLICATION_PATH: ${APPLICATION_PATH},"
-OUTPUT="$OUTPUT STRATOS_PARAM_FILE_PATH: ${STRATOS_PARAM_FILE_PATH}"
-echo $OUTPUT | tee -a $log
-echo "Member List: ${STRATOS_MEMBER_LIST_JSON}" | tee -a $log
-echo "Topology: ${STRATOS_TOPOLOGY_JSON}" | tee -a $log
-echo "---------------" | tee -a $log
+echo `date`": Member terminated event shell extension executed"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/StartServers.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/StartServers.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/StartServers.sh
index 31ce66c..5cc74a5 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/StartServers.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/StartServers.sh
@@ -19,21 +19,8 @@
# under the License.
#
# --------------------------------------------------------------
-# This extension script will be executed to start the servers.
+# This extension script will be executed when a subscription domain added
+# event is received by the cartridge agent.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-if [[ -z $STRATOS_CLUSTERING ]]; then
- echo `date`": Starting servers..." | tee -a $log
-else
- echo `date`": Starting servers in clustering mode..." | tee -a $log
-fi
-
-echo "LB IP: ${STRATOS_LB_IP}" | tee -a $log
-echo "LB PUBLIC IP: $STRATOS_LB_PUBLIC_IP}" | tee -a $log
-echo "STRATOS_PARAM_FILE_PATH: ${STRATOS_PARAM_FILE_PATH}"
-echo "Member List: ${STRATOS_MEMBER_LIST_JSON}" | tee -a $log
-echo "Complete Topology: ${STRATOS_TOPOLOGY_JSON}" | tee -a $log
-echo "Members in LB: ${STRATOS_MEMBERS_IN_LB_JSON}" | tee -a $log
-echo "APPLICATION_PATH: ${APPLICATION_PATH}" | tee -a $log
\ No newline at end of file
+echo `date`": Start servers event shell extension executed"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/TenantSubscribedEvent.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/TenantSubscribedEvent.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/TenantSubscribedEvent.sh
deleted file mode 100755
index 66f004c..0000000
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/TenantSubscribedEvent.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-# --------------------------------------------------------------
-#
-# 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.
-#
-# --------------------------------------------------------------
-# This extension script will be executed once the update artifacts
-# event is received and they are copied to the given path.
-# --------------------------------------------------------------
-#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-echo `date`": Tenant Subscribed Event" | tee -a $log
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/clean.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/clean.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/clean.sh
index c62ad35..6f15529 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/clean.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/clean.sh
@@ -23,6 +23,4 @@
# to clean up the instance before terminating it.
# --------------------------------------------------------------
#
-
-log=/var/log/apache-stratos/cartridge-agent-extensions.log
-echo `date`": Cleaning the cartridge" | tee -a $log
+echo `date`": Cleaning the cartridge"
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java b/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java
index bb116ce..ea62d97 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java
+++ b/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java
@@ -19,8 +19,10 @@
package org.apache.stratos.python.cartridge.agent.test;
+import org.apache.activemq.broker.BrokerService;
import org.apache.commons.exec.*;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,11 +40,13 @@ import org.apache.stratos.messaging.listener.instance.status.InstanceStartedEven
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 org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.net.ServerSocket;
@@ -57,7 +61,7 @@ public class PythonCartridgeAgentTest {
private static final Log log = LogFactory.getLog(PythonCartridgeAgentTest.class);
private static final String NEW_LINE = System.getProperty("line.separator");
-// private static final long TIMEOUT = 1440000;
+ // private static final long TIMEOUT = 1440000;
private static final long TIMEOUT = 120000;
private static final String CLUSTER_ID = "php.php.domain";
private static final String DEPLOYMENT_POLICY_NAME = "deployment-policy-1";
@@ -82,6 +86,10 @@ public class PythonCartridgeAgentTest {
private TopologyEventReceiver topologyEventReceiver;
private InstanceStatusEventReceiver instanceStatusEventReceiver;
private int cepPort = 7711;
+ private BrokerService broker = new BrokerService();
+ private static final String ACTIVEMQ_AMQP_BIND_ADDRESS = "tcp://localhost:61617";
+ private static final String ACTIVEMQ_MQTT_BIND_ADDRESS = "mqtt://localhost:1883";
+ private static final UUID PYTHON_AGENT_DIR_NAME = UUID.randomUUID();
public PythonCartridgeAgentTest(ArtifactUpdatedEvent artifactUpdatedEvent, Boolean expectedResult) {
this.artifactUpdatedEvent = artifactUpdatedEvent;
@@ -101,10 +109,21 @@ public class PythonCartridgeAgentTest {
* Setup method for test method testPythonCartridgeAgent
*/
@Before
- public void setup(){
+ public void setup() {
serverSocketList = new ArrayList<ServerSocket>();
executorList = new HashMap<String, Executor>();
-
+ try {
+ broker.addConnector(ACTIVEMQ_AMQP_BIND_ADDRESS);
+ broker.addConnector(ACTIVEMQ_MQTT_BIND_ADDRESS);
+ broker.setBrokerName("testBroker");
+ broker.setDataDirectory(PythonCartridgeAgentTest.class.getResource("/").getPath() +
+ File.separator + ".." + File.separator + PYTHON_AGENT_DIR_NAME + File.separator + "activemq-data");
+ broker.start();
+ log.info("Broker service started!");
+ }
+ catch (Exception e) {
+ log.error("Error while setting up broker service", e);
+ }
if (!this.eventReceiverInitiated) {
ExecutorService executorService = StratosThreadPool.getExecutorService("TEST_THREAD_POOL", 15);
topologyEventReceiver = new TopologyEventReceiver();
@@ -135,13 +154,14 @@ public class PythonCartridgeAgentTest {
this.eventReceiverInitiated = true;
}
-
- String agentPath = setupPythonAgent();
- log.info("Starting python cartridge agent...");
- this.outputStream = executeCommand("python " + agentPath + "/agent.py");
-
// Simulate CEP server socket
startServerSocket(cepPort);
+ String agentPath = setupPythonAgent();
+ log.info("Python agent working directory name: " + PYTHON_AGENT_DIR_NAME);
+ log.info("Starting python cartridge agent...");
+ this.outputStream = executeCommand(
+ "python " + agentPath + "/agent.py > " + getResourcesFolderPath() + File.separator + ".." +
+ File.separator + PYTHON_AGENT_DIR_NAME + File.separator + "cartridge-agent-ttttt.log");
}
/**
@@ -158,26 +178,24 @@ public class PythonCartridgeAgentTest {
log.info("Terminating process: " + commandText);
watchdog.destroyProcess();
}
- File workingDirectory = executor.getWorkingDirectory();
- if (workingDirectory != null) {
- log.info("Cleaning working directory: " + workingDirectory.getAbsolutePath());
- FileUtils.deleteDirectory(workingDirectory);
- }
- } catch (Exception ignore) {
+ }
+ catch (Exception ignore) {
}
}
for (ServerSocket serverSocket : serverSocketList) {
try {
log.info("Stopping socket server: " + serverSocket.getLocalSocketAddress());
serverSocket.close();
- } catch (IOException ignore) {
+ }
+ catch (IOException ignore) {
}
}
try {
log.info("Deleting source checkout folder...");
FileUtils.deleteDirectory(new File(SOURCE_PATH));
- } catch (Exception ignore){
+ }
+ catch (Exception ignore) {
}
@@ -186,16 +204,23 @@ public class PythonCartridgeAgentTest {
this.instanceActivated = false;
this.instanceStarted = false;
+ try {
+ broker.stop();
+ }
+ catch (Exception e) {
+ log.error("Error while stopping the broker service", e);
+ }
}
/**
* This method returns a collection of {@link org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent}
* objects as parameters to the test
+ *
* @return
*/
@Parameterized.Parameters
- public static Collection getArtifactUpdatedEventsAsParams(){
+ public static Collection getArtifactUpdatedEventsAsParams() {
ArtifactUpdatedEvent publicRepoEvent = createTestArtifactUpdatedEvent();
ArtifactUpdatedEvent privateRepoEvent = createTestArtifactUpdatedEvent();
@@ -223,6 +248,7 @@ public class PythonCartridgeAgentTest {
/**
* Creates an {@link org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent} object with a public
* repository URL
+ *
* @return
*/
private static ArtifactUpdatedEvent createTestArtifactUpdatedEvent() {
@@ -256,7 +282,8 @@ public class PythonCartridgeAgentTest {
// Publish member initialized event
log.info("Publishing member initialized event...");
MemberInitializedEvent memberInitializedEvent = new MemberInitializedEvent(
- SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, PARTITION_ID
+ SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID,
+ PARTITION_ID
);
publishEvent(memberInitializedEvent);
log.info("Member initialized event published");
@@ -282,7 +309,7 @@ public class PythonCartridgeAgentTest {
communicatorThread.start();
- while (!instanceActivated){
+ while (!instanceActivated) {
// wait until the instance activated event is received.
sleep(2000);
}
@@ -293,6 +320,7 @@ public class PythonCartridgeAgentTest {
/**
* Publish messaging event
+ *
* @param event
*/
private void publishEvent(Event event) {
@@ -303,6 +331,7 @@ public class PythonCartridgeAgentTest {
/**
* Start server socket
+ *
* @param port
*/
private void startServerSocket(final int port) {
@@ -311,9 +340,11 @@ public class PythonCartridgeAgentTest {
public void run() {
try {
ServerSocket serverSocket = new ServerSocket(port);
- serverSocket.accept();
serverSocketList.add(serverSocket);
- } catch (IOException e) {
+ log.info("Server socket started on port: " + port);
+ serverSocket.accept();
+ }
+ catch (IOException e) {
String message = "Could not start server socket: [port] " + port;
log.error(message, e);
throw new RuntimeException(message, e);
@@ -384,7 +415,8 @@ public class PythonCartridgeAgentTest {
private void sleep(long time) {
try {
Thread.sleep(time);
- } catch (InterruptedException ignore) {
+ }
+ catch (InterruptedException ignore) {
}
}
@@ -397,7 +429,9 @@ public class PythonCartridgeAgentTest {
try {
log.info("Setting up python cartridge agent...");
String srcAgentPath = getResourcesFolderPath() + "/../../src/main/python/cartridge.agent/cartridge.agent";
- String destAgentPath = getResourcesFolderPath() + "/../" + UUID.randomUUID() + "/cartridge.agent";
+ String destAgentPath =
+ getResourcesFolderPath() + File.separator + ".." + File.separator + PYTHON_AGENT_DIR_NAME +
+ "/cartridge.agent";
FileUtils.copyDirectory(new File(srcAgentPath), new File(destAgentPath));
String srcAgentConfPath = getResourcesFolderPath() + "/agent.conf";
@@ -415,14 +449,15 @@ public class PythonCartridgeAgentTest {
log.info("Changing extension scripts permissions");
File extensionsPath = new File(destAgentPath + "/extensions/bash");
File[] extensions = extensionsPath.listFiles();
- for (File extension:extensions){
+ for (File extension : extensions) {
extension.setExecutable(true);
}
log.info("Python cartridge agent setup completed");
return destAgentPath;
- } catch (Exception e) {
+ }
+ catch (Exception e) {
String message = "Could not copy cartridge agent distribution";
log.error(message, e);
throw new RuntimeException(message, e);
@@ -440,6 +475,8 @@ public class PythonCartridgeAgentTest {
CommandLine commandline = CommandLine.parse(commandText);
DefaultExecutor exec = new DefaultExecutor();
PumpStreamHandler streamHandler = new PumpStreamHandler(outputStream);
+ exec.setWorkingDirectory(new File(
+ getResourcesFolderPath() + File.separator + ".." + File.separator + PYTHON_AGENT_DIR_NAME));
exec.setStreamHandler(streamHandler);
ExecuteWatchdog watchdog = new ExecuteWatchdog(TIMEOUT);
exec.setWatchdog(watchdog);
@@ -456,7 +493,8 @@ public class PythonCartridgeAgentTest {
});
executorList.put(commandText, exec);
return outputStream;
- } catch (Exception e) {
+ }
+ catch (Exception e) {
log.error(outputStream.toString(), e);
throw new RuntimeException(e);
}
@@ -464,10 +502,11 @@ public class PythonCartridgeAgentTest {
/**
* Get resources folder path
+ *
* @return
*/
private static String getResourcesFolderPath() {
- String path = PythonCartridgeAgentTest.class.getResource("/").getPath();
+ String path = PythonCartridgeAgentTest.class.getResource(File.separator).getPath();
return StringUtils.removeEnd(path, File.separator);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f8fb760/components/org.apache.stratos.python.cartridge.agent/src/test/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/test/resources/jndi.properties b/components/org.apache.stratos.python.cartridge.agent/src/test/resources/jndi.properties
index 21d7420..beefe3c 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/test/resources/jndi.properties
+++ b/components/org.apache.stratos.python.cartridge.agent/src/test/resources/jndi.properties
@@ -18,5 +18,5 @@
#
connectionfactoryName=TopicConnectionFactory
-java.naming.provider.url=tcp://localhost:61616
+java.naming.provider.url=tcp://localhost:61617
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
[23/50] [abbrv] stratos git commit: renaming the testng.xml
Posted by la...@apache.org.
renaming the testng.xml
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c7a5ffd5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c7a5ffd5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c7a5ffd5
Branch: refs/heads/data-publisher-integration
Commit: c7a5ffd5df10810aab5c3685b9386d2f14360999
Parents: 66487b2
Author: reka <rt...@gmail.com>
Authored: Fri Aug 7 11:39:43 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Fri Aug 7 11:39:43 2015 +0530
----------------------------------------------------------------------
products/stratos/modules/integration/pom.xml | 2 +-
.../src/test/resources/strats-testng.xml | 66 ++++++++++++++++++++
.../integration/src/test/resources/testng.xml | 66 --------------------
3 files changed, 67 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7a5ffd5/products/stratos/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/pom.xml b/products/stratos/modules/integration/pom.xml
index ca92a8b..1e0d1f5 100755
--- a/products/stratos/modules/integration/pom.xml
+++ b/products/stratos/modules/integration/pom.xml
@@ -118,7 +118,7 @@
<emma.home>${basedir}/target/emma</emma.home>
</systemProperties>
<suiteXmlFiles>
- <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
+ <suiteXmlFile>src/test/resources/strats-testng.xml</suiteXmlFile>
</suiteXmlFiles>
<workingDirectory>${basedir}/target</workingDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7a5ffd5/products/stratos/modules/integration/src/test/resources/strats-testng.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/strats-testng.xml b/products/stratos/modules/integration/src/test/resources/strats-testng.xml
new file mode 100644
index 0000000..356b5ec
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/strats-testng.xml
@@ -0,0 +1,66 @@
+<?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="StratosIntegrationSuite">
+
+ <test name="CartridgeTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.group.CartridgeTest" />
+ </classes>
+ </test>
+ <test name="CartridgeGroupTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest" />
+ </classes>
+ </test>
+ <test name="NetworkPartitionTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.policies.NetworkPartitionTest" />
+ </classes>
+ </test>
+ <test name="ApplicationPolicyTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.policies.ApplicationPolicyTest" />
+ </classes>
+ </test>
+ <test name="DeploymentPolicyTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.policies.DeploymentPolicyTest" />
+ </classes>
+ </test>
+ <test name="AutoscalingPolicyTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.policies.AutoscalingPolicyTest" />
+ </classes>
+ </test>
+ <test name="SampleApplicationsTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" />
+ </classes>
+ </test>
+ <test name="ApplicationBurstingTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" />
+ </classes>
+ </test>
+
+</suite>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7a5ffd5/products/stratos/modules/integration/src/test/resources/testng.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/testng.xml b/products/stratos/modules/integration/src/test/resources/testng.xml
deleted file mode 100644
index 356b5ec..0000000
--- a/products/stratos/modules/integration/src/test/resources/testng.xml
+++ /dev/null
@@ -1,66 +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="StratosIntegrationSuite">
-
- <test name="CartridgeTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.group.CartridgeTest" />
- </classes>
- </test>
- <test name="CartridgeGroupTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest" />
- </classes>
- </test>
- <test name="NetworkPartitionTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.policies.NetworkPartitionTest" />
- </classes>
- </test>
- <test name="ApplicationPolicyTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.policies.ApplicationPolicyTest" />
- </classes>
- </test>
- <test name="DeploymentPolicyTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.policies.DeploymentPolicyTest" />
- </classes>
- </test>
- <test name="AutoscalingPolicyTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.policies.AutoscalingPolicyTest" />
- </classes>
- </test>
- <test name="SampleApplicationsTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" />
- </classes>
- </test>
- <test name="ApplicationBurstingTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" />
- </classes>
- </test>
-
-</suite>
[15/50] [abbrv] stratos git commit: Introducing stratos integration
test suite for the artifacts
Posted by la...@apache.org.
Introducing stratos integration test suite for the artifacts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5b844043
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5b844043
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5b844043
Branch: refs/heads/data-publisher-integration
Commit: 5b844043cd0572fd2dff3e31fd7ac525ac69beac
Parents: 08b9696
Author: reka <rt...@gmail.com>
Authored: Thu Aug 6 16:45:23 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Aug 6 19:33:43 2015 +0530
----------------------------------------------------------------------
products/stratos/modules/integration/pom.xml | 3 +
.../tests/ApplicationBurstingTest.java | 37 +
.../tests/ApplicationPolicyTest.java | 111 +-
.../integration/tests/ApplicationTest.java | 55 +-
.../tests/AutoscalingPolicyTest.java | 70 +-
.../integration/tests/CartridgeGroupTest.java | 110 +-
.../integration/tests/CartridgeTest.java | 116 +-
.../integration/tests/DeploymentPolicyTest.java | 139 ++-
.../integration/tests/NetworkPartitionTest.java | 74 +-
.../integration/tests/RestConstants.java | 15 +
.../tests/SampleApplicationsTest.java | 1111 +++---------------
.../tests/StratosTestServerManager.java | 6 +
.../integration/tests/TopologyHandler.java | 394 +++++++
.../tests/config/ApplicationBean.java | 25 +
.../tests/config/ApplicationConfigParser.java | 25 +
.../integration/tests/rest/RestClient.java | 2 +-
.../application-policy-2.json | 18 +
.../single-cartridge-app/g-sc-G123-1-v1.json | 86 ++
.../single-cartridge-app/g-sc-G123-1-v2.json | 86 ++
.../single-cartridge-app/g-sc-G123-1-v3.json | 86 ++
.../update/g-sc-G123-1-v1.json | 86 --
.../update/g-sc-G123-1.json | 86 --
.../autoscaling-policy-c0-v1.json | 14 +
.../update/autoscaling-policy-c0.json | 14 -
.../cartridges-groups/cartrdige-nested-v1.json | 50 +
.../cartridges-groups/g4-g5-g6-v1.json | 50 +
.../resources/cartridges-groups/g4-g5-g6.json | 50 +
.../update/cartrdige-nested.json | 50 -
.../test/resources/cartridges/mock/c0-v1.json | 124 ++
.../src/test/resources/cartridges/mock/c4.json | 45 +
.../src/test/resources/cartridges/mock/c5.json | 124 ++
.../src/test/resources/cartridges/mock/c6.json | 45 +
.../resources/cartridges/mock/update/c0.json | 124 --
.../deployment-policy-1-v1.json | 36 +
.../deployment-policy-2-v1.json | 36 +
.../deployment-policy-2.json | 32 +
.../deployment-policy-3.json | 32 +
.../update/deployment-policy-1.json | 36 -
.../ec2/network-partition-1.json | 19 -
.../ec2/network-partition-2.json | 19 -
.../gce/network-partition-1.json | 15 -
.../kubernetes/network-partition-1.json | 15 -
.../kubernetes/network-partition-2.json | 15 -
.../kubernetes/network-partition-3.json | 15 -
.../mock/network-partition-1-v1.json | 28 +
.../mock/network-partition-3-v1.json | 28 +
.../mock/network-partition-4.json | 15 -
.../mock/network-partition-5-v1.json | 28 +
.../mock/network-partition-5.json | 15 +
.../mock/network-partition-6.json | 24 +
.../mock/network-partition-7.json | 15 +
.../mock/network-partition-8.json | 24 +
.../mock/update/network-partition-1.json | 28 -
.../multi/ap-southeast-1-nw-partition.json | 19 -
.../multi/ap-southeast-2-nw-partition.json | 25 -
.../multi/openstack-nw-partition.json | 21 -
.../openstack/network-partition-1.json | 15 -
.../openstack/network-partition-2.json | 15 -
.../integration/src/test/resources/testng.xml | 61 +
59 files changed, 2317 insertions(+), 1745 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/pom.xml b/products/stratos/modules/integration/pom.xml
index bf2c684..ca92a8b 100755
--- a/products/stratos/modules/integration/pom.xml
+++ b/products/stratos/modules/integration/pom.xml
@@ -117,6 +117,9 @@
<extracted.dir>stratos-parent-${project.version}</extracted.dir>
<emma.home>${basedir}/target/emma</emma.home>
</systemProperties>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
<workingDirectory>${basedir}/target</workingDirectory>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java
new file mode 100644
index 0000000..cefd786
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.integration.tests;
+
+import org.apache.stratos.common.beans.application.ApplicationBean;
+import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
+/**
+ * This will handle the application bursting test cases
+ */
+public class ApplicationBurstingTest extends StratosTestServerManager {
+
+ @Test
+ public void testApplication() {
+ assertTrue("test passes", true);
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
index dafa36e..b727e82 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
@@ -21,38 +21,109 @@ package org.apache.stratos.integration.tests;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.PropertyBean;
+import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
-import org.apache.stratos.integration.tests.rest.RestClient;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
/**
* Test to handle Network partition CRUD operations
*/
-public class ApplicationPolicyTest {
+public class ApplicationPolicyTest extends StratosTestServerManager {
private static final Log log = LogFactory.getLog(ApplicationPolicyTest.class);
- private static final String applicationPolicies = "/application-policies/";
- private static final String applicationPoliciesUpdate = "/application-policies/update/";
- private static final String entityName = "applicationPolicy";
+ @Test
+ public void testApplicationPolicy() {
+ try {
+ String applicationPolicyId = "application-policy-2";
+ log.info("Started Application policy test case**************************************");
- public boolean addApplicationPolicy(String applicationPolicyId, RestClient restClient) {
- return restClient.addEntity(applicationPolicies + "/" + applicationPolicyId,
- RestConstants.APPLICATION_POLICIES, entityName);
- }
+ boolean addedN1 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-7" + ".json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN1, true);
- public ApplicationPolicyBean getApplicationPolicy(String applicationPolicyId, RestClient restClient) {
+ boolean addedN2 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-8" + ".json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN2, true);
- return (ApplicationPolicyBean) restClient.
- getEntity(RestConstants.APPLICATION_POLICIES, applicationPolicyId,
- ApplicationPolicyBean.class, entityName);
- }
+ boolean addedDep = restClient.addEntity(RestConstants.APPLICATION_POLICIES_PATH + "/" +
+ applicationPolicyId + ".json",
+ RestConstants.APPLICATION_POLICIES, RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(addedDep, true);
- public boolean updateApplicationPolicy(String applicationPolicyId, RestClient restClient) {
- return restClient.updateEntity(applicationPoliciesUpdate + "/" + applicationPolicyId,
- RestConstants.APPLICATION_POLICIES, entityName);
+ ApplicationPolicyBean bean = (ApplicationPolicyBean) restClient.
+ getEntity(RestConstants.APPLICATION_POLICIES, applicationPolicyId,
+ ApplicationPolicyBean.class, RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(bean.getId(), applicationPolicyId);
+ assertEquals(String.format("The expected algorithm %s is not found in %s",
+ "one-after-another", applicationPolicyId), bean.getAlgorithm(), "one-after-another");
+ assertEquals(String.format("The expected id %s is not found",
+ applicationPolicyId), bean.getId(), applicationPolicyId);
+ assertEquals(String.format("The expected networkpartitions size %s is not found in %s",
+ 2, applicationPolicyId), bean.getNetworkPartitions().length, 2);
+ assertEquals(String.format("The first network partition is not %s in %s",
+ "network-partition-7", applicationPolicyId), bean.getNetworkPartitions()[0],
+ "network-partition-7");
+ assertEquals(String.format("The Second network partition is not %s in %s",
+ "network-partition-8", applicationPolicyId), bean.getNetworkPartitions()[1],
+ "network-partition-8");
+ boolean algoFound = false;
+ for (PropertyBean propertyBean : bean.getProperties()) {
+ if (propertyBean.getName().equals("networkPartitionGroups")) {
+ assertEquals(String.format("The networkPartitionGroups algorithm %s is not found in %s",
+ "network-partition-7,network-partition-8", applicationPolicyId),
+ propertyBean.getValue(), "network-partition-7,network-partition-8");
+ algoFound = true;
- }
+ }
+ }
+ if (!algoFound) {
+ assertTrue(String.format("The networkPartitionGroups property is not found in %s",
+ applicationPolicyId), false);
+ }
+
+ boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-7", RestConstants.NETWORK_PARTITIONS_NAME);
+ //Trying to remove the used network partition
+ assertEquals(removedNet, false);
+
+ boolean removedDep = restClient.removeEntity(RestConstants.APPLICATION_POLICIES,
+ applicationPolicyId, RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(removedDep, true);
+
+ ApplicationPolicyBean beanRemovedDep = (ApplicationPolicyBean) restClient.
+ getEntity(RestConstants.APPLICATION_POLICIES, applicationPolicyId,
+ ApplicationPolicyBean.class, RestConstants.APPLICATION_POLICIES_NAME);
+ assertEquals(beanRemovedDep, null);
+
+ boolean removedN1 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-7", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN1, true);
+
+ NetworkPartitionBean beanRemovedN1 = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, "network-partition-7",
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(beanRemovedN1, null);
+
+ boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-8", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN2, true);
+
+ NetworkPartitionBean beanRemovedN2 = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, "network-partition-8",
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(beanRemovedN2, null);
+
+ log.info("Ended deployment policy test case**************************************");
- public boolean removeApplicationPolicy(String applicationPolicyId, RestClient restClient) {
- return restClient.removeEntity(RestConstants.APPLICATION_POLICIES, applicationPolicyId, entityName);
+ } catch (Exception e) {
+ log.error("An error occurred while handling deployment policy", e);
+ assertTrue("An error occurred while handling deployment policy", false);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
index c886644..8ceec4d 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
@@ -16,61 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.stratos.integration.tests;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.beans.application.ApplicationBean;
-import org.apache.stratos.integration.tests.rest.RestClient;
+import org.apache.stratos.messaging.message.receiver.application.ApplicationsEventReceiver;
+import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver;
/**
- * Test to handle application CRUD operations, deploy and undeploy
+ * Super class for application test cases
*/
-public class ApplicationTest {
- private static final Log log = LogFactory.getLog(ApplicationTest.class);
- String applications = "/applications/simple/single-cartridge-app/";
- String applicationsUpdate = "/applications/simple/single-cartridge-app/update/";
- private static final String entityName = "application";
-
- public boolean addApplication(String applicationId, RestClient restClient) {
- return restClient.addEntity(applications + "/" + applicationId,
- RestConstants.APPLICATIONS, entityName);
- }
-
- public ApplicationBean getApplication(String applicationId,
- RestClient restClient) {
- return (ApplicationBean) restClient.
- getEntity(RestConstants.APPLICATIONS, applicationId,
- ApplicationBean.class, entityName);
- }
-
- public boolean updateApplication(String applicationId, RestClient restClient) {
- return restClient.updateEntity(applicationsUpdate + "/" + applicationId,
- RestConstants.APPLICATIONS, entityName);
- }
-
- public boolean removeApplication(String applicationId, RestClient restClient) {
- return restClient.removeEntity(RestConstants.APPLICATIONS, applicationId, entityName);
-
- }
-
- public boolean deployApplication(String applicationId, String applicationPolicyId,
- RestClient restClient) {
- return restClient.deployEntity(RestConstants.APPLICATIONS + "/" + applicationId +
- RestConstants.APPLICATIONS_DEPLOY + "/" + applicationPolicyId, entityName);
- }
-
- public boolean undeployApplication(String applicationId,
- RestClient restClient) {
- return restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + applicationId +
- RestConstants.APPLICATIONS_UNDEPLOY, entityName);
- }
-
- public boolean forceUndeployApplication(String applicationId,
- RestClient restClient) {
- return restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + applicationId +
- RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", entityName);
- }
+public class ApplicationTest extends StratosTestServerManager {
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
index 1c99cad..d841552 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
@@ -21,37 +21,67 @@ package org.apache.stratos.integration.tests;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
-import org.apache.stratos.integration.tests.rest.RestClient;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
/**
* Test to handle autoscaling policy CRUD operations
*/
-public class AutoscalingPolicyTest {
+public class AutoscalingPolicyTest extends StratosTestServerManager {
private static final Log log = LogFactory.getLog(AutoscalingPolicyTest.class);
- private static final String autoscalingPolicy = "/autoscaling-policies/";
- private static final String autoscalingPolicyUpdate = "/autoscaling-policies/update/";
- private static final String entityName = "autoscalingPolicy";
- public boolean addAutoscalingPolicy(String autoscalingPolicyName, RestClient restClient) {
- return restClient.addEntity(autoscalingPolicy + "/" + autoscalingPolicyName,
- RestConstants.AUTOSCALING_POLICIES, entityName);
+ @Test
+ public void testAutoscalingPolicy() {
+ log.info("Started autoscaling policy test case**************************************");
+ String policyId = "autoscaling-policy-c0";
+ try {
+ boolean added = restClient.addEntity(RestConstants.AUTOSCALING_POLICIES_PATH + "/" + policyId + ".json",
+ RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
- }
+ assertEquals(String.format("Autoscaling policy did not added: [autoscaling-policy-id] %s", policyId), added, true);
+ AutoscalePolicyBean bean = (AutoscalePolicyBean) restClient.
+ getEntity(RestConstants.AUTOSCALING_POLICIES, policyId,
+ AutoscalePolicyBean.class, RestConstants.AUTOSCALING_POLICIES_NAME);
- public AutoscalePolicyBean getAutoscalingPolicy(String autoscalingPolicyName, RestClient restClient) {
- return (AutoscalePolicyBean) restClient.
- getEntity(RestConstants.AUTOSCALING_POLICIES, autoscalingPolicyName,
- AutoscalePolicyBean.class, entityName);
- }
+ assertEquals(String.format("[autoscaling-policy-id] %s is not correct", bean.getId()),
+ bean.getId(), policyId);
+ assertEquals(String.format("[autoscaling-policy-id] %s RIF is not correct", policyId),
+ bean.getLoadThresholds().getRequestsInFlight().getThreshold(), 35.0, 0.0);
+ assertEquals(String.format("[autoscaling-policy-id] %s Memory is not correct", policyId),
+ bean.getLoadThresholds().getMemoryConsumption().getThreshold(), 45.0, 0.0);
+ assertEquals(String.format("[autoscaling-policy-id] %s Load is not correct", policyId),
+ bean.getLoadThresholds().getLoadAverage().getThreshold(), 25.0, 0.0);
- public boolean updateAutoscalingPolicy(String autoscalingPolicyName, RestClient restClient) {
- return restClient.updateEntity(autoscalingPolicyUpdate + "/" + autoscalingPolicyName,
- RestConstants.AUTOSCALING_POLICIES, entityName);
+ boolean updated = restClient.updateEntity(RestConstants.AUTOSCALING_POLICIES_PATH + "/" + policyId + "-v1.json",
+ RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME);
- }
+ assertEquals(String.format("[autoscaling-policy-id] %s update failed", policyId), updated, true);
+ AutoscalePolicyBean updatedBean = (AutoscalePolicyBean) restClient.getEntity(
+ RestConstants.AUTOSCALING_POLICIES, policyId,
+ AutoscalePolicyBean.class, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(String.format("[autoscaling-policy-id] %s RIF is not correct", policyId),
+ updatedBean.getLoadThresholds().getRequestsInFlight().getThreshold(), 30.0, 0.0);
+ assertEquals(String.format("[autoscaling-policy-id] %s Load is not correct", policyId),
+ updatedBean.getLoadThresholds().getMemoryConsumption().getThreshold(), 40.0, 0.0);
+ assertEquals(String.format("[autoscaling-policy-id] %s Memory is not correct", policyId),
+ updatedBean.getLoadThresholds().getLoadAverage().getThreshold(), 20.0, 0.0);
- public boolean removeAutoscalingPolicy(String autoscalingPolicyName, RestClient restClient) {
- return restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES, autoscalingPolicyName, entityName);
+ boolean removed = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES,
+ policyId, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(String.format("[autoscaling-policy-id] %s couldn't be removed", policyId),
+ removed, true);
+ AutoscalePolicyBean beanRemoved = (AutoscalePolicyBean) restClient.getEntity(
+ RestConstants.AUTOSCALING_POLICIES, policyId,
+ AutoscalePolicyBean.class, RestConstants.AUTOSCALING_POLICIES_NAME);
+ assertEquals(String.format("[autoscaling-policy-id] %s didn't get removed successfully",
+ policyId), beanRemoved, null);
+ log.info("Ended autoscaling policy test case**************************************");
+ } catch (Exception e) {
+ log.error("An error occurred while handling [autoscaling policy] " + policyId, e);
+ assertTrue("An error occurred while handling [autoscaling policy] " + policyId, false);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
index 9aae646..8bc3a9e 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
@@ -22,35 +22,105 @@ package org.apache.stratos.integration.tests;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
-import org.apache.stratos.integration.tests.rest.RestClient;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
/**
* Test to handle Cartridge group CRUD operations
*/
-public class CartridgeGroupTest {
+public class CartridgeGroupTest extends StratosTestServerManager {
private static final Log log = LogFactory.getLog(CartridgeGroupTest.class);
- private static final String cartridgeGroups = "/cartridges-groups/";
- private static final String cartridgeGroupsUpdate = "/cartridges-groups/update/";
- private static final String entityName = "cartridgeGroup";
- public boolean addCartridgeGroup(String groupName, RestClient restClient) {
- return restClient.addEntity(cartridgeGroups + "/" + groupName,
- RestConstants.CARTRIDGE_GROUPS, entityName);
- }
+ @Test
+ public void testCartridgeGroup() {
+ try {
+ log.info("Started Cartridge group test case**************************************");
- public CartridgeGroupBean getCartridgeGroup(String groupName, RestClient restClient) {
- return (CartridgeGroupBean) restClient.
- getEntity(RestConstants.CARTRIDGE_GROUPS, groupName,
- CartridgeGroupBean.class, entityName);
- }
+ boolean addedC1 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c4.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c4"), addedC1, true);
- public boolean updateCartridgeGroup(String groupName, RestClient restClient) {
- return restClient.updateEntity(cartridgeGroupsUpdate + "/" + groupName,
- RestConstants.CARTRIDGE_GROUPS, entityName);
- }
+ boolean addedC2 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c5.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c5"), addedC2, true);
+
+ boolean addedC3 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c6.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c6"), addedC3, true);
+
+ boolean added = restClient.addEntity(RestConstants.CARTRIDGE_GROUPS_PATH +
+ "/" + "g4-g5-g6.json", RestConstants.CARTRIDGE_GROUPS,
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge Group did not added: [cartridge-group-name] %s",
+ "g4-g5-g6"), added, true);
+ CartridgeGroupBean bean = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, "G4",
+ CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge Group name did not match: [cartridge-group-name] %s",
+ "g4-g5-g6.json"), bean.getName(), "G4");
+
+ boolean updated = restClient.updateEntity(RestConstants.CARTRIDGE_GROUPS_PATH +
+ "/" + "g4-g5-g6-v1.json",
+ RestConstants.CARTRIDGE_GROUPS, RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge Group did not updated: [cartridge-group-name] %s",
+ "g4-g5-g6"), updated, true);
+ CartridgeGroupBean updatedBean = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, "G4",
+ CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Updated Cartridge Group didn't match: [cartridge-group-name] %s",
+ "g4-g5-g6"), updatedBean.getName(), "G4");
+
+ boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "c4",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge can be removed while it is used in " +
+ "cartridge group: [cartridge-name] %s", "c4"), removedC1, false);
+
+ boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "c5",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge can be removed while it is used in " +
+ "cartridge group: [cartridge-name] %s",
+ "c5"), removedC2, false);
+
+ boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "c6",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge can be removed while it is used in " +
+ "cartridge group: [cartridge-name] %s",
+ "c6"), removedC3, false);
+
+ boolean removed = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "G4",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge Group did not removed: [cartridge-group-name] %s",
+ "g4-g5-g6"), removed, true);
+
+ CartridgeGroupBean beanRemoved = (CartridgeGroupBean) restClient.
+ getEntity(RestConstants.CARTRIDGE_GROUPS, "G4",
+ CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge Group did not removed completely: " +
+ "[cartridge-group-name] %s",
+ "g4-g5-g6"), beanRemoved, null);
+
+ removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "c4",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
+ "c4"), removedC1, true);
+
+ removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "c5",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
+ "c5"), removedC2, true);
+
+ removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "c6",
+ RestConstants.CARTRIDGE_GROUPS_NAME);
+ assertEquals(String.format("Cartridge can not be removed : [cartridge-name] %s",
+ "c6"), removedC3, true);
- public boolean removeCartridgeGroup(String groupName, RestClient restClient) {
- return restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, groupName, entityName);
+ log.info("Ended Cartridge group test case**************************************");
+ } catch (Exception e) {
+ log.error("An error occurred while handling Cartridge group test case", e);
+ assertTrue("An error occurred while handling Cartridge group test case", false);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/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 1d135dd..26eb881 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
@@ -21,38 +21,106 @@ package org.apache.stratos.integration.tests;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.PropertyBean;
import org.apache.stratos.common.beans.cartridge.CartridgeBean;
-import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
-import org.apache.stratos.integration.tests.rest.RestClient;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
/**
* Test to handle Cartridge CRUD operations
*/
-public class CartridgeTest {
+public class CartridgeTest extends StratosTestServerManager {
private static final Log log = LogFactory.getLog(CartridgeTest.class);
- private static final String cartridges = "/cartridges/mock/";
- private static final String cartridgesUpdate = "/cartridges/mock/update/";
- private static final String entityName = "cartridge";
-
-
- public boolean addCartridge(String cartridgeType, RestClient restClient) {
- return restClient.addEntity(cartridges + "/" + cartridgeType,
- RestConstants.CARTRIDGES, entityName);
- }
- public CartridgeBean getCartridge(String cartridgeType,
- RestClient restClient) {
- return (CartridgeBean) restClient.
- getEntity(RestConstants.CARTRIDGES, cartridgeType,
- CartridgeBean.class, entityName);
- }
+ @Test
+ public void testCartridge() {
+ log.info("Started Cartridge test case**************************************");
- public boolean updateCartridge(String cartridgeType, RestClient restClient) {
- return restClient.updateEntity(cartridgesUpdate + "/" + cartridgeType,
- RestConstants.CARTRIDGES, entityName);
- }
+ try {
+ String cartridgeType = "c0";
+ boolean added = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" +
+ cartridgeType + ".json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(added, true);
+ CartridgeBean bean = (CartridgeBean) restClient.
+ getEntity(RestConstants.CARTRIDGES, cartridgeType,
+ CartridgeBean.class, RestConstants.CARTRIDGES_NAME);
+ assertEquals(bean.getCategory(), "Application");
+ assertEquals(bean.getHost(), "qmog.cisco.com");
+ for (PropertyBean property : bean.getProperty()) {
+ if (property.getName().equals("payload_parameter.CEP_IP")) {
+ assertEquals(property.getValue(), "octl.qmog.cisco.com");
+ } else if (property.getName().equals("payload_parameter.CEP_ADMIN_PASSWORD")) {
+ assertEquals(property.getValue(), "admin");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_IP")) {
+ assertEquals(property.getValue(), "octl.qmog.cisco.com");
+ } else if (property.getName().equals("payload_parameter.QTCM_NETWORK_COUNT")) {
+ assertEquals(property.getValue(), "1");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD")) {
+ assertEquals(property.getValue(), "admin");
+ } else if (property.getName().equals("payload_parameter.QTCM_DNS_SEGMENT")) {
+ assertEquals(property.getValue(), "test");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_SECURE_PORT")) {
+ assertEquals(property.getValue(), "7711");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_PORT")) {
+ assertEquals(property.getValue(), "7611");
+ } else if (property.getName().equals("payload_parameter.CEP_PORT")) {
+ assertEquals(property.getValue(), "7611");
+ } else if (property.getName().equals("payload_parameter.MB_PORT")) {
+ assertEquals(property.getValue(), "61616");
+ }
+ }
+
+
+ boolean updated = restClient.updateEntity(RestConstants.CARTRIDGES_PATH + "/" +
+ cartridgeType + "-v1.json",
+ RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME);
+ assertEquals(updated, true);
+ CartridgeBean updatedBean = (CartridgeBean) restClient.
+ getEntity(RestConstants.CARTRIDGES, cartridgeType,
+ CartridgeBean.class, RestConstants.CARTRIDGES_NAME);
+ assertEquals(updatedBean.getType(), "c0");
+ assertEquals(updatedBean.getCategory(), "Data");
+ assertEquals(updatedBean.getHost(), "qmog.cisco.com12");
+ for (PropertyBean property : updatedBean.getProperty()) {
+ if (property.getName().equals("payload_parameter.CEP_IP")) {
+ assertEquals(property.getValue(), "octl.qmog.cisco.com123");
+ } else if (property.getName().equals("payload_parameter.CEP_ADMIN_PASSWORD")) {
+ assertEquals(property.getValue(), "admin123");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_IP")) {
+ assertEquals(property.getValue(), "octl.qmog.cisco.com123");
+ } else if (property.getName().equals("payload_parameter.QTCM_NETWORK_COUNT")) {
+ assertEquals(property.getValue(), "3");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD")) {
+ assertEquals(property.getValue(), "admin123");
+ } else if (property.getName().equals("payload_parameter.QTCM_DNS_SEGMENT")) {
+ assertEquals(property.getValue(), "test123");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_SECURE_PORT")) {
+ assertEquals(property.getValue(), "7712");
+ } else if (property.getName().equals("payload_parameter.MONITORING_SERVER_PORT")) {
+ assertEquals(property.getValue(), "7612");
+ } else if (property.getName().equals("payload_parameter.CEP_PORT")) {
+ assertEquals(property.getValue(), "7612");
+ } else if (property.getName().equals("payload_parameter.MB_PORT")) {
+ assertEquals(property.getValue(), "61617");
+ }
+ }
+
+ boolean removed = restClient.removeEntity(RestConstants.CARTRIDGES, cartridgeType,
+ RestConstants.CARTRIDGES_NAME);
+ assertEquals(removed, true);
+
+ CartridgeBean beanRemoved = (CartridgeBean) restClient.
+ getEntity(RestConstants.CARTRIDGES, cartridgeType,
+ CartridgeBean.class, RestConstants.CARTRIDGES_NAME);
+ assertEquals(beanRemoved, null);
- public boolean removeCartridge(String cartridgeType, RestClient restClient) {
- return restClient.removeEntity(RestConstants.CARTRIDGES, cartridgeType, entityName);
+ log.info("Ended Cartridge test case**************************************");
+ } catch (Exception e) {
+ log.error("An error occurred while handling RESTConstants.CARTRIDGES_PATH", e);
+ assertTrue("An error occurred while handling RESTConstants.CARTRIDGES_PATH", false);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
index eeb3ed9..6c1f4e0 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
@@ -21,36 +21,133 @@ package org.apache.stratos.integration.tests;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
-import org.apache.stratos.integration.tests.rest.RestClient;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
/**
* Test to handle Deployment policy CRUD operations
*/
-public class DeploymentPolicyTest {
+public class DeploymentPolicyTest extends StratosTestServerManager {
private static final Log log = LogFactory.getLog(DeploymentPolicyTest.class);
- private static final String deploymentPolicies = "/deployment-policies/";
- private static final String deploymentPoliciesUpdate = "/deployment-policies/update/";
- private static final String entityName = "deploymentPolicy";
- public boolean addDeploymentPolicy(String deploymentPolicyId, RestClient restClient) {
- return restClient.addEntity(deploymentPolicies + "/" + deploymentPolicyId,
- RestConstants.DEPLOYMENT_POLICIES, entityName);
- }
+ @Test
+ public void testDeploymentPolicy() {
+ try {
+ String deploymentPolicyId = "deployment-policy-2";
+ log.info("Started deployment policy test case**************************************");
- public DeploymentPolicyBean getDeploymentPolicy(String deploymentPolicyId,
- RestClient restClient) {
- return (DeploymentPolicyBean) restClient.
- getEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId,
- DeploymentPolicyBean.class, entityName);
- }
+ boolean addedN1 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-5" + ".json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN1, true);
- public boolean updateDeploymentPolicy(String deploymentPolicyId, RestClient restClient) {
- return restClient.updateEntity(deploymentPoliciesUpdate + "/" + deploymentPolicyId,
- RestConstants.DEPLOYMENT_POLICIES, entityName);
- }
+ boolean addedN2 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-6" + ".json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(addedN2, true);
+
+ boolean addedDep = restClient.addEntity(RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
+ deploymentPolicyId + ".json",
+ RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(addedDep, true);
+
+ DeploymentPolicyBean bean = (DeploymentPolicyBean) restClient.
+ getEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId,
+ DeploymentPolicyBean.class, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(bean.getId(), "deployment-policy-2");
+ assertEquals(bean.getNetworkPartitions().size(), 2);
+ assertEquals(bean.getNetworkPartitions().get(0).getId(), "network-partition-5");
+ assertEquals(bean.getNetworkPartitions().get(0).getPartitionAlgo(), "one-after-another");
+ assertEquals(bean.getNetworkPartitions().get(0).getPartitions().size(), 1);
+ assertEquals(bean.getNetworkPartitions().get(0).getPartitions().get(0).getId(), "partition-1");
+ assertEquals(bean.getNetworkPartitions().get(0).getPartitions().get(0).getPartitionMax(), 20);
+
+ assertEquals(bean.getNetworkPartitions().get(1).getId(), "network-partition-6");
+ assertEquals(bean.getNetworkPartitions().get(1).getPartitionAlgo(), "round-robin");
+ assertEquals(bean.getNetworkPartitions().get(1).getPartitions().size(), 2);
+ assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(0).getId(),
+ "network-partition-6-partition-1");
+ assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(0).getPartitionMax(), 10);
+ assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(1).getId(),
+ "network-partition-6-partition-2");
+ assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(1).getPartitionMax(), 9);
+
+ //update network partition
+ boolean updated = restClient.updateEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ "network-partition-5-v1.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(updated, true);
+
+ //update deployment policy with new partition and max values
+ boolean updatedDep = restClient.updateEntity(RestConstants.DEPLOYMENT_POLICIES_PATH +
+ "/" + deploymentPolicyId + "-v1.json", RestConstants.DEPLOYMENT_POLICIES,
+ RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(updatedDep, true);
+
+ DeploymentPolicyBean updatedBean = (DeploymentPolicyBean) restClient.
+ getEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId,
+ DeploymentPolicyBean.class, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(updatedBean.getId(), "deployment-policy-2");
+ assertEquals(updatedBean.getNetworkPartitions().size(), 2);
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getId(), "network-partition-5");
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitionAlgo(), "one-after-another");
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().size(), 2);
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(0).getId(), "partition-1");
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(0).getPartitionMax(), 25);
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(1).getId(), "partition-2");
+ assertEquals(updatedBean.getNetworkPartitions().get(0).getPartitions().get(1).getPartitionMax(), 20);
+
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getId(), "network-partition-6");
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitionAlgo(), "round-robin");
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().size(), 2);
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(0).getId(),
+ "network-partition-6-partition-1");
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(0).getPartitionMax(), 15);
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(1).getId(),
+ "network-partition-6-partition-2");
+ assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(1).getPartitionMax(), 5);
+
+ boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-5", RestConstants.NETWORK_PARTITIONS_NAME);
+ //Trying to remove the used network partition
+ assertEquals(removedNet, false);
+
+ boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES,
+ deploymentPolicyId, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(removedDep, true);
+
+ DeploymentPolicyBean beanRemovedDep = (DeploymentPolicyBean) restClient.
+ getEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId,
+ DeploymentPolicyBean.class, RestConstants.DEPLOYMENT_POLICIES_NAME);
+ assertEquals(beanRemovedDep, null);
+
+ boolean removedN1 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-5", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN1, true);
+
+ NetworkPartitionBean beanRemovedN1 = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, "network-partition-5",
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(beanRemovedN1, null);
+
+ boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ "network-partition-6", RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removedN2, true);
+
+ NetworkPartitionBean beanRemovedN2 = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, "network-partition-6",
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(beanRemovedN2, null);
+
+ log.info("Ended deployment policy test case**************************************");
- public boolean removeDeploymentPolicy(String deploymentPolicyId, RestClient restClient) {
- return restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES, deploymentPolicyId, entityName);
+ } catch (Exception e) {
+ log.error("An error occurred while handling deployment policy", e);
+ assertTrue("An error occurred while handling deployment policy", false);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
index 8593a09..a2ec9dc 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
@@ -22,35 +22,67 @@ package org.apache.stratos.integration.tests;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
-import org.apache.stratos.integration.tests.rest.RestClient;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
/**
* Test to handle Network partition CRUD operations
*/
-public class NetworkPartitionTest {
+public class NetworkPartitionTest extends StratosTestServerManager {
private static final Log log = LogFactory.getLog(NetworkPartitionTest.class);
- private static final String networkPartitions = "/network-partitions/mock/";
- private static final String networkPartitionsUpdate = "/network-partitions/mock/update/";
- private static final String entityName = "networkPartition";
- public boolean addNetworkPartition(String networkPartitionId, RestClient restClient) {
- return restClient.addEntity(networkPartitions + "/" + networkPartitionId,
- RestConstants.NETWORK_PARTITIONS, entityName);
- }
+ @Test
+ public void testNetworkPartition() {
+ try {
+ String networkPartitionId = "network-partition-3";
+ log.info("Started network partition test case**************************************");
- public NetworkPartitionBean getNetworkPartition(String networkPartitionId,
- RestClient restClient) {
- return (NetworkPartitionBean) restClient.
- getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId,
- NetworkPartitionBean.class, entityName);
- }
+ boolean added = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ networkPartitionId + ".json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
- public boolean updateNetworkPartition(String networkPartitionId, RestClient restClient) {
- return restClient.updateEntity(networkPartitionsUpdate + "/" + networkPartitionId,
- RestConstants.NETWORK_PARTITIONS, entityName);
- }
+ assertEquals(added, true);
+ NetworkPartitionBean bean = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId,
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+
+ assertEquals(bean.getId(), "network-partition-3");
+ assertEquals(bean.getPartitions().size(), 1);
+ assertEquals(bean.getPartitions().get(0).getId(), "partition-1");
+ assertEquals(bean.getPartitions().get(0).getProperty().get(0).getName(), "region");
+ assertEquals(bean.getPartitions().get(0).getProperty().get(0).getValue(), "default");
+
+ boolean updated = restClient.updateEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" +
+ networkPartitionId + "-v1.json",
+ RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
+
+ assertEquals(updated, true);
+ NetworkPartitionBean updatedBean = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId,
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(updatedBean.getId(), "network-partition-3");
+ assertEquals(updatedBean.getPartitions().size(), 2);
+ assertEquals(updatedBean.getPartitions().get(1).getId(), "partition-2");
+ assertEquals(updatedBean.getPartitions().get(1).getProperty().get(0).getName(), "region");
+ assertEquals(updatedBean.getPartitions().get(1).getProperty().get(0).getValue(), "default1");
+ assertEquals(updatedBean.getPartitions().get(1).getProperty().get(1).getName(), "zone");
+ assertEquals(updatedBean.getPartitions().get(1).getProperty().get(1).getValue(), "z1");
+
+ boolean removed = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS,
+ networkPartitionId, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(removed, true);
+
+ NetworkPartitionBean beanRemoved = (NetworkPartitionBean) restClient.
+ getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId,
+ NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME);
+ assertEquals(beanRemoved, null);
- public boolean removeNetworkPartition(String networkPartitionId, RestClient restClient) {
- return restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId, entityName);
+ log.info("Ended network partition test case**************************************");
+ } catch (Exception e) {
+ log.error("An error occurred while handling network partitions", e);
+ assertTrue("An error occurred while handling network partitions", false);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b844043/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java
index 9678c4e..181aaa5 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java
@@ -34,4 +34,19 @@ public class RestConstants {
public static final String APPLICATIONS_DEPLOY = "/deploy";
public static final String APPLICATIONS_UNDEPLOY = "/undeploy";
+ public static final String AUTOSCALING_POLICIES_PATH = "/autoscaling-policies/";
+ public static final String AUTOSCALING_POLICIES_NAME = "autoscalingPolicy";
+ public static final String CARTRIDGE_GROUPS_PATH = "/cartridges-groups/";
+ public static final String CARTRIDGE_GROUPS_NAME = "cartridgeGroup";
+ public static final String CARTRIDGES_PATH = "/cartridges/mock/";
+ public static final String CARTRIDGES_NAME = "cartridge";
+ public static final String NETWORK_PARTITIONS_PATH = "/network-partitions/mock/";
+ public static final String NETWORK_PARTITIONS_NAME = "networkPartition";
+ public static final String DEPLOYMENT_POLICIES_PATH = "/deployment-policies/";
+ public static final String DEPLOYMENT_POLICIES_NAME = "deploymentPolicy";
+ public static final String APPLICATIONS_PATH = "/applications/simple/single-cartridge-app/";
+ public static final String APPLICATIONS_NAME = "application";
+ public static final String APPLICATION_POLICIES_PATH = "/application-policies/";
+ public static final String APPLICATION_POLICIES_NAME = "applicationPolicy";
+
}
[07/50] [abbrv] stratos git commit: Updated Dockerfiles for Stratos
4.1.1 release
Posted by la...@apache.org.
Updated Dockerfiles for Stratos 4.1.1 release
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d5680aa8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d5680aa8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d5680aa8
Branch: refs/heads/data-publisher-integration
Commit: d5680aa89d3de75a3c01e8cfa45c3ae149e37d78
Parents: 67576a8
Author: Akila Perera <ra...@gmail.com>
Authored: Thu Aug 6 19:23:56 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Thu Aug 6 19:24:10 2015 +0530
----------------------------------------------------------------------
README.md | 24 ++++++++++----------
.../src/test/python/README.md | 2 +-
.../console/README.md | 2 +-
.../jclouds/apis/vcloud/1.8.1-stratos/pom.xml | 2 +-
pom.xml | 2 +-
.../modules/distribution/INSTALL.txt | 2 +-
products/stratos-cli/distribution/README.txt | 2 +-
.../stratos/modules/distribution/INSTALL.txt | 2 +-
.../stratos/modules/distribution/README.txt | 2 +-
tools/config-scripts/ec2/config.sh | 2 +-
tools/config-scripts/gce/config.sh | 2 +-
tools/config-scripts/openstack/config.sh | 2 +-
.../base-image/Dockerfile | 10 ++++----
.../base-image/files/run | 2 +-
.../base-image/packs/.gitignore | 4 ++++
.../cartridge-docker-images/build.sh | 8 +++----
.../service-images/php/Dockerfile | 2 +-
.../service-images/tomcat-saml-sso/Dockerfile | 2 +-
.../service-images/tomcat/Dockerfile | 2 +-
.../service-images/wso2is-saml-sso/Dockerfile | 2 +-
.../stratos-docker-images/run-example.sh | 2 +-
tools/puppet3/modules/agent/files/README.txt | 2 +-
tools/puppet3/modules/haproxy/files/README.txt | 2 +-
tools/puppet3/modules/lb/files/README.txt | 2 +-
.../modules/python_agent/files/README.txt | 2 +-
tools/stratos-installer/README.md | 4 ++--
tools/stratos-installer/conf/setup.conf | 2 +-
27 files changed, 49 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 28a8398..8d6b96b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ Apache Stratos
===========================
Apache Stratos includes polyglot language and environment support together with the ability to run on top of multiple IaaS runtimes.
Stratos is licensed under the Apache License, Version 2.0
-The following are the key features available in Apache Stratos 4.1.0:
+The following are the key features available in Apache Stratos 4.1.1:
Features
--------
@@ -46,13 +46,13 @@ auto-scaling policies with multiple factors,i.e., requests in flight, memory con
considered when scaling up or down. The Auto-scaler also supports scaling for non-HTTP transport.
<br />
For detailed information on how multi-factored auto-scaling takes place in Stratos,
-see [Autoscaler](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Autoscaler).
+see [Autoscaler](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Autoscaler).
* Smart policies <br />
The Auto-scaler in Stratos uses two smart policies when making auto-scaling decisions: auto-scaling policy and deployment policy.
The instances will be automatically spawned based on the smart policies that are applied to the application.
<br />
-For more information on auto-scaling and deployment policy scaling policies, see [Smart Policies](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Smart+Policies).
+For more information on auto-scaling and deployment policy scaling policies, see [Smart Policies](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Smart+Policies).
* Multiple IaaS support <br />
Apache Stratos is tested on the following IaaS providers: AWS EC2 and OpenStack. However, it is very easy to extend
@@ -66,7 +66,7 @@ be off-loaded to another cloud.
* Controlling IaaS resources <br />
It is possible for DevOps to define partitions in a network partition, to control IaaS resources. Thereby,
Apache Stratos can control resources per cloud, region, and zone. Controlling of IaaS resources provide a high
-availability and solves disaster recovery concerns. For more information, see [Cloud Partitioning](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Cloud+Partitioning).
+availability and solves disaster recovery concerns. For more information, see [Cloud Partitioning](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Cloud+Partitioning).
* Loosely coupled communication <br />
Stratos uses the Advanced Message Queuing Protocol (AMQP) messaging technology for communication among all its components.
@@ -85,7 +85,7 @@ A cartridge is a package of code that includes a Virtual Machine (VM) image plus
be plugged into Stratos to offer a new PaaS service. Stratos supports single tenant and multi-tenant cartridges.
If needed, tenants can easily add their own cartridges to Stratos.
<br />
-For more information on how Stratos uses cartridges, see [Cartridge](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Cartridge).
+For more information on how Stratos uses cartridges, see [Cartridge](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Cartridge).
* Cartridge automation using Puppet <br />
Cartridges can be easily configured with the use of an orchestration layer such as Puppet.
@@ -94,7 +94,7 @@ Cartridges can be easily configured with the use of an orchestration layer such
Stratos supports third-party load balancers (LBs), i.e, HAProxy, NGINX. Thereby, if required, users can use their own
LB with Stratos.
<br />
-For more information, see [Load Balancers](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Load+Balancers).
+For more information, see [Load Balancers](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Load+Balancers).
* Artifact distribution coordination <br />
The Artifact Distribution Coordinator is responsible for the distribution of artifacts. Artifacts can be uploaded
@@ -103,24 +103,24 @@ topology and send notifications to appropriate Cartridge instances. ADC supports
repositories based deployment synchronization. Users are able to use their own Git repository to sync artifacts with
a service instance.
<br />
-For more information, see [Artifact Distribution Coordinator](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Artifact+Distribution+Coordinator).
+For more information, see [Artifact Distribution Coordinator](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Artifact+Distribution+Coordinator).
* Stratos Manager Console <br />
Administrators and tenants can use the Stratos Manager console, which is a web-based UI management console in Stratos,
to interact with Stratos.
<br />
-For more information, see [Stratos Manager](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Stratos+Manager).
+For more information, see [Stratos Manager](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Stratos+Manager).
* Stratos REST API <br />
DevOps can use REST APIs to carry out various administering functions (e.g., adding a tenant, adding a cartridge, etc.).
<br />
-For more information, see the [Stratos API Reference Guide](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Stratos+API+Reference).
+For more information, see the [Stratos API Reference Guide](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Stratos+API+Reference).
* Interactive CLI Tool <br />
Command Line Interface (CLI) tool provides users an interface to interact with Stratos and manage your applications.
<br />
-For more information, see the [CLI Tool](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+CLI+Tool) and the
-[CLI Guide](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+CLI+Guide).
+For more information, see the [CLI Tool](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+CLI+Tool) and the
+[CLI Guide](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+CLI+Guide).
* Monitoring and metering <br />
Apache Stratos provides centralized monitoring and metering. The level of resource utilization in Stratos is measured using metering.
@@ -129,7 +129,7 @@ Apache Stratos provides centralized monitoring and metering. The level of resour
If required, the DevOps can enable a persistent volume for cartridges. If persistent volume is enabled, Apache Stratos
automatically attaches a volume when a new cartridge instance is created.
<br />
-For more information, see [Persistence Volume Mapping](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Persistence+Volume+Mapping).
+For more information, see [Persistence Volume Mapping](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Persistence+Volume+Mapping).
* Gracefully shutdown instances <br />
Before terminating an instance, when scaling down, the Auto-scaler will allow all the existing requests to the instance
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/components/org.apache.stratos.cli/src/test/python/README.md
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/test/python/README.md b/components/org.apache.stratos.cli/src/test/python/README.md
index 57cbfbb..4704069 100644
--- a/components/org.apache.stratos.cli/src/test/python/README.md
+++ b/components/org.apache.stratos.cli/src/test/python/README.md
@@ -18,7 +18,7 @@ Set the environment variables CLI_JAR, PYTHONPATH and WIREMOCK_JAR, WIREMOCK_HTT
```
# the stratos CLI_JAR
-export CLI_JAR=~/stratos/components/org.apache.stratos.cli/target/org.apache.stratos.cli-4.1.0.jar
+export CLI_JAR=~/stratos/components/org.apache.stratos.cli/target/org.apache.stratos.cli-4.1.1.jar
# set the PYTHONPATH to include pexpect
export PYTHONPATH=$PYTHONPATH:~/stratos/components/org.apache.stratos.cli/target/pexpect-3.2
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/components/org.apache.stratos.manager.console/console/README.md
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/README.md b/components/org.apache.stratos.manager.console/console/README.md
index ae53f7a..18e6c03 100644
--- a/components/org.apache.stratos.manager.console/console/README.md
+++ b/components/org.apache.stratos.manager.console/console/README.md
@@ -1,4 +1,4 @@
-##Stratos 4.1.0 New UXD Implemantation##
+##Stratos 4.1.1 New UXD Implemantation##
====================================
Initial version with improved UXDesigns.
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
index c41f538..c731b6c 100644
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
+++ b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml
@@ -126,6 +126,6 @@
</profiles>
<scm>
- <tag>4.1.0-rc4</tag>
+ <tag>4.1.1-SNAPSHOT</tag>
</scm>
</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2f602b1..6296672 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/stratos.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/stratos.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=stratos.git</url>
- <tag>4.1.0-rc4</tag>
+ <tag>4.1.1-SNAPSHOT</tag>
</scm>
<modules>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/products/load-balancer/modules/distribution/INSTALL.txt
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/INSTALL.txt b/products/load-balancer/modules/distribution/INSTALL.txt
index dde8bf3..dd371ea 100644
--- a/products/load-balancer/modules/distribution/INSTALL.txt
+++ b/products/load-balancer/modules/distribution/INSTALL.txt
@@ -56,7 +56,7 @@ System Requirements
Please refer following link for more information:
-https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Installation+Guide
+https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Installation+Guide
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/products/stratos-cli/distribution/README.txt
----------------------------------------------------------------------
diff --git a/products/stratos-cli/distribution/README.txt b/products/stratos-cli/distribution/README.txt
index b342790..12f0e32 100755
--- a/products/stratos-cli/distribution/README.txt
+++ b/products/stratos-cli/distribution/README.txt
@@ -25,7 +25,7 @@ in the interactive mode.
Configuring CLI Tool
==================================
-Configuration guide can be found at https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Configuring+CLI+Tool
+Configuration guide can be found at https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Configuring+CLI+Tool
Help
==================================
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/products/stratos/modules/distribution/INSTALL.txt
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/INSTALL.txt b/products/stratos/modules/distribution/INSTALL.txt
index 4344d36..bdf7360 100755
--- a/products/stratos/modules/distribution/INSTALL.txt
+++ b/products/stratos/modules/distribution/INSTALL.txt
@@ -64,4 +64,4 @@ System Requirements
Please refer below link for more information:
-https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Installation+Guide
\ No newline at end of file
+https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Installation+Guide
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/products/stratos/modules/distribution/README.txt
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/README.txt b/products/stratos/modules/distribution/README.txt
index 989f20c..5150545 100755
--- a/products/stratos/modules/distribution/README.txt
+++ b/products/stratos/modules/distribution/README.txt
@@ -30,7 +30,7 @@ from instances and updates the routing topology periodically. Topology updates f
Please refer below link for more information:
-https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Architecture
+https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Architecture
Crypto Notice
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/config-scripts/ec2/config.sh
----------------------------------------------------------------------
diff --git a/tools/config-scripts/ec2/config.sh b/tools/config-scripts/ec2/config.sh
index 880a778..4b49ea1 100755
--- a/tools/config-scripts/ec2/config.sh
+++ b/tools/config-scripts/ec2/config.sh
@@ -33,7 +33,7 @@ CP=`which cp`
MV=`which mv`
HOSTSFILE=/etc/hosts
-LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.0/wso2carbon.lck
+LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.1-SNAPSHOT/wso2carbon.lck
DATE=`date +%d%m%y%S`
RANDOMNUMBER="`${TR} -c -d 0-9 < /dev/urandom | ${HEAD} -c 4`${DATE}"
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/config-scripts/gce/config.sh
----------------------------------------------------------------------
diff --git a/tools/config-scripts/gce/config.sh b/tools/config-scripts/gce/config.sh
index ab75b12..067ba8e 100644
--- a/tools/config-scripts/gce/config.sh
+++ b/tools/config-scripts/gce/config.sh
@@ -36,7 +36,7 @@ CURL=`which curl`
HOSTSFILE=/etc/hosts
DATE=`date +%d%m%y%S`
RANDOMNUMBER="`${TR} -c -d 0-9 < /dev/urandom | ${HEAD} -c 4`${DATE}"
-LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.0/wso2carbon.lck
+LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.1-SNAPSHOT/wso2carbon.lck
function valid_ip()
{
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/config-scripts/openstack/config.sh
----------------------------------------------------------------------
diff --git a/tools/config-scripts/openstack/config.sh b/tools/config-scripts/openstack/config.sh
index 76f04dc..e68029b 100755
--- a/tools/config-scripts/openstack/config.sh
+++ b/tools/config-scripts/openstack/config.sh
@@ -33,7 +33,7 @@ CP=`which cp`
MV=`which mv`
HOSTSFILE=/etc/hosts
-LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.0/wso2carbon.lck
+LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.1-SNAPSHOT/wso2carbon.lck
DATE=`date +%d%m%y%S`
RANDOMNUMBER="`${TR} -c -d 0-9 < /dev/urandom | ${HEAD} -c 4`${DATE}"
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/base-image/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/base-image/Dockerfile b/tools/docker-images/cartridge-docker-images/base-image/Dockerfile
index 686fd41..95debf9 100644
--- a/tools/docker-images/cartridge-docker-images/base-image/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/base-image/Dockerfile
@@ -48,13 +48,13 @@ RUN pip install yapsy
# -------------------------
WORKDIR /mnt/
-ADD packs/apache-stratos-python-cartridge-agent-4.1.0.zip /mnt/apache-stratos-python-cartridge-agent-4.1.0.zip
-RUN unzip -q /mnt/apache-stratos-python-cartridge-agent-4.1.0.zip -d /mnt/
-RUN rm /mnt/apache-stratos-python-cartridge-agent-4.1.0.zip
+ADD packs/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip
+RUN unzip -q /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip -d /mnt/
+RUN rm /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip
-RUN mkdir -p /mnt/apache-stratos-python-cartridge-agent-4.1.0/payload
+RUN mkdir -p /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT/payload
-RUN chmod +x /mnt/apache-stratos-python-cartridge-agent-4.1.0/extensions/bash/*
+RUN chmod +x /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT/extensions/bash/*
RUN mkdir -p /var/log/apache-stratos/
RUN touch /var/log/apache-stratos/cartridge-agent-extensions.log
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/base-image/files/run
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/base-image/files/run b/tools/docker-images/cartridge-docker-images/base-image/files/run
index ee71b11..f952864 100755
--- a/tools/docker-images/cartridge-docker-images/base-image/files/run
+++ b/tools/docker-images/cartridge-docker-images/base-image/files/run
@@ -26,7 +26,7 @@
source /root/.bashrc
-export STRATOS_VERSION="4.1.0"
+export STRATOS_VERSION="4.1.1-SNAPSHOT"
export PCA_HOME="/mnt/apache-stratos-python-cartridge-agent-${STRATOS_VERSION}"
set -o posix ; set | sed -e ':a;N;$!ba;s/\n/,/g' > ${PCA_HOME}/payload/launch-params
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/base-image/packs/.gitignore
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/base-image/packs/.gitignore b/tools/docker-images/cartridge-docker-images/base-image/packs/.gitignore
new file mode 100644
index 0000000..5e7d273
--- /dev/null
+++ b/tools/docker-images/cartridge-docker-images/base-image/packs/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/build.sh
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/build.sh b/tools/docker-images/cartridge-docker-images/build.sh
index 3f32667..0f676c0 100755
--- a/tools/docker-images/cartridge-docker-images/build.sh
+++ b/tools/docker-images/cartridge-docker-images/build.sh
@@ -26,18 +26,18 @@ pca_distribution_path=`cd "$script_path/../../../products/python-cartridge-agent
pushd ${pca_distribution_path}
mvn clean install -Dmaven.test.skip=true
-cp -vf target/apache-stratos-python-cartridge-agent-4.1.0.zip ${script_path}/base-image/packs/
+cp -vf target/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip ${script_path}/base-image/packs/
popd
pushd ${script_path}/base-image/
echo "Building base docker image..."
-docker build -t stratos/base-image:4.1.0 .
+sudo docker build -t stratos/base-image:4.1.1 .
pushd ${script_path}/service-images/php
echo "Building php docker image..."
-docker build -t stratos/php:4.1.0 .
+sudo docker build -t stratos/php:4.1.1 .
pushd ${script_path}/service-images/tomcat
echo "Building tomcat docker image..."
-docker build -t stratos/tomcat:4.1.0 .
+sudo docker build -t stratos/tomcat:4.1.1 .
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/service-images/php/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/php/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/php/Dockerfile
index 9277e35..e5ad338 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/php/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/service-images/php/Dockerfile
@@ -19,7 +19,7 @@
#
# --------------------------------------------------------------
-FROM stratos/base-image:4.1.0
+FROM stratos/base-image:4.1.1
MAINTAINER dev@stratos.apache.org
# ----------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile
index 48b6ff51..12ccb98 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile
@@ -19,7 +19,7 @@
#
# --------------------------------------------------------------
-FROM stratos/base-image:4.1.0
+FROM stratos/base-image:4.1.1
MAINTAINER dev@stratos.apache.org
ENV JDK_VERSION 1.7.0_60
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile
index d3edddd..0bc4ecb 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile
@@ -19,7 +19,7 @@
#
# --------------------------------------------------------------
-FROM stratos/base-image:4.1.0
+FROM stratos/base-image:4.1.1
MAINTAINER dev@stratos.apache.org
ENV JDK_VERSION 1.7.0_67
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
index be84fb5..9298ad2 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
@@ -19,7 +19,7 @@
#
# --------------------------------------------------------------
-FROM stratos/base-image:4.1.0
+FROM stratos/base-image:4.1.1
MAINTAINER dev@stratos.apache.org
ENV DEBIAN_FRONTEND noninteractive
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/stratos-docker-images/run-example.sh
----------------------------------------------------------------------
diff --git a/tools/docker-images/stratos-docker-images/run-example.sh b/tools/docker-images/stratos-docker-images/run-example.sh
index 94703f9..c41893d 100755
--- a/tools/docker-images/stratos-docker-images/run-example.sh
+++ b/tools/docker-images/stratos-docker-images/run-example.sh
@@ -31,7 +31,7 @@ export DOMAIN=example.com
export IP_ADDR=192.168.56.5
# Set the version of Stratos docker images
-export STRATOS_VERSION=4.1.0
+export STRATOS_VERSION=4.1.1-SNAPSHOT
########
# Bind
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/puppet3/modules/agent/files/README.txt
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/files/README.txt b/tools/puppet3/modules/agent/files/README.txt
index 04d5d6d..4bd05cd 100644
--- a/tools/puppet3/modules/agent/files/README.txt
+++ b/tools/puppet3/modules/agent/files/README.txt
@@ -7,6 +7,6 @@ This folder should have following:
eg:
if $mb_type = activemq, folder structure of this folder would be:
>$ls
->activemq apache-stratos-python-cartridge-agent-4.1.0.zip
+>activemq apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip
3. Under $mb_type folder, please add all the client jars, that should be copied to the agent's lib directory.
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/puppet3/modules/haproxy/files/README.txt
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/haproxy/files/README.txt b/tools/puppet3/modules/haproxy/files/README.txt
index f3b4d69..189007a 100644
--- a/tools/puppet3/modules/haproxy/files/README.txt
+++ b/tools/puppet3/modules/haproxy/files/README.txt
@@ -7,6 +7,6 @@ This folder should have following:
eg:
if $mb_type = activemq, folder structure of this folder would be:
>$ls
->activemq apache-stratos-haproxy-extension-4.1.0.zip
+>activemq apache-stratos-haproxy-extension-4.1.1-SNAPSHOT.zip
3. Under $mb_type folder, please add all the client jars, that should be copied to the haproxy-extension's lib directory.
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/puppet3/modules/lb/files/README.txt
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/lb/files/README.txt b/tools/puppet3/modules/lb/files/README.txt
index 04b99bf..8d1fe23 100644
--- a/tools/puppet3/modules/lb/files/README.txt
+++ b/tools/puppet3/modules/lb/files/README.txt
@@ -7,6 +7,6 @@ This folder should have following:
eg:
if $mb_type = activemq, folder structure of this folder would be:
>$ls
->activemq apache-stratos-load-balancer-4.1.0.zip
+>activemq apache-stratos-load-balancer-4.1.1-SNAPSHOT.zip
3. Under $mb_type folder, please add all the client jars, that should be copied to the load balancer's repository/components/lib directory.
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/puppet3/modules/python_agent/files/README.txt
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/python_agent/files/README.txt b/tools/puppet3/modules/python_agent/files/README.txt
index 04d5d6d..4bd05cd 100644
--- a/tools/puppet3/modules/python_agent/files/README.txt
+++ b/tools/puppet3/modules/python_agent/files/README.txt
@@ -7,6 +7,6 @@ This folder should have following:
eg:
if $mb_type = activemq, folder structure of this folder would be:
>$ls
->activemq apache-stratos-python-cartridge-agent-4.1.0.zip
+>activemq apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip
3. Under $mb_type folder, please add all the client jars, that should be copied to the agent's lib directory.
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/stratos-installer/README.md
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/README.md b/tools/stratos-installer/README.md
index 4e67187..68ea3e4 100644
--- a/tools/stratos-installer/README.md
+++ b/tools/stratos-installer/README.md
@@ -1,7 +1,7 @@
-Apache Stratos 4.1.0 Installer
+Apache Stratos 4.1.1 Installer
------------------------------
Stratos-Installer is a tool to install Stratos in Single JVM as well as in distributed setup.
Please refer the following Stratos Wiki page for detailed installation guide:
-https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Installation+Guide
+https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Installation+Guide
http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf
index 6378091..045052f 100644
--- a/tools/stratos-installer/conf/setup.conf
+++ b/tools/stratos-installer/conf/setup.conf
@@ -55,7 +55,7 @@ export mb_ip="127.0.0.1" # Machine ip on which mb run
export mb_port=61616 #default port which the message broker service runs
export stratos_extract_path=$stratos_path/"apache-stratos"
-export stratos_pack_zip_name="apache-stratos-4.1.0.zip"
+export stratos_pack_zip_name="apache-stratos-4.1.1-SNAPSHOT.zip"
export stratos_pack_zip=$stratos_packs/$stratos_pack_zip_name
export activemq_pack=$stratos_packs/"apache-activemq-5.9.1-bin.tar.gz"
[24/50] [abbrv] stratos git commit: removing listener
Posted by la...@apache.org.
removing listener
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3eb7d7c2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3eb7d7c2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3eb7d7c2
Branch: refs/heads/data-publisher-integration
Commit: 3eb7d7c25cef217c80dfce97de61646359f9711e
Parents: c7a5ffd
Author: reka <rt...@gmail.com>
Authored: Fri Aug 7 11:57:35 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Fri Aug 7 11:57:35 2015 +0530
----------------------------------------------------------------------
.../org/apache/stratos/integration/tests/TopologyHandler.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3eb7d7c2/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
index 846302b..ec63f84 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
@@ -390,8 +390,4 @@ public class TopologyHandler {
String path = getClass().getResource("/").getPath();
return StringUtils.removeEnd(path, File.separator);
}
-
- private void addEventListeners() {
- topologyEventReceiver.addEventListener(MemberInitializedEventListener );
- }
}
[43/50] [abbrv] stratos git commit: Removing unnecessary features,
artifacts and restructuring distribution artifacts
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/jndi.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/jndi.properties b/products/stratos/modules/distribution/src/main/conf/jndi.properties
index f5246ca..60b7f48 100644
--- a/products/stratos/modules/distribution/src/main/conf/jndi.properties
+++ b/products/stratos/modules/distribution/src/main/conf/jndi.properties
@@ -17,6 +17,6 @@
# under the License.
#
-java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
-connectionfactoryName=topicConnectionfactory
-connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://localhost:5677'&reconnect='true'
+connectionfactoryName=TopicConnectionFactory
+java.naming.provider.url=tcp://localhost:61616
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/mqtttopic.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/mqtttopic.properties b/products/stratos/modules/distribution/src/main/conf/mqtttopic.properties
new file mode 100644
index 0000000..823c1a9
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/mqtttopic.properties
@@ -0,0 +1,21 @@
+# 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.
+#
+
+mqtturl=tcp://localhost:1883
+clientID=stratos
+tempfilelocation=/tmp
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/registry.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/registry.xml b/products/stratos/modules/distribution/src/main/conf/registry.xml
new file mode 100755
index 0000000..a395610
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/registry.xml
@@ -0,0 +1,103 @@
+<?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.
+ -->
+<wso2registry>
+
+ <!--
+ For details on configuring different config & governance registries see;
+ http://wso2.org/library/tutorials/2010/04/sharing-registry-space-across-multiple-product-instances
+ -->
+
+ <currentDBConfig>wso2registry</currentDBConfig>
+ <readOnly>false</readOnly>
+ <enableCache>true</enableCache>
+ <registryRoot>/</registryRoot>
+
+ <dbConfig name="wso2registry">
+ <dataSource>jdbc/WSO2CarbonDB</dataSource>
+ </dbConfig>
+
+ <!--<handler class="org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler">
+ <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+ <property name="mediaType">application/vnd.apache.synapse</property>
+ </filter>
+ </handler>
+
+ <handler class="org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler">
+ <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+ <property name="mediaType">application/vnd.apache.esb</property>
+ </filter>
+ </handler>
+
+ <handler class="org.wso2.carbon.registry.extensions.handlers.Axis2RepositoryHandler">
+ <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+ <property name="mediaType">application/vnd.apache.axis2</property>
+ </filter>
+ </handler>
+
+ <handler class="org.wso2.carbon.registry.extensions.handlers.Axis2RepositoryHandler">
+ <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+ <property name="mediaType">application/vnd.apache.wsas</property>
+ </filter>
+ </handler>
+
+ <handler class="org.wso2.carbon.registry.extensions.handlers.WSDLMediaTypeHandler">
+ <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+ <property name="mediaType">application/wsdl+xml</property>
+ </filter>
+ </handler>
+
+ <handler class="org.wso2.carbon.registry.extensions.handlers.XSDMediaTypeHandler">
+ <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+ <property name="mediaType">application/x-xsd+xml</property>
+ </filter>
+ </handler> -->
+
+ <!--remoteInstance url="https://localhost:9443/registry">
+ <id>instanceid</id>
+ <username>username</username>
+ <password>password</password>
+ </remoteInstance-->
+
+ <!--remoteInstance url="https://localhost:9443/registry">
+ <id>instanceid</id>
+ <dbConfig>wso2registry</dbConfig>
+ <readOnly>false</readOnly>
+ <enableCache>true</enableCache>
+ <registryRoot>/</registryRoot>
+ </remoteInstance-->
+
+ <!--mount path="/_system/config" overwrite="true|false|virtual">
+ <instanceId>instanceid</instanceId>
+ <targetPath>/_system/nodes</targetPath>
+ </mount-->
+
+
+ <versionResourcesOnChange>false</versionResourcesOnChange>
+
+ <!-- NOTE: You can edit the options under "StaticConfiguration" only before the
+ startup. -->
+ <staticConfiguration>
+ <versioningProperties>true</versioningProperties>
+ <versioningComments>true</versioningComments>
+ <versioningTags>true</versioningTags>
+ <versioningRatings>true</versioningRatings>
+ </staticConfiguration>
+</wso2registry>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/sso-idp-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/sso-idp-config.xml b/products/stratos/modules/distribution/src/main/conf/sso-idp-config.xml
new file mode 100644
index 0000000..902c8fa
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/sso-idp-config.xml
@@ -0,0 +1,39 @@
+<!--
+ ~ 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.
+ -->
+<SSOIdentityProviderConfig>
+ <ServiceProviders>
+ <ServiceProvider>
+ <Issuer>console</Issuer>
+ <AssertionConsumerService>https://localhost:9443/console/controllers/acs.jag</AssertionConsumerService>
+ <UseFullyQualifiedUsernameInNameID>true</UseFullyQualifiedUsernameInNameID>
+ <SignResponse>true</SignResponse>
+ <SignAssertion>true</SignAssertion>
+ <EnableAttributeProfile>true</EnableAttributeProfile>
+ <IncludeAttributeByDefault>true</IncludeAttributeByDefault>
+ <Claims>
+ <Claim>http://wso2.org/claims/role</Claim>
+ </Claims>
+ <EnableAudienceRestriction>true</EnableAudienceRestriction>
+ <AudiencesList>
+ <Audience>https://localhost:9445/oauth2/token</Audience>
+ </AudiencesList>
+ <ConsumingServiceIndex>123456</ConsumingServiceIndex>
+ </ServiceProvider>
+ </ServiceProviders>
+</SSOIdentityProviderConfig>
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/tenant-mgt.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/tenant-mgt.xml b/products/stratos/modules/distribution/src/main/conf/tenant-mgt.xml
new file mode 100644
index 0000000..ddfe83a
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/tenant-mgt.xml
@@ -0,0 +1,42 @@
+<!--
+ ~ 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.
+ -->
+<TenantManagers>
+ <TenantManager class="org.wso2.carbon.user.core.tenant.JDBCTenantManager">
+ <Property name="MultiTenantRealmConfigBuilder">org.wso2.carbon.user.core.config.multitenancy.SimpleRealmConfigBuilder</Property>
+ </TenantManager>
+</TenantManagers>
+
+<!--If the product is using LDAP user store in MT mode, use following tenant manager.-->
+<!--TenantManager class="org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager">
+ <Property name="RootPartition">dc=wso2,dc=com</Property>
+ <Property name="OrganizationalObjectClass">organizationalUnit</Property>
+ <Property name="OrganizationalAttribute">ou</Property>
+ <Property name="OrganizationalSubContextObjectClass">organizationalUnit</Property>
+ <Property name="OrganizationalSubContextAttribute">ou</Property>
+</TenantManager-->
+<!--Following tenant manager is used by Identity Server (IS) as its default tenant manager.
+ IS will do token replacement when building the product. Therefore do not change the syntax.-->
+<!--TenantManager class="org.wso2.carbon.user.core.tenant.JDBCTenantManager">
+ <Property name="RootPartition">dc=wso2,dc=org</Property>
+ <Property name="OrganizationalObjectClass">organizationalUnit</Property>
+ <Property name="OrganizationalAttribute">ou</Property>
+ <Property name="OrganizationalSubContextObjectClass">organizationalUnit</Property>
+ <Property name="OrganizationalSubContextAttribute">ou</Property>
+</TenantManager-->
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/thrift-client-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/thrift-client-config.xml b/products/stratos/modules/distribution/src/main/conf/thrift-client-config.xml
new file mode 100644
index 0000000..5cacada
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/thrift-client-config.xml
@@ -0,0 +1,27 @@
+<?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.
+ -->
+
+<!-- Apache thrift client configuration for publishing statistics to WSO2 CEP -->
+<thriftClientConfiguration>
+ <username>admin</username>
+ <password>admin</password>
+ <ip>localhost</ip>
+ <port>7611</port>
+</thriftClientConfiguration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/user-mgt.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/user-mgt.xml b/products/stratos/modules/distribution/src/main/conf/user-mgt.xml
new file mode 100644
index 0000000..9bf1c88
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/user-mgt.xml
@@ -0,0 +1,343 @@
+<!--
+ ~ Copyright WSO2, Inc. (http://wso2.com)
+ ~
+ ~ Licensed 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.
+ -->
+
+<UserManager>
+ <Realm>
+ <Configuration>
+ <AddAdmin>true</AddAdmin>
+ <AdminRole>admin</AdminRole>
+ <AdminUser>
+ <UserName>admin</UserName>
+ <Password>admin</Password>
+ </AdminUser>
+ <EveryOneRoleName>everyone</EveryOneRoleName> <!-- By default users in this role sees the registry root -->
+ <Property name="dataSource">jdbc/WSO2CarbonDB</Property>
+ </Configuration>
+ <!-- Following is the default user store manager. This user store manager is based on embedded-apacheds LDAP. It reads/writes users and roles into the default apacheds LDAP user store. Descriptions about each of the following properties can be found in user management documentation of the respective product. In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
+ Note: Do not comment within UserStoreManager tags. Cause, specific tag names are used as tokens when building configurations for products. -->
+ <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
+ <Property name="TenantManager">org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager</Property>
+ <Property name="ConnectionURL">ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}</Property>
+ <Property name="ConnectionName">uid=admin,ou=system</Property>
+ <Property name="ConnectionPassword">admin</Property>
+ <Property name="Disabled">false</Property>
+ <Property name="passwordHashMethod">SHA</Property>
+ <Property name="UserNameListFilter">(objectClass=person)</Property>
+ <Property name="UserEntryObjectClass">wso2Person</Property>
+ <Property name="UserSearchBase">ou=Users,dc=wso2,dc=org</Property>
+ <Property name="UserNameSearchFilter">(&(objectClass=person)(uid=?))</Property>
+ <Property name="UserNameAttribute">uid</Property>
+ <Property name="PasswordJavaScriptRegEx">^[\S]{5,30}$</Property>
+ <Property name="UsernameJavaScriptRegEx">^[\S]{3,30}$</Property>
+ <Property name="UsernameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
+ <Property name="RolenameJavaScriptRegEx">^[\S]{3,30}$</Property>
+ <Property name="RolenameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
+ <Property name="ReadGroups">true</Property>
+ <Property name="WriteGroups">true</Property>
+ <Property name="EmptyRolesAllowed">true</Property>
+ <Property name="GroupSearchBase">ou=Groups,dc=wso2,dc=org</Property>
+ <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
+ <Property name="GroupEntryObjectClass">groupOfNames</Property>
+ <Property name="GroupNameSearchFilter">(&(objectClass=groupOfNames)(cn=?))</Property>
+ <Property name="GroupNameAttribute">cn</Property>
+ <Property name="SharedGroupNameAttribute">cn</Property>
+ <Property name="SharedGroupSearchBase">ou=SharedGroups,dc=wso2,dc=org</Property>
+ <Property name="SharedGroupEntryObjectClass">groupOfNames</Property>
+ <Property name="SharedGroupNameListFilter">(objectClass=groupOfNames)</Property>
+ <Property name="SharedGroupNameSearchFilter">(&(objectClass=groupOfNames)(cn=?))</Property>
+ <Property name="SharedTenantNameListFilter">(objectClass=organizationalUnit)</Property>
+ <Property name="SharedTenantNameAttribute">ou</Property>
+ <Property name="SharedTenantObjectClass">organizationalUnit</Property>
+ <Property name="MembershipAttribute">member</Property>
+ <Property name="UserRolesCacheEnabled">true</Property>
+ <Property name="UserDNPattern">uid={0},ou=Users,dc=wso2,dc=org</Property>
+ <Property name="MaxRoleNameListLength">100</Property>
+ <Property name="MaxUserNameListLength">100</Property>
+ <Property name="SCIMEnabled">false</Property>
+ </UserStoreManager-->
+
+ <!-- Following is the configuration for internal JDBC user store. This user store manager is based on JDBC. In case if application needs to manage passwords externally set property <Property name="PasswordsExternallyManaged">true</Property>. In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>. Furthermore properties, IsEmailUserName and DomainCalculation are readonly properties.
+ Note: Do not comment within UserStoreManager tags. Cause, specific tag names are used as tokens when building configurations for products. -->
+ <UserStoreManager class="org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager">
+ <Property name="TenantManager">org.wso2.carbon.user.core.tenant.JDBCTenantManager</Property>
+ <Property name="ReadOnly">false</Property>
+ <Property name="MaxUserNameListLength">100</Property>
+ <Property name="IsEmailUserName">false</Property>
+ <Property name="DomainCalculation">default</Property>
+ <Property name="PasswordDigest">SHA-256</Property>
+ <Property name="StoreSaltedPassword">true</Property>
+ <Property name="ReadGroups">true</Property>
+ <Property name="WriteGroups">true</Property>
+ <Property name="UserNameUniqueAcrossTenants">false</Property>
+ <Property name="PasswordJavaRegEx">^[\S]{5,30}$</Property>
+ <Property name="PasswordJavaScriptRegEx">^[\S]{5,30}$</Property>
+ <Property name="UsernameJavaRegEx">^[^~!#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
+ <Property name="UsernameJavaScriptRegEx">^[\S]{3,30}$</Property>
+ <Property name="RolenameJavaRegEx">^[^~!#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
+ <Property name="RolenameJavaScriptRegEx">^[\S]{3,30}$</Property>
+ <Property name="UserRolesCacheEnabled">true</Property>
+ <Property name="MaxRoleNameListLength">100</Property>
+ <Property name="MaxUserNameListLength">100</Property>
+ <Property name="SharedGroupEnabled">false</Property>
+ <Property name="SCIMEnabled">false</Property>
+ </UserStoreManager>
+
+ <!-- If product is using an external LDAP as the user store in READ ONLY mode, use following user manager.
+ In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
+ -->
+ <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadOnlyLDAPUserStoreManager">
+ <Property name="TenantManager">org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager</Property>
+ <Property name="ReadOnly">true</Property>
+ <Property name="Disabled">false</Property>
+ <Property name="MaxUserNameListLength">100</Property>
+ <Property name="ConnectionURL">ldap://localhost:10389</Property>
+ <Property name="ConnectionName">uid=admin,ou=system</Property>
+ <Property name="ConnectionPassword">admin</Property>
+ <Property name="passwordHashMethod">PLAIN_TEXT</Property>
+ <Property name="UserSearchBase">ou=system</Property>
+ <Property name="UserNameListFilter">(objectClass=person)</Property>
+ <Property name="UserNameSearchFilter">(&(objectClass=person)(uid=?))</Property>
+ <Property name="UserNameAttribute">uid</Property>
+ <Property name="ReadGroups">true</Property>
+ <Property name="GroupSearchBase">ou=system</Property>
+ <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
+ <Property name="GroupNameSearchFilter">(&(objectClass=groupOfNames)(cn=?))</Property>
+ <Property name="GroupNameAttribute">cn</Property>
+ <Property name="SharedGroupNameAttribute">cn</Property>
+ <Property name="SharedGroupSearchBase">ou=SharedGroups,dc=wso2,dc=org</Property>
+ <Property name="SharedGroupNameListFilter">(objectClass=groupOfNames)</Property>
+ <Property name="SharedTenantNameListFilter">(objectClass=organizationalUnit)</Property>
+ <Property name="SharedTenantNameAttribute">ou</Property>
+ <Property name="SharedTenantObjectClass">organizationalUnit</Property>
+ <Property name="MembershipAttribute">member</Property>
+ <Property name="UserRolesCacheEnabled">true</Property>
+ <Property name="ReplaceEscapeCharactersAtUserLogin">true</Property>
+ <Property name="MaxRoleNameListLength">100</Property>
+ <Property name="MaxUserNameListLength">100</Property>
+ <Property name="SCIMEnabled">false</Property>
+ </UserStoreManager-->
+
+ <!-- Active directory configuration is as follows.
+ In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
+ There are few special properties for "Active Directory".
+ They are :
+ 1.Referral - (comment out this property if this feature is not reuired) This enables LDAP referral support.
+ 2.BackLinksEnabled - (Do not comment, set to true or false) In some cases LDAP works with BackLinksEnabled. In which role is stored
+ at user level. Depending on this value we need to change the Search Base within code.
+ 3.isADLDSRole - (Do not comment) Set to true if connecting to an AD LDS instance else set to false.
+ -->
+ <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ActiveDirectoryUserStoreManager">
+ <Property name="TenantManager">org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager</Property>
+ <Property name="defaultRealmName">WSO2.ORG</Property>
+ <Property name="Disabled">false</Property>
+ <Property name="kdcEnabled">false</Property>
+ <Property name="ConnectionURL">ldaps://10.100.1.100:636</Property>
+ <Property name="ConnectionName">CN=admin,CN=Users,DC=WSO2,DC=Com</Property>
+ <Property name="ConnectionPassword">A1b2c3d4</Property>
+ <Property name="passwordHashMethod">PLAIN_TEXT</Property>
+ <Property name="UserSearchBase">CN=Users,DC=WSO2,DC=Com</Property>
+ <Property name="UserEntryObjectClass">user</Property>
+ <Property name="UserNameAttribute">cn</Property>
+ <Property name="isADLDSRole">false</Property>
+ <Property name="userAccountControl">512</Property>
+ <Property name="UserNameListFilter">(objectClass=user)</Property>
+ <Property name="UserNameSearchFilter">(&(objectClass=user)(cn=?))</Property>
+ <Property name="UsernameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
+ <Property name="UsernameJavaScriptRegEx">^[\S]{3,30}$</Property>
+ <Property name="PasswordJavaScriptRegEx">^[\S]{5,30}$</Property>
+ <Property name="RolenameJavaScriptRegEx">^[\S]{3,30}$</Property>
+ <Property name="RolenameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
+ <Property name="ReadGroups">true</Property>
+ <Property name="WriteGroups">true</Property>
+ <Property name="EmptyRolesAllowed">true</Property>
+ <Property name="GroupSearchBase">CN=Users,DC=WSO2,DC=Com</Property>
+ <Property name="GroupEntryObjectClass">group</Property>
+ <Property name="GroupNameAttribute">cn</Property>
+ <Property name="SharedGroupNameAttribute">cn</Property>
+ <Property name="SharedGroupSearchBase">ou=SharedGroups,dc=wso2,dc=org</Property>
+ <Property name="SharedGroupEntryObjectClass">groups</Property>
+ <Property name="SharedTenantNameListFilter">(object=organizationalUnit)</Property>
+ <Property name="SharedTenantNameAttribute">ou</Property>
+ <Property name="SharedTenantObjectClass">organizationalUnit</Property>
+ <Property name="MembershipAttribute">member</Property>
+ <Property name="GroupNameListFilter">(objectcategory=group)</Property>
+ <Property name="GroupNameSearchFilter">(&(objectClass=group)(cn=?))</Property>
+ <Property name="UserRolesCacheEnabled">true</Property>
+ <Property name="Referral">follow</Property>
+ <Property name="BackLinksEnabled">true</Property>
+ <Property name="MaxRoleNameListLength">100</Property>
+ <Property name="MaxUserNameListLength">100</Property>
+ <Property name="SCIMEnabled">false</Property>
+ </UserStoreManager-->
+
+ <!-- If product is using an external LDAP as the user store in read/write mode, use following user manager
+ In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
+ -->
+ <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
+ <Property name="TenantManager">org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager</Property>
+ <Property name="ConnectionURL">ldap://localhost:10389</Property>
+ <Property name="Disabled">false</Property>
+ <Property name="ConnectionName">uid=admin,ou=system</Property>
+ <Property name="ConnectionPassword">secret</Property>
+ <Property name="passwordHashMethod">PLAIN_TEXT</Property>
+ <Property name="UserNameListFilter">(objectClass=person)</Property>
+ <Property name="UserEntryObjectClass">inetOrgPerson</Property>
+ <Property name="UserSearchBase">ou=system</Property>
+ <Property name="UserNameSearchFilter">(&(objectClass=person)(uid=?))</Property>
+ <Property name="UserNameAttribute">uid</Property>
+ <Property name="UsernameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
+ <Property name="UsernameJavaScriptRegEx">^[\S]{3,30}$</Property>
+ <Property name="RolenameJavaScriptRegEx">^[\S]{3,30}$</Property>
+ <Property name="RolenameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
+ <Property name="PasswordJavaScriptRegEx">^[\S]{5,30}$</Property>
+ <Property name="ReadGroups">true</Property>
+ <Property name="WriteGroups">true</Property>
+ <Property name="EmptyRolesAllowed">false</Property>
+ <Property name="GroupSearchBase">ou=system</Property>
+ <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
+ <Property name="GroupEntryObjectClass">groupOfNames</Property>
+ <Property name="GroupNameSearchFilter">(&(objectClass=groupOfNames)(cn=?))</Property>
+ <Property name="GroupNameAttribute">cn</Property>
+ <Property name="SharedGroupNameAttribute">cn</Property>
+ <Property name="SharedGroupSearchBase">ou=SharedGroups,dc=wso2,dc=org</Property>
+ <Property name="SharedGroupEntryObjectClass">groupOfNames</Property>
+ <Property name="SharedGroupNameListFilter">(objectClass=groupOfNames)</Property>
+ <Property name="SharedGroupNameSearchFilter">(&(objectClass=groupOfNames)(cn=?))</Property>
+ <Property name="SharedTenantNameListFilter">(objectClass=organizationalUnit)</Property>
+ <Property name="SharedTenantNameAttribute">ou</Property>
+ <Property name="SharedTenantObjectClass">organizationalUnit</Property>
+ <Property name="MembershipAttribute">member</Property>
+ <Property name="UserRolesCacheEnabled">true</Property>
+ <Property name="ReplaceEscapeCharactersAtUserLogin">true</Property>
+ <Property name="MaxRoleNameListLength">100</Property>
+ <Property name="MaxUserNameListLength">100</Property>
+ <Property name="SCIMEnabled">false</Property>
+ </UserStoreManager-->
+
+ <!-- Following user manager is used by Identity Server (IS) as its default user manager.
+ IS will do token replacement when building the product. Therefore do not change the syntax.
+ If "kdcEnabled" parameter is true, IS will allow service principle management. Thus "ServicePasswordJavaRegEx", "ServiceNameJavaRegEx"
+ properties control the service name format and service password formats.
+ In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
+ -->
+ <!--ISUserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
+ <Property name="TenantManager">org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager</Property>
+ <Property name="defaultRealmName">WSO2.ORG</Property>
+ <Property name="kdcEnabled">false</Property>
+ <Property name="Disabled">false</Property>
+ <Property name="ConnectionURL">ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}</Property>
+ <Property name="ConnectionName">uid=admin,ou=system</Property>
+ <Property name="ConnectionPassword">admin</Property>
+ <Property name="passwordHashMethod">SHA</Property>
+ <Property name="UserNameListFilter">(objectClass=person)</Property>
+ <Property name="UserEntryObjectClass">identityPerson</Property>
+ <Property name="UserSearchBase">ou=Users,dc=wso2,dc=org</Property>
+ <Property name="UserNameSearchFilter">(&(objectClass=person)(uid=?))</Property>
+ <Property name="UserNameAttribute">uid</Property>
+ <Property name="PasswordJavaScriptRegEx">^[\S]{5,30}$</Property>
+ <Property name="ServicePasswordJavaRegEx">^[\\S]{5,30}$</Property>
+ <Property name="ServiceNameJavaRegEx">^[\\S]{2,30}/[\\S]{2,30}$</Property>
+ <Property name="UsernameJavaScriptRegEx">^[\S]{3,30}$</Property>
+ <Property name="UsernameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
+ <Property name="RolenameJavaScriptRegEx">^[\S]{3,30}$</Property>
+ <Property name="RolenameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
+ <Property name="ReadGroups">true</Property>
+ <Property name="WriteGroups">true</Property>
+ <Property name="EmptyRolesAllowed">true</Property>
+ <Property name="GroupSearchBase">ou=Groups,dc=wso2,dc=org</Property>
+ <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
+ <Property name="GroupEntryObjectClass">groupOfNames</Property>
+ <Property name="GroupNameSearchFilter">(&(objectClass=groupOfNames)(cn=?))</Property>
+ <Property name="GroupNameAttribute">cn</Property>
+ <Property name="SharedGroupNameAttribute">cn</Property>
+ <Property name="SharedGroupSearchBase">ou=SharedGroups,dc=wso2,dc=org</Property>
+ <Property name="SharedGroupEntryObjectClass">groupOfNames</Property>
+ <Property name="SharedGroupNameListFilter">(objectClass=groupOfNames)</Property>
+ <Property name="SharedGroupNameSearchFilter">(&(objectClass=groupOfNames)(cn=?))</Property>
+ <Property name="SharedTenantNameListFilter">(objectClass=organizationalUnit)</Property>
+ <Property name="SharedTenantNameAttribute">ou</Property>
+ <Property name="SharedTenantObjectClass">organizationalUnit</Property>
+ <Property name="MembershipAttribute">member</Property>
+ <Property name="UserRolesCacheEnabled">true</Property>
+ <Property name="UserDNPattern">uid={0},ou=Users,dc=wso2,dc=org</Property>
+ <Property name="RoleDNPattern">cn={0},ou=Groups,dc=wso2,dc=org</Property>
+ <Property name="SCIMEnabled">true</Property>
+ <Property name="MaxRoleNameListLength">100</Property>
+ <Property name="MaxUserNameListLength">100</Property>
+ </ISUserStoreManager-->
+
+ <!-- Following configuration is for the CassandraUserStoreManager. The CassandraUserStoreManager is capable of using a Cassandra
+ database as a user store. This user manager supports multiple credentials for authentication. Credential types can be defined
+ and configured in the following configuration. The CassandraUserStoreManager does not ships with the any of the WSO2 Carbon
+ Servers by default, therefor Cassandra user manager component needs to be installed to the Carbon Server befor using.
+
+ And if this CassandraUserStoreManager is used as the primary user store with multi tenants, it should also implement a
+ compatible TenantManager and set property <Property name="TenantManager">FULL_QUALIFIED_TENANT_MANAGER_CLASS_NAME</Property>.
+ -->
+ <!--UserStoreManager class="org.wso2.carbon.user.cassandra.CassandraUserStoreManager">
+ <Property name="Keyspace">User_KS3</Property>
+ <Property name="Host">localhost</Property>
+ <Property name="Port">9160</Property>
+ <Property name="PasswordDigest">SHA-256</Property>
+ <Property name="StoreSaltedPassword">true</Property>
+ <Property name="AuthenticateWithAnyCredential">true</Property>
+ <Property name="DomainName">multipleCredentialUserStoreDomain</Property>
+ <MultipleCredentials>
+ <Credential type="Default">org.wso2.carbon.user.cassandra.credentialtypes.EmailCredential</Credential>
+ <Credential type="Email">org.wso2.carbon.user.cassandra.credentialtypes.EmailCredential</Credential>
+ <Credential type="PhoneNumber">org.wso2.carbon.user.cassandra.credentialtypes.PhoneNumberCredential</Credential>
+ <Credential type="Device">org.wso2.carbon.user.cassandra.credentialtypes.DeviceCredential</Credential>
+ <Credential type="External">org.wso2.carbon.user.cassandra.credentialtypes.ExternalProviderCredential</Credential>
+ </MultipleCredentials>
+ </UserStoreManager-->
+
+ <AuthorizationManager
+ class="org.wso2.carbon.user.core.authorization.JDBCAuthorizationManager">
+ <Property name="AdminRoleManagementPermissions">/permission</Property>
+ <Property name="AuthorizationCacheEnabled">true</Property>
+ </AuthorizationManager>
+ </Realm>
+</UserManager>
+
+ <!--*******Description of some of the configuration properties used in user-mgt.xml*********************************
+
+ DomainName - This property must be used by all secondary user store managers in multiple user store configuration.
+ DomainName is a unique identifier given to the user store. Users must provide both the domain name and
+ username at log-in as "DomainName\Username"
+
+ UserRolesCacheEnabled - This is to indicate whether to cache role list of a user. By default it is set to true.
+ You may need to disable it if user-roles are changed by external means and need to reflect
+ those changes in the carbon product immediately.
+
+ ReplaceEscapeCharactersAtUserLogin - This is to configure whether escape characters in user name needs to be replaced at user login.
+ Currently the identified escape characters that needs to be replaced are '\' & '\\'
+
+ UserDNPattern - This property will be used when authenticating users. During authentication we do a bind. But if the user is login with
+ email address or some other property we need to first lookup LDAP and retreive DN for the user. This involves an additional step.
+ If UserDNPattern is specified the DN will be contructed using the pattern specified in this property. Performance of this is much better than looking
+ up DN and binding user.
+
+ RoleDNPattern - This property will be used when checking whether user has been assigned to a given role. Rather than searching the role in search base, by
+ using this property direct search can be done.
+
+ passwordHashMethod - This says how the password should be stored. Allowed values are as follows,
+ SHA - Uses SHA digest method
+ MD5 - Uses MD 5 digest method
+ PLAIN_TEXT - Plain text passwords
+ In addition to above this supports all digest methods supported by http://docs.oracle.com/javase/6/docs/api/java/security/MessageDigest.html.
+
+ DisplayNameAttribute - this is to have a dedicated LDAP attribute to display an entity(User/Role) in UI, in addition to the UserNameAttribute which is used for IS-UserStore interactions.
+ -->
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/logo.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/logo.gif
new file mode 100755
index 0000000..3b1e913
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/main.css
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/main.css b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/main.css
new file mode 100644
index 0000000..1271433
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/main.css
@@ -0,0 +1,253 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+/* ---------------- template styles ------------------------- */
+
+table#main-table td#header {
+ background-image: url( theme-header-region-bg.gif);
+}
+
+table#main-table td#menu-panel {
+ border-right: solid 0px #73559D;
+ background-image: url(theme-menu-panel-l-bg.gif);
+ background-position: left top;
+ background-repeat: no-repeat;
+ padding-left: 0;
+ background-color: #F4F4F4;
+}
+
+table#main-table td#menu-panel table#menu-table {
+ background-image:url("theme-menu-table-bg.gif");
+ background-position:left bottom;
+ background-repeat:no-repeat;
+}
+table#main-table td#menu-panel table#menu-table td {
+ padding-left: 6px;
+ padding-right:16px;
+}
+table#main-table td#menu-panel table#menu-table tbody tr td img {
+ height: 17px;
+}
+/* ---------------- header styles ------------------ */
+div#header-div {
+ background-image: url( theme-header-bg.gif);
+ height: 115px;
+}
+
+div#header-div div.left-logo {
+ background-image: url( logo.gif );
+ background-position: left center;
+ height: 80px;
+ margin-left:65px;
+ margin-top:0px;
+}
+
+div#header-div div.middle-ad {
+ float: left;
+ margin-top: 18px;
+ height: 55px;
+ width: 35%;
+ display: none;
+}
+
+div#header-div div.right-logo {
+ background-image:url("../../../../../../../../../carbon/admin/images/t-right-logo.gif");
+ background-position:right top;
+ background-repeat:no-repeat;
+ height:45px;
+ margin-right:20px;
+ line-height: 0px;
+ margin-top:10px;
+ padding-right:0px;
+ padding-top:5px;
+ color: #fff;
+ font-size: 0px;
+ width: 500px;
+}
+div#header-div div.header-links {
+ margin-top:0px;
+}
+div#header-div div.header-links div.right-links {
+ margin-right: 0px;
+ height: 35px;
+ padding-top: 0px;
+}
+div#header-div div.header-links div.right-links ul {
+ background-image:url("theme-right-links-bg.gif");
+ background-position:left top;
+ background-repeat:repeat-x;
+ padding-left: 25px;
+ padding-right: 15px;
+ padding-top: 6px;
+ padding-bottom: 7px;
+}
+/* ------------- menu styles ---------------------- */
+div#menu {
+}
+
+div#menu ul.main {
+}
+
+div#menu ul.main li {
+}
+
+div#menu ul.main li.normal {
+}
+
+div#menu ul.main li a.menu-home {
+ display:block !important;
+}
+
+div#menu ul.main li.menu-header {
+ background-image:url("theme-menu-header.gif");
+ background-position: top;
+ height: 28px;
+}
+
+div#menu ul.main li a.menu-default {
+}
+
+div#menu ul.main li a.menu-default:hover {
+ background-color: #EFECF5;
+ border-bottom: solid 1px #C2B7D8;
+ border-top: solid 1px #C2B7D8;
+ color: #00447C;
+}
+
+div#menu ul.sub {
+}
+
+/* -------------- child no-01 styles -------------- */
+
+div#menu ul.sub li.normal {
+
+}
+
+div#menu ul.sub li a.menu-default {
+}
+
+/* ----------- child no-01 (disabled) styles ------------------- */
+
+div#menu ul.sub li a.menu-disabled-link {
+ }
+
+ div#menu ul.sub li a.menu-disabled-link:hover {
+ }
+
+/* -------------- child no-02 styles -------------- */
+
+div#menu ul.sub li.normal ul.sub li a.menu-default {
+
+}
+
+/* -------------- child no-03 styles -------------- */
+
+div#menu ul.sub li.normal ul.sub li.normal ul.sub li a.menu-default {
+}
+
+/* ------------- footer styles -------------------- */
+
+
+div#footer-div div.footer-content {
+ background-image: url(../../../../../../../../../carbon/admin/images/powered.gif);
+ background-position: right center;
+ background-repeat: no-repeat;
+ margin-right: 10px;
+
+}
+
+/* ---- login styles ----- */
+
+
+/* --------------- table styles -------------------- */
+
+.tableOddRow{background-color: white;}
+.tableEvenRow{background-color: #EFECF5;}
+
+.button:hover{
+ border:solid 1px #8268A8;
+}
+
+/* =============================================================================================================== */
+
+
+
+.cornerExpand {
+ position: relative;
+ top: 3px;
+ left: -12px;
+ cursor: pointer;
+}
+
+.cornerCollapse {
+ position: relative;
+ top: 3px;
+ left: -12px;
+ cursor: pointer;
+}
+
+/* chanaka */
+
+.form-table td{
+ padding-bottom:5px !important;
+ padding-left:5px !important;
+ padding-top:5px !important;
+ padding-right:10px !important;
+}
+.form-table td div.indented{
+ padding-left:7px !important;
+ color:#595959 !important;
+}
+.form-table-left{
+width:100px;
+}
+
+.longTextField{
+width:270px;
+}
+.rowAlone{
+padding-top:10px;
+padding-bottom:10px;
+}
+.tabedBox{
+border:solid 1px #cccccc;
+margin-left:10px;
+padding:10px;
+margin-bottom:10px;
+}
+/* chanaka end */
+
+a.fact-selector-icon-link {
+ background-repeat: no-repeat;
+ background-position: left top;
+ padding-left: 20px;
+ line-height: 17px;
+ height: 17px;
+ float: left;
+ position: relative;
+ margin-left: 10px;
+ margin-top: 5px;
+ margin-bottom: 3px;
+ white-space: nowrap;
+}
+table#main-table td#middle-content {
+
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/powered-stratos.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/powered-stratos.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/powered-stratos.gif
new file mode 100755
index 0000000..6597d26
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/powered-stratos.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/right-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/right-logo.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/right-logo.gif
new file mode 100755
index 0000000..e6c3d13
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/right-logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-header-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-header-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-header-bg.gif
new file mode 100755
index 0000000..99add93
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-header-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-header-region-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-header-region-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-header-region-bg.gif
new file mode 100755
index 0000000..7cc3f52
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-header-region-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-menu-header.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-menu-header.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-menu-header.gif
new file mode 100755
index 0000000..84bb42e
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-menu-header.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-menu-panel-l-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-menu-panel-l-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-menu-panel-l-bg.gif
new file mode 100755
index 0000000..a6c268f
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-menu-panel-l-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-menu-table-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-menu-table-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-menu-table-bg.gif
new file mode 100755
index 0000000..213819a
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-menu-table-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-right-links-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-right-links-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-right-links-bg.gif
new file mode 100755
index 0000000..0a2e51a
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/admin/theme-right-links-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/thumb.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/thumb.png b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/thumb.png
new file mode 100755
index 0000000..7db90a6
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Dark/thumb.png differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/def-body-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/def-body-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/def-body-bg.gif
new file mode 100755
index 0000000..5db1464
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/def-body-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/def-header-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/def-header-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/def-header-bg.gif
new file mode 100755
index 0000000..758363d
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/def-header-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/def-header-region-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/def-header-region-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/def-header-region-bg.gif
new file mode 100755
index 0000000..935ee9e
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/def-header-region-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/logo.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/logo.gif
new file mode 100755
index 0000000..3b1e913
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/main.css
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/main.css b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/main.css
new file mode 100644
index 0000000..25f4dfe
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/main.css
@@ -0,0 +1,250 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+/* ---------------- template styles ------------------------- */
+body {
+ background-image: url( def-body-bg.gif);
+ background-position: left top;
+ background-repeat: repeat-x;
+}
+
+table#main-table td#header {
+ background-image: url( def-header-region-bg.gif);
+ background-position: right top;
+ background-repeat: no-repeat;
+}
+
+table#main-table td#menu-panel {
+ border-right: solid 0px #78BDE8;
+ padding-right: 10px;
+}
+
+table#main-table td#menu-panel table#menu-table {
+ background-image: none;
+ background-position:left bottom;
+ background-repeat:no-repeat;
+}
+table#main-table td#menu-panel table#menu-table {
+ background-image: none;
+ background-position:left bottom;
+ background-repeat:no-repeat;
+ border-right:1px solid #B6D8F2;
+ border-bottom:1px solid #B6D8F2;
+}
+table#main-table td#menu-panel table#menu-table tbody tr td img {
+ height: 17px;
+}
+/* ---------------- header styles ------------------ */
+div#header-div {
+ background-image: url( def-header-bg.gif);
+ height: 121px;
+}
+
+div#header-div div.left-logo {
+ background-image:url("logo.gif");
+ background-position:left center;
+ height:50px;
+ margin-left:50px;
+ margin-top:37px;
+}
+
+div#header-div div.middle-ad {
+ float: left;
+ margin-top: 18px;
+ height: 55px;
+ width: 35%;
+ display:none;
+}
+
+div#header-div div.right-logo {
+ background-image:url("../../../../../../../../../carbon/admin/images/t-right-logo.gif");
+ background-position:right top;
+ background-repeat:no-repeat;
+ color:#B6D8F2;
+ font-size:0;
+ height:45px;
+ line-height:0;
+ margin-right:20px;
+ margin-top:20px;
+ padding-right:0;
+ padding-top:5px;
+ width:500px;
+}
+div#header-div div.header-links {
+ margin-top: 8px;
+}
+div#header-div div.header-links div.right-links {
+ margin-right: 0px;
+ height: 20px;
+ padding-top: 0px;
+}
+div#header-div div.header-links div.right-links ul {
+ background-image: none;
+ background-position:left top;
+ background-repeat:repeat-x;
+ padding-left: 25px;
+ padding-right: 15px;
+ padding-top: 6px;
+ padding-bottom: 7px;
+}
+/* ------------- menu styles ---------------------- */
+div#menu {
+}
+
+div#menu ul.main {
+}
+
+div#menu ul.main li {
+}
+
+div#menu ul.main li.normal {
+}
+
+div#menu ul.main li a.menu-home {
+ display: block !important;
+}
+
+div#menu ul.main li.menu-header {
+ background-image:none;
+ background-position:center top;
+ border-top: 1px solid #CFE3F6;
+ border-bottom:1px solid #78BDE8;
+ height:25px;
+}
+
+div#menu ul.main li a.menu-default {
+}
+
+div#menu ul.main li a.menu-default:hover {
+ background-color: #DAF0FC;
+ border-bottom: solid 1px #72CDF4;
+ border-top: solid 1px #72CDF4;
+ color: #00447C;
+}
+
+div#menu ul.sub {
+}
+
+/* -------------- child no-01 styles -------------- */
+
+div#menu ul.sub li.normal {
+
+}
+
+div#menu ul.sub li a.menu-default {
+}
+
+/* ----------- child no-01 (disabled) styles ------------------- */
+
+div#menu ul.sub li a.menu-disabled-link {
+ }
+
+ div#menu ul.sub li a.menu-disabled-link:hover {
+ }
+
+/* -------------- child no-02 styles -------------- */
+
+div#menu ul.sub li.normal ul.sub li a.menu-default {
+
+}
+
+/* -------------- child no-03 styles -------------- */
+
+div#menu ul.sub li.normal ul.sub li.normal ul.sub li a.menu-default {
+}
+
+/* ------------- footer styles -------------------- */
+
+div#footer-div div.footer-content {
+ background-image: url(../../../../../../../../../carbon/admin/images/powered.gif);
+ background-position: right center;
+ background-repeat: no-repeat;
+ margin-right: 10px;
+}
+
+div#middle {
+ background-color: #fff;
+}
+
+/* ---- login styles ----- */
+
+
+/* --------------- table styles -------------------- */
+
+.tableOddRow{background-color: white;}
+.tableEvenRow{background-color: #EFECF5;}
+
+.button:hover{
+ border:solid 1px #8268A8;
+}
+
+/* =============================================================================================================== */
+
+
+
+.cornerExpand {
+ position: relative;
+ top: 3px;
+ left: -12px;
+ cursor: pointer;
+}
+
+.cornerCollapse {
+ position: relative;
+ top: 3px;
+ left: -12px;
+ cursor: pointer;
+}
+
+/* chanaka */
+
+.form-table td{
+ padding-bottom:5px !important;
+ padding-left:5px !important;
+ padding-top:5px !important;
+ padding-right:10px !important;
+}
+.form-table td div.indented{
+ padding-left:7px !important;
+ color:#595959 !important;
+}
+.form-table-left{
+width:100px;
+}
+
+.longTextField{
+width:270px;
+}
+.rowAlone{
+padding-top:10px;
+padding-bottom:10px;
+}
+.tabedBox{
+border:solid 1px #cccccc;
+margin-left:10px;
+padding:10px;
+margin-bottom:10px;
+}
+/* chanaka end */
+
+table#main-table td#middle-content {
+ background-color: #fff;
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/powered-stratos.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/powered-stratos.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/powered-stratos.gif
new file mode 100755
index 0000000..6597d26
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/powered-stratos.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/right-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/right-logo.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/right-logo.gif
new file mode 100755
index 0000000..f118904
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/admin/right-logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Default/thumb.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Default/thumb.png b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/thumb.png
new file mode 100755
index 0000000..46fc8e6
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Default/thumb.png differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/logo.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/logo.gif
new file mode 100755
index 0000000..3b1e913
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/main.css
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/main.css b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/main.css
new file mode 100644
index 0000000..7d8f94e
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/main.css
@@ -0,0 +1,250 @@
+/*
+ *
+ * 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.
+ *
+*/
+
+/* ---------------- template styles ------------------------- */
+
+table#main-table td#header {
+ background-image: url( theme-header-region-bg.gif);
+}
+
+table#main-table td#menu-panel {
+ border-right: solid 0px #73559D;
+ background-image: url(theme-menu-panel-l-bg.gif);
+ background-position: left top;
+ background-repeat: no-repeat;
+ padding-left: 0;
+ background-color: #F4F4F4;
+}
+
+table#main-table td#menu-panel table#menu-table {
+ background-image:url("theme-menu-table-bg.gif");
+ background-position:left bottom;
+ background-repeat:no-repeat;
+}
+table#main-table td#menu-panel table#menu-table td {
+ padding-left: 6px;
+ padding-right:16px;
+}
+table#main-table td#menu-panel table#menu-table tbody tr td img {
+ height: 17px;
+}
+/* ---------------- header styles ------------------ */
+div#header-div {
+ background-image: url( theme-header-bg.gif);
+ height: 103px;
+}
+
+div#header-div div.left-logo {
+ background-image: url( logo.gif );
+ background-position: left center;
+ height: 80px;
+ margin-left:65px;
+ margin-top:0px;
+}
+
+div#header-div div.middle-ad {
+ float: left;
+ margin-top: 18px;
+ height: 55px;
+ width: 35%;
+ display:none;
+}
+
+div#header-div div.right-logo {
+ background-image:url("../../../../../../../../../carbon/admin/images/t-right-logo.gif");
+ background-position:right top;
+ background-repeat:no-repeat;
+ height:45px;
+ margin-right:20px;
+ line-height: 0px;
+ margin-top:10px;
+ padding-right:0px;
+ padding-top:5px;
+ color: #fff;
+ font-size: 0px;
+ width:500px;
+}
+div#header-div div.header-links {
+ margin-top:-10px;
+}
+div#header-div div.header-links div.right-links {
+ margin-right: 0px;
+ height: 35px;
+ padding-top: 0px;
+}
+div#header-div div.header-links div.right-links ul {
+ background-position:left top;
+ background-repeat:repeat-x;
+ padding-left: 25px;
+ padding-right: 15px;
+ padding-top: 6px;
+ padding-bottom: 7px;
+}
+/* ------------- menu styles ---------------------- */
+div#menu {
+}
+
+div#menu ul.main {
+}
+
+div#menu ul.main li {
+}
+
+div#menu ul.main li.normal {
+}
+
+div#menu ul.main li a.menu-home {
+ display:block !important;
+}
+
+div#menu ul.main li.menu-header {
+ background-position: top;
+ height: 28px;
+}
+
+div#menu ul.main li a.menu-default {
+}
+
+div#menu ul.main li a.menu-default:hover {
+ background-color: #EFECF5;
+ border-bottom: solid 1px #C2B7D8;
+ border-top: solid 1px #C2B7D8;
+ color: #00447C;
+}
+
+div#menu ul.sub {
+}
+
+/* -------------- child no-01 styles -------------- */
+
+div#menu ul.sub li.normal {
+
+}
+
+div#menu ul.sub li a.menu-default {
+}
+
+/* ----------- child no-01 (disabled) styles ------------------- */
+
+div#menu ul.sub li a.menu-disabled-link {
+ }
+
+ div#menu ul.sub li a.menu-disabled-link:hover {
+ }
+
+/* -------------- child no-02 styles -------------- */
+
+div#menu ul.sub li.normal ul.sub li a.menu-default {
+
+}
+
+/* -------------- child no-03 styles -------------- */
+
+div#menu ul.sub li.normal ul.sub li.normal ul.sub li a.menu-default {
+}
+
+/* ------------- footer styles -------------------- */
+
+
+div#footer-div div.footer-content {
+ background-image: url(../../../../../../../../../carbon/admin/images/powered.gif);
+ background-position: right center;
+ background-repeat: no-repeat;
+ margin-right: 10px;
+}
+
+/* ---- login styles ----- */
+
+
+/* --------------- table styles -------------------- */
+
+.tableOddRow{background-color: white;}
+.tableEvenRow{background-color: #EFECF5;}
+
+.button:hover{
+ border:solid 1px #8268A8;
+}
+
+/* =============================================================================================================== */
+
+
+
+.cornerExpand {
+ position: relative;
+ top: 3px;
+ left: -12px;
+ cursor: pointer;
+}
+
+.cornerCollapse {
+ position: relative;
+ top: 3px;
+ left: -12px;
+ cursor: pointer;
+}
+
+/* chanaka */
+
+.form-table td{
+ padding-bottom:5px !important;
+ padding-left:5px !important;
+ padding-top:5px !important;
+ padding-right:10px !important;
+}
+.form-table td div.indented{
+ padding-left:7px !important;
+ color:#595959 !important;
+}
+.form-table-left{
+width:100px;
+}
+
+.longTextField{
+width:270px;
+}
+.rowAlone{
+padding-top:10px;
+padding-bottom:10px;
+}
+.tabedBox{
+border:solid 1px #cccccc;
+margin-left:10px;
+padding:10px;
+margin-bottom:10px;
+}
+/* chanaka end */
+
+a.fact-selector-icon-link {
+ background-repeat: no-repeat;
+ background-position: left top;
+ padding-left: 20px;
+ line-height: 17px;
+ height: 17px;
+ float: left;
+ position: relative;
+ margin-left: 10px;
+ margin-top: 5px;
+ margin-bottom: 3px;
+ white-space: nowrap;
+}
+table#main-table td#middle-content {
+
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/menu_header.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/menu_header.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/menu_header.gif
new file mode 100755
index 0000000..6887ec4
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/menu_header.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/powered-stratos.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/powered-stratos.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/powered-stratos.gif
new file mode 100755
index 0000000..6597d26
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/powered-stratos.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/right-links-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/right-links-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/right-links-bg.gif
new file mode 100755
index 0000000..ba9d5d0
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/right-links-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/right-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/right-logo.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/right-logo.gif
new file mode 100755
index 0000000..e6c3d13
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/right-logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-header-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-header-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-header-bg.gif
new file mode 100755
index 0000000..4d47044
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-header-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-header-region-b-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-header-region-b-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-header-region-b-bg.gif
new file mode 100755
index 0000000..463b157
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-header-region-b-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-header-region-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-header-region-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-header-region-bg.gif
new file mode 100755
index 0000000..57a2ec1
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-header-region-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-menu-panel-l-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-menu-panel-l-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-menu-panel-l-bg.gif
new file mode 100755
index 0000000..bafb43a
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-menu-panel-l-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-menu-table-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-menu-table-bg.gif b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-menu-table-bg.gif
new file mode 100755
index 0000000..9582772
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/admin/theme-menu-table-bg.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/allthemes/Light/thumb.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/allthemes/Light/thumb.png b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/thumb.png
new file mode 100755
index 0000000..6dba1ff
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/allthemes/Light/thumb.png differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/launch.ini
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/launch.ini b/products/stratos/modules/distribution/src/main/resources/launch.ini
deleted file mode 100644
index 53dbec5..0000000
--- a/products/stratos/modules/distribution/src/main/resources/launch.ini
+++ /dev/null
@@ -1,269 +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.
-#
-
-# Eclipse Runtime Configuration Overrides
-# These properties are loaded prior to starting the framework and can also be used to override System Properties
-# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework
-# "*" can be used together with @null to clear System Properties that match a prefix name.
-
-osgi.*=@null
-org.osgi.*=@null
-eclipse.*=@null
-
-osgi.parentClassloader=app
-osgi.contextClassLoaderParent=app
-
-# When osgi.clean is set to "true", any cached data used by the OSGi framework
-# will be wiped clean. This will clean the caches used to store bundle
-# dependency resolution and eclipse extension registry data. Using this
-# option will force OSGi framework to reinitialize these caches.
-# The following setting is put in place to get rid of the problems
-# faced when re-starting the system. Please note that, when this setting is
-# true, if you manually start a bundle, it would not be available when
-# you re-start the system. To avid this, copy the bundle jar to the plugins
-# folder, before you re-start the system.
-osgi.clean=true
-
-# Uncomment the following line to turn on Eclipse Equinox debugging.
-# You may also edit the osgi-debug.options file and fine tune the debugging
-# options to suite your needs.
-#osgi.debug=./repository/conf/osgi-debug.options
-
-# Following system property allows us to control the public JDK packages exported through the system bundle.
-org.osgi.framework.system.packages=javax.accessibility,\
-javax.lang.model.type, \
-javax.activity,\
-javax.crypto,\
-javax.crypto.interfaces,\
-javax.crypto.spec,\
-javax.imageio,\
-javax.imageio.event,\
-javax.imageio.metadata,\
-javax.imageio.plugins.bmp,\
-javax.imageio.plugins.jpeg,\
-javax.imageio.spi,\
-javax.imageio.stream,\
-javax.jms,\
-javax.management,\
-javax.management.loading,\
-javax.management.modelmbean,\
-javax.management.monitor,\
-javax.management.openmbean,\
-javax.management.relation,\
-javax.management.remote,\
-javax.management.remote.rmi,\
-javax.management.timer,\
-javax.naming,\
-javax.naming.directory,\
-javax.naming.event,\
-javax.naming.ldap,\
-javax.naming.spi,\
-javax.net,\
-javax.net.ssl,\
-javax.print,\
-javax.print.attribute,\
-javax.print.attribute.standard,\
-javax.print.event,\
-javax.rmi,\
-javax.rmi.CORBA,\
-javax.rmi.ssl,\
-javax.script,\
-javax.security.auth,\
-javax.security.auth.callback,\
-javax.security.auth.kerberos,\
-javax.security.auth.login,\
-javax.security.auth.spi,\
-javax.security.auth.x500,\
-javax.security.cert,\
-javax.security.sasl,\
-javax.sound.midi,\
-javax.sound.midi.spi,\
-javax.sound.sampled,\
-javax.sound.sampled.spi,\
-javax.sql,\
-javax.sql.rowset,\
-javax.sql.rowset.serial,\
-javax.sql.rowset.spi,\
-javax.swing,\
-javax.swing.border,\
-javax.swing.colorchooser,\
-javax.swing.event,\
-javax.swing.filechooser,\
-javax.swing.plaf,\
-javax.swing.plaf.basic,\
-javax.swing.plaf.metal,\
-javax.swing.plaf.multi,\
-javax.swing.plaf.synth,\
-javax.swing.table,\
-javax.swing.text,\
-javax.swing.text.html,\
-javax.swing.text.html.parser,\
-javax.swing.text.rtf,\
-javax.swing.tree,\
-javax.swing.undo,\
-javax.transaction,\
-javax.transaction.xa,\
-javax.xml.namespace,\
-javax.xml.parsers,\
-javax.xml.transform,\
-javax.xml.transform.stream,\
-javax.xml.transform.dom,\
-javax.xml.transform.sax,\
-javax.xml,\
-javax.xml.validation,\
-javax.xml.datatype,\
-javax.xml.xpath,\
-javax.activation,\
-com.sun.activation.registries,\
-com.sun.activation.viewers,\
-org.ietf.jgss,\
-org.omg.CORBA,\
-org.omg.CORBA_2_3,\
-org.omg.CORBA_2_3.portable,\
-org.omg.CORBA.DynAnyPackage,\
-org.omg.CORBA.ORBPackage,\
-org.omg.CORBA.portable,\
-org.omg.CORBA.TypeCodePackage,\
-org.omg.CosNaming,\
-org.omg.CosNaming.NamingContextExtPackage,\
-org.omg.CosNaming.NamingContextPackage,\
-org.omg.Dynamic,\
-org.omg.DynamicAny,\
-org.omg.DynamicAny.DynAnyFactoryPackage,\
-org.omg.DynamicAny.DynAnyPackage,\
-org.omg.IOP,\
-org.omg.IOP.CodecFactoryPackage,\
-org.omg.IOP.CodecPackage,\
-org.omg.Messaging,\
-org.omg.PortableInterceptor,\
-org.omg.PortableInterceptor.ORBInitInfoPackage,\
-org.omg.PortableServer,\
-org.omg.PortableServer.CurrentPackage,\
-org.omg.PortableServer.POAManagerPackage,\
-org.omg.PortableServer.POAPackage,\
-org.omg.PortableServer.portable,\
-org.omg.PortableServer.ServantLocatorPackage,\
-org.omg.SendingContext,\
-org.omg.stub.java.rmi,\
-org.w3c.dom,\
-org.w3c.dom.bootstrap,\
-org.w3c.dom.css,\
-org.w3c.dom.events,\
-org.w3c.dom.html,\
-org.w3c.dom.ls,\
-org.w3c.dom.ranges,\
-org.w3c.dom.stylesheets,\
-org.w3c.dom.traversal,\
-org.w3c.dom.views ,\
-org.xml.sax,\
-org.xml.sax.ext,\
-org.xml.sax.helpers,\
-org.apache.xerces.xpointer,\
-org.apache.xerces.xni.grammars,\
-org.apache.xerces.impl.xs.util,\
-org.apache.xerces.jaxp.validation,\
-org.apache.xerces.impl.dtd.models,\
-org.apache.xerces.impl.xpath,\
-org.apache.xerces.dom3.as,\
-org.apache.xerces.impl.dv.xs,\
-org.apache.xerces.util,\
-org.apache.xerces.impl.xs.identity,\
-org.apache.xerces.impl.xs.opti,\
-org.apache.xerces.jaxp,\
-org.apache.xerces.impl.dv,\
-org.apache.xerces.xs.datatypes,\
-org.apache.xerces.dom.events,\
-org.apache.xerces.impl.msg,\
-org.apache.xerces.xni,\
-org.apache.xerces.impl.xs,\
-org.apache.xerces.impl,\
-org.apache.xerces.impl.io,\
-org.apache.xerces.xinclude,\
-org.apache.xerces.jaxp.datatype,\
-org.apache.xerces.parsers,\
-org.apache.xerces.impl.dv.util,\
-org.apache.xerces.xni.parser,\
-org.apache.xerces.impl.xs.traversers,\
-org.apache.xerces.impl.dv.dtd,\
-org.apache.xerces.xs,\
-org.apache.xerces.impl.dtd,\
-org.apache.xerces.impl.validation,\
-org.apache.xerces.impl.xs.models,\
-org.apache.xerces.impl.xpath.regex,\
-org.apache.xml.serialize,\
-org.apache.xerces.dom,\
-org.apache.xalan,\
-org.apache.xalan.xslt,\
-org.apache.xalan.templates,\
-org.apache.xalan.xsltc,\
-org.apache.xalan.xsltc.cmdline,\
-org.apache.xalan.xsltc.cmdline.getopt,\
-org.apache.xalan.xsltc.trax,\
-org.apache.xalan.xsltc.dom,\
-org.apache.xalan.xsltc.runtime,\
-org.apache.xalan.xsltc.runtime.output,\
-org.apache.xalan.xsltc.util,\
-org.apache.xalan.xsltc.compiler,\
-org.apache.xalan.xsltc.compiler.util,\
-org.apache.xalan.serialize,\
-org.apache.xalan.client,\
-org.apache.xalan.res,\
-org.apache.xalan.transformer,\
-org.apache.xalan.extensions,\
-org.apache.xalan.lib,\
-org.apache.xalan.lib.sql,\
-org.apache.xalan.processor,\
-org.apache.xalan.trace,\
-org.apache.xml.dtm,\
-org.apache.xml.dtm.ref,\
-org.apache.xml.dtm.ref.sax2dtm,\
-org.apache.xml.dtm.ref.dom2dtm,\
-org.apache.xml.utils,\
-org.apache.xml.utils.res,\
-org.apache.xml.res,\
-org.apache.xml.serializer,\
-org.apache.xml.serializer.utils,\
-org.apache.xpath,\
-org.apache.xpath.domapi,\
-org.apache.xpath.objects,\
-org.apache.xpath.patterns,\
-org.apache.xpath.jaxp,\
-org.apache.xpath.res,\
-org.apache.xpath.operations,\
-org.apache.xpath.functions,\
-org.apache.xpath.axes,\
-org.apache.xpath.compiler,\
-org.apache.xml.resolver,\
-org.apache.xml.resolver.tools,\
-org.apache.xml.resolver.helpers,\
-org.apache.xml.resolver.readers,\
-org.apache.xml.resolver.etc,\
-org.apache.xml.resolver.apps,\
-javax.xml.ws,\
-javax.xml.bind,\
-javax.xml.bind.annotation,\
-javax.annotation,\
-javax.jws,\
-javax.jws.soap,\
-javax.xml.soap,\
-com.sun.xml.internal.messaging.saaj.soap.ver1_1,\
-com.sun.xml.internal.messaging.saaj.soap,\
-com.sun.tools.internal.ws.spi,\
-org.wso2.carbon.bootstrap
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/appserver-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/appserver-logo.gif b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/appserver-logo.gif
new file mode 100755
index 0000000..55e4751
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/appserver-logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/bam-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/bam-logo.gif b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/bam-logo.gif
new file mode 100755
index 0000000..f8b6a74
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/bam-logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/bps-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/bps-logo.gif b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/bps-logo.gif
new file mode 100755
index 0000000..5dd2171
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/bps-logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/brs-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/brs-logo.gif b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/brs-logo.gif
new file mode 100755
index 0000000..ccba887
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/brs-logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/csg-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/csg-logo.gif b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/csg-logo.gif
new file mode 100755
index 0000000..e69aaa6
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/csg-logo.gif differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/ds-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/ds-logo.gif b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/ds-logo.gif
new file mode 100755
index 0000000..f70a205
Binary files /dev/null and b/products/stratos/modules/distribution/src/main/resources/powerded-by-logos/ds-logo.gif differ