Return-Path: 
 <chukwa-commits-return-634-apmail-incubator-chukwa-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-chukwa-commits-archive@www.apache.org
Received: (qmail 32889 invoked from network); 4 Nov 2010 21:56:25 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 4 Nov 2010 21:56:25 -0000
Received: (qmail 69540 invoked by uid 500); 4 Nov 2010 21:56:57 -0000
Delivered-To: apmail-incubator-chukwa-commits-archive@incubator.apache.org
Received: (qmail 69525 invoked by uid 500); 4 Nov 2010 21:56:56 -0000
Mailing-List: contact chukwa-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:chukwa-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:chukwa-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:chukwa-commits@incubator.apache.org>
List-Id: <chukwa-commits.incubator.apache.org>
Reply-To: chukwa-dev@incubator.apache.org
Delivered-To: mailing list chukwa-commits@incubator.apache.org
Received: (qmail 69517 invoked by uid 99); 4 Nov 2010 21:56:56 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Nov 2010 21:56:56 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Nov 2010 21:56:55 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 409322388A1C; Thu,  4 Nov 2010 21:55:42 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1031281 - in /incubator/chukwa/trunk: ivy.xml
 src/web/hicc/WEB-INF/web.xml
Date: Thu, 04 Nov 2010 21:55:42 -0000
To: chukwa-commits@incubator.apache.org
From: eyang@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101104215542.409322388A1C@eris.apache.org>

Author: eyang
Date: Thu Nov  4 21:55:41 2010
New Revision: 1031281

URL: http://svn.apache.org/viewvc?rev=1031281&view=rev
Log:
CHUKWA-542.  Disable hbase jar download from maven, and include hicc rest api in HICC web.xml (Eric Yang)

Modified:
    incubator/chukwa/trunk/ivy.xml
    incubator/chukwa/trunk/src/web/hicc/WEB-INF/web.xml

Modified: incubator/chukwa/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/ivy.xml?rev=1031281&r1=1031280&r2=1031281&view=diff
==============================================================================
--- incubator/chukwa/trunk/ivy.xml (original)
+++ incubator/chukwa/trunk/ivy.xml Thu Nov  4 21:55:41 2010
@@ -61,13 +61,13 @@
       name="hadoop-test"
       rev="${hadoop.version}"
       conf="common->master"/>
-    <dependency org="org.apache.hbase"
+<!--    <dependency org="org.apache.hbase"
       name="hbase"
       rev="${hbase.version}"
       conf="common->master">
       <artifact name="hbase" type="jar"/>
       <artifact name="hbase" type="tests" ext="jar" m:classifier="tests"/>
-    </dependency>
+    </dependency> -->
     <dependency org="com.google.guava"
       name="guava"
       rev="${guava.version}"
@@ -188,6 +188,12 @@
       name="core"
       rev="${jetty.eclipse.jdt.core.version}"
       conf="jetty->master"/>
+<!-- Comment out sigar until Sigar 1.6.5 is on maven repository -->
+<!--
+    <dependency org="org.hyperic"
+      name="sigar"
+      rev="${sigar.version}"
+      conf="common->default"/> -->
     <dependency org="springframework"
       name="spring-mock"
       rev="${spring-mock.version}"

Modified: incubator/chukwa/trunk/src/web/hicc/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/web/hicc/WEB-INF/web.xml?rev=1031281&r1=1031280&r2=1031281&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/web/hicc/WEB-INF/web.xml (original)
+++ incubator/chukwa/trunk/src/web/hicc/WEB-INF/web.xml Thu Nov  4 21:55:41 2010
@@ -33,7 +33,7 @@
       </servlet-class>
       <init-param>
 	<param-name>com.sun.jersey.config.property.packages</param-name>
-	<param-value>org.apache.hadoop.chukwa.rest.resource</param-value>
+	<param-value>org.apache.hadoop.chukwa.rest.resource;org.apache.hadoop.chukwa.hicc.rest</param-value>
       </init-param>
       <load-on-startup>1</load-on-startup>
     </servlet>