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 2012/08/31 21:42:34 UTC
git commit: Fix the awsapi build by downloading the correct
dependencies Use maven to download all dependencies for the ant build,
just make sure mvn is in the path
Updated Branches:
refs/heads/master 4f93161c1 -> 9789e934b
Fix the awsapi build by downloading the correct dependencies
Use maven to download all dependencies for the ant build, just make sure mvn is in the path
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9789e934
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9789e934
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9789e934
Branch: refs/heads/master
Commit: 9789e934b66a1d76b6a3da54d80ddde06a889683
Parents: 4f93161
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Aug 31 21:41:16 2012 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Aug 31 21:41:16 2012 +0200
----------------------------------------------------------------------
build/build-aws-api.xml | 8 ++++----
build/build-cloud-plugins.xml | 4 ----
build/build-cloud.xml | 12 ++++++++----
build/package.xml | 3 ++-
deps/pom.xml | 13 ++++++++++++-
5 files changed, 26 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9789e934/build/build-aws-api.xml
----------------------------------------------------------------------
diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml
index 9ab267e..3e96069 100644
--- a/build/build-aws-api.xml
+++ b/build/build-aws-api.xml
@@ -26,12 +26,12 @@
<dirname property="base.dir" file="${ant.file.awsapi}/.." />
<property environment="env" />
<property name="axis2.home" value="${base.dir}" />
- <path id="axis2.class.path">
+ <path id="axis2.classpath">
<fileset dir="${axis2.home}">
- <include name="deps/awsapi-lib/*.jar" />
+ <include name="deps/*.jar" />
</fileset>
</path>
- <taskdef name="wsdl2code" classname="org.apache.axis2.tool.ant.AntCodegenTask" classpathref="axis2.class.path" />
+ <taskdef name="wsdl2code" classname="org.apache.axis2.tool.ant.AntCodegenTask" classpathref="axis2.classpath" />
<!-- directories for build and distribution -->
<!-- property name="env.CATALINA_HOME" value="${base.dir}/tomcat" / -->
<property name="catalina.dir" value="${env.CATALINA_HOME}" />
@@ -113,7 +113,7 @@
</target>
<path id="awsapi.classpath">
<path refid="deps.classpath" />
- <path refid="thirdparty.classpath" />
+ <!-- <path refid="thirdparty.classpath" /> -->
<path refid="rampart.classpath" />
<path refid="dist.classpath" />
</path>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9789e934/build/build-cloud-plugins.xml
----------------------------------------------------------------------
diff --git a/build/build-cloud-plugins.xml b/build/build-cloud-plugins.xml
index a7a1f39..b73289e 100755
--- a/build/build-cloud-plugins.xml
+++ b/build/build-cloud-plugins.xml
@@ -84,7 +84,6 @@
<property name="build.log" location="${target.dir}/ant_verbose.txt" />
<property name="deps.dir" location="${base.dir}/deps" />
- <property name="tools.jar.dir" location="${base.dir}/tools/tooljars" />
<!-- directories for client compilation-->
<property name="client.dir" location="${base.dir}/client" />
@@ -155,9 +154,6 @@
</path>
<path id="compile.deps.classpath">
- <fileset dir="${tools.jar.dir}" erroronmissingdir="true">
- <include name="*.jar" />
- </fileset>
</path>
<path id="deps.classpath">
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9789e934/build/build-cloud.xml
----------------------------------------------------------------------
diff --git a/build/build-cloud.xml b/build/build-cloud.xml
index 2ad3715..90ef25b 100755
--- a/build/build-cloud.xml
+++ b/build/build-cloud.xml
@@ -78,7 +78,6 @@
<property name="build.log" location="${target.dir}/ant_verbose.txt" />
<property name="deps.dir" location="${base.dir}/deps" />
- <property name="tools.jar.dir" location="${base.dir}/tools/tooljars" />
<!-- directories for client compilation-->
<property name="client.dir" location="${base.dir}/client" />
@@ -150,9 +149,6 @@
</path>
<path id="compile.deps.classpath">
- <fileset dir="${tools.jar.dir}" erroronmissingdir="true">
- <include name="*.jar" />
- </fileset>
</path>
<path id="deps.classpath">
@@ -576,6 +572,14 @@
<mkdir dir="${jar.dir}" />
<mkdir dir="${docs.dir}" />
<mkdir dir="${dep.cache.dir}" />
+
+ <!-- Download all dependencies using maven -->
+ <exec executable="mvn" >
+ <arg value="-P"/>
+ <arg value="deps"/>
+ <arg value="-pl"/>
+ <arg value="deps"/>
+ </exec>
<record name="${build.log}" action="stop" />
</target>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9789e934/build/package.xml
----------------------------------------------------------------------
diff --git a/build/package.xml b/build/package.xml
index f3435f8..275d265 100755
--- a/build/package.xml
+++ b/build/package.xml
@@ -156,7 +156,8 @@
</zip>
</target>
- <target name="build-all" depends="build-opensource, build-plugins, build-ui, build-war-oss, compile-testclient, compile-usage, build-awsapi">
+ <!-- <target name="build-all" depends="build-opensource, build-plugins, build-ui, build-war-oss, compile-testclient, compile-usage, build-awsapi"> -->
+ <target name="build-all" depends="build-opensource, build-plugins, build-ui, build-war-oss, compile-usage, build-awsapi">
</target>
<target name="build-all-with-simulator" depends="build-all, compile-agent-simulator">
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9789e934/deps/pom.xml
----------------------------------------------------------------------
diff --git a/deps/pom.xml b/deps/pom.xml
index 1bf8c2c..cb31eeb 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -94,6 +94,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-awsapi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.21</version>
@@ -130,6 +135,12 @@
<artifactId>cloud-plugin-network-netscaler</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- for awsapi build -->
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-ant-plugin</artifactId>
+ <version>1.4.1</version>
+ </dependency>
</dependencies>
<build>
<defaultGoal>install</defaultGoal>
@@ -150,7 +161,7 @@
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
- <excludeArtifactIds>cloud-core,cloud-server,cloud-api,cloud-utils,cloud-vmware-base,cloud-agent,cloud-plugin-host-allocator-random,cloud-plugin-hypervisor-kvm,cloud-plugin-hypervisor-ovm,cloud-plugin-hypervisor-vmware,cloud-plugin-hypervisor-xen,cloud-plugin-netapp,cloud-plugin-network-elb,cloud-plugin-network-f5,cloud-plugin-network-netscaler,cloud-plugin-network-nvp,cloud-plugin-network-ovs,cloud-plugin-network-srx,cloud-plugin-planner-user-concentrated-pod,cloud-plugin-planner-user-dispersing,cloud-plugin-storage-allocator-random,cloud-plugin-user-authenticator-ldap,cloud-plugin-user-authenticator-md5,cloud-plugin-user-authenticator-plaintext,cloud-utils,cloud-vmware-base</excludeArtifactIds>
+ <excludeArtifactIds>cloud-core,cloud-server,cloud-api,cloud-utils,cloud-vmware-base,cloud-agent,cloud-plugin-host-allocator-random,cloud-plugin-hypervisor-kvm,cloud-plugin-hypervisor-ovm,cloud-plugin-hypervisor-vmware,cloud-plugin-hypervisor-xen,cloud-plugin-netapp,cloud-plugin-network-elb,cloud-plugin-network-f5,cloud-plugin-network-netscaler,cloud-plugin-network-nvp,cloud-plugin-network-ovs,cloud-plugin-network-srx,cloud-plugin-planner-user-concentrated-pod,cloud-plugin-planner-user-dispersing,cloud-plugin-storage-allocator-random,cloud-plugin-user-authenticator-ldap,cloud-plugin-user-authenticator-md5,cloud-plugin-user-authenticator-plaintext,cloud-utils,cloud-vmware-base,cloud-awsapi</excludeArtifactIds>
</configuration>
</execution>
</executions>