svn commit: r992466 - in /hadoop/hdfs/trunk: CHANGES.txt build.xml src/test/krb5.conf

[jg...@apache.org]

Author: jghoman
Date: Fri Sep  3 21:01:51 2010
New Revision: 992466

URL: http://svn.apache.org/viewvc?rev=992466&view=rev
Log:
HDFS-1284. TestBlockToken fails. Contributed by Kan Zhang.

Added:
    hadoop/hdfs/trunk/src/test/krb5.conf
Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    hadoop/hdfs/trunk/build.xml

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=992466&r1=992465&r2=992466&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Fri Sep  3 21:01:51 2010
@@ -229,6 +229,8 @@ Trunk (unreleased changes)
     
     HDFS-1352. Fix jsvc.location. (Eli Collins via jghoman)
 
+    HDFS-1284. TestBlockToken fails.  (Kan Zhang via jghoman)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hdfs/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=992466&r1=992465&r2=992466&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Fri Sep  3 21:01:51 2010
@@ -583,6 +583,7 @@
         <sysproperty key="hadoop.log.dir" value="@{test.dir}/logs"/>
         <sysproperty key="test.src.dir" value="@{fileset.dir}"/>
         <sysproperty key="test.build.extraconf" value="@{test.dir}/extraconf" />
+        <sysproperty key="java.security.krb5.conf" value="${test.src.dir}/krb5.conf"/>
         <sysproperty key="hadoop.policy.file" value="hadoop-policy.xml"/>
         <sysproperty key="hdfs.rpc.engine" value="${test.hdfs.rpc.engine}"/>
         <classpath refid="@{classpath}"/>

Added: hadoop/hdfs/trunk/src/test/krb5.conf
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/krb5.conf?rev=992466&view=auto
==============================================================================
--- hadoop/hdfs/trunk/src/test/krb5.conf (added)
+++ hadoop/hdfs/trunk/src/test/krb5.conf Fri Sep  3 21:01:51 2010
@@ -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