/*
 * Copyright 2013 the original author or authors.
 *
 * Licensed 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.
 */
package org.gradle.api.internal.tasks;

import org.gradle.api.tasks.BinaryContainer;
import org.gradle.api.tasks.JvmBinaryContainer;

public class DefaultBinariesContainer implements BinaryContainer {
    private final JvmBinaryContainer container;

    public DefaultBinariesContainer(JvmBinaryContainer container) {
        this.container = container;
    }

    public JvmBinaryContainer getJvm() {
        return container;
    }
}

@@ -675,29 +675,73 @@
 api.
-tasks.BinaryContainer
+Named;%0Aimport org.gradle.api.internal.DefaultNamedDomainObjectSet
 ;%0Aim
@@ -766,25 +766,24 @@
 i.tasks.
-Jvm
 Binar
-y
+ies
 Containe
@@ -784,16 +784,65 @@
 ntainer;
+%0Aimport org.gradle.internal.reflect.Instantiator;
 %0A%0Apublic
@@ -877,83 +877,79 @@
 ner 
-implements BinaryContainer %7B%0A    private final JvmBinaryContainer c
+extends DefaultNamedDomainObjectSet%3CNamed%3E implements BinariesC
 ontainer
 ;%0A%0A 
@@ -944,18 +944,18 @@
 ontainer
-;%0A
+ %7B
 %0A    pub
@@ -987,148 +987,77 @@
 ner(
-JvmBinaryContainer container) %7B%0A        this.container = container;%0A    %7D%0A%0A    public JvmBinaryContainer getJvm() %7B%0A        return container
+Instantiator instantiator) %7B%0A        super(Named.class, instantiator)
 ;%0A  

use appropriate domain object containers for BinariesContainer and JvmBinaryContainer (2)