Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-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 E0123D107 for ; Wed, 3 Oct 2012 06:43:03 +0000 (UTC) Received: (qmail 58843 invoked by uid 500); 3 Oct 2012 06:43:03 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 58786 invoked by uid 500); 3 Oct 2012 06:43:03 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 58775 invoked by uid 99); 3 Oct 2012 06:43:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Oct 2012 06:43:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 03 Oct 2012 06:42:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8501D238896F; Wed, 3 Oct 2012 06:42:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1393315 - in /incubator/ambari/branches/AMBARI-666: ./ ambari-api/ ambari-project/ ambari-server/src/main/java/org/apache/ambari/server/agent/ ambari-server/src/test/java/org/apache/ambari/server/agent/ ambari-server/src/test/resources/ Date: Wed, 03 Oct 2012 06:42:14 -0000 To: ambari-commits@incubator.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121003064214.8501D238896F@eris.apache.org> Author: mahadev Date: Wed Oct 3 06:42:13 2012 New Revision: 1393315 URL: http://svn.apache.org/viewvc?rev=1393315&view=rev Log: AMBARI-795. Fix failing tests for AgentResource and BootStrap. (mahadev) Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt incubator/ambari/branches/AMBARI-666/ambari-api/pom.xml incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/log4j.properties Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1393315&r1=1393314&r2=1393315&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original) +++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Wed Oct 3 06:42:13 2012 @@ -12,6 +12,8 @@ AMBARI-666 branch (unreleased changes) NEW FEATURES + AMBARI-795. Fix failing tests for AgentResource and BootStrap. (mahadev) + AMBARI-793. Make MapReduce, Nagios, and Ganglia optional during cluster install. (yusaku) Modified: incubator/ambari/branches/AMBARI-666/ambari-api/pom.xml URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-api/pom.xml?rev=1393315&r1=1393314&r2=1393315&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-api/pom.xml (original) +++ incubator/ambari/branches/AMBARI-666/ambari-api/pom.xml Wed Oct 3 06:42:13 2012 @@ -12,96 +12,92 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - - - - - 4.0.0 + + org.apache.ambari - ambari-api - jar - Ambari API + ambari-project 1.0.3-SNAPSHOT - Ambari API - + ../ambari-project + + 4.0.0 + org.apache.ambari + ambari-api + jar + Ambari API + 1.0.3-SNAPSHOT + Ambari API + - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.2 - - - junit - junit - 4.10 - - - org.xerial - sqlite-jdbc - 3.7.2 - - - org.easymock - easymock - 3.1 - test - - - org.objenesis - objenesis-tck - 1.2 - - - cglib - cglib - 2.2.2 - - - org.codehaus.jackson - jackson-core-asl - 1.9.2 - - - org.codehaus.jackson - jackson-jaxrs - 1.9.2 - - - org.codehaus.jackson - jackson-xc - 1.9.7 - - - asm - asm - 3.3.1 - - - com.sun.jersey - jersey-bundle - 1.10-b01 - - - com.sun.jersey - jersey-core - 1.10 - - - com.sun.jersey - jersey-grizzly - 1.10 - - - com.sun.jersey.contribs - jersey-multipart - 1.10 - - - com.sun.grizzly - grizzly-comet-webserver - 1.9.36 - - + + + org.codehaus.jackson + jackson-mapper-asl + 1.9.2 + + + junit + junit + + + org.xerial + sqlite-jdbc + 3.7.2 + + + org.easymock + easymock + 3.1 + test + + + org.objenesis + objenesis-tck + 1.2 + + + cglib + cglib + 2.2.2 + + + org.codehaus.jackson + jackson-core-asl + 1.9.2 + + + org.codehaus.jackson + jackson-jaxrs + 1.9.2 + + + org.codehaus.jackson + jackson-xc + 1.9.7 + + + asm + asm + 3.3.1 + + + com.sun.jersey + jersey-bundle + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-grizzly + + + com.sun.jersey.contribs + jersey-multipart + + + com.sun.grizzly + grizzly-comet-webserver + + Modified: incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml?rev=1393315&r1=1393314&r2=1393315&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml (original) +++ incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml Wed Oct 3 06:42:13 2012 @@ -204,6 +204,26 @@ servlet-api 2.5 + + com.sun.jersey + jersey-core + 1.8 + + + com.sun.jersey + jersey-grizzly + 1.8 + + + com.sun.grizzly + grizzly-comet-webserver + 1.9.36 + + + com.sun.jersey + jersey-bundle + 1.8 + com.sun.jersey jersey-json Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java?rev=1393315&r1=1393314&r2=1393315&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java (original) +++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java Wed Oct 3 06:42:13 2012 @@ -27,8 +27,6 @@ import org.apache.ambari.server.state.li import org.apache.ambari.server.state.live.Cluster; import org.apache.ambari.server.state.live.Clusters; import org.apache.ambari.server.state.live.host.Host; -import org.apache.ambari.server.state.live.host.HostEvent; -import org.apache.ambari.server.state.live.host.HostEventType; import org.apache.ambari.server.state.live.host.HostHealthyHeartbeatEvent; import org.apache.ambari.server.state.live.host.HostRegistrationRequestEvent; import org.apache.ambari.server.state.live.host.HostState; Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java?rev=1393315&r1=1393314&r2=1393315&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java (original) +++ incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java Wed Oct 3 06:42:13 2012 @@ -18,9 +18,10 @@ package org.apache.ambari.server.agent; +import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.mockito.Matchers.any; + import javax.ws.rs.core.MediaType; import junit.framework.Assert; @@ -55,7 +56,7 @@ public class AgentResourceTest extends J super(new WebAppDescriptor.Builder(PACKAGE_NAME).servletClass(ServletContainer.class) .build()); } - + public class MockModule extends AbstractModule { RegistrationResponse response = new RegistrationResponse(); Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/log4j.properties?rev=1393315&r1=1393314&r2=1393315&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/log4j.properties (original) +++ incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/log4j.properties Wed Oct 3 06:42:13 2012 @@ -12,7 +12,7 @@ # log4j configuration used during build and unit tests -log4j.rootLogger=INFO,stdout +log4j.rootLogger=DEBUG,stdout log4j.threshhold=ALL log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout