Commit Graph

159 Commits

Author SHA1 Message Date
Edison Su
5ee613fbf2 This fix doesn't work, no link been created on fresh installation ubuntu
Revert "debian: Package symlinks and config files for AWS API"

This reverts commit 3854de46ce.
2012-10-10 14:41:37 -07:00
Wido den Hollander
3854de46ce debian: Package symlinks and config files for AWS API
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.
2012-10-10 17:50:27 +02:00
Wido den Hollander
c446c459b9 debian: Depend on antlr from the Ubuntu repositories for AWS API
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
2012-10-10 17:01:17 +02:00
Wido den Hollander
38dca7c9c3 debian: Depend on libcommons-fileupload-java 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.
2012-10-10 14:54:05 +02:00
Wido den Hollander
e2288ad518 debian: Depend on dom4j from Ubuntu repository for AWS API
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.
2012-10-10 14:41:25 +02:00
Wido den Hollander
62ad5af4d4 debian: Do not package xml-apis for AWS API
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.
2012-10-10 14:13:55 +02:00
Rohit Yadav
f20d6369e4 Revert: javassist related recent changes
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>
2012-10-10 12:49:38 +05:30
Edison Su
7bcbae5e91 axis2-1.5.1.jar should be loaded at first, add javaassist dependence 2012-10-09 19:31:41 -07:00
Edison Su
863c9e6ccf oh, wido, wido 2012-10-09 18:05:23 -07:00
Edison Su
a253fd3f10 add these jars back, 2012-10-09 17:35:40 -07:00
Chip Childers
8bb7226397 Modified references to 4.0.0 to 4.0.0-incubating 2012-10-09 20:22:59 -04:00
Edison Su
8b592301a4 set ownership to cloud 2012-10-09 15:35:33 -07:00
Edison Su
18226b067d add cloud awsapi postinit 2012-10-09 15:24:00 -07:00
Edison Su
b9e936c345 add more dep jar 2012-10-09 15:16:51 -07:00
Wido den Hollander
e86e9d3fab debian: Package less cloud-awsapi JAR files
These libraries do not seem to be used/imported in the AWS API code so we don't have to package them
2012-10-09 23:41:48 +02:00
Wido den Hollander
5f2f3c22cc debian: Dependency update cloud-awsapi
A lot of JAR files are provided by the Debian and Ubuntu package repositories.

We can depend on them instead of packaging them ourselfs.
2012-10-09 23:38:50 +02:00
Wido den Hollander
9e5a7b1323 debian: Update description cloud-awsapi package 2012-10-09 23:30:57 +02:00
Wido den Hollander
8b4814467a debian: Do not package the axis2 jar in cloud-deps
This is only needed by cloud-awsapi and we already package it there.
2012-10-09 23:29:51 +02:00
Edison Su
a3e0fe8366 fix tab 2012-10-09 13:41:36 -07:00
Edison Su
af17555089 fix ubuntu deb build 2012-10-09 13:27:22 -07:00
Edison Su
ffe1dbbf53 add aws deb build 2012-10-09 13:27:22 -07:00
Chip Childers
735def2c5c Fixed debian/changelog format error 2012-10-05 16:11:36 -04:00
Chip Childers
455f6264db Switching debian/changelog version to 4.0.0 2012-10-05 15:50:46 -04:00
Wido den Hollander
cd28aa34be debian: Bump the version to 4.0 beta 6 2012-10-05 11:11:21 -07:00
David Nalley
3efbf868f5 fixing a broken ubuntu build 2012-10-04 20:29:05 -04:00
Wido den Hollander
e2dbc2853d debian: Fix version number for beta1
dpkg thought it was a downgrade from rc2 to beta1, add a epoch at the front
2012-09-26 21:38:22 -07:00
Wido den Hollander
a9ec123c2d debian: Don't have cloud-agent depend on libservlet2.5-java 2012-09-26 21:38:11 -07:00
Wido den Hollander
ed59ec194a debian: Add docs to packages 2012-09-26 21:37:55 -07:00
Wido den Hollander
d40d5cd9f7 debian: Fix dependencies around libcommons*java
Packages like cloud-agent were depending on various libcommons* packages
which are only used in the server and utils.

