diff --git a/proposal/myrmidon/docs/buildfile.html b/proposal/myrmidon/docs/buildfile.html index 7cb213ed6..e0e06d47e 100644 --- a/proposal/myrmidon/docs/buildfile.html +++ b/proposal/myrmidon/docs/buildfile.html @@ -490,9 +490,9 @@ Implicit tasks can be used to initialise the project. For example:

-

Targets have the same format as in Ant 1.x, though some of the behaviour -is different. A <target> element takes the following -attributes:

+

Targets have a similar format to targets in Ant 1.x, though some of the +behaviour is different. A <target> element takes the +following attributes:

- - - - - - - - - -
None -
- - if - - - - Only execute this target if the specified property is set, and not - equal to false. - - - - None - -
- - unless - - - - Do not execute this target if the specified property is set, and not - equal to false. - - - - None -
diff --git a/proposal/myrmidon/docs/todo.html b/proposal/myrmidon/docs/todo.html index 30e96a744..68f8239dd 100644 --- a/proposal/myrmidon/docs/todo.html +++ b/proposal/myrmidon/docs/todo.html @@ -317,12 +317,6 @@
  • Fire ProjectListener events projectStarted() and projectFinished() events on start and finish of referenced projects, adding indicator methods to ProjectEvent.
    • -
  • Validate project and target names in DefaultProjectBuilder - reject dodgy - names like "," or "", or " ". Probably want to reject names that start or - end with white-space (though internal whitespace is probably fine). We also - want to reserve certain punctuation characters like , : ? $ [ ] { } < >, etc for - future use.
    • -
  • Similarly, validate property names, using the same rules.
  • Detect duplicate type names.
  • Add fully qualified type names, based on antlib name and type shorthand name. Allow these to be used in build files in addition to the shorthand names.
    • @@ -333,6 +327,10 @@
  • Split up <is-set> condition into is-set and is-true conditions.
  • Allow the <if> task to take any condition implementation.
  • Add an else block to the <if> task.
    • +
  • Split the <available> condition into separate conditions + that test for the availability of a class, or a resource.
    • +
  • Move crimson.jar to bin/lib in the distribution, + and make to other jars via the extension mechanism.
  • Unit tests.
    • diff --git a/proposal/myrmidon/docs/vfs.html b/proposal/myrmidon/docs/vfs.html index 53cd876db..921acf275 100644 --- a/proposal/myrmidon/docs/vfs.html +++ b/proposal/myrmidon/docs/vfs.html @@ -136,14 +136,13 @@ valign="top" align="left"> The contents of Zip files (and Jar, War, and Ear files). - Currently, the VFS supports read-only access to Zip file contents, - and only for local Zip files. + Currently, the VFS supports read-only access to Zip file contents. - zip:// zip-file-path [!absolute-path] + zip: zip-file-uri [!absolute-path] @@ -188,12 +187,14 @@ +

    Both forward or backward slashes can be used to separate the elements of + a URL.

    Here are some example URLs:

    diff --git a/proposal/myrmidon/src/xdocs/buildfile.xml b/proposal/myrmidon/src/xdocs/buildfile.xml index ba5aa2523..b447e2757 100644 --- a/proposal/myrmidon/src/xdocs/buildfile.xml +++ b/proposal/myrmidon/src/xdocs/buildfile.xml @@ -168,9 +168,9 @@ Implicit tasks can be used to initialise the project. For example:

    -

    Targets have the same format as in Ant 1.x, though some of the behaviour -is different. A <target> element takes the following -attributes:

    +

    Targets have a similar format to targets in Ant 1.x, though some of the +behaviour is different. A <target> element takes the +following attributes:

    @@ -185,18 +185,6 @@ attributes:

    This list can contain targets from referenced projects. - - - - - - - - - -
    AttributeDescriptionDefault Value
    None
    ifOnly execute this target if the specified property is set, and not - equal to false.None
    unlessDo not execute this target if the specified property is set, and not - equal to false.None
     diff --git a/proposal/myrmidon/src/xdocs/todo.xml b/proposal/myrmidon/src/xdocs/todo.xml index 620acfb97..27df209fb 100644 --- a/proposal/myrmidon/src/xdocs/todo.xml +++ b/proposal/myrmidon/src/xdocs/todo.xml @@ -219,6 +219,10 @@
  • Split up <is-set> condition into is-set and is-true conditions.
  • Allow the <if> task to take any condition implementation.
  • Add an else block to the <if> task.
    • +
  • Split the <available> condition into separate conditions + that test for the availability of a class, or a resource.
    • +
  • Move crimson.jar to bin/lib in the distribution, + and make to other jars via the extension mechanism.
  • Unit tests.
    • diff --git a/proposal/myrmidon/src/xdocs/vfs.xml b/proposal/myrmidon/src/xdocs/vfs.xml index ab2ea2776..707e989d8 100644 --- a/proposal/myrmidon/src/xdocs/vfs.xml +++ b/proposal/myrmidon/src/xdocs/vfs.xml @@ -31,9 +31,8 @@ Zip Files The contents of Zip files (and Jar, War, and Ear files). - Currently, the VFS supports read-only access to Zip file contents, - and only for local Zip files. - zip:// zip-file-path [!absolute-path] + Currently, the VFS supports read-only access to Zip file contents. + zip: zip-file-uri [!absolute-path] FTP @@ -47,13 +46,16 @@ +

    Both forward or backward slashes can be used to separate the elements of + a URL.

    +

    Here are some example URLs: