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"
