Repository: stratos Updated Branches: refs/heads/master 459234467 -> 0fd41840f
Updating stratos version 4.1.0-SNAPSHOT to 4.1.0 Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0fd41840 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0fd41840 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0fd41840 Branch: refs/heads/master Commit: 0fd41840fb04d92ba921bf58c59c2c3fbad0c561 Parents: 4592344 Author: Imesh Gunaratne <[email protected]> Authored: Tue Jul 7 12:54:47 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Jul 7 12:54:47 2015 +0530 ---------------------------------------------------------------------- .../cartridge/agent/test/JavaCartridgeAgentTest.java | 4 ++-- .../org.apache.stratos.cli/src/test/python/README.md | 2 +- .../modules/distribution/src/main/license/LICENSE | 14 +++++++------- .../stratos-cli/distribution/src/main/license/LICENSE | 14 +++++++------- .../integration/tests/StratosTestServerManager.java | 2 +- .../cartridge-docker-images/base-image/Dockerfile | 10 +++++----- .../cartridge-docker-images/base-image/files/run | 2 +- tools/docker-images/cartridge-docker-images/build.sh | 2 +- .../stratos-docker-images/run-example.sh | 2 +- tools/puppet3/modules/agent/files/README.txt | 2 +- tools/puppet3/modules/python_agent/manifests/init.pp | 2 +- tools/stratos-installer/conf/setup.conf | 2 +- 12 files changed, 29 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0fd41840/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java index 3f0e73e..27db6cc 100644 --- a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java +++ b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java @@ -77,7 +77,7 @@ public class JavaCartridgeAgentTest { private static final String PARTITION_ID = "partition-1"; private static final String TENANT_ID = "-1234"; private static final String SERVICE_NAME = "php"; - public static final String AGENT_NAME = "apache-stratos-cartridge-agent-4.1.0-SNAPSHOT"; + public static final String AGENT_NAME = "apache-stratos-cartridge-agent-4.1.0"; private static HashMap<String, Executor> executorList; private static ArrayList<ServerSocket> serverSocketList; private final ArtifactUpdatedEvent artifactUpdatedEvent; @@ -249,7 +249,7 @@ public class JavaCartridgeAgentTest { } log.info("Copying agent jar"); - String agentJar = "org.apache.stratos.cartridge.agent-4.1.0-SNAPSHOT.jar"; + String agentJar = "org.apache.stratos.cartridge.agent-4.1.0.jar"; String agentJarSource = getResourcesFolderPath() + "/../" + agentJar; String agentJarDest = agentHome.getCanonicalPath() + "/lib/" + agentJar; FileUtils.copyFile(new File(agentJarSource), new File(agentJarDest)); http://git-wip-us.apache.org/repos/asf/stratos/blob/0fd41840/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 878ad1e..57cbfbb 100644 --- a/components/org.apache.stratos.cli/src/test/python/README.md +++ b/components/org.apache.stratos.cli/src/test/python/README.md @@ -18,7 +18,7 @@ Set the environment variables CLI_JAR, PYTHONPATH and WIREMOCK_JAR, WIREMOCK_HTT ``` # the stratos CLI_JAR -export CLI_JAR=~/stratos/components/org.apache.stratos.cli/target/org.apache.stratos.cli-4.1.0-SNAPSHOT.jar +export CLI_JAR=~/stratos/components/org.apache.stratos.cli/target/org.apache.stratos.cli-4.1.0.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/0fd41840/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 f39282d..9be3ea3 100644 --- a/products/cartridge-agent/modules/distribution/src/main/license/LICENSE +++ b/products/cartridge-agent/modules/distribution/src/main/license/LICENSE @@ -218,7 +218,7 @@ activemq-client-5.10.0.jar, ant-1.7.0.jar, ant-1.7.0.wso2v1.jar, ant-launcher-1.7.0.jar, -apache-stratos-cartridge-agent-4.1.0-SNAPSHOT.jar, +apache-stratos-cartridge-agent-4.1.0.jar, axiom-1.2.11.wso2v4.jar, axiom-api-1.2.11.jar, axiom-impl-1.2.11.jar, @@ -272,12 +272,12 @@ neethi-2.0.4.wso2v4.jar not-yet-commons-ssl-0.3.9.jar opencsv-1.8.wso2v1.jar org.apache.log4j-1.2.13.v200706111418.jar -org.apache.stratos.cartridge.agent-4.1.0-SNAPSHOT.jar -org.apache.stratos.common-4.1.0-SNAPSHOT.jar -org.apache.stratos.messaging-4.1.0-SNAPSHOT.jar -org.apache.stratos.autoscaler.service.stub-4.1.0-SNAPSHOT.jar -org.apache.stratos.cloud.controller.service.stub-4.1.0-SNAPSHOT.jar -org.apache.stratos.manager.service.stub-4.1.0-SNAPSHOT.jar +org.apache.stratos.cartridge.agent-4.1.0.jar +org.apache.stratos.common-4.1.0.jar +org.apache.stratos.messaging-4.1.0.jar +org.apache.stratos.autoscaler.service.stub-4.1.0.jar +org.apache.stratos.cloud.controller.service.stub-4.1.0.jar +org.apache.stratos.manager.service.stub-4.1.0.jar org.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/0fd41840/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 3cc27f2..d562d04 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-SNAPSHOT.jar, -org.apache.stratos.cli-4.1.0-SNAPSHOT.jar, -org.apache.stratos.cloud.controller.service.stub-4.1.0-SNAPSHOT.jar, -org.apache.stratos.common-4.1.0-SNAPSHOT.jar, -org.apache.stratos.manager-4.1.0-SNAPSHOT.jar, -org.apache.stratos.manager.service.stub-4.1.0-SNAPSHOT.jar, -org.apache.stratos.messaging-4.1.0-SNAPSHOT.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.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/0fd41840/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 4e7f404..765467c 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,7 +47,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.0-SNAPSHOT.zip"; + "/../../../distribution/target/apache-stratos-4.1.0.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/0fd41840/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 c78a96f..686fd41 100644 --- a/tools/docker-images/cartridge-docker-images/base-image/Dockerfile +++ b/tools/docker-images/cartridge-docker-images/base-image/Dockerfile @@ -48,13 +48,13 @@ RUN pip install yapsy # ------------------------- WORKDIR /mnt/ -ADD packs/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT.zip /mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT.zip -RUN unzip -q /mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT.zip -d /mnt/ -RUN rm /mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT.zip +ADD packs/apache-stratos-python-cartridge-agent-4.1.0.zip /mnt/apache-stratos-python-cartridge-agent-4.1.0.zip +RUN unzip -q /mnt/apache-stratos-python-cartridge-agent-4.1.0.zip -d /mnt/ +RUN rm /mnt/apache-stratos-python-cartridge-agent-4.1.0.zip -RUN mkdir -p /mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT/payload +RUN mkdir -p /mnt/apache-stratos-python-cartridge-agent-4.1.0/payload -RUN chmod +x /mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT/extensions/bash/* +RUN chmod +x /mnt/apache-stratos-python-cartridge-agent-4.1.0/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/0fd41840/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 042856a..b3d9f8f 100755 --- a/tools/docker-images/cartridge-docker-images/base-image/files/run +++ b/tools/docker-images/cartridge-docker-images/base-image/files/run @@ -26,7 +26,7 @@ source /root/.bashrc -export STRATOS_VERSION="4.1.0-SNAPSHOT" +export STRATOS_VERSION="4.1.0" 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/0fd41840/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 e0f090b..3f32667 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.0-SNAPSHOT.zip ${script_path}/base-image/packs/ +cp -vf target/apache-stratos-python-cartridge-agent-4.1.0.zip ${script_path}/base-image/packs/ popd pushd ${script_path}/base-image/ http://git-wip-us.apache.org/repos/asf/stratos/blob/0fd41840/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 2b892ce..94703f9 100755 --- a/tools/docker-images/stratos-docker-images/run-example.sh +++ b/tools/docker-images/stratos-docker-images/run-example.sh @@ -31,7 +31,7 @@ export DOMAIN=example.com export IP_ADDR=192.168.56.5 # Set the version of Stratos docker images -export STRATOS_VERSION=4.1.0-SNAPSHOT +export STRATOS_VERSION=4.1.0 ######## # Bind http://git-wip-us.apache.org/repos/asf/stratos/blob/0fd41840/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 27ca28d..04d5d6d 100644 --- a/tools/puppet3/modules/agent/files/README.txt +++ b/tools/puppet3/modules/agent/files/README.txt @@ -7,6 +7,6 @@ This folder should have following: eg: if $mb_type = activemq, folder structure of this folder would be: >$ls ->activemq apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT.zip +>activemq apache-stratos-python-cartridge-agent-4.1.0.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/0fd41840/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 603d79b..10709a7 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-SNAPSHOT', + $version = '4.1.0', $owner = 'root', $group = 'root', $target = "/mnt", http://git-wip-us.apache.org/repos/asf/stratos/blob/0fd41840/tools/stratos-installer/conf/setup.conf ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf index 552e681..6378091 100644 --- a/tools/stratos-installer/conf/setup.conf +++ b/tools/stratos-installer/conf/setup.conf @@ -55,7 +55,7 @@ export mb_ip="127.0.0.1" # Machine ip on which mb run export mb_port=61616 #default port which the message broker service runs export stratos_extract_path=$stratos_path/"apache-stratos" -export stratos_pack_zip_name="apache-stratos-4.1.0-SNAPSHOT.zip" +export stratos_pack_zip_name="apache-stratos-4.1.0.zip" export stratos_pack_zip=$stratos_packs/$stratos_pack_zip_name export activemq_pack=$stratos_packs/"apache-activemq-5.9.1-bin.tar.gz"
