svn commit: r1066981 - in /hadoop/mapreduce/branches/branch-0.22: CHANGES.txt build.xml src/test/krb5.conf

[to...@apache.org]

Author: todd
Date: Thu Feb  3 21:27:46 2011
New Revision: 1066981

URL: http://svn.apache.org/viewvc?rev=1066981&view=rev
Log:
MAPREDUCE-2200. TestUmbilicalProtocolWithJobToken is failing without Krb evironment: needs to be conditional. Contributed by Konstantin Boudnik.

Added:
    hadoop/mapreduce/branches/branch-0.22/src/test/krb5.conf
Modified:
    hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
    hadoop/mapreduce/branches/branch-0.22/build.xml

Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1066981&r1=1066980&r2=1066981&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Thu Feb  3 21:27:46 2011
@@ -457,6 +457,9 @@ Release 0.22.0 - Unreleased
 
     MAPREDUCE-2281. MR part of HADOOP-6642. (Chris Douglas, Po Cheung via shv)
 
+    MAPREDUCE-2200. TestUmbilicalProtocolWithJobToken is failing without Krb
+    environment: needs to be conditional. (Konstantin Boudnik via todd)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

Modified: hadoop/mapreduce/branches/branch-0.22/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/build.xml?rev=1066981&r1=1066980&r2=1066981&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/build.xml (original)
+++ hadoop/mapreduce/branches/branch-0.22/build.xml Thu Feb  3 21:27:46 2011
@@ -674,6 +674,8 @@
         errorProperty="tests.failed" failureProperty="tests.failed">
         <jvmarg value="${test.junit.jvmargs}" />
         <sysproperty key="test.build.data" value="@{test.dir}/data"/>
+        <sysproperty key="java.security.krb5.conf"
+          value="${test.src.dir}/krb5.conf"/>
         <sysproperty key="test.tools.input.dir" value = "${test.tools.input.dir}"/>
         <sysproperty key="test.cache.data" value="${test.cache.data}"/>     
         <sysproperty key="test.debug.data" value="${test.debug.data}"/>

Added: hadoop/mapreduce/branches/branch-0.22/src/test/krb5.conf
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/test/krb5.conf?rev=1066981&view=auto
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/src/test/krb5.conf (added)
+++ hadoop/mapreduce/branches/branch-0.22/src/test/krb5.conf Thu Feb  3 21:27:46 2011
@@ -0,0 +1,28 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+[libdefaults]
+	default_realm = APACHE.ORG
+	udp_preference_limit = 1
+	extra_addresses = 127.0.0.1
+[realms]
+	APACHE.ORG = {
+		admin_server = localhost:88
+		kdc = localhost:88
+	}
+[domain_realm]
+	localhost = APACHE.ORG