Author: vinodkv Date: Mon Jan 7 11:10:04 2013 New Revision: 1429749 URL: http://svn.apache.org/viewvc?rev=1429749&view=rev Log: YARN-315. Using the common security token protobuf definition from hadoop common. Contributed by Suresh Srinivas. svn merge --ignore-ancestry -c 1429748 ../../trunk/
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/CancelDelegationTokenRequestPBImpl.java hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetDelegationTokenResponsePBImpl.java hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RenewDelegationTokenRequestPBImpl.java hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerPBImpl.java hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerTokenPBImpl.java hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/DelegationTokenPBImpl.java hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1429749&r1=1429748&r2=1429749&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Mon Jan 7 11:10:04 2013 @@ -72,6 +72,9 @@ Release 2.0.3-alpha - Unreleased YARN-254. Update fair scheduler web UI for hierarchical queues. (sandyr via tucu) + YARN-315. Using the common security token protobuf definition from hadoop + common. (Suresh Srinivas via vinodkv) + OPTIMIZATIONS BUG FIXES Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml?rev=1429749&r1=1429748&r2=1429749&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml Mon Jan 7 11:10:04 2013 @@ -62,6 +62,7 @@ <configuration> <executable>protoc</executable> <arguments> + <argument>-I../../../hadoop-common-project/hadoop-common/src/main/proto/</argument> <argument>-Isrc/main/proto/</argument> <argument>--java_out=target/generated-sources/proto</argument> <argument>src/main/proto/yarn_protos.proto</argument> Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/CancelDelegationTokenRequestPBImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/CancelDelegationTokenRequestPBImpl.java?rev=1429749&r1=1429748&r2=1429749&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/CancelDelegationTokenRequestPBImpl.java (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/CancelDelegationTokenRequestPBImpl.java Mon Jan 7 11:10:04 2013 @@ -17,11 +17,11 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; +import org.apache.hadoop.security.proto.SecurityProtos.TokenProto; import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest; import org.apache.hadoop.yarn.api.records.DelegationToken; import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.DelegationTokenPBImpl; -import org.apache.hadoop.yarn.proto.YarnProtos.DelegationTokenProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.CancelDelegationTokenRequestProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.CancelDelegationTokenRequestProtoOrBuilder; @@ -96,11 +96,11 @@ public class CancelDelegationTokenReques viaProto = false; } - private DelegationTokenPBImpl convertFromProtoFormat(DelegationTokenProto p) { + private DelegationTokenPBImpl convertFromProtoFormat(TokenProto p) { return new DelegationTokenPBImpl(p); } - private DelegationTokenProto convertToProtoFormat(DelegationToken t) { + private TokenProto convertToProtoFormat(DelegationToken t) { return ((DelegationTokenPBImpl) t).getProto(); } } Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetDelegationTokenResponsePBImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetDelegationTokenResponsePBImpl.java?rev=1429749&r1=1429748&r2=1429749&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetDelegationTokenResponsePBImpl.java (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetDelegationTokenResponsePBImpl.java Mon Jan 7 11:10:04 2013 @@ -18,11 +18,11 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; +import org.apache.hadoop.security.proto.SecurityProtos.TokenProto; import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenResponse; import org.apache.hadoop.yarn.api.records.DelegationToken; import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.DelegationTokenPBImpl; -import org.apache.hadoop.yarn.proto.YarnProtos.DelegationTokenProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetDelegationTokenResponseProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetDelegationTokenResponseProtoOrBuilder; @@ -99,11 +99,11 @@ ProtoBase<GetDelegationTokenResponseProt } - private DelegationTokenPBImpl convertFromProtoFormat(DelegationTokenProto p) { + private DelegationTokenPBImpl convertFromProtoFormat(TokenProto p) { return new DelegationTokenPBImpl(p); } - private DelegationTokenProto convertToProtoFormat(DelegationToken t) { + private TokenProto convertToProtoFormat(DelegationToken t) { return ((DelegationTokenPBImpl)t).getProto(); } } Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RenewDelegationTokenRequestPBImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RenewDelegationTokenRequestPBImpl.java?rev=1429749&r1=1429748&r2=1429749&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RenewDelegationTokenRequestPBImpl.java (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RenewDelegationTokenRequestPBImpl.java Mon Jan 7 11:10:04 2013 @@ -17,11 +17,11 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; +import org.apache.hadoop.security.proto.SecurityProtos.TokenProto; import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenRequest; import org.apache.hadoop.yarn.api.records.DelegationToken; import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.DelegationTokenPBImpl; -import org.apache.hadoop.yarn.proto.YarnProtos.DelegationTokenProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.RenewDelegationTokenRequestProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.RenewDelegationTokenRequestProtoOrBuilder; @@ -97,11 +97,11 @@ public class RenewDelegationTokenRequest } - private DelegationTokenPBImpl convertFromProtoFormat(DelegationTokenProto p) { + private DelegationTokenPBImpl convertFromProtoFormat(TokenProto p) { return new DelegationTokenPBImpl(p); } - private DelegationTokenProto convertToProtoFormat(DelegationToken t) { + private TokenProto convertToProtoFormat(DelegationToken t) { return ((DelegationTokenPBImpl)t).getProto(); } } Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerPBImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerPBImpl.java?rev=1429749&r1=1429748&r2=1429749&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerPBImpl.java (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerPBImpl.java Mon Jan 7 11:10:04 2013 @@ -19,6 +19,7 @@ package org.apache.hadoop.yarn.api.records.impl.pb; +import org.apache.hadoop.security.proto.SecurityProtos.TokenProto; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerState; @@ -33,7 +34,6 @@ import org.apache.hadoop.yarn.proto.Yarn import org.apache.hadoop.yarn.proto.YarnProtos.ContainerProtoOrBuilder; import org.apache.hadoop.yarn.proto.YarnProtos.ContainerStateProto; import org.apache.hadoop.yarn.proto.YarnProtos.ContainerStatusProto; -import org.apache.hadoop.yarn.proto.YarnProtos.ContainerTokenProto; import org.apache.hadoop.yarn.proto.YarnProtos.NodeIdProto; import org.apache.hadoop.yarn.proto.YarnProtos.PriorityProto; import org.apache.hadoop.yarn.proto.YarnProtos.ResourceProto; @@ -324,11 +324,11 @@ public class ContainerPBImpl extends Pro return ((PriorityPBImpl)p).getProto(); } - private ContainerTokenPBImpl convertFromProtoFormat(ContainerTokenProto p) { + private ContainerTokenPBImpl convertFromProtoFormat(TokenProto p) { return new ContainerTokenPBImpl(p); } - private ContainerTokenProto convertToProtoFormat(ContainerToken t) { + private TokenProto convertToProtoFormat(ContainerToken t) { return ((ContainerTokenPBImpl)t).getProto(); } Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerTokenPBImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerTokenPBImpl.java?rev=1429749&r1=1429748&r2=1429749&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerTokenPBImpl.java (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerTokenPBImpl.java Mon Jan 7 11:10:04 2013 @@ -23,14 +23,14 @@ import java.nio.ByteBuffer; import org.apache.hadoop.yarn.api.records.ContainerToken; import org.apache.hadoop.yarn.api.records.ProtoBase; -import org.apache.hadoop.yarn.proto.YarnProtos.ContainerTokenProto; -import org.apache.hadoop.yarn.proto.YarnProtos.ContainerTokenProtoOrBuilder; +import org.apache.hadoop.security.proto.SecurityProtos.TokenProto; +import org.apache.hadoop.security.proto.SecurityProtos.TokenProtoOrBuilder; -public class ContainerTokenPBImpl extends ProtoBase<ContainerTokenProto> implements ContainerToken { - private ContainerTokenProto proto = ContainerTokenProto.getDefaultInstance(); - private ContainerTokenProto.Builder builder = null; +public class ContainerTokenPBImpl extends ProtoBase<TokenProto> implements ContainerToken { + private TokenProto proto = TokenProto.getDefaultInstance(); + private TokenProto.Builder builder = null; private boolean viaProto = false; private ByteBuffer identifier; @@ -38,15 +38,15 @@ public class ContainerTokenPBImpl extend public ContainerTokenPBImpl() { - builder = ContainerTokenProto.newBuilder(); + builder = TokenProto.newBuilder(); } - public ContainerTokenPBImpl(ContainerTokenProto proto) { + public ContainerTokenPBImpl(TokenProto proto) { this.proto = proto; viaProto = true; } - public synchronized ContainerTokenProto getProto() { + public synchronized TokenProto getProto() { mergeLocalToProto(); proto = viaProto ? proto : builder.build(); viaProto = true; @@ -72,7 +72,7 @@ public class ContainerTokenPBImpl extend private synchronized void maybeInitBuilder() { if (viaProto || builder == null) { - builder = ContainerTokenProto.newBuilder(proto); + builder = TokenProto.newBuilder(proto); } viaProto = false; } @@ -80,7 +80,7 @@ public class ContainerTokenPBImpl extend @Override public synchronized ByteBuffer getIdentifier() { - ContainerTokenProtoOrBuilder p = viaProto ? proto : builder; + TokenProtoOrBuilder p = viaProto ? proto : builder; if (this.identifier != null) { return this.identifier; } @@ -100,7 +100,7 @@ public class ContainerTokenPBImpl extend } @Override public synchronized ByteBuffer getPassword() { - ContainerTokenProtoOrBuilder p = viaProto ? proto : builder; + TokenProtoOrBuilder p = viaProto ? proto : builder; if (this.password != null) { return this.password; } @@ -120,7 +120,7 @@ public class ContainerTokenPBImpl extend } @Override public synchronized String getKind() { - ContainerTokenProtoOrBuilder p = viaProto ? proto : builder; + TokenProtoOrBuilder p = viaProto ? proto : builder; if (!p.hasKind()) { return null; } @@ -138,7 +138,7 @@ public class ContainerTokenPBImpl extend } @Override public synchronized String getService() { - ContainerTokenProtoOrBuilder p = viaProto ? proto : builder; + TokenProtoOrBuilder p = viaProto ? proto : builder; if (!p.hasService()) { return null; } Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/DelegationTokenPBImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/DelegationTokenPBImpl.java?rev=1429749&r1=1429748&r2=1429749&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/DelegationTokenPBImpl.java (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/DelegationTokenPBImpl.java Mon Jan 7 11:10:04 2013 @@ -20,15 +20,15 @@ package org.apache.hadoop.yarn.api.recor import java.nio.ByteBuffer; +import org.apache.hadoop.security.proto.SecurityProtos.TokenProto; +import org.apache.hadoop.security.proto.SecurityProtos.TokenProtoOrBuilder; import org.apache.hadoop.yarn.api.records.DelegationToken; import org.apache.hadoop.yarn.api.records.ProtoBase; -import org.apache.hadoop.yarn.proto.YarnProtos.DelegationTokenProto; -import org.apache.hadoop.yarn.proto.YarnProtos.DelegationTokenProtoOrBuilder; -public class DelegationTokenPBImpl extends ProtoBase<DelegationTokenProto> +public class DelegationTokenPBImpl extends ProtoBase<TokenProto> implements DelegationToken { - private DelegationTokenProto proto = DelegationTokenProto.getDefaultInstance(); - private DelegationTokenProto.Builder builder = null; + private TokenProto proto = TokenProto.getDefaultInstance(); + private TokenProto.Builder builder = null; private boolean viaProto = false; private ByteBuffer identifier; @@ -36,15 +36,15 @@ public class DelegationTokenPBImpl exten public DelegationTokenPBImpl() { - builder = DelegationTokenProto.newBuilder(); + builder = TokenProto.newBuilder(); } - public DelegationTokenPBImpl(DelegationTokenProto proto) { + public DelegationTokenPBImpl(TokenProto proto) { this.proto = proto; viaProto = true; } - public synchronized DelegationTokenProto getProto() { + public synchronized TokenProto getProto() { mergeLocalToProto(); proto = viaProto ? proto : builder.build(); viaProto = true; @@ -70,7 +70,7 @@ public class DelegationTokenPBImpl exten private synchronized void maybeInitBuilder() { if (viaProto || builder == null) { - builder = DelegationTokenProto.newBuilder(proto); + builder = TokenProto.newBuilder(proto); } viaProto = false; } @@ -78,7 +78,7 @@ public class DelegationTokenPBImpl exten @Override public synchronized ByteBuffer getIdentifier() { - DelegationTokenProtoOrBuilder p = viaProto ? proto : builder; + TokenProtoOrBuilder p = viaProto ? proto : builder; if (this.identifier != null) { return this.identifier; } @@ -98,7 +98,7 @@ public class DelegationTokenPBImpl exten } @Override public synchronized ByteBuffer getPassword() { - DelegationTokenProtoOrBuilder p = viaProto ? proto : builder; + TokenProtoOrBuilder p = viaProto ? proto : builder; if (this.password != null) { return this.password; } @@ -118,7 +118,7 @@ public class DelegationTokenPBImpl exten } @Override public synchronized String getKind() { - DelegationTokenProtoOrBuilder p = viaProto ? proto : builder; + TokenProtoOrBuilder p = viaProto ? proto : builder; if (!p.hasKind()) { return null; } @@ -136,7 +136,7 @@ public class DelegationTokenPBImpl exten } @Override public synchronized String getService() { - DelegationTokenProtoOrBuilder p = viaProto ? proto : builder; + TokenProtoOrBuilder p = viaProto ? proto : builder; if (!p.hasService()) { return null; } Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto?rev=1429749&r1=1429748&r2=1429749&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto Mon Jan 7 11:10:04 2013 @@ -21,6 +21,8 @@ option java_outer_classname = "YarnProto option java_generic_services = true; option java_generate_equals_and_hash = true; +import "Security.proto"; + message YarnRemoteExceptionProto { optional string message = 1; optional string trace = 2; @@ -58,20 +60,6 @@ enum ContainerStateProto { C_COMPLETE = 3; } -message ContainerTokenProto { - optional bytes identifier = 1; - optional bytes password = 2; - optional string kind = 3; - optional string service = 4; -} - -message DelegationTokenProto { - optional bytes identifier = 1; - optional bytes password = 2; - optional string kind = 3; - optional string service = 4; -} - message ContainerProto { optional ContainerIdProto id = 1; optional NodeIdProto nodeId = 2; @@ -79,7 +67,7 @@ message ContainerProto { optional ResourceProto resource = 4; optional PriorityProto priority = 5; optional ContainerStateProto state = 6; - optional ContainerTokenProto container_token = 7; + optional hadoop.common.TokenProto container_token = 7; optional ContainerStatusProto container_status = 8; } Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto?rev=1429749&r1=1429748&r2=1429749&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto Mon Jan 7 11:10:04 2013 @@ -21,6 +21,7 @@ option java_outer_classname = "YarnServi option java_generic_services = true; option java_generate_equals_and_hash = true; +import "Security.proto"; import "yarn_protos.proto"; ////////////////////////////////////////////////////// @@ -144,11 +145,11 @@ message GetDelegationTokenRequestProto { } message GetDelegationTokenResponseProto { - optional DelegationTokenProto application_token = 1; + optional hadoop.common.TokenProto application_token = 1; } message RenewDelegationTokenRequestProto { - required DelegationTokenProto delegation_token = 1; + required hadoop.common.TokenProto delegation_token = 1; } message RenewDelegationTokenResponseProto { @@ -156,7 +157,7 @@ message RenewDelegationTokenResponseProt } message CancelDelegationTokenRequestProto { - required DelegationTokenProto delegation_token = 1; + required hadoop.common.TokenProto delegation_token = 1; } message CancelDelegationTokenResponseProto { Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml?rev=1429749&r1=1429748&r2=1429749&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml Mon Jan 7 11:10:04 2013 @@ -98,6 +98,7 @@ <configuration> <executable>protoc</executable> <arguments> + <argument>-I../../../hadoop-common-project/hadoop-common/src/main/proto/</argument> <argument>-I../hadoop-yarn-api/src/main/proto/</argument> <argument>-Isrc/main/proto/</argument> <argument>--java_out=target/generated-sources/proto</argument> Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml?rev=1429749&r1=1429748&r2=1429749&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml Mon Jan 7 11:10:04 2013 @@ -84,6 +84,7 @@ <configuration> <executable>protoc</executable> <arguments> + <argument>-I../../../../hadoop-common-project/hadoop-common/src/main/proto/</argument> <argument>-I../../hadoop-yarn-api/src/main/proto/</argument> <argument>-Isrc/main/proto/</argument> <argument>--java_out=target/generated-sources/proto</argument> Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml?rev=1429749&r1=1429748&r2=1429749&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml Mon Jan 7 11:10:04 2013 @@ -182,6 +182,7 @@ <configuration> <executable>protoc</executable> <arguments> + <argument>-I../../../../hadoop-common-project/hadoop-common/src/main/proto/</argument> <argument>-I../../hadoop-yarn-api/src/main/proto/</argument> <argument>-Isrc/main/proto/</argument> <argument>--java_out=target/generated-sources/proto</argument>