Return-Path: 
 <cloudstack-commits-return-2246-apmail-incubator-cloudstack-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5B40595F8
	for <apmail-incubator-cloudstack-commits-archive@minotaur.apache.org>;
 Thu,  9 Aug 2012 19:03:18 +0000 (UTC)
Received: (qmail 13117 invoked by uid 500); 9 Aug 2012 19:03:18 -0000
Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org
Received: (qmail 13018 invoked by uid 500); 9 Aug 2012 19:03:18 -0000
Mailing-List: contact cloudstack-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cloudstack-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cloudstack-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cloudstack-commits@incubator.apache.org>
List-Id: <cloudstack-commits.incubator.apache.org>
Reply-To: cloudstack-dev@incubator.apache.org
Delivered-To: mailing list cloudstack-commits@incubator.apache.org
Received: (qmail 12995 invoked by uid 99); 9 Aug 2012 19:03:18 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 19:03:18 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id CFE883CDCF; Thu,  9 Aug 2012 19:03:17 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ke4qqq@apache.org
To: cloudstack-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [1/26] git commit: resolving conflict
Message-Id: <20120809190317.CFE883CDCF@tyr.zones.apache.org>
Date: Thu,  9 Aug 2012 19:03:17 +0000 (UTC)

Updated Branches:
  refs/heads/deps-ctrl b2b57a161 -> 9722bbcca


resolving conflict


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9722bbcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9722bbcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9722bbcc

Branch: refs/heads/deps-ctrl
Commit: 9722bbccae93447a3875f51eb3b0f5fefd0b2a50
Parents: eb2cbe9 b2b57a1
Author: David Nalley <david@gnsa.us>
Authored: Thu Aug 9 15:03:43 2012 -0400
Committer: David Nalley <david@gnsa.us>
Committed: Thu Aug 9 15:03:43 2012 -0400

----------------------------------------------------------------------
 build/alldeps.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9722bbcc/build/alldeps.xml
----------------------------------------------------------------------
diff --cc build/alldeps.xml
index 8742509,0000000..f3fa2ef
mode 100644,000000..100644
--- a/build/alldeps.xml
+++ b/build/alldeps.xml
@@@ -1,163 -1,0 +1,164 @@@
 +<project name="CloudStack Deps Resolver" default="help" basedir=".">
 +  <description> This downloads binary copies of dependencies for building CloudStack</description>
 +
 +  <target name="resolveBuildDeps">
 +   <mkdir dir="deps" />
 +   <get src="http://search.maven.org/remotecontent?filepath=log4j/log4j/1.2.16/log4j-1.2.16.jar" 
 +     dest="deps/log4j-1.2.16.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/org/apache/axis/axis/1.4/axis-1.4.jar" 
 +     dest="deps/axis-1.4.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar" 
 +     dest="deps/backport-util-concurrent-3.1.jar" usetimestamp="true" /> 
 +   <get src="http://repo1.maven.org/maven2/cglib/cglib/2.2.2/cglib-2.2.2.jar" 
 +     dest="deps/cglib-2.2.2.jar" usetimestamp="true" /> 
 +   <get src="http://repo1.maven.org/maven2/commons-configuration/commons-configuration/1.8/commons-configuration-1.8.jar" 
 +     dest="deps/commons-configuration-1.8.jar" usetimestamp="true" /> 
 +   <get src="http://repo1.maven.org/maven2/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar" 
 +     dest="deps/commons-dbcp-1.4.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" 
 +     dest="deps/commons-httpclient-3.1.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/commons-pool/commons-pool/1.6/commons-pool-1.6.jar" 
 +     dest="deps/commons-pool-1.6.jar" usetimestamp="true" />
 +   <get src="https://oss.sonatype.org/content/repositories/sourceforge-releases/net/sf/ehcache/ehcache-core/2.6.0/ehcache-core-2.6.0.jar" 
 +     dest="deps/ehcache-core-2.6.0.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/javax/mail/mail/1.4/mail-1.4.jar" 
 +     dest="deps/email-1.4.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/com/google/code/gson/gson/1.7.2/gson-1.7.2.jar" 
 +     dest="deps/gson-1.7.2.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.2.1/httpcore-4.2.1.jar" 
 +     dest="deps/httpcore-4.2.1.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/org/jasypt/jasypt/1.8/jasypt-1.8.jar" 
 +     dest="deps/jasypt-1.9.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar" 
 +     dest="deps/jsch-0.1.42.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/junit/junit/4.10/junit-4.10.jar" 
 +     dest="deps/junit-4.10.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/org/tmatesoft/svnkit/trilead-ssh2/build213-svnkit-1.3-patch/trilead-ssh2-build213-svnkit-1.3-patch.jar"
 +     dest="deps/trilead-ssh2-build213.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/org/apache/xmlrpc/xmlrpc-client/3.1.3/xmlrpc-client-3.1.3.jar"
 +      dest="deps/xmlrpc-client-3.1.3.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/org/apache/xmlrpc/xmlrpc-common/3.1.3/xmlrpc-common-3.1.3.jar" 
 +      dest="deps/xmlrpc-common-3.1.3.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar" 
 +      dest="deps/xstream-1.3.1.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26.jar"
 +      dest="deps/jetty-6.1.26.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26.jar"
 +      dest="deps/jetty-util-6.1.26.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/commons-codec/commons-codec/1.6/commons-codec-1.6.jar" 
 +      dest="deps/commons-codec-1.6.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" 
 +      dest="deps/commons-collections-3.2.1.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" 
 +      dest="deps/commons-lang-2.6.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/apache/tomcat/servlet-api/6.0.35/servlet-api-6.0.35.jar" 
 +      dest="deps/servlet-api-6.0.35.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/seleniumhq/selenium/server/selenium-server/1.0.3/selenium-server-1.0.3-standalone.jar"
 +      dest="deps/selenium-1.0.3-standalone-1.0.3.jar" usetimestamp="true" />
 +<!--############# AWS STUFF BELOW THIS LINE ####################-->
 +   <get src="http://repo1.maven.org/maven2/org/apache/ws/commons/axiom/axiom-api/1.2.8/axiom-api-1.2.8.jar" 
 +      dest="deps/awsapi-lib/axiom-api-1.2.8.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/org/apache/ws/commons/axiom/axiom-impl/1.2.8/axiom-impl-1.2.8.jar"
 +      dest="deps/awsapi-lib/axiom-impl-1.2.8.jar" usetimestamp="true" />  
 +   <get src="http://repo1.maven.org/maven2/org/apache/axis2/axis2/1.5.1/axis2-1.5.1.jar"
 +      dest="deps/awsapi-lib/axis2-1.5.1.jar" usetimestamp="true" />
 +   <get src="http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.46/bcprov-jdk15on-1.46.jar" 
 +      dest="deps/bcprov-jdk15on-1.46.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/org/apache/axis2/axis2-ant-plugin/1.5.1/axis2-ant-plugin-1.5.1.jar"
 +      dest="deps/awsapi-lib/axis2-ant-plugin-1.5.1.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.jar" 
 +      dest="deps/awsapi-lib/json-simple-1.1.jar" usetimestamp="true" /> 
 +   <get src="http://repo1.maven.org/maven2/org/apache/neethi/neethi/2.0.4/neethi-2.0.4.jar" 
 +      dest="deps/awsapi-lib/neethi-2.0.4.jar" usetimestamp="true" />
 +
 +  </target>
 +
 +  <target name="resolveOptBuildDeps">
 +    <mkdir dir="deps" />
-     <get src="http://www.libvirt.org/maven2/org/libvirt/libvirt/0.4.7/libvirt-0.4.7.jar" 
-       dest="deps/libvirt-0.4.7.jar" usetimestamp="true" />
++    <!-- This should actually point to libvirt.org, but they don't have 0.4.8 online at /maven2 -->
++    <get src="http://zooi.widodh.nl/cloudstack/libvirt-java/libvirt-0.4.8.jar" 
++      dest="deps/libvirt-0.4.8.jar" usetimestamp="true" />
 +    <get src="https://www.f5se.com/repository/com/f5se/utils/iControl/1.0/iControl-1.0.jar" 
 +      dest="deps/iControl-1.0.jar" usetimestamp="true" />
 +
 +  </target>
 +
 +  <target name="resolveRuntimeDeps">
 +    <mkdir dir="deps" />
 +    <get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/log4j/apache-log4j-extras/1.1/apache-log4j-extras-1.1.jar" 
 +      dest="deps/apache-log4j-extras-1.1.jar" usetimestamp="true" />
 +    <get src="http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.46/bcprov-jdk15on-1.46.jar" 
 +      dest="deps/bcprov-jdk15on-1.46.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/commons-discovery/commons-discovery/0.5/commons-discovery-0.5.jar" 
 +      dest="deps/common-discovery-0.5.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" 
 +      dest="deps/commons-lang-2.6.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" 
 +      dest="deps/commons-loggin-1.1.1.jar" usetimestamp="true" />
 +    <get src="http://search.maven.org/remotecontent?filepath=jstl/jstl/1.2/jstl-1.2.jar" 
 +      dest="deps/jstl-1.2.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/apache/tomcat/servlet-api/6.0.35/servlet-api-6.0.35.jar" 
 +      dest="deps/servlet-api-6.0.35.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/apache/ws/commons/util/ws-commons-util/1.0.2/ws-commons-util-1.0.2.jar" 
 +      dest="deps/ws-commons-util-1.0.2.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar" 
 +      dest="deps/wsdl4j-1.6.2.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/commons-configuration/commons-configuration/1.8/commons-configuration-1.8.jar"
 +      dest="deps/commons-configuration-1.8.jar" usetimestamp="true" />
 +
 +    <!-- AWS runtime deps below -->
 +    <mkdir dir="deps/awsapi-lib" />
 +    <get src="http://mirrors.ibiblio.org/pub/mirrors/maven/antlr/jars/antlr-2.7.6.jar" 
 +      dest="deps/awsapi-lib/antlr-2.7.6.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/apache/axis2/axis2-adb/1.5.1/axis2-adb-1.5.1.jar"
 +      dest="deps/awsapi-lib/axis2-adb-1.5.1.jar" usetimestamp="true" /> 
 +    <get src="http://repo1.maven.org/maven2/org/apache/axis2/axis2-jaxbri/1.5.1/axis2-jaxbri-1.5.1.jar"
 +      dest="deps/awsapi-lib/axis2-jaxbri-1.5.1.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/apache/axis2/axis2-jaxws/1.5.1/axis2-jaxws-1.5.1.jar"
 +      dest="deps/awsapi-lib/axis2-jaxws-1.5.1.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/apache/axis2/axis2-jibx/1.5.1/axis2-jibx-1.5.1.jar"
 +      dest="deps/awsapi-lib/axis2-jibx-1.5.1.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/apache/axis2/axis2-json/1.5.1/axis2-json-1.5.1.jar" 
 +      dest="deps/awsapi-lib/axis2-json-1.5.1.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/apache/axis2/axis2-kernel/1.5.1/axis2-kernel-1.5.1.jar"
 +      dest="deps/awsapi-lib/axis2-kernel-1.5.1.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/apache/axis2/axis2-transport-http/1.5.1/axis2-transport-http-1.5.1.jar"
 +      dest="deps/awsapi-lib/axis2-transport-http-1.5.1.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/apache/axis2/axis2-transport-local/1.5.1/axis2-transport-local-1.5.1.jar"
 +      dest="deps/awsapi-lib/axis2-transport-local-1.5.1.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/c3p0/c3p0/0.9.1.2/c3p0-0.9.1.2.jar" 
 +      dest="deps/awsapi-lib/c3p0-0.9.1.2.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"
 +      dest="deps/awsapi-lib/commons-fileupload-1.2.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/commons-io/commons-io/1.4/commons-io-1.4.jar" 
 +      dest="deps/awsapi-lib/commons-io-1.4.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" 
 +      dest="deps/awsapi-lib/dom4j-1.6.1.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar"
 +      dest="deps/awsapi-lib/javassist-3.9.0.GA.jar" usetimestamp="true" /> 
 +    <get src="http://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" 
 +      dest="deps/awsapi-lib/jaxb-api-2.1.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/2.1.7/jaxb-impl-2.1.7.jar"
 +      dest="deps/awsapi-lib/jaxb-impl-2.1.7.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-xjc/2.1.7/jaxb-xjc-2.1.7.jar" 
 +      dest="deps/awsapi-lib/jaxb-xjc-2.1.7.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/javax/transaction/jta/1.1/jta-1.1.jar" 
 +      dest="deps/awsapi-lib/jta-1.1.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.5.11/slf4j-api-1.5.11.jar" 
 +      dest="deps/awsapi-lib/slf4j-api-1.5.11.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/1.5.11/slf4j-jdk14-1.5.11.jar"
 +      dest="deps/awsapi-lib/slf4j-jdk14-1.5.11.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/apache/woden/woden-api/1.0M8/woden-api-1.0M8.jar" 
 +      dest="deps/awsapi-lib/woden-api-1.0M8.jar" usetimestamp="true" />
 +    <get src="http://repo1.maven.org/maven2/org/apache/woden/woden-impl-om/1.0M8/woden-impl-om-1.0M8.jar"
 +      dest="deps/awsapi-lib/woden-impl-om-1.0M8.jar" usetimestamp="true" />  
 +    <get src="http://repo1.maven.org/maven2/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar" 
 +      dest="deps/awsapi-lib/xercesImpl-2.8.1.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar" 
 +      dest="deps/awsapi-lib/xml-apis-1.3.03.jar" usetimestamp="true" />
 +   <get src="http://repo1.maven.org/maven2/org/apache/ws/commons/schema/XmlSchema/1.4.3/XmlSchema-1.4.3.jar"
 +      dest="deps/awsapi-lib/XmlSchema-1.4.3.jar" usetimestamp="true" />
 +
 +  </target>
 +
 +</project>