This went through several itterations within master,
as well as the master copy of the pom.xml being
edited to help formalize our maven build process beyond
the 4.0.0 release.
Because of the file's confusing history,
I have to do this as an isolated commit within 4.0.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
I'm removing the awsapi/README.txt file, since it's
not required at all, and is actually from Axis.
I'm also removing the deps/XenServerJava/LICENSE.txt
and README.txt files, since the license is covered
by our top level LICENSE and the README.txt is
not for our project itself.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
Added the following new features to ASFCS 4.0 Release Note:
CLVM support reappeared for KVM
RBD support for KVM
Nicira NVP support
Caringo object storage support
Signed-off-by: Chip Childers <chip.childers@gmail.com>
Unlike rpms, cloud-client does not depend on cloud-awsapi. Hence, in
case of the ubuntu build it failed to get installed. Patch simply adds
rule that awsapi pkg be installed when mgmt server is installed. Upgrade
and remove scenarios also tested.
Note: user should remove her old apt-get cache from /var/cache/apt/*
Signed-off-by: Rohit Yadav <bhaisaab@baagi.org>
We should not do any of these things on postinst files, this will lead to garbage
staying behind when removing the package, confusing sysadmins
By creating the symlinks on the rules file they will get added into the DEB package
and cleaned up should the package be removed.
The antlr JAR files conflict with the Ubuntu packages for this JAR files.
Maven depends on this as well, so when you try to install cloud-awsapi on a system
with Maven installed, you get:
(Reading database ... 68888 files and directories currently installed.)
Unpacking cloud-awsapi (from cloud-awsapi_4.0.0-incubating_amd64.deb) ...
dpkg: error processing cloud-awsapi_4.0.0-incubating_amd64.deb (--install):
trying to overwrite '/usr/share/java/antlr-2.7.7.jar', which is also in package libantlr-java 2.7.7+dfsg-3
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
Errors were encountered while processing:
cloud-awsapi_4.0.0-incubating_amd64.deb
antlr-2.7.7.jar is in classpath.conf, so we can depend on this package and it will be loaded
for AWS API
This JAR is also provided by a Ubuntu package and is the version we depend on with Maven.
By adding this JAR to wscript_configure it is added to the classpath so the AWS API will be able to use it.
Not having this will result in a conflict in a package conflict
During build time we will build against the version fetched by Maven, but runtime we will use the one from
the Ubuntu repository.
On my system I already had libdom4j-java installed and this lead to:
(Reading database ... 68888 files and directories currently installed.)
Unpacking cloud-awsapi (from .../cloud-awsapi_4.0.0-incubating_amd64.deb) ...
dpkg: error processing ../cloud-awsapi_4.0.0-incubating_amd64.deb (--install):
trying to overwrite '/usr/share/java/dom4j-1.6.1.jar', which is also in package libdom4j-java 1.6.1+dfsg.2-5
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
Errors were encountered while processing:
../cloud-awsapi_4.0.0-incubating_amd64.deb
Since this JAR file is available from the Ubuntu repository we depend on it instead of packaging it ourselfs.
This conflicts with with libjaxp1.3-java on Ubuntu systems.
libjaxp1.3-java is installed when maven is installed, so on my local system I got:
root@gateway:/usr/src# dpkg -i cloud-awsapi_4.0.0-incubating_amd64.deb
(Reading database ... 68888 files and directories currently installed.)
Unpacking cloud-awsapi (from cloud-awsapi_4.0.0-incubating_amd64.deb) ...
dpkg: error processing cloud-awsapi_4.0.0-incubating_amd64.deb (--install):
trying to overwrite '/usr/share/java/xml-apis-1.3.04.jar', which is also in package libjaxp1.3-java 1.3.05-2ubuntu2
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
Errors were encountered while processing:
cloud-awsapi_4.0.0-incubating_amd64.deb
root@gateway:/usr/src#
This prevents you from installing the AWS API on a Ubuntu machine which also has Maven installed.
The classpath is still generated by WAF which looks in the deps/ directory and will find the same JAR file
there as what's in the Deb package we depend on.
Changes:
- Have javassist dependency in awsapi/pom.xml
- Have it deployed by waf while rpm building in wscript_build
- Fixed dependency in debian/control
- Add javassist pkg in cloud-deps for debian
This is a squashed commit of the following:
commit eed46e7749f2716d0046f6c8237e9900043078ee
Author: Rohit Yadav <bhaisaab@apache.org>
Date: Wed Oct 10 12:42:41 2012 +0530
Revert: Add javaassist dependence"
Reverted javassist but axis2-1.5.1.jar is still first in the classpath
This reverts commit 7bcbae5e91.
commit eab6b6afe9331bf3920fafbd59695141366a2a61
Author: Rohit Yadav <bhaisaab@apache.org>
Date: Wed Oct 10 12:38:42 2012 +0530
Revert: "maven: Remove javassist as a dependency for AWS API"
We want javassist to be fetched by mvn and get it packaged in
cloud-deps.
This reverts commit 8504332404.
commit 35af1ebdb6340105f342dbfc461f5fb892b9ab76
Author: Rohit Yadav <bhaisaab@apache.org>
Date: Wed Oct 10 12:36:43 2012 +0530
Revert: "add javassit on the classpath"
We don't need javassist from a distro's repo. That is included in
cloud-deps.
This reverts commit 66daa1a2bc.
commit cb11d153fbb809aad94f0a3d19f3efba13691d71
Author: Rohit Yadav <bhaisaab@apache.org>
Date: Wed Oct 10 12:34:09 2012 +0530
Revert: "fix rpm build"
We need javaassist for awsapi package.
This reverts commit c49f3beccf.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
Since only the cephx user like 'admin' was passed we couldn't define two RBD storage pools
using the cephx user admin, even if they were running on different Ceph clusters.
By adding the monitor hostname and poolname to the secret's usage (which we don't even use) it becomes
unique.
Chip Childers
Anthony Xu
David Nalley
Ilya Musayev, CloudSand.com
Radhika PC
Edison Su
Edison Su
Rohit Yadav
Jessica Tomechak
Wido den Hollander
Rohit Yadav