ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/docs/manual/CoreTypes namespace.html
Date Sat, 12 Jun 2004 16:54:34 GMT
peterreilly    2004/06/12 09:54:34

  Modified:    .        Tag: ANT_16_BRANCH WHATSNEW
               src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
                        IntrospectionHelper.java
               docs/manual/CoreTypes Tag: ANT_16_BRANCH namespace.html
  Log:
  sync
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.503.2.104 +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.103
  retrieving revision 1.503.2.104
  diff -u -r1.503.2.103 -r1.503.2.104
  --- WHATSNEW	11 Jun 2004 16:38:56 -0000	1.503.2.103
  +++ WHATSNEW	12 Jun 2004 16:54:34 -0000	1.503.2.104
  @@ -14,6 +14,9 @@
   * All exceptions thrown by tasks are now wrapped in a buildexception
     giving the location in the buildfile of the task.
   
  +* Nested elements for namespaced tasks and types may belong to the
  +  Ant default namespace as well as the task's or type's namespace.
  +
   Fixed bugs:
   -----------
   
  
  
  
  No                   revision
  No                   revision
  1.65.2.16 +2 -2      ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
  
  Index: IntrospectionHelper.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
  retrieving revision 1.65.2.15
  retrieving revision 1.65.2.16
  diff -u -r1.65.2.15 -r1.65.2.16
  --- IntrospectionHelper.java	4 Jun 2004 07:39:09 -0000	1.65.2.15
  +++ IntrospectionHelper.java	12 Jun 2004 16:54:34 -0000	1.65.2.16
  @@ -604,7 +604,7 @@
               parentUri = "";
           }
           NestedCreator nc = null;
  -        if (uri.equals(parentUri)) { //  || uri.equals("")) {
  +        if (uri.equals(parentUri) || uri.equals("")) {
               nc = (NestedCreator) nestedCreators.get(
                   name.toLowerCase(Locale.US));
           }
  @@ -775,7 +775,7 @@
   
           return (
               nestedCreators.containsKey(name.toLowerCase(Locale.US))
  -            && (uri.equals(parentUri))) // || uri.equals("")))
  +            && (uri.equals(parentUri) || uri.equals("")))
               || DynamicElement.class.isAssignableFrom(bean)
               || DynamicElementNS.class.isAssignableFrom(bean)
               || addTypeMethods.size() != 0;
  
  
  
  No                   revision
  No                   revision
  1.1.2.3   +14 -1     ant/docs/manual/CoreTypes/namespace.html
  
  Index: namespace.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTypes/namespace.html,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- namespace.html	9 Feb 2004 22:12:10 -0000	1.1.2.2
  +++ namespace.html	12 Jun 2004 16:54:34 -0000	1.1.2.3
  @@ -93,7 +93,8 @@
   
       <h2>Namespaces and Nested Elements</h2>
   
  -    <p>Almost always in Ant 1.6, elements nested inside a namespaced
  +    <p>
  +      Almost always in Ant 1.6, elements nested inside a namespaced
         element have the same namespace as their parent. So if 'task' in the
         example above allowed a nested 'config' element, the build file snippet
         would look like this:
  @@ -112,6 +113,18 @@
      ...
             &lt;/task&gt;
           </pre>
  +    <p>
  +      From Ant 1.6.2, elements nested inside a namespaced element may also be
  +      in Ant's default namespace. This means that the following is now allowed:
  +    </p>
  +    </p><pre> &lt;typedef resource="org/example/tasks.properties"
  +   uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/&gt;
  + &lt;my:task xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
  +   &lt;config a="foo" b="bar"/&gt;
  +   ...
  + &lt;/my:task&gt;
  +</pre>
  +      
       <h2>Namespaces and Attributes</h2>
   
       <p>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message