Correct the dependency for this
2012-09-26 21:37:44 -07:00
Wido den Hollander
60a043f908 debian: Do not have cloud-agent depend on libcommons-httpclient
Already done by cloud-agent-libs
2012-09-26 21:37:15 -07:00
Wido den Hollander
3da14f6bc3 debian: Do not have cloud-agent depend on python
It depends on cloud-python and that depends on python already
2012-09-26 21:37:11 -07:00
Wido den Hollander
e577f64058 debian: Bump the version number to beta1 2012-09-26 21:37:06 -07:00
Wido den Hollander
5ab6ac285e debian: Have cloud-server depend on cloud-scripts 2012-09-26 21:36:36 -07:00
Wido den Hollander
9e8000f470 CLOUDSTACK-190: Add symlink for agent -> common for backwards compatibility 2012-09-24 10:20:59 -07:00
Wido den Hollander
1204005af7 debian: Update package version to RC2 2012-09-24 10:15:16 -07:00
Edison Su
32e050ddce remove README.html in deb build 2012-09-14 14:49:24 -07:00
Wido den Hollander
465e0466c3 debian: Remove Google GSON from cloud-agent-deps and depend on cloud-deps
Both the Agent and Server require Google GSON. This is not available from
the Ubuntu repositories, so we have to package it ourselfs.

Due to the fact that people might choose to run the Hypervisor on the same
host as the management server we can't have cloud-agent-deps conflict with cloud-deps

cloud-agent-deps now depends on cloud-deps so the hypervisor has Google GSON 1.7.1

This results in a number of extra JAR files to be installed on the hypervisor.
2012-09-14 15:03:17 +02:00
Wido den Hollander
d66db854d4 debian: Add XenSource XAPI Java Bindings to cloud-deps package 2012-09-13 23:19:48 +02:00
Wido den Hollander
cff12de2ca debian: Add Google GSON to the cloud-deps package 2012-09-13 23:19:48 +02:00
Wido den Hollander
fed7938814 xen: Rename JAR file
cloud-xen.jar does not meet the namespace, so rename it to fit in
2012-09-13 23:19:48 +02:00
Wido den Hollander
7eaf537d95 Rename cloud-agent-scripts to cloud-scripts
The management server also depends on a couple of these scripts, so renaming
to cloud-scripts makes more sence then installing cloud-agent-scripts.

In the future we might want to split this up in two packages.
2012-09-13 16:29:01 +02:00
Wido den Hollander
b892ff6630 Depend on libvirt-java 0.4.9 due to license change
0.4.9 switched from GPL to MIT
2012-09-13 16:29:01 +02:00
Wido den Hollander
e426ba25ed debian: Remove vmops-* package references
In CS 3.X the name vmops wasn't used for packages, so it's safe to remove this now.
2012-09-13 16:29:01 +02:00
Wido den Hollander
ababd0cbdc debian: Depend on either maven3 or maven with version 3 or higher. 2012-09-13 09:38:27 +02:00
Edison Su
17b2af2a90 on ubuntu, in order to build debs, need to add add-apt-repository ppa:natecarlson/maven3, then install maven3 2012-09-12 15:27:51 -07:00
Edison Su
29df8d8b8e remove bcprov-jdk14 2012-09-12 13:46:12 -07:00
Wido den Hollander
a572e59411 debian: Remove *.conffiles files
By default any file in /etc is a conffile according to dh_installdeb compat >= 3
2012-09-11 17:47:09 +02:00
Wido den Hollander
d4ca7361c1 debian: Add two JAR files to cloud-deps
These are not available through the Ubuntu or Debian repositories
2012-09-11 16:42:39 +02:00
Wido den Hollander
93126414bc debian: Get backport-util-concurrent from the Debian repositories 2012-09-11 14:03:38 +02:00
Wido den Hollander
e7ff6ecd77 debian: Depend on jsch from the repository
This way we don't need to distribute the JAR in cloud-deps
2012-09-11 13:31:50 +02:00