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/08/30 20:17:40 UTC
[47/50] [abbrv] stratos git commit: Preparing for next development
iteration
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/products/cartridge-agent/pom.xml
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/pom.xml b/products/cartridge-agent/pom.xml
index 2e15c7d..5ccf761 100644
--- a/products/cartridge-agent/pom.xml
+++ b/products/cartridge-agent/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-products-parent</artifactId>
- <version>4.1.2</version>
+ <version>4.2.0-SNAPSHOT</version>
</parent>
<artifactId>cartidge-agent</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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..7f1f732 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.2.0+Installation+Guide
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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 abb1516..e94108d 100755
--- a/products/load-balancer/modules/distribution/pom.xml
+++ b/products/load-balancer/modules/distribution/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos.load.balancer</groupId>
<artifactId>load-balancer-parent</artifactId>
- <version>4.1.2</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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 cdfa54a..321a036 100644
--- a/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
+++ b/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
@@ -19,6 +19,7 @@
product.name=Apache Stratos Load Balancer
product.key=LB
-hotdeployment=true
-hotupdate=false
-default.server.role=LoadBalancer
\ No newline at end of file
+product.version=4.2.0
+lb.version=2.0.5
+default.server.role=LoadBalancer
+bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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..3080f50 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.2.0.jar,
+org.apache.stratos.load.balancer.common_4.2.0.jar,
+org.apache.stratos.load.balancer_4.2.0.jar,
+org.apache.stratos.messaging_4.2.0.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/52f6245e/products/load-balancer/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/p2-profile-gen/pom.xml b/products/load-balancer/modules/p2-profile-gen/pom.xml
index 72e21a6..306d67f 100755
--- a/products/load-balancer/modules/p2-profile-gen/pom.xml
+++ b/products/load-balancer/modules/p2-profile-gen/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos.load.balancer</groupId>
<artifactId>load-balancer-parent</artifactId>
- <version>4.1.2</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/products/load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/pom.xml b/products/load-balancer/pom.xml
index 860344a..64b41e5 100755
--- a/products/load-balancer/pom.xml
+++ b/products/load-balancer/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.2</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/products/pom.xml
----------------------------------------------------------------------
diff --git a/products/pom.xml b/products/pom.xml
index 56baebd..f4057dc 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.2</version>
+ <version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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 10826e0..f41d891 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.2</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/products/python-cartridge-agent/pom.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/pom.xml b/products/python-cartridge-agent/pom.xml
index 16ba3b7..5e00c1c 100755
--- 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.2</version>
+ <version>4.2.0-SNAPSHOT</version>
</parent>
<artifactId>python-cartridge-agent-parent</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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..d1e02ee 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.2.0+Configuring+CLI+Tool
Help
==================================
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/products/stratos-cli/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-cli/modules/distribution/pom.xml b/products/stratos-cli/modules/distribution/pom.xml
index 790055c..5a967aa 100644
--- a/products/stratos-cli/modules/distribution/pom.xml
+++ b/products/stratos-cli/modules/distribution/pom.xml
@@ -23,8 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>apache-stratos-cli-parent</artifactId>
- <version>4.1.2</version>
- <relativePath>../../pom.xml</relativePath>
+ <version>4.2.0-SNAPSHOT</version>
</parent>
<artifactId>apache-stratos-cli</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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..a443b87 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.2.0.jar,
+org.apache.stratos.cli-4.2.0.jar,
+org.apache.stratos.cloud.controller.service.stub-4.2.0.jar,
+org.apache.stratos.common-4.2.0.jar,
+org.apache.stratos.manager-4.2.0.jar,
+org.apache.stratos.manager.service.stub-4.2.0.jar,
+org.apache.stratos.messaging-4.2.0.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/52f6245e/products/stratos-cli/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-cli/pom.xml b/products/stratos-cli/pom.xml
index 539ea6b..18accfe 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.2</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/products/stratos/modules/distribution/INSTALL.txt
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/INSTALL.txt b/products/stratos/modules/distribution/INSTALL.txt
index 1a254fb..4d16e3b 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.2.0+Installation+Guide
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/products/stratos/modules/distribution/README.txt
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/README.txt b/products/stratos/modules/distribution/README.txt
index 9b1571b..1691021 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.2.1+Architecture
Crypto Notice
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/products/stratos/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml
index 64867bb..1a4ea53 100755
--- a/products/stratos/modules/distribution/pom.xml
+++ b/products/stratos/modules/distribution/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos</artifactId>
- <version>4.1.2</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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 5131124..04684d5 100755
--- a/products/stratos/modules/distribution/src/assembly/filter.properties
+++ b/products/stratos/modules/distribution/src/assembly/filter.properties
@@ -19,6 +19,7 @@
product.name=Apache Stratos
product.key=STRATOS
+product.version=4.2.0
hotdeployment=true
hotupdate=false
default.server.role=Stratos
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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..5e549bf 100644
--- a/products/stratos/modules/distribution/src/main/license/LICENSE
+++ b/products/stratos/modules/distribution/src/main/license/LICENSE
@@ -357,21 +357,22 @@ 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.2.0.jar,
+org.apache.stratos.autoscaler_4.2.0.jar,
+org.apache.stratos.cloud.controller.service.stub_4.2.0.jar,
+org.apache.stratos.cloud.controller_4.2.0.jar,
+org.apache.stratos.common_4.2.0.jar,
+org.apache.stratos.custom.handlers_4.2.0.jar,
+org.apache.stratos.kubernetes.client_4.2.0.jar,
+org.apache.stratos.logging.view.ui_4.2.0.jar,
+org.apache.stratos.manager.service.stub_4.2.0.jar,
+org.apache.stratos.manager.service.stub_4.2.0.jar,
+org.apache.stratos.manager.styles_4.2.0.jar,
+org.apache.stratos.manager_4.2.0.jar,
+org.apache.stratos.messaging_4.2.0.jar,
+org.apache.stratos.metadata.client_4.2.0.jar,
+org.apache.stratos.mock.iaas.client_4.2.0.jar,
+org.apache.stratos.mock.iaas_4.2.0.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/52f6245e/products/stratos/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/pom.xml b/products/stratos/modules/integration/pom.xml
index 4d8d869..a3ae303 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.2</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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 ea3d8f9..83d333a 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
@@ -47,25 +47,15 @@ import static org.testng.Assert.assertNotNull;
*/
public class StratosTestServerManager extends TestServerManager {
private static final Log log = LogFactory.getLog(StratosTestServerManager.class);
- private static Properties integrationProperties;
- public static final String BASE_PATH = StratosTestServerManager.class.getResource("/").getPath();
- public static final String STRATOS_DISTRIBUTION_NAME = "distribution.path";
- public final static String PORT_OFFSET = "carbon.port.offset";
- public static final String ACTIVEMQ_BIND_ADDRESS = "activemq.bind.address";
- public static final String STRATOS_ENDPOINT = "stratos.endpoint";
- public static final String ADMIN_USERNAME = "stratos.admin.username";
- public static final String ADMIN_PASSWORD = "stratos.admin.password";
- public static final String MOCK_IAAS_XML_FILE = "mock-iaas.xml";
- public static final String SCALING_DROOL_FILE = "scaling.drl";
- public static final String JNDI_PROPERTIES_FILE = "jndi.properties";
- public static final String JMS_OUTPUT_ADAPTER_FILE = "JMSOutputAdaptor.xml";
-
- protected String distributionName;
- protected int portOffset;
- protected String adminUsername;
- protected String adminPassword;
- protected String stratosEndpoint;
- protected String activemqBindAddress;
+
+ private final static String CARBON_ZIP = SampleApplicationsTest.class.getResource("/").getPath() +
+ "/../../../distribution/target/apache-stratos-4.2.0-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";
+ private static final String SCALING_DROOL_FILE = "scaling.drl";
+ private static final String JNDI_PROPERTIES_FILE = "jndi.properties";
+ private static final String JMS_OUTPUT_ADAPTER_FILE = "JMSOutputAdaptor.xml";
protected RestClient restClient;
private BrokerService broker = new BrokerService();
private TestLogAppender testLogAppender = new TestLogAppender();
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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 3f4be61..1fce144 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.2</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/products/stratos/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/pom.xml b/products/stratos/pom.xml
index 5306ba6..406f737 100755
--- a/products/stratos/pom.xml
+++ b/products/stratos/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-products-parent</artifactId>
- <version>4.1.2</version>
+ <version>4.2.0-SNAPSHOT</version>
</parent>
<artifactId>stratos</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/samples/cartridges/kubernetes/esb.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/esb.json b/samples/cartridges/kubernetes/esb.json
index 75a7c21..0c145c1 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.2",
+ "imageId": "stratos/cartridge:4.2.0",
"networkInterfaces": [
{
"networkUuid": ""
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/samples/cartridges/kubernetes/php.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/php.json b/samples/cartridges/kubernetes/php.json
index 7c4aeae..6fa8399 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.2.0",
"networkInterfaces": [
],
"property": [
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/samples/cartridges/kubernetes/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/tomcat.json b/samples/cartridges/kubernetes/tomcat.json
index e50de25..b161e75 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.2.0",
"networkInterfaces": [
],
"property": [
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/samples/cartridges/kubernetes/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/tomcat1.json b/samples/cartridges/kubernetes/tomcat1.json
index a79b1a8..4942792 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.2",
+ "imageId": "stratos/cartridge:4.2.0",
"networkInterfaces": [
{
"networkUuid": ""
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/samples/cartridges/kubernetes/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/tomcat2.json b/samples/cartridges/kubernetes/tomcat2.json
index 8701122..dece175 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.2",
+ "imageId": "stratos/cartridge:4.2.0",
"networkInterfaces": [
{
"networkUuid": ""
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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 ce0413a..94a4a91 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.2</version>
+ <version>4.2.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.stratos.autoscaler.service.stub</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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 07c8d4c..55e7d3e 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
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-service-stubs-parent</artifactId>
- <version>4.1.2</version>
+ <version>4.2.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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 8e94747..768b5f0 100644
--- a/service-stubs/org.apache.stratos.manager.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.manager.service.stub/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-service-stubs-parent</artifactId>
- <version>4.1.2</version>
+ <version>4.2.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.stratos.manager.service.stub</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/service-stubs/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml
index f620b91..b3623ee 100644
--- a/service-stubs/pom.xml
+++ b/service-stubs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
- <version>4.1.2</version>
+ <version>4.2.0-SNAPSHOT</version>
</parent>
<artifactId>stratos-service-stubs-parent</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/tools/config-scripts/ec2/config.sh
----------------------------------------------------------------------
diff --git a/tools/config-scripts/ec2/config.sh b/tools/config-scripts/ec2/config.sh
index 7588777..21b43de 100755
--- a/tools/config-scripts/ec2/config.sh
+++ b/tools/config-scripts/ec2/config.sh
@@ -33,6 +33,7 @@ CP=`which cp`
MV=`which mv`
HOSTSFILE=/etc/hosts
+LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.2.0/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/52f6245e/tools/config-scripts/gce/config.sh
----------------------------------------------------------------------
diff --git a/tools/config-scripts/gce/config.sh b/tools/config-scripts/gce/config.sh
index 95eb6e0..c8b8ee2 100644
--- a/tools/config-scripts/gce/config.sh
+++ b/tools/config-scripts/gce/config.sh
@@ -36,6 +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.2.0/wso2carbon.lck
function valid_ip()
{
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/tools/config-scripts/openstack/config.sh
----------------------------------------------------------------------
diff --git a/tools/config-scripts/openstack/config.sh b/tools/config-scripts/openstack/config.sh
index 7588777..21b43de 100755
--- a/tools/config-scripts/openstack/config.sh
+++ b/tools/config-scripts/openstack/config.sh
@@ -33,6 +33,7 @@ CP=`which cp`
MV=`which mv`
HOSTSFILE=/etc/hosts
+LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.2.0/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/52f6245e/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..50bd112 100644
--- a/tools/docker-images/cartridge-docker-images/base-image/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/base-image/Dockerfile
@@ -49,13 +49,13 @@ RUN pip install yapsy
# -------------------------
WORKDIR /mnt/
-ADD packs/${PCA_DISTRIBUTION_NAME}.zip /mnt/${PCA_DISTRIBUTION_NAME}.zip
-RUN unzip -q /mnt/${PCA_DISTRIBUTION_NAME}.zip -d /mnt/
-RUN rm /mnt/${PCA_DISTRIBUTION_NAME}.zip
+ADD packs/apache-stratos-python-cartridge-agent-4.2.0-SNAPSHOT.zip /mnt/apache-stratos-python-cartridge-agent-4.2.0-SNAPSHOT.zip
+RUN unzip -q /mnt/apache-stratos-python-cartridge-agent-4.2.0-SNAPSHOT.zip -d /mnt/
+RUN rm /mnt/apache-stratos-python-cartridge-agent-4.2.0-SNAPSHOT.zip
-RUN mkdir -p /mnt/${PCA_DISTRIBUTION_NAME}/payload
+RUN mkdir -p /mnt/apache-stratos-python-cartridge-agent-4.2.0-SNAPSHOT/payload
-RUN chmod +x /mnt/${PCA_DISTRIBUTION_NAME}/extensions/bash/*
+RUN chmod +x /mnt/apache-stratos-python-cartridge-agent-4.2.0-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/52f6245e/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..18e8932 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.2.0-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/52f6245e/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..af6efa5 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.2.0-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.2.0 .
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.2.0 .
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.2.0 .
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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..93fdba3 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.2.0
MAINTAINER dev@stratos.apache.org
# ----------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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..fbc0996 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.2.0
MAINTAINER dev@stratos.apache.org
ENV JDK_VERSION 1.7.0_80
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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..03b69ad 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.2.0
MAINTAINER dev@stratos.apache.org
ENV JDK_VERSION 1.7.0_80
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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..0925a7b 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.2.0
MAINTAINER dev@stratos.apache.org
ENV DEBIAN_FRONTEND noninteractive
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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..1201a19 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.2.0
########
# Bind
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/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 c988d4d..7526a8d 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-<java-agent-version>.zip
+>activemq apache-stratos-python-cartridge-agent-4.2.0-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/52f6245e/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 0045c1c..d1306c3 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-<haproxy-version>.zip
+>activemq apache-stratos-haproxy-extension-4.2.0-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/52f6245e/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 90ce24e..3953149 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-<load-balancer-version>.zip
+>activemq apache-stratos-load-balancer-4.2.0-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/52f6245e/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 163193e..7526a8d 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-<python-agent-version>.zip
+>activemq apache-stratos-python-cartridge-agent-4.2.0-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/52f6245e/tools/stratos-installer/README.md
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/README.md b/tools/stratos-installer/README.md
index b20d146..ee39f98 100644
--- a/tools/stratos-installer/README.md
+++ b/tools/stratos-installer/README.md
@@ -1,8 +1,7 @@
-------------------------------
-Apache Stratos Installer
+Apache Stratos 4.2.0 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.2.0+Installation+Guide
http://git-wip-us.apache.org/repos/asf/stratos/blob/52f6245e/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf
index babab6e..e01185f 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.2.0-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"