Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-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 F36C37480 for ; Fri, 9 Dec 2011 21:03:03 +0000 (UTC) Received: (qmail 19726 invoked by uid 500); 9 Dec 2011 21:03:03 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 19702 invoked by uid 500); 9 Dec 2011 21:03:03 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 19694 invoked by uid 99); 9 Dec 2011 21:03:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Dec 2011 21:03:03 +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; Fri, 09 Dec 2011 21:03:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CF31323889D7; Fri, 9 Dec 2011 21:02:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1212630 - in /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/org/apache/hadoop/hdfs/protocol/proto/ src/main/proto/ src/proto/ Date: Fri, 09 Dec 2011 21:02:38 -0000 To: hdfs-commits@hadoop.apache.org From: tucu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111209210238.CF31323889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tucu Date: Fri Dec 9 21:02:38 2011 New Revision: 1212630 URL: http://svn.apache.org/viewvc?rev=1212630&view=rev Log: Merge -r 1212608:1212609 from trunk to branch. FIXES: HDFS-2511 Added: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/ - copied from r1212626, hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/proto/ Removed: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/proto/DataTransferProtos.java hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/proto/HdfsProtos.java hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/proto/ Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1212630&r1=1212629&r2=1212630&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri Dec 9 21:02:38 2011 @@ -48,6 +48,8 @@ Release 0.23.1 - UNRELEASED HDFS-2178. Contributing Hoop to HDFS, replacement for HDFS proxy with read/write capabilities. (tucu) + HDFS-2511. Add dev script to generate HDFS protobufs. (tucu) + OPTIMIZATIONS HDFS-2130. Switch default checksum to CRC32C. (todd) Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml?rev=1212630&r1=1212629&r2=1212630&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml Fri Dec 9 21:02:38 2011 @@ -205,6 +205,7 @@ + ${project.build.directory}/generated-sources/java ${project.build.directory}/generated-src/main/jsp @@ -216,6 +217,29 @@ maven-antrun-plugin + compile-proto + generate-sources + + run + + + + + PROTO_DIR=${basedir}/src/main/proto + ls $PROTO_DIR &> /dev/null + if [ $? = 0 ]; then + JAVA_DIR=${project.build.directory}/generated-sources/java + mkdir -p $JAVA_DIR + ls $PROTO_DIR/*.proto | xargs -n 1 protoc -I$PROTO_DIR --java_out=$JAVA_DIR + fi + + + + + + + + create-web-xmls compile