You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2012/10/17 10:50:11 UTC
[38/50] [abbrv] git commit: Modified devcloud build process to
include maven3 install and steps.
Modified devcloud build process to include maven3 install and steps.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/90fd0793
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/90fd0793
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/90fd0793
Branch: refs/heads/regions
Commit: 90fd0793feb124623817e896b883709c610ed40c
Parents: ac31b7d
Author: Chip Childers <ch...@gmail.com>
Authored: Mon Oct 1 16:40:00 2012 -0400
Committer: Chip Childers <ch...@gmail.com>
Committed: Mon Oct 1 16:56:05 2012 -0400
----------------------------------------------------------------------
.../puppet-devcloud/files/builddevcloud.sh | 6 ++++
.../puppet-devcloud/files/installmaven.sh | 22 +++++++++++++++
.../devcloudbox/puppet-devcloud/manifests/init.pp | 17 +++++++++++
3 files changed, 45 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/90fd0793/tools/devcloud/devcloudbox/puppet-devcloud/files/builddevcloud.sh
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/files/builddevcloud.sh b/tools/devcloud/devcloudbox/puppet-devcloud/files/builddevcloud.sh
index 7755766..03bd854 100644
--- a/tools/devcloud/devcloudbox/puppet-devcloud/files/builddevcloud.sh
+++ b/tools/devcloud/devcloudbox/puppet-devcloud/files/builddevcloud.sh
@@ -18,5 +18,11 @@
# under the License.
export CATALINA_HOME=/opt/cloudstack/apache-tomcat-6.0.32
+export M2_HOME=/opt/cloudstack/apache-maven-3.0.4
+export M2=$M2_HOME/bin
+MAVEN_OPTS="-Xms256m -Xmx512m"
+PATH=$M2:$PATH
cd /opt/cloudstack/incubator-cloudstack/
+/usr/bin/mvn -P deps
+/usr/bin/mvn clean
/usr/bin/ant clean-all build-all deploy-server deploydb
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/90fd0793/tools/devcloud/devcloudbox/puppet-devcloud/files/installmaven.sh
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/files/installmaven.sh b/tools/devcloud/devcloudbox/puppet-devcloud/files/installmaven.sh
new file mode 100644
index 0000000..48ffdfe
--- /dev/null
+++ b/tools/devcloud/devcloudbox/puppet-devcloud/files/installmaven.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# 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.
+
+cd /opt/cloudstack
+/usr/bin/wget http://apache.mirrors.pair.com/maven/maven-3/3.0.4/binaries/apache-maven-3.0.4-bin.tar.gz
+/bin/tar xvfz apache-maven-3.0.4-bin.tar.gz
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/90fd0793/tools/devcloud/devcloudbox/puppet-devcloud/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/manifests/init.pp b/tools/devcloud/devcloudbox/puppet-devcloud/manifests/init.pp
index 5547ed3..3dc74a1 100644
--- a/tools/devcloud/devcloudbox/puppet-devcloud/manifests/init.pp
+++ b/tools/devcloud/devcloudbox/puppet-devcloud/manifests/init.pp
@@ -297,9 +297,26 @@ class puppet-devcloud {
group => '0',
}
+ file { '/opt/cloudstack/installmaven.sh':
+ ensure => 'file',
+ source => 'puppet:///modules/puppet-devcloud/installmaven.sh',
+ mode => '777',
+ owner => '0',
+ group => '0',
+ }
+
+ exec { "install_maven":
+ require => File['/opt/cloudstack/installmaven.sh'],
+ command => '/opt/cloudstack/installmaven.sh',
+ cwd => '/opt/cloudstack',
+ creates => '/opt/cloudstack/apache-maven-3.0.4/',
+ timeout => '0',
+ }
+
exec { "build_cloudstack":
require => [
Package['ant'],
+ Exec['install_maven'],
Exec["catalina_home"],
File['/opt/cloudstack/incubator-cloudstack/dist'],
File['/opt/cloudstack/incubator-cloudstack/target'],