You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/09/20 08:31:28 UTC
[04/17] stratos git commit: Update Stratos version references to 4.1.3
Update Stratos version references to 4.1.3
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bacf6210
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bacf6210
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bacf6210
Branch: refs/heads/stratos-4.1.x
Commit: bacf6210c72e6d71716a0f99610aceadd5b5bb1b
Parents: b4a40ff
Author: Akila Perera <ra...@gmail.com>
Authored: Sat Sep 19 23:00:52 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Sun Sep 20 00:19:41 2015 +0530
----------------------------------------------------------------------
README.md | 27 +++++++++------
.../src/test/python/README.md | 2 +-
.../haproxy-extension/src/main/license/LICENSE | 8 ++---
.../nginx-extension/src/main/license/LICENSE | 8 ++---
pom.xml | 2 +-
.../modules/distribution/INSTALL.txt | 2 +-
.../modules/distribution/README.txt | 2 +-
.../distribution/src/main/license/LICENSE | 14 ++++----
.../modules/distribution/INSTALL.txt | 2 +-
.../distribution/src/main/license/LICENSE | 8 ++---
.../stratos-cli/modules/distribution/README.txt | 2 +-
.../distribution/src/main/license/LICENSE | 14 ++++----
.../stratos/modules/distribution/INSTALL.txt | 2 +-
.../stratos/modules/distribution/README.txt | 2 +-
.../distribution/src/main/license/LICENSE | 30 ++++++++---------
samples/cartridges/kubernetes/esb.json | 35 --------------------
samples/cartridges/kubernetes/php.json | 2 +-
samples/cartridges/kubernetes/tomcat.json | 2 +-
samples/cartridges/kubernetes/tomcat1.json | 35 --------------------
samples/cartridges/kubernetes/tomcat2.json | 35 --------------------
samples/cartridges/kubernetes/tomcat3.json | 32 ------------------
samples/cartridges/kubernetes/wso2-is.json | 29 ----------------
.../base-image/Dockerfile | 2 +-
.../base-image/files/run | 2 +-
.../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/stratos-installer/README.md | 2 +-
tools/stratos-installer/conf/setup.conf | 2 +-
32 files changed, 80 insertions(+), 241 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 8550a91..b411954 100644
--- a/README.md
+++ b/README.md
@@ -46,13 +46,14 @@ 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.2+Autoscaler).
+see [Autoscaler](https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+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.2+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.3+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 +67,8 @@ 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.2+Cloud+Partitioning).
+availability and solves disaster recovery concerns. For more information, see [Cloud Partitioning]
+(https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+Cloud+Partitioning).
* Loosely coupled communication <br />
Stratos uses the Advanced Message Queuing Protocol (AMQP) messaging technology for communication among all its components.
@@ -85,7 +87,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.2+Cartridge).
+For more information on how Stratos uses cartridges, see [Cartridge](https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+Cartridge).
* Cartridge automation using Puppet <br />
Cartridges can be easily configured with the use of an orchestration layer such as Puppet.
@@ -94,7 +96,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.2+Load+Balancers).
+For more information, see [Load Balancers](https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+Load+Balancers).
* Artifact distribution coordination <br />
The Artifact Distribution Coordinator is responsible for the distribution of artifacts. Artifacts can be uploaded
@@ -103,24 +105,26 @@ 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.2+Artifact+Distribution+Coordinator).
+For more information, see [Artifact Distribution Coordinator]
+(https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+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.2+Stratos+Manager).
+For more information, see [Stratos Manager](https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+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.2+Stratos+API+Reference).
+For more information, see the [Stratos API Reference Guide]
+(https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+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.2+CLI+Tool) and the
-[CLI Guide](https://cwiki.apache.org/confluence/display/STRATOS/4.1.2+CLI+Guide).
+For more information, see the [CLI Tool](https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+CLI+Tool) and the
+[CLI Guide](https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+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 +133,8 @@ 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.2+Persistence+Volume+Mapping).
+For more information, see [Persistence Volume Mapping]
+(https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+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/bacf6210/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 da73cb6..e7f56af 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.2.jar
+export CLI_JAR=~/stratos/components/org.apache.stratos.cli/target/org.apache.stratos.cli-4.1.3.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/bacf6210/extensions/load-balancer/modules/haproxy-extension/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/modules/haproxy-extension/src/main/license/LICENSE b/extensions/load-balancer/modules/haproxy-extension/src/main/license/LICENSE
index 60e7f41..1e2307d 100644
--- a/extensions/load-balancer/modules/haproxy-extension/src/main/license/LICENSE
+++ b/extensions/load-balancer/modules/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.2.jar
-org.apache.stratos.load.balancer.common-4.1.2.jar
-org.apache.stratos.load.balancer.extension.api-4.1.2.jar
-org.apache.stratos.messaging-4.1.2.jar
+org.apache.stratos.common-4.1.3.jar
+org.apache.stratos.load.balancer.common-4.1.3.jar
+org.apache.stratos.load.balancer.extension.api-4.1.3.jar
+org.apache.stratos.messaging-4.1.3.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/bacf6210/extensions/load-balancer/modules/nginx-extension/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/modules/nginx-extension/src/main/license/LICENSE b/extensions/load-balancer/modules/nginx-extension/src/main/license/LICENSE
index 60e7f41..1e2307d 100644
--- a/extensions/load-balancer/modules/nginx-extension/src/main/license/LICENSE
+++ b/extensions/load-balancer/modules/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.2.jar
-org.apache.stratos.load.balancer.common-4.1.2.jar
-org.apache.stratos.load.balancer.extension.api-4.1.2.jar
-org.apache.stratos.messaging-4.1.2.jar
+org.apache.stratos.common-4.1.3.jar
+org.apache.stratos.load.balancer.common-4.1.3.jar
+org.apache.stratos.load.balancer.extension.api-4.1.3.jar
+org.apache.stratos.messaging-4.1.3.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/bacf6210/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4f937bd..36da476 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,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.2</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/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 6229354..2457f14 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.2+Installation+Guide
\ No newline at end of file
+https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+Installation+Guide
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/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 e9ec1bf..8d0da21 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.2+Cartridge+Agent
+https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+Cartridge+Agent
Thank you for using Apache Stratos!
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/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 43644d8..cf0f6d0 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.2.jar,
+apache-stratos-cartridge-agent-4.1.3.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.2.jar
-org.apache.stratos.common-4.1.2.jar
-org.apache.stratos.messaging-4.1.2.jar
-org.apache.stratos.autoscaler.service.stub-4.1.2.jar
-org.apache.stratos.cloud.controller.service.stub-4.1.2.jar
-org.apache.stratos.manager.service.stub-4.1.2.jar
+org.apache.stratos.cartridge.agent-4.1.3.jar
+org.apache.stratos.common-4.1.3.jar
+org.apache.stratos.messaging-4.1.3.jar
+org.apache.stratos.autoscaler.service.stub-4.1.3.jar
+org.apache.stratos.cloud.controller.service.stub-4.1.3.jar
+org.apache.stratos.manager.service.stub-4.1.3.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/bacf6210/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 fd1cdcc..c62e1f7 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.2+Installation+Guide
+https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+Installation+Guide
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/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 12d2763..7259d6f 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.2.jar,
-org.apache.stratos.load.balancer.common_4.1.2.jar,
-org.apache.stratos.load.balancer_4.1.2.jar,
-org.apache.stratos.messaging_4.1.2.jar,
+org.apache.stratos.common_4.1.3.jar,
+org.apache.stratos.load.balancer.common_4.1.3.jar,
+org.apache.stratos.load.balancer_4.1.3.jar,
+org.apache.stratos.messaging_4.1.3.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/bacf6210/products/stratos-cli/modules/distribution/README.txt
----------------------------------------------------------------------
diff --git a/products/stratos-cli/modules/distribution/README.txt b/products/stratos-cli/modules/distribution/README.txt
index 42044ed..b8cbbc9 100755
--- a/products/stratos-cli/modules/distribution/README.txt
+++ b/products/stratos-cli/modules/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.2+Configuring+CLI+Tool
+Configuration guide can be found at https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+Configuring+CLI+Tool
Help
==================================
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/products/stratos-cli/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/stratos-cli/modules/distribution/src/main/license/LICENSE b/products/stratos-cli/modules/distribution/src/main/license/LICENSE
index fa362b0..893fc38 100644
--- a/products/stratos-cli/modules/distribution/src/main/license/LICENSE
+++ b/products/stratos-cli/modules/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.2.jar,
-org.apache.stratos.cli-4.1.2.jar,
-org.apache.stratos.cloud.controller.service.stub-4.1.2.jar,
-org.apache.stratos.common-4.1.2.jar,
-org.apache.stratos.manager-4.1.2.jar,
-org.apache.stratos.manager.service.stub-4.1.2.jar,
-org.apache.stratos.messaging-4.1.2.jar,
+org.apache.stratos.autoscaler.service.stub-4.1.3.jar,
+org.apache.stratos.cli-4.1.3.jar,
+org.apache.stratos.cloud.controller.service.stub-4.1.3.jar,
+org.apache.stratos.common-4.1.3.jar,
+org.apache.stratos.manager-4.1.3.jar,
+org.apache.stratos.manager.service.stub-4.1.3.jar,
+org.apache.stratos.messaging-4.1.3.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/bacf6210/products/stratos/modules/distribution/INSTALL.txt
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/INSTALL.txt b/products/stratos/modules/distribution/INSTALL.txt
index 1a254fb..63bf6c7 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.2+Installation+Guide
\ No newline at end of file
+https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+Installation+Guide
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/products/stratos/modules/distribution/README.txt
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/README.txt b/products/stratos/modules/distribution/README.txt
index 9b1571b..6c3a5a8 100755
--- a/products/stratos/modules/distribution/README.txt
+++ b/products/stratos/modules/distribution/README.txt
@@ -51,7 +51,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.2+Architecture
+https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+Architecture
Crypto Notice
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/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 16a7a7a..39ef46f 100644
--- a/products/stratos/modules/distribution/src/main/license/LICENSE
+++ b/products/stratos/modules/distribution/src/main/license/LICENSE
@@ -357,21 +357,21 @@ 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.2.jar,
-org.apache.stratos.autoscaler_4.1.2.jar,
-org.apache.stratos.cloud.controller.service.stub_4.1.2.jar,
-org.apache.stratos.cloud.controller_4.1.2.jar,
-org.apache.stratos.common_4.1.2.jar,
-org.apache.stratos.custom.handlers_4.1.2.jar,
-org.apache.stratos.kubernetes.client_4.1.2.jar,
-org.apache.stratos.manager.service.stub_4.1.2.jar,
-org.apache.stratos.manager.service.stub_4.1.2.jar,
-org.apache.stratos.manager.styles_4.1.2.jar,
-org.apache.stratos.manager_4.1.2.jar,
-org.apache.stratos.messaging_4.1.2.jar,
-org.apache.stratos.metadata.client_4.1.2.jar,
-org.apache.stratos.mock.iaas.client_4.1.2.jar,
-org.apache.stratos.mock.iaas_4.1.2.jar,
+org.apache.stratos.autoscaler.service.stub_4.1.3.jar,
+org.apache.stratos.autoscaler_4.1.3.jar,
+org.apache.stratos.cloud.controller.service.stub_4.1.3.jar,
+org.apache.stratos.cloud.controller_4.1.3.jar,
+org.apache.stratos.common_4.1.3.jar,
+org.apache.stratos.custom.handlers_4.1.3.jar,
+org.apache.stratos.kubernetes.client_4.1.3.jar,
+org.apache.stratos.manager.service.stub_4.1.3.jar,
+org.apache.stratos.manager.service.stub_4.1.3.jar,
+org.apache.stratos.manager.styles_4.1.3.jar,
+org.apache.stratos.manager_4.1.3.jar,
+org.apache.stratos.messaging_4.1.3.jar,
+org.apache.stratos.metadata.client_4.1.3.jar,
+org.apache.stratos.mock.iaas.client_4.1.3.jar,
+org.apache.stratos.mock.iaas_4.1.3.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/bacf6210/samples/cartridges/kubernetes/esb.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/esb.json b/samples/cartridges/kubernetes/esb.json
deleted file mode 100755
index 75a7c21..0000000
--- a/samples/cartridges/kubernetes/esb.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "type": "esb",
- "provider": "wso2",
- "category": "framework",
- "host": "esb.stratos.org",
- "displayName": "esb",
- "description": "esb Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280",
- "kubernetesPortType":"NodePort"
- }
- ],
- "deployment": {
- "baseDir": "/var/www"
- },
- "iaasProvider": [
- {
- "type": "kubernetes",
- "imageId": "stratos/cartridge:4.1.2",
- "networkInterfaces": [
- {
- "networkUuid": ""
- }
- ],
- "property": [
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/samples/cartridges/kubernetes/php.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/php.json b/samples/cartridges/kubernetes/php.json
index 7c4aeae..aa8a9ee 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.2",
+ "imageId": "stratos/php:4.1.3",
"networkInterfaces": [
],
"property": [
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/samples/cartridges/kubernetes/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/tomcat.json b/samples/cartridges/kubernetes/tomcat.json
index e50de25..1bd3cbf 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.2",
+ "imageId": "stratos/tomcat:4.1.3",
"networkInterfaces": [
],
"property": [
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/samples/cartridges/kubernetes/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/tomcat1.json b/samples/cartridges/kubernetes/tomcat1.json
deleted file mode 100755
index a79b1a8..0000000
--- a/samples/cartridges/kubernetes/tomcat1.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "type": "tomcat1",
- "provider": "apache",
- "category": "framework",
- "host": "tomcat1.stratos.org",
- "displayName": "tomcat1",
- "description": "tomcat1 Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280",
- "kubernetesPortType":"NodePort"
- }
- ],
- "deployment": {
- "baseDir": "/var/www"
- },
- "iaasProvider": [
- {
- "type": "kubernetes",
- "imageId": "stratos/cartridge:4.1.2",
- "networkInterfaces": [
- {
- "networkUuid": ""
- }
- ],
- "property": [
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/samples/cartridges/kubernetes/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/tomcat2.json b/samples/cartridges/kubernetes/tomcat2.json
deleted file mode 100755
index 8701122..0000000
--- a/samples/cartridges/kubernetes/tomcat2.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "type": "tomcat2",
- "provider": "apache",
- "category": "framework",
- "host": "tomcat2.tomcat2.stratos.org",
- "displayName": "tomcat2",
- "description": "tomcat2 Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280",
- "kubernetesPortType":"NodePort"
- }
- ],
- "deployment": {
- "baseDir": "/var/www"
- },
- "iaasProvider": [
- {
- "type": "kubernetes",
- "imageId": "stratos/cartridge:4.1.2",
- "networkInterfaces": [
- {
- "networkUuid": ""
- }
- ],
- "property": [
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/samples/cartridges/kubernetes/tomcat3.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/tomcat3.json b/samples/cartridges/kubernetes/tomcat3.json
deleted file mode 100755
index 6562183..0000000
--- a/samples/cartridges/kubernetes/tomcat3.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "type": "tomcat3",
- "provider": "apache",
- "host": "tomcat.stratos.org",
- "category": "framework",
- "displayName": "Tomcat 7",
- "description": "Tomcat 7 Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "tomcat-http",
- "protocol": "http",
- "port": "8080",
- "proxyPort": "8280",
- "kubernetesPortType":"NodePort"
- }
- ],
- "deployment": {
- "baseDir": "/opt/tomcat/webapps"
- },
- "iaasProvider": [
- {
- "type": "kubernetes",
- "imageId": "stratos/tomcat:7.0.5-saml-sso",
- "networkInterfaces": [
- ],
- "property": [
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/samples/cartridges/kubernetes/wso2-is.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/wso2-is.json b/samples/cartridges/kubernetes/wso2-is.json
deleted file mode 100644
index 41c8714..0000000
--- a/samples/cartridges/kubernetes/wso2-is.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "type": "wso2is",
- "provider": "wso2",
- "host": "wso2is.stratos.org",
- "category": "framework",
- "displayName": "WSO2 IS 5.0.0",
- "description": "WSO2 IS 5.0.0 Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "mgt-console",
- "protocol": "https",
- "port": "9443",
- "proxyPort": "8443",
- "kubernetesPortType":"NodePort"
- }
- ],
- "iaasProvider": [
- {
- "type": "kubernetes",
- "imageId": "stratos/wso2is:5.0.0-sp1-saml-sso",
- "networkInterfaces": [
- ],
- "property": [
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/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 7076fae..c21a049 100644
--- a/tools/docker-images/cartridge-docker-images/base-image/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/base-image/Dockerfile
@@ -22,7 +22,7 @@
FROM debian:7.8
MAINTAINER dev@stratos.apache.org
-ENV PCA_DISTRIBUTION_NAME apache-stratos-python-cartridge-agent-4.1.2
+ENV PCA_DISTRIBUTION_NAME apache-stratos-python-cartridge-agent-4.1.3-SNAPSHOT
# ------------------
# Setup ssh server
# ------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/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 96fd23f..9443a40 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.2"
+export STRATOS_VERSION="4.1.3-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/bacf6210/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 6c809ad..b926169 100755
--- a/tools/docker-images/cartridge-docker-images/build.sh
+++ b/tools/docker-images/cartridge-docker-images/build.sh
@@ -26,17 +26,17 @@ 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.2.zip ${script_path}/base-image/packs/
+cp -vf target/apache-stratos-python-cartridge-agent-4.1.3-SNAPSHOT.zip ${script_path}/base-image/packs/
popd
pushd ${script_path}/base-image/
echo "Building base Docker image..."
-sudo docker build -t stratos/base-image:4.1.2 .
+sudo docker build -t stratos/base-image:4.1.3 .
pushd ${script_path}/service-images/php
echo "Building PHP Docker image..."
-sudo docker build -t stratos/php:4.1.2 .
+sudo docker build -t stratos/php:4.1.3 .
pushd ${script_path}/service-images/tomcat
echo "Building Tomcat Docker image..."
-sudo docker build -t stratos/tomcat:4.1.2 .
+sudo docker build -t stratos/tomcat:4.1.3 .
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/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 3795e9c..c2d5e37 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.2
+FROM stratos/base-image:4.1.3
MAINTAINER dev@stratos.apache.org
# ----------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/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 5d547f8..6bdb9cb 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.2
+FROM stratos/base-image:4.1.3
MAINTAINER dev@stratos.apache.org
ENV JDK_VERSION 1.7.0_80
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/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 fd47a81..ef7d887 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.2
+FROM stratos/base-image:4.1.3
MAINTAINER dev@stratos.apache.org
ENV JDK_VERSION 1.7.0_80
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/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 08ee45c..97a2475 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.2
+FROM stratos/base-image:4.1.3
MAINTAINER dev@stratos.apache.org
ENV DEBIAN_FRONTEND noninteractive
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/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 8a3921d..35becee 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.2
+export STRATOS_VERSION=4.1.3-SNAPSHOT
########
# Bind
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/tools/stratos-installer/README.md
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/README.md b/tools/stratos-installer/README.md
index b20d146..910a997 100644
--- a/tools/stratos-installer/README.md
+++ b/tools/stratos-installer/README.md
@@ -5,4 +5,4 @@ Apache Stratos 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.2+Installation+Guide
+https://cwiki.apache.org/confluence/display/STRATOS/4.1.3+Installation+Guide
http://git-wip-us.apache.org/repos/asf/stratos/blob/bacf6210/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf
index babab6e..41dc86e 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.2.zip"
+export stratos_pack_zip_name="apache-stratos-4.1.3-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"