You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/09/18 13:36:34 UTC
[1/3] git commit: updated refs/heads/nonoss-to-noredist to 86bef8b
Updated Branches:
refs/heads/nonoss-to-noredist [created] 86bef8bfb
Rename nonoss to noredist to better reflect what the flag is used for.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/13e8b59b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/13e8b59b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/13e8b59b
Branch: refs/heads/nonoss-to-noredist
Commit: 13e8b59bc2c40de9009457bbe01608b28dac1f5d
Parents: 62b0ad0
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Sep 18 19:10:27 2013 +0800
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Sep 18 19:36:08 2013 +0800
----------------------------------------------------------------------
client/pom.xml | 22 +++++++++++-----------
plugins/pom.xml | 12 ++++++------
pom.xml | 2 +-
services/console-proxy/server/pom.xml | 2 +-
4 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e8b59b/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 119c96e..7ae1eb7 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -472,18 +472,18 @@
</configuration>
</execution>
<execution>
- <id>process-nonoss</id>
+ <id>process-noredist</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
- <target if="${nonoss}">
+ <target if="${noredist}">
<echo>test</echo>
<replaceregexp
file="${basedir}/target/generated-webapp/WEB-INF/classes/environment.properties"
match="cloud-stack-components-specification=.*"
- replace="cloud-stack-components-specification=components-nonoss.xml"
+ replace="cloud-stack-components-specification=components-noredist.xml"
byline="true" />
</target>
</configuration>
@@ -505,16 +505,16 @@
</configuration>
</execution>
<execution>
- <id>process-nonoss-spring-context</id>
+ <id>process-noredist-spring-context</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
- <target if="${nonoss}">
+ <target if="${noredist}">
<replaceregexp
file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
- match="classpath:componentContext.xml" replace="classpath:nonossComponentContext.xml"
+ match="classpath:componentContext.xml" replace="classpath:noredistComponentContext.xml"
byline="true" />
<copy overwrite="true"
todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
@@ -633,7 +633,7 @@
<id>netapp</id>
<activation>
<property>
- <name>nonoss</name>
+ <name>noredist</name>
</property>
</activation>
<dependencies>
@@ -648,7 +648,7 @@
<id>f5</id>
<activation>
<property>
- <name>nonoss</name>
+ <name>noredist</name>
</property>
</activation>
<dependencies>
@@ -663,7 +663,7 @@
<id>netscaler</id>
<activation>
<property>
- <name>nonoss</name>
+ <name>noredist</name>
</property>
</activation>
<dependencies>
@@ -678,7 +678,7 @@
<id>srx</id>
<activation>
<property>
- <name>nonoss</name>
+ <name>noredist</name>
</property>
</activation>
<dependencies>
@@ -693,7 +693,7 @@
<id>vmware</id>
<activation>
<property>
- <name>nonoss</name>
+ <name>noredist</name>
</property>
</activation>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e8b59b/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0812642..ff18e83 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -99,7 +99,7 @@
<id>netapp</id>
<activation>
<property>
- <name>nonoss</name>
+ <name>noredist</name>
</property>
</activation>
<modules>
@@ -110,7 +110,7 @@
<id>kvm</id>
<activation>
<property>
- <name>nonoss</name>
+ <name>noredist</name>
</property>
</activation>
<modules>
@@ -121,7 +121,7 @@
<id>f5</id>
<activation>
<property>
- <name>nonoss</name>
+ <name>noredist</name>
</property>
</activation>
<modules>
@@ -132,7 +132,7 @@
<id>netscaler</id>
<activation>
<property>
- <name>nonoss</name>
+ <name>noredist</name>
</property>
</activation>
<modules>
@@ -143,7 +143,7 @@
<id>srx</id>
<activation>
<property>
- <name>nonoss</name>
+ <name>noredist</name>
</property>
</activation>
<modules>
@@ -154,7 +154,7 @@
<id>vmware</id>
<activation>
<property>
- <name>nonoss</name>
+ <name>noredist</name>
</property>
</activation>
<modules>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e8b59b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6d9a30f..c2c7e30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -704,7 +704,7 @@
<id>vmware</id>
<activation>
<property>
- <name>nonoss</name>
+ <name>noredist</name>
</property>
</activation>
<modules>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e8b59b/services/console-proxy/server/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml
index 391c15a..7e101e8 100644
--- a/services/console-proxy/server/pom.xml
+++ b/services/console-proxy/server/pom.xml
@@ -204,7 +204,7 @@
<id>vmware</id>
<activation>
<property>
- <name>nonoss</name>
+ <name>noredist</name>
</property>
</activation>
<dependencies>
[2/3] git commit: updated refs/heads/nonoss-to-noredist to 86bef8b
Posted by hu...@apache.org.
Update packaging script with the new noredist flag
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8f01d20a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8f01d20a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8f01d20a
Branch: refs/heads/nonoss-to-noredist
Commit: 8f01d20a5ae083849c9e9b12e294efb4542733d5
Parents: 13e8b59
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Sep 18 19:34:32 2013 +0800
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Sep 18 19:36:09 2013 +0800
----------------------------------------------------------------------
packaging/centos63/package.sh | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f01d20a/packaging/centos63/package.sh
----------------------------------------------------------------------
diff --git a/packaging/centos63/package.sh b/packaging/centos63/package.sh
index f30a0e7..8337944 100755
--- a/packaging/centos63/package.sh
+++ b/packaging/centos63/package.sh
@@ -18,14 +18,14 @@
function usage() {
echo ""
- echo "usage: ./package.sh [-p|--pack] [-h|--help] [ARGS]"
+ echo "usage: ./package.sh [-p|e-pack] [-h|--help] [ARGS]"
echo ""
echo "The commonly used Arguments are:"
- echo "oss|OSS To package OSS specific"
- echo "nonoss|NONOSS To package NONOSS specific"
+ echo "oss|OSS To package OSS specific"
+ echo "noredist|NOREDIST To package with no redistributable libraries"
echo ""
echo "Examples: ./package.sh -p|--pack oss|OSS"
- echo " ./package.sh -p|--pack nonoss|NONOSS"
+ echo " ./package.sh -p|--pack noredist|NOREDIST"
echo " ./package.sh (Default OSS)"
exit 1
}
@@ -114,6 +114,7 @@ elif [ $# -gt 0 ] ; then
eval set -- "$ARGS"
while [ $# -gt 0 ] ; do
+ echo $1
case "$1" in
-h | --help)
usage
@@ -124,7 +125,7 @@ elif [ $# -gt 0 ] ; then
packageval=$2
if [ "$packageval" == "oss" -o "$packageval" == "OSS" ] ; then
defaultPackaging
- elif [ "$packageval" == "nonoss" -o "$packageval" == "NONOSS" ] ; then
+ elif [ "$packageval" == "noredist" -o "$packageval" == "NOREDIST" ] ; then
packaging
else
echo "Error: Incorrect value provided in package.sh script, Please see help ./package.sh --help|-h for more details."
@@ -136,19 +137,8 @@ elif [ $# -gt 0 ] ; then
usage
exit 1
;;
- --)
- echo "Unrecognized option..."
- usage
- exit 1
- ;;
- -*)
- echo "Unrecognized option..."
- usage
- exit 1
- ;;
*)
shift
- break
;;
esac
done
[3/3] git commit: updated refs/heads/nonoss-to-noredist to 86bef8b
Posted by hu...@apache.org.
Update the INSTALL.md file with the changed noredist flag.
And fix a few old entries
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/86bef8bf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/86bef8bf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/86bef8bf
Branch: refs/heads/nonoss-to-noredist
Commit: 86bef8bfbf180d2b534bdabafba41b5a5b96d92d
Parents: 8f01d20
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Sep 18 19:35:05 2013 +0800
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Sep 18 19:36:09 2013 +0800
----------------------------------------------------------------------
INSTALL.md | 37 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86bef8bf/INSTALL.md
----------------------------------------------------------------------
diff --git a/INSTALL.md b/INSTALL.md
index 37415dc..47fd2e6 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -96,23 +96,20 @@ Clean and build:
$ mvn clean install -P systemvm,developer
-In case you want support for VMWare, SRX and other non-Apache (referred to as nonoss)
-compliant libs, you may download the following jar artifacts from respective vendors:
+CloudStack supports several plugins that depend on libraries with distribution restrictions.
+Because of this they are not included in the default build. Enable these additional plugins
+activate their respective profiles. For convenience adding -Dnoredist will enable all plugins
+that depend on libraries with distribution restrictions. The build procedure expects that the
+required libraries are present in the maven repository.
- deps/cloud-iControl.jar
- deps/cloud-manageontap.jar
- deps/cloud-netscaler-sdx.jar
- deps/cloud-netscaler.jar
- deps/vmware-apputils.jar
- deps/vmware-vim.jar
- deps/vmware-vim25.jar
-
-Install them to ~/.m2 so maven can get them as dependencies:
+The following procedure can be used to add the libraries to the local maven repository. Details
+on obtaining the required libraries can be found in this file. Note that this will vary between
+releases of cloudstack
$ cd deps
$ ./install-non-oss.sh
-To build with nonoss components, use the build command with the nonoss flag:
+To build all non redistributable components, add the noredist flag to the build command:
$ mvn clean install -P systemvm,developer -Dnonoss
@@ -153,7 +150,7 @@ This section describes packaging and installation.
To create debs:
- $ mvn -P deps # -D nonoss, for nonoss as described in the "Building" section above
+ $ mvn -P deps # -D noredist, for noredist as described in the "Building" section above
$ dpkg-buildpackage
All the deb packages will be created in ../$PWD
@@ -183,15 +180,15 @@ Install needed packages, apt-get upgrade for upgrading:
To create rpms:
- $ mvn -P deps # -D nonoss, for nonoss as described in the "Building" section above
- $ ./waf rpm
+ $ cd packaging/centos63
+ $ bash packaging.sh [ -p NOREDIST ]
-All the rpm packages will be create in artifacts/rpmbuild/RPMS/x86_64
+All the rpm packages will be create in dist/rpmbuild/RPMS/x86_64
To create a yum repo: (assuming appropriate user privileges)
$ path=/path/to/your/webserver/cloudstack
- $ cd artifacts/rpmbuild/RPMS/x86_64
+ $ cd dist/rpmbuild/RPMS/x86_64
$ mv *.rpm $path
$ createrepo $path
@@ -208,10 +205,10 @@ Installation:
Install needed packages:
$ yum update
- $ yum install cloud-client # management server
+ $ yum install cloudstack-management # management server
$ yum install mysql-server # mysql server
- $ yum install cloud-agent # agent (kvm)
- $ yum install cloud-usage # usage server
+ $ yum install cloudstack-agent # agent (kvm)
+ $ yum install cloudstack-usage # usage server
## Installing CloudMonkey CLI