Repository: incubator-stratos Updated Branches: refs/heads/4.0.0-incubating 8445f4f3b -> a56ab6f69
Reverted back artifact versions of dependent components and fixed cartridge agent package name in puppet scripts Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a56ab6f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a56ab6f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a56ab6f6 Branch: refs/heads/4.0.0-incubating Commit: a56ab6f6993407ab0287e4d073e1f09e0fed03e0 Parents: 8445f4f Author: Imesh Gunaratne <[email protected]> Authored: Wed May 14 10:38:18 2014 +0800 Committer: Imesh Gunaratne <[email protected]> Committed: Wed May 14 10:38:18 2014 +0800 ---------------------------------------------------------------------- .../org.apache.stratos.cloud.controller/pom.xml | 8 ++++---- .../jclouds/apis/ec2/1.7.1-stratos/pom.xml | 4 ++-- .../apis/openstack-nova/1.7.1-stratos/pom.xml | 4 ++-- .../jclouds/apis/vcloud/1.7.1-stratos/pom.xml | 4 ++-- .../provider/aws-ec2/1.7.1-stratos/pom.xml | 8 ++++---- dependencies/org.wso2.carbon.ui/pom.xml | 2 +- .../pom.xml | 8 ++++---- products/stratos/modules/distribution/pom.xml | 2 +- tools/puppet3/modules/agent/files/README.txt | 4 ++-- .../puppet3/modules/agent/manifests/initialize.pp | 18 +++++++++--------- 10 files changed, 31 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a56ab6f6/components/org.apache.stratos.cloud.controller/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml index 65d095d..a1883a3 100644 --- a/components/org.apache.stratos.cloud.controller/pom.xml +++ b/components/org.apache.stratos.cloud.controller/pom.xml @@ -187,17 +187,17 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>ec2</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>aws-ec2</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>openstack-nova</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> @@ -212,7 +212,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>vcloud</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a56ab6f6/dependencies/jclouds/apis/ec2/1.7.1-stratos/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/pom.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/pom.xml index 18740d2..7e38f12 100644 --- a/dependencies/jclouds/apis/ec2/1.7.1-stratos/pom.xml +++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.stratos</groupId> <artifactId>ec2</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> <name>jclouds ec2 api</name> <description>jclouds components to access an implementation of EC2</description> <packaging>bundle</packaging> @@ -138,7 +138,7 @@ </profiles> <scm> - <tag>4.0.0-incubating-rc2</tag> + <tag>4.0.0-incubating-rc3</tag> </scm> </project> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a56ab6f6/dependencies/jclouds/apis/openstack-nova/1.7.1-stratos/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/openstack-nova/1.7.1-stratos/pom.xml b/dependencies/jclouds/apis/openstack-nova/1.7.1-stratos/pom.xml index ac06dc2..aa76d29 100644 --- a/dependencies/jclouds/apis/openstack-nova/1.7.1-stratos/pom.xml +++ b/dependencies/jclouds/apis/openstack-nova/1.7.1-stratos/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.stratos</groupId> <artifactId>openstack-nova</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> <name>jclouds openstack-nova api</name> <description>jclouds components to access an implementation of OpenStack Nova</description> <packaging>bundle</packaging> @@ -140,6 +140,6 @@ </profiles> <scm> - <tag>4.0.0-incubating-rc2</tag> + <tag>4.0.0-incubating-rc3</tag> </scm> </project> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a56ab6f6/dependencies/jclouds/apis/vcloud/1.7.1-stratos/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/vcloud/1.7.1-stratos/pom.xml b/dependencies/jclouds/apis/vcloud/1.7.1-stratos/pom.xml index 4bbd92e..5a340ae 100755 --- a/dependencies/jclouds/apis/vcloud/1.7.1-stratos/pom.xml +++ b/dependencies/jclouds/apis/vcloud/1.7.1-stratos/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.stratos</groupId> <artifactId>vcloud</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> <name>jclouds vcloud api</name> <description>jclouds components to access an implementation of VMWare vCloud</description> <packaging>bundle</packaging> @@ -126,6 +126,6 @@ </profiles> <scm> - <tag>4.0.0-incubating-rc2</tag> + <tag>4.0.0-incubating-rc3</tag> </scm> </project> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a56ab6f6/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/pom.xml b/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/pom.xml index ea69cc5..7f2601e 100644 --- a/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/pom.xml +++ b/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.stratos</groupId> <artifactId>aws-ec2</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> <name>jclouds Amazon EC2 provider</name> <description>EC2 implementation targeted to Amazon Web Services</description> <packaging>bundle</packaging> @@ -61,12 +61,12 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>ec2</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>ec2</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -150,7 +150,7 @@ </profiles> <scm> - <tag>4.0.0-incubating-rc2</tag> + <tag>4.0.0-incubating-rc3</tag> </scm> </project> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a56ab6f6/dependencies/org.wso2.carbon.ui/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/org.wso2.carbon.ui/pom.xml b/dependencies/org.wso2.carbon.ui/pom.xml index 4d8aa1b..24c875f 100644 --- a/dependencies/org.wso2.carbon.ui/pom.xml +++ b/dependencies/org.wso2.carbon.ui/pom.xml @@ -30,7 +30,7 @@ <packaging>bundle</packaging> <name>WSO2 Carbon - UI</name> <description>org.wso2.carbon.ui patch version for apache stratos</description> - <version>4.0.1-SNAPSHOT</version> + <version>4.2.0-stratos</version> <url>http://wso2.org</url> <repositories> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a56ab6f6/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml index 609a3a2..fffdb93 100644 --- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml +++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml @@ -76,17 +76,17 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>ec2</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>aws-ec2</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>openstack-nova</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> </dependency> <dependency> @@ -119,7 +119,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>vcloud</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>1.7.1-stratos</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a56ab6f6/products/stratos/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml index 5ecc44b..38e430e 100755 --- a/products/stratos/modules/distribution/pom.xml +++ b/products/stratos/modules/distribution/pom.xml @@ -462,7 +462,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.wso2.carbon.ui</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>4.2.0-stratos</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a56ab6f6/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 b7fa8a4..daea5ed 100644 --- a/tools/puppet3/modules/agent/files/README.txt +++ b/tools/puppet3/modules/agent/files/README.txt @@ -1,12 +1,12 @@ This folder should have following: -1. apache-stratos-cartridge-agent-${version}-bin.zip file +1. apache-stratos-cartridge-agent-${version}.zip file 2. Folder having a name as $mb_type which is defined in the nodes.pp file. eg: if $mb_type = activemq, folder structure of this folder would be: >$ls ->activemq apache-stratos-cartridge-agent-4.0.0-incubating-bin.zip +>activemq apache-stratos-cartridge-agent-4.0.0-incubating.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/incubator-stratos/blob/a56ab6f6/tools/puppet3/modules/agent/manifests/initialize.pp ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/agent/manifests/initialize.pp b/tools/puppet3/modules/agent/manifests/initialize.pp index 4fdb0c7..2eaadd0 100755 --- a/tools/puppet3/modules/agent/manifests/initialize.pp +++ b/tools/puppet3/modules/agent/manifests/initialize.pp @@ -23,29 +23,29 @@ define agent::initialize ($repo, $version, $service, $local_dir, $target, $owner ensure => present; } file { - "/${local_dir}/apache-stratos-${service}-${version}-bin.zip": + "/${local_dir}/apache-stratos-${service}-${version}.zip": ensure => present, - source => "puppet:///modules/agent/apache-stratos-${service}-${version}-bin.zip", + source => "puppet:///modules/agent/apache-stratos-${service}-${version}.zip", require => File["/${local_dir}/"]; } exec { "creating_target_for_${name}": path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', command => "mkdir -p ${target}", - require => File["/${local_dir}/apache-stratos-${service}-${version}-bin.zip"]; + require => File["/${local_dir}/apache-stratos-${service}-${version}.zip"]; "creating_local_package_repo_for_${name}": path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/java/bin/', unless => "test -d ${local_dir}", command => "mkdir -p ${local_dir}"; - "downloading_apache-stratos-${service}-${version}-bin.zip": + "downloading_apache-stratos-${service}-${version}.zip": path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', cwd => $local_dir, - unless => "test -f ${local_dir}/apache-stratos-${service}-${version}-bin.zip", - command => "puppet:///modules/agent/apache-stratos-${service}-${version}-bin.zip", + unless => "test -f ${local_dir}/apache-stratos-${service}-${version}.zip", + command => "puppet:///modules/agent/apache-stratos-${service}-${version}.zip", logoutput => 'on_failure', - creates => "${local_dir}/apache-stratos-${service}-${version}-bin.zip", + creates => "${local_dir}/apache-stratos-${service}-${version}.zip", timeout => 10, require => Exec["creating_local_package_repo_for_${name}", "creating_target_for_${name}"]; @@ -53,11 +53,11 @@ define agent::initialize ($repo, $version, $service, $local_dir, $target, $owner path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', cwd => $target, unless => "test -d ${target}/apache-stratos-${service}-${version}/conf", - command => "unzip ${local_dir}/apache-stratos-${service}-${version}-bin.zip", + command => "unzip ${local_dir}/apache-stratos-${service}-${version}.zip", logoutput => 'on_failure', creates => "${target}/apache-stratos-${service}-${version}/repository", timeout => 0, - require => Exec["downloading_apache-stratos-${service}-${version}-bin.zip"]; + require => Exec["downloading_apache-stratos-${service}-${version}.zip"]; "setting_permission_for_${name}": path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
