Return-Path: 
 <commits-return-366-apmail-giraph-commits-archive=giraph.apache.org@giraph.apache.org>
X-Original-To: apmail-giraph-commits-archive@www.apache.org
Delivered-To: apmail-giraph-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B5664D345
	for <apmail-giraph-commits-archive@www.apache.org>;
 Wed, 10 Oct 2012 23:22:26 +0000 (UTC)
Received: (qmail 15134 invoked by uid 500); 10 Oct 2012 23:22:26 -0000
Delivered-To: apmail-giraph-commits-archive@giraph.apache.org
Received: (qmail 15091 invoked by uid 500); 10 Oct 2012 23:22:26 -0000
Mailing-List: contact commits-help@giraph.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@giraph.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@giraph.apache.org>
List-Post: <mailto:commits@giraph.apache.org>
List-Id: <commits.giraph.apache.org>
Reply-To: dev@giraph.apache.org
Delivered-To: mailing list commits@giraph.apache.org
Received: (qmail 15084 invoked by uid 99); 10 Oct 2012 23:22:26 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Oct 2012 23:22:26 +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, 10 Oct 2012 23:22:25 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id ECB5023889E7;
	Wed, 10 Oct 2012 23:21:41 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1396858 - in /giraph/trunk: CHANGELOG pom.xml
 src/main/java/org/apache/giraph/comm/netty/SaslNettyServer.java
Date: Wed, 10 Oct 2012 23:21:41 -0000
To: commits@giraph.apache.org
From: ekoontz@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121010232141.ECB5023889E7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ekoontz
Date: Wed Oct 10 23:21:41 2012
New Revision: 1396858

URL: http://svn.apache.org/viewvc?rev=1396858&view=rev
Log:
GIRAPH-363: Fix hadoop_0.23 profile broken by GIRAPH-211

Modified:
    giraph/trunk/CHANGELOG
    giraph/trunk/pom.xml
    giraph/trunk/src/main/java/org/apache/giraph/comm/netty/SaslNettyServer.java

Modified: giraph/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1396858&r1=1396857&r2=1396858&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Wed Oct 10 23:21:41 2012
@@ -2,6 +2,10 @@ Giraph Change Log
 
 Release 0.2.0 - unreleased
 
+  GIRAPH-363: Fix hadoop_0.23 profile broken by GIRAPH-211 (ekoontz)
+
+  GIRAPH-211: Add secure authentication to Netty IPC (ekoontz)
+
   GIRAPH-361: Hive output partition parsing is broken (nitay via apresta)
 
   GIRAPH-360: Keep track of the task id in ChannelRotater to send

Modified: giraph/trunk/pom.xml
URL: http://svn.apache.org/viewvc/giraph/trunk/pom.xml?rev=1396858&r1=1396857&r2=1396858&view=diff
==============================================================================
--- giraph/trunk/pom.xml (original)
+++ giraph/trunk/pom.xml Wed Oct 10 23:21:41 2012
@@ -558,7 +558,7 @@ under the License.
             </executions>
 	    <!-- profile: hadoop_0.20.203 -->
             <configuration>
-              <symbols>HADOOP_NON_INTERVERSIONED_RPC,HADOOP_NON_JOBCONTEXT_IS_INTERFACE,HADOOP_1_SECURITY</symbols>
+              <symbols>HADOOP_NON_INTERVERSIONED_RPC,HADOOP_NON_JOBCONTEXT_IS_INTERFACE,HADOOP_1_SECURITY,HADOOP_1_SECRET_MANAGER</symbols>
             </configuration>
           </plugin>
         </plugins>
@@ -608,7 +608,7 @@ under the License.
             </executions>
 	    <!-- profile: hadoop_1.0 -->
             <configuration>
-              <symbols>HADOOP_NON_INTERVERSIONED_RPC,HADOOP_NON_JOBCONTEXT_IS_INTERFACE,HADOOP_1_SECURITY</symbols>
+              <symbols>HADOOP_NON_INTERVERSIONED_RPC,HADOOP_NON_JOBCONTEXT_IS_INTERFACE,HADOOP_1_SECURITY,HADOOP_1_SECRET_MANAGER</symbols>
             </configuration>
           </plugin>
         </plugins>
@@ -713,7 +713,7 @@ under the License.
           <groupId>commons-httpclient</groupId>
           <artifactId>commons-httpclient</artifactId>
           <version>3.0.1</version>
-      <scope>runtime</scope>
+	  <scope>runtime</scope>
         </dependency>
       </dependencies>
       <build>
@@ -788,9 +788,6 @@ under the License.
       </build>
     </profile>
 
-    <!-- Help keep future Hadoop versions munge-free: 
-	 All profiles below are munge-free: avoid introducing any munge
-         flags on any of the following profiles. -->
     <profile>
       <id>hadoop_0.23</id>
        <activation>
@@ -800,7 +797,7 @@ under the License.
         </property>
       </activation>
       <properties>
-        <hadoop.version>0.23.1</hadoop.version>
+        <hadoop.version>0.23.3</hadoop.version>
       </properties>
       <dependencies>
         <dependency>
@@ -820,9 +817,42 @@ under the License.
           <artifactId>hadoop-mapreduce-client-common</artifactId>
           <version>${hadoop.version}</version>
         </dependency>
+
+	<dependency>
+	  <groupId>commons-net</groupId>
+	  <artifactId>commons-net</artifactId>
+	  <scope>provided</scope>
+	  <version>3.1</version>
+	</dependency>
+
       </dependencies>
+      <build>
+	<plugins>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>munge-maven-plugin</artifactId>
+            <version>${munge-maven-plugin.version}</version>
+            <executions>
+              <execution>
+		<id>munge</id>
+		<phase>generate-sources</phase>
+		<goals>
+                  <goal>munge</goal>
+		</goals>
+              </execution>
+            </executions>
+	    <!-- profile: hadoop_0.23 -->
+            <configuration>
+	      <symbols>HADOOP_1_SECRET_MANAGER</symbols>
+            </configuration>
+          </plugin>
+	</plugins>
+      </build>
     </profile>
 
+    <!-- Help keep future Hadoop versions munge-free: 
+	 All profiles below are munge-free: avoid introducing any munge
+         flags on any of the following profiles. -->
     <profile>
       <id>hadoop_2.0.0</id>
        <activation>

Modified: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/SaslNettyServer.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/SaslNettyServer.java?rev=1396858&r1=1396857&r2=1396858&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/netty/SaslNettyServer.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/SaslNettyServer.java Wed Oct 10 23:21:41 2012
@@ -62,15 +62,14 @@ public class SaslNettyServer extends Sas
     if (LOG.isDebugEnabled()) {
       LOG.debug("SaslNettyServer: Secret manager is: " + secretManager);
     }
-/*if[HADOOP_1_SECURITY]
-else[HADOOP_1_SECURITY]*/
+/*if[HADOOP_1_SECRET_MANAGER]
+else[HADOOP_1_SECRET_MANAGER]*/
     try {
       secretManager.checkAvailableForRead();
     } catch (StandbyException e) {
       LOG.error("SaslNettyServer: Could not read secret manager: " + e);
     }
-/*end[HADOOP_1_SECURITY]*/
-
+/*end[HADOOP_1_SECRET_MANAGER]*/
     try {
       SaslDigestCallbackHandler ch =
           new SaslNettyServer.SaslDigestCallbackHandler(secretManager);