You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2012/10/10 17:00:32 UTC
git commit: debian: Depend on libcommons-fileupload-java for AWS API
Updated Branches:
refs/heads/4.0 e2288ad51 -> 38dca7c9c
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/38dca7c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/38dca7c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/38dca7c9
Branch: refs/heads/4.0
Commit: 38dca7c9c3dbc00acb4cae518113b325f61ce2e4
Parents: e2288ad
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Wed Oct 10 14:54:05 2012 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Wed Oct 10 14:54:05 2012 +0200
----------------------------------------------------------------------
debian/cloud-awsapi.install | 1 -
debian/control | 2 +-
wscript_configure | 1 +
3 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/38dca7c9/debian/cloud-awsapi.install
----------------------------------------------------------------------
diff --git a/debian/cloud-awsapi.install b/debian/cloud-awsapi.install
index b932886..6287d7b 100644
--- a/debian/cloud-awsapi.install
+++ b/debian/cloud-awsapi.install
@@ -25,7 +25,6 @@
/usr/share/java/axis2-*.jar
/usr/share/java/neethi*.jar
/usr/share/java/CAStorSDK*.jar
-/usr/share/java/commons-fileupload*.jar
/usr/share/java/json-simple*.jar
/usr/share/java/axiom-*.jar
/usr/share/java/antlr*.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/38dca7c9/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 1bca86c..c9bf694 100644
--- a/debian/control
+++ b/debian/control
@@ -120,6 +120,6 @@ Description: CloudStack commandline tool
Package: cloud-awsapi
Provides: cloud-awsapi
Architecture: any
-Depends: openjdk-6-jre, tomcat6, libcommons-lang-java, libjaxp1.3-java (>= 1.3), libdom4j-java (>= 1.6.1)
+Depends: openjdk-6-jre, tomcat6, libcommons-lang-java, libjaxp1.3-java (>= 1.3), libdom4j-java (>= 1.6.1), libcommons-fileupload-java (>= 1.2)
Description: CloudStack AWS API wrapper
The CloudStack Amazon Webservices API wrapper
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/38dca7c9/wscript_configure
----------------------------------------------------------------------
diff --git a/wscript_configure b/wscript_configure
index 5cde646..dd8b0be 100644
--- a/wscript_configure
+++ b/wscript_configure
@@ -47,6 +47,7 @@ systemjars = {
"commons-logging-api.jar",
"commons-pool.jar",
"commons-httpclient.jar",
+ "commons-fileupload.jar",
"ws-commons-util.jar",
"mysql-connector-java.jar",
),