0.21.0 API

[Martin Becker]

 Hello,
I am trying to move to Hadoop MapReduce 0.21.0.
The corresponding tutorial still uses Tool and ToolRunner.
Yet both are deprecated. What would be the correct way to implement, 
configure and submit a Job now? I was thinking in terms of:

        Configuration configuration = new Configuration();
        Cluster cluster = new Cluster(configuration);
        Job job = Job.getInstance(cluster);

        job.setJarByClass(WordCount.class);
        job.setMapperClass(Map.class);
        job.setCombinerClass(Reduce.class);
        job.setReducerClass(Reduce.class);
        job.setOutputKeyClass(Text.class);
        job.setOutputValueClass(IntWritable.class);

        FileInputFormat.addInputPath(job, new Path(INPUT));
        FileOutputFormat.setOutputPath(job, new Path(OUTPUT));

        System.exit(job.waitForCompletion(true) ? 0 : 1);

Thanks in advance,
Martin