langtools/test/tools/lib/toolbox/JavaTask.java
author jjg
Wed, 10 Aug 2016 15:47:46 -0700
changeset 40308 274367a99f98
parent 36778 e04318f39f92
permissions -rw-r--r--
8136930: Simplify use of module-system options by custom launchers 8160489: Multiple -Xpatch lines ignored by javac 8156998: javac should support new option -XinheritRuntimeEnvironment Reviewed-by: jlahoda, ksrini
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
     1
/*
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
     2
 * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
     4
 *
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
     7
 * published by the Free Software Foundation.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
     8
 *
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    13
 * accompanied this code).
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    14
 *
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    18
 *
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    21
 * questions.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    22
 */
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    23
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    24
package toolbox;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    25
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    26
import java.io.IOException;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    27
import java.util.ArrayList;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    28
import java.util.Arrays;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    29
import java.util.List;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    30
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    31
/**
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    32
 * A task to configure and run the Java launcher.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    33
 */
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    34
public class JavaTask extends AbstractTask<JavaTask> {
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    35
    boolean includeStandardOptions = true;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    36
    private String classpath;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    37
    private List<String> vmOptions;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    38
    private String className;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    39
    private List<String> classArgs;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    40
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    41
    /**
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    42
     * Create a task to run the Java launcher, using {@code EXEC} mode.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    43
     * @param toolBox the {@code ToolBox} to use
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    44
     */
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    45
    public JavaTask(ToolBox toolBox) {
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    46
        super(toolBox, Task.Mode.EXEC);
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    47
    }
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    48
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    49
    /**
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    50
     * Sets the classpath.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    51
     * @param classpath the classpath
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    52
     * @return this task object
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    53
     */
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    54
    public JavaTask classpath(String classpath) {
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    55
        this.classpath = classpath;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    56
        return this;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    57
    }
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    58
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    59
    /**
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    60
     * Sets the VM options.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    61
     * @param vmOptions the options
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    62
     * @return this task object
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    63
     */
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    64
    public JavaTask vmOptions(String... vmOptions) {
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    65
        this.vmOptions = Arrays.asList(vmOptions);
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    66
        return this;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    67
    }
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    68
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    69
    /**
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
    70
     * Sets the VM options.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
    71
     * @param vmOptions the options
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
    72
     * @return this task object
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
    73
     */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
    74
    public JavaTask vmOptions(List<String> vmOptions) {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
    75
        this.vmOptions = vmOptions;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
    76
        return this;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
    77
    }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
    78
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
    79
    /**
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    80
     * Sets the name of the class to be executed.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    81
     * @param className the name of the class
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    82
     * @return this task object
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    83
     */
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    84
    public JavaTask className(String className) {
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    85
        this.className = className;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    86
        return this;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    87
    }
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    88
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    89
    /**
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    90
     * Sets the arguments for the class to be executed.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    91
     * @param classArgs the arguments
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    92
     * @return this task object
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    93
     */
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    94
    public JavaTask classArgs(String... classArgs) {
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    95
        this.classArgs = Arrays.asList(classArgs);
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    96
        return this;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    97
    }
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    98
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
    99
    /**
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
   100
     * Sets the arguments for the class to be executed.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
   101
     * @param classArgs the arguments
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
   102
     * @return this task object
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
   103
     */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
   104
    public JavaTask classArgs(List<String> classArgs) {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
   105
        this.classArgs = classArgs;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
   106
        return this;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
   107
    }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
   108
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 36778
diff changeset
   109
    /**
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   110
     * Sets whether or not the standard VM and java options for the test should be passed
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   111
     * to the new VM instance. If this method is not called, the default behavior is that
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   112
     * the options will be passed to the new VM instance.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   113
     *
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   114
     * @param includeStandardOptions whether or not the standard VM and java options for
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   115
     *                               the test should be passed to the new VM instance.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   116
     * @return this task object
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   117
     */
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   118
    public JavaTask includeStandardOptions(boolean includeStandardOptions) {
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   119
        this.includeStandardOptions = includeStandardOptions;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   120
        return this;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   121
    }
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   122
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   123
    /**
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   124
     * {@inheritDoc}
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   125
     * @return the name "java"
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   126
     */
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   127
    @Override
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   128
    public String name() {
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   129
        return "java";
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   130
    }
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   131
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   132
    /**
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   133
     * Calls the Java launcher with the arguments as currently configured.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   134
     * @return a Result object indicating the outcome of the task
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   135
     * and the content of any output written to stdout or stderr.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   136
     * @throws TaskError if the outcome of the task is not as expected.
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   137
     */
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   138
    @Override
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   139
    public Task.Result run() {
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   140
        List<String> args = new ArrayList<>();
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   141
        args.add(toolBox.getJDKTool("java").toString());
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   142
        if (includeStandardOptions) {
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   143
            args.addAll(toolBox.split(System.getProperty("test.vm.opts"), " +"));
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   144
            args.addAll(toolBox.split(System.getProperty("test.java.opts"), " +"));
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   145
        }
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   146
        if (classpath != null) {
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   147
            args.add("-classpath");
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   148
            args.add(classpath);
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   149
        }
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   150
        if (vmOptions != null)
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   151
            args.addAll(vmOptions);
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   152
        if (className != null)
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   153
            args.add(className);
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   154
        if (classArgs != null)
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   155
            args.addAll(classArgs);
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   156
        ProcessBuilder pb = getProcessBuilder();
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   157
        pb.command(args);
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   158
        try {
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   159
            return runProcess(toolBox, this, pb.start());
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   160
        } catch (IOException | InterruptedException e) {
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   161
            throw new Error(e);
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   162
        }
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   163
    }
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
diff changeset
   164
}