Return-Path: 
 <cloudstack-commits-return-4735-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 AF2A5DA76
	for <apmail-incubator-cloudstack-commits-archive@minotaur.apache.org>;
 Wed, 10 Oct 2012 03:38:15 +0000 (UTC)
Received: (qmail 30147 invoked by uid 500); 10 Oct 2012 03:38:15 -0000
Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org
Received: (qmail 29907 invoked by uid 500); 10 Oct 2012 03:38:11 -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 29882 invoked by uid 99); 10 Oct 2012 03:38:10 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Oct 2012 03:38:10 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 1F84E3D20A; Wed, 10 Oct 2012 03:38:09 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: edison@apache.org
To: cloudstack-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: Revert "Revert "Revert
 75e2a1012fccc01c639c7f41be564ac0e32088fb""
Message-Id: <20121010033810.1F84E3D20A@tyr.zones.apache.org>
Date: Wed, 10 Oct 2012 03:38:09 +0000 (UTC)

Updated Branches:
  refs/heads/4.0 da1ce5fd5 -> 828fa3389


Revert "Revert "Revert 75e2a1012fccc01c639c7f41be564ac0e32088fb""

This reverts commit bb7f9ad9774019f4fdb4d72b2e32a36df9c89188.


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

Branch: refs/heads/4.0
Commit: 828fa3389bbe7cd0378c4e55152d671932badca2
Parents: da1ce5f
Author: Edison Su <sudison@gmail.com>
Authored: Tue Oct 9 20:37:30 2012 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Tue Oct 9 20:37:51 2012 -0700

----------------------------------------------------------------------
 deps/pom.xml |   11 ++++++++---
 pom.xml      |    1 +
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/828fa338/deps/pom.xml
----------------------------------------------------------------------
diff --git a/deps/pom.xml b/deps/pom.xml
index 32ac7ee..069da5c 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -118,9 +118,14 @@
     </dependency>
     <!-- For vmware-base -->
     <dependency>
-      <groupId>org.apache.axis2</groupId>
-      <artifactId>axis2</artifactId>
-      <version>${cs.axis2.version}</version>
+      <groupId>org.apache.axis</groupId>
+      <artifactId>axis</artifactId>
+      <version>${cs.axis.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.axis</groupId>
+      <artifactId>axis-jaxrpc</artifactId>
+      <version>${cs.axis.version}</version>
     </dependency>
   </dependencies>
   <build>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/828fa338/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 88396a2..5e93711 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
     <cs.xstream.version>1.3.1</cs.xstream.version>
     <cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
     <cs.mail.version>1.4</cs.mail.version>
+    <cs.axis.version>1.4</cs.axis.version>
     <cs.axis2.version>1.5.1</cs.axis2.version>
     <cs.rampart.version>1.6.2</cs.rampart.version>
     <cs.axiom.version>1.2.8</cs.axiom.version>