Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=726883&r1=726882&r2=726883&view=diff ============================================================================== --- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java (original) +++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Mon Dec 15 16:05:03 2008 @@ -101,6 +101,11 @@ static enum State {NORMAL, STALE, INTERRUPTED, DENIED} + static{ + Configuration.addDefaultResource("mapred-default.xml"); + Configuration.addDefaultResource("mapred-site.xml"); + } + public static final Log LOG = LogFactory.getLog(TaskTracker.class);
Added: hadoop/core/trunk/src/test/core-site.xml URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/core-site.xml?rev=726883&view=auto ============================================================================== --- hadoop/core/trunk/src/test/core-site.xml (added) +++ hadoop/core/trunk/src/test/core-site.xml Mon Dec 15 16:05:03 2008 @@ -0,0 +1,50 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> + +<!-- Values used when running unit tests. This is mostly empty, to --> +<!-- use of the default values, overriding the potentially --> +<!-- user-editted core-site.xml in the conf/ directory. --> + +<configuration> + + +<property> + <name>hadoop.tmp.dir</name> + <value>build/test</value> + <description>A base for other temporary directories.</description> + <final>true</final> +</property> + +<property> + <name>test.fs.s3.name</name> + <value>s3:///</value> + <description>The name of the s3 file system for testing.</description> +</property> + +<property> + <name>fs.s3.block.size</name> + <value>128</value> + <description>Size of a block in bytes.</description> +</property> + +<property> + <name>fs.ftp.user.localhost</name> + <value>user</value> + <description>The username for connecting to FTP server running on localhost. + This is required by FTPFileSystem</description> +</property> + +<property> + <name>fs.ftp.password.localhost</name> + <value>password</value> + <description>The password for connecting to FTP server running on localhost. + This is required by FTPFileSystem</description> +</property> + +<property> + <name>test.fs.s3n.name</name> + <value>s3n:///</value> + <description>The name of the s3n file system for testing.</description> +</property> + +</configuration> Modified: hadoop/core/trunk/src/test/hadoop-site.xml URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/hadoop-site.xml?rev=726883&r1=726882&r2=726883&view=diff ============================================================================== --- hadoop/core/trunk/src/test/hadoop-site.xml (original) +++ hadoop/core/trunk/src/test/hadoop-site.xml Mon Dec 15 16:05:03 2008 @@ -8,43 +8,5 @@ <configuration> -<property> - <name>hadoop.tmp.dir</name> - <value>build/test</value> - <description>A base for other temporary directories.</description> - <final>true</final> -</property> - -<property> - <name>test.fs.s3.name</name> - <value>s3:///</value> - <description>The name of the s3 file system for testing.</description> -</property> - -<property> - <name>fs.s3.block.size</name> - <value>128</value> - <description>Size of a block in bytes.</description> -</property> - -<property> - <name>fs.ftp.user.localhost</name> - <value>user</value> - <description>The username for connecting to FTP server running on localhost. - This is required by FTPFileSystem</description> -</property> - -<property> - <name>fs.ftp.password.localhost</name> - <value>password</value> - <description>The password for connecting to FTP server running on localhost. - This is required by FTPFileSystem</description> -</property> - -<property> - <name>test.fs.s3n.name</name> - <value>s3n:///</value> - <description>The name of the s3n file system for testing.</description> -</property> </configuration> Added: hadoop/core/trunk/src/test/hdfs-site.xml URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/hdfs-site.xml?rev=726883&view=auto ============================================================================== --- hadoop/core/trunk/src/test/hdfs-site.xml (added) +++ hadoop/core/trunk/src/test/hdfs-site.xml Mon Dec 15 16:05:03 2008 @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> + +<!-- Put site-specific property overrides in this file. --> + +<configuration> + + +</configuration> Added: hadoop/core/trunk/src/test/mapred-site.xml URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/mapred-site.xml?rev=726883&view=auto ============================================================================== --- hadoop/core/trunk/src/test/mapred-site.xml (added) +++ hadoop/core/trunk/src/test/mapred-site.xml Mon Dec 15 16:05:03 2008 @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> + +<!-- Put site-specific property overrides in this file. --> + +<configuration> + +</configuration> Modified: hadoop/core/trunk/src/test/org/apache/hadoop/conf/TestConfiguration.java URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/conf/TestConfiguration.java?rev=726883&r1=726882&r2=726883&view=diff ============================================================================== --- hadoop/core/trunk/src/test/org/apache/hadoop/conf/TestConfiguration.java (original) +++ hadoop/core/trunk/src/test/org/apache/hadoop/conf/TestConfiguration.java Mon Dec 15 16:05:03 2008 @@ -224,7 +224,7 @@ conf.addResource(fileResource); String expectedOutput = - "Configuration: hadoop-default.xml, hadoop-site.xml, " + + "Configuration: core-default.xml, core-site.xml, " + fileResource.toString(); assertEquals(expectedOutput, conf.toString()); } Modified: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java?rev=726883&r1=726882&r2=726883&view=diff ============================================================================== --- hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java (original) +++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java Mon Dec 15 16:05:03 2008 @@ -60,10 +60,10 @@ } private void testConfOption(String[] args, String namenode) { - // prepare configuration hadoop-site.xml + // prepare configuration hdfs-site.xml File configDir = new File(new File("build", "test"), "minidfs"); assertTrue(configDir.mkdirs()); - File siteFile = new File(configDir, "hadoop-site.xml"); + File siteFile = new File(configDir, "hdfs-site.xml"); PrintWriter pw; try { pw = new PrintWriter(siteFile); Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java?rev=726883&r1=726882&r2=726883&view=diff ============================================================================== --- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java (original) +++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java Mon Dec 15 16:05:03 2008 @@ -606,7 +606,7 @@ stopJobTracker(); } finally { File configDir = new File("build", "minimr"); - File siteFile = new File(configDir, "hadoop-site.xml"); + File siteFile = new File(configDir, "mapred-site.xml"); siteFile.delete(); } }
