Re: [VOTE] Weblogic and Starteam antlibs for ant 1.8.0

[Kevin Jackson]

Hi all,

Move to anlibs +1 from me.

Kev

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r568040 - /ant/core/trunk/WHATSNEW

[peterreilly]

Author: peterreilly
Date: Tue Aug 21 02:42:22 2007
New Revision: 568040

URL: http://svn.apache.org/viewvc?rev=568040&view=rev
Log:
adding componentdef to WHATSNEW

Modified:
ant/core/trunk/WHATSNEW

Modified: ant/core/trunk/WHATSNEW
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=568040&r1=568039&r2=568040&view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Aug 21 02:42:22 2007
@@ -10,6 +10,17 @@
   task for registering delegates and/or replacing the registered PropertyHelper
   instance.  Bugzilla report 42736.
 
+* Added a restricted form of typedef called . This allows
+  definition of elements that can only be within tasks or types. This
+  method is now used to define conditions, selectors and selectors. This
+  means that tasks may now have nested conditions just by implementing
+  the Condition interface, rather than extending ConditionBase. It also
+  means that the use of namespaces for some of the selectors introduced
+  in Ant 1.7.0 is no longer necessary.
+  Implementing this means that the DynamicElement work-around introduced
+  in Ant 1.7.0 has been removed.
+  Bugzilla report 40511.
+
 Fixed bugs:
 ---
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40511] - Add componentdef to ant

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40511


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
   Target Milestone|--- |1.8.0




--- Additional Comments From [EMAIL PROTECTED]  2007-08-21 02:42 ---
Committed.


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r568091 - /ant/core/trunk/build.xml

[peterreilly]

Author: peterreilly
Date: Tue Aug 21 05:17:40 2007
New Revision: 568091

URL: http://svn.apache.org/viewvc?rev=568091&view=rev
Log:
optionaly allow build to pass even if tests fail

Modified:
ant/core/trunk/build.xml

Modified: ant/core/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/build.xml?rev=568091&r1=568090&r2=568091&view=diff
==
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Tue Aug 21 05:17:40 2007
@@ -1627,7 +1627,7 @@
 
   
-Unit tests failed;
+Unit tests failed;
 see ${build.junit.reports} / ${antunit.reports}
 
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r568093 - /ant/core/branches/ANT_17_BRANCH/build.xml

[peterreilly]

Author: peterreilly
Date: Tue Aug 21 05:18:37 2007
New Revision: 568093

URL: http://svn.apache.org/viewvc?rev=568093&view=rev
Log:
sync

Modified:
ant/core/branches/ANT_17_BRANCH/build.xml

Modified: ant/core/branches/ANT_17_BRANCH/build.xml
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/build.xml?rev=568093&r1=568092&r2=568093&view=diff
==
--- ant/core/branches/ANT_17_BRANCH/build.xml (original)
+++ ant/core/branches/ANT_17_BRANCH/build.xml Tue Aug 21 05:18:37 2007
@@ -1627,7 +1627,7 @@
 
   
-Unit tests failed;
+Unit tests failed;
 see ${build.junit.reports} / ${antunit.reports}
 
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r568096 - /ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java

[peterreilly]

Author: peterreilly
Date: Tue Aug 21 05:26:21 2007
New Revision: 568096

URL: http://svn.apache.org/viewvc?rev=568096&view=rev
Log:
Allow reflection on setX(Object x) to be an xml attribute
Normally x will be of String type, however with the new
PropertyHelper, x may be of other types. 
  x="${el:path.main}" for example.


Modified:
ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java?rev=568096&r1=568095&r2=568096&view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java 
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java Tue 
Aug 21 05:26:21 2007
@@ -943,6 +943,17 @@
 final Class reflectedArg = PRIMITIVE_TYPE_MAP.containsKey(arg)
 ? (Class) PRIMITIVE_TYPE_MAP.get(arg) : arg;
 
+// Object.class - it gets handled differently by AttributeSetter
+if (java.lang.Object.class == reflectedArg) {
+return new AttributeSetter(m, arg) {
+public void set(Project p, Object parent, String value)
+throws InvocationTargetException,
+IllegalAccessException {
+throw new BuildException(
+"Internal ant problem - this should not get called");
+}
+};
+}
 // simplest case - setAttribute expects String
 if (java.lang.String.class.equals(reflectedArg)) {
 return new AttributeSetter(m, arg) {



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r568040 - /ant/core/trunk/WHATSNEW

[Dominique Devienne]

On 8/21/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
> Modified: ant/core/trunk/WHATSNEW
>
> +  means that tasks may now have nested conditions just by implementing
> +  the Condition interface, rather than extending ConditionBase.

I'm not sure I'm following here Peter. How does implementing Condition
(which has only an eval() method) translate into accepting any nested
conditions?

> +  means that the use of namespaces for some of the selectors introduced
> +  in Ant 1.7.0 is no longer necessary.

Aren't we making it more difficult (impossible?) to validate Ant build
files by allowing an extensible set of nested elements without the use
of namespaces?

Thanks, --DD

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r568040 - /ant/core/trunk/WHATSNEW

[Peter Reilly]

On 8/21/07, Dominique Devienne <[EMAIL PROTECTED]> wrote:
> On 8/21/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
> > Modified: ant/core/trunk/WHATSNEW
> >
> > +  means that tasks may now have nested conditions just by implementing
> > +  the Condition interface, rather than extending ConditionBase.
>
> I'm not sure I'm following here Peter. How does implementing Condition
> (which has only an eval() method) translate into accepting any nested
> conditions?


It means that one can do:
  public class Example {
  List conditions ;
  public void add(Condition c) {
  conditions.add(c);
  }
   }
and pick up conditions like and, or etc.
up to now, one has to extend conditionBase to do this,

>
> > +  means that the use of namespaces for some of the selectors introduced
> > +  in Ant 1.7.0 is no longer necessary.
>
> Aren't we making it more difficult (impossible?) to validate Ant build
> files by allowing an extensible set of nested elements without the use
> of namespaces?
Not necessary.

The core ant conditons, selectors would be known (per release) and
one could easily write an RelaxNG description of them. (this is no
different for the refection based elements).

For third party antlibs, they would use their own namespace.

However, ant does contain things like macrodef and presetdef which
will modify the current scheama, and 
do not enforce placing the new element in a different namespace.

Peter
>
> Thanks, --DD
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r568040 - /ant/core/trunk/WHATSNEW

[Dominique Devienne]

On 8/21/07, Peter Reilly <[EMAIL PROTECTED]> wrote:
> On 8/21/07, Dominique Devienne <[EMAIL PROTECTED]> wrote:
> > On 8/21/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
> > > Modified: ant/core/trunk/WHATSNEW
> > >
> > > +  means that tasks may now have nested conditions just by implementing
> > > +  the Condition interface, rather than extending ConditionBase.
> >
> > I'm not sure I'm following here Peter. How does implementing Condition
> > (which has only an eval() method) translate into accepting any nested
> > conditions?
>
>
> It means that one can do:
>   public class Example {
>   List conditions ;
>   public void add(Condition c) {
>   conditions.add(c);
>   }
>}
> and pick up conditions like and, or etc.
> up to now, one has to extend conditionBase to do this,

OK, makes sense now, thanks. One still has to accept nested elements
of a given type, as usual, and implementing Condition for Example is
not necessary, and unrelated. For a moment there I thought some new
magic had crept into Ant ;-)

PS: It's put the composed condition into an And or Or condition rather
than a List.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r568096 - /ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java

[Matt Benson]

--- [EMAIL PROTECTED] wrote:

> Author: peterreilly
> Date: Tue Aug 21 05:26:21 2007
> New Revision: 568096
> 
> URL:
> http://svn.apache.org/viewvc?rev=568096&view=rev
> Log:
> Allow reflection on setX(Object x) to be an xml
> attribute
> Normally x will be of String type, however with the
> new
> PropertyHelper, x may be of other types. 
>   x="${el:path.main}" for example.
> 
> 

Peter--I must be having an idiotic moment.  Can you
explain this one?  :)

-Matt

(Not so brilliant now, am I?)

> Modified:
>
>
ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
> 
> Modified:
>
ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
> URL:
>
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java?rev=568096&r1=568095&r2=568096&view=diff
>
==
> ---
>
ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
> (original)
> +++
>
ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
> Tue Aug 21 05:26:21 2007
> @@ -943,6 +943,17 @@
>  final Class reflectedArg =
> PRIMITIVE_TYPE_MAP.containsKey(arg)
>  ? (Class) PRIMITIVE_TYPE_MAP.get(arg) :
> arg;
>  
> +// Object.class - it gets handled
> differently by AttributeSetter
> +if (java.lang.Object.class == reflectedArg)
> {
> +return new AttributeSetter(m, arg) {
> +public void set(Project p, Object
> parent, String value)
> +throws
> InvocationTargetException,
> +IllegalAccessException {
> +throw new BuildException(
> +"Internal ant problem -
> this should not get called");
> +}
> +};
> +}
>  // simplest case - setAttribute expects
> String
>  if
> (java.lang.String.class.equals(reflectedArg)) {
>  return new AttributeSetter(m, arg) {
> 
> 
> 
>
-
> To unsubscribe, e-mail:
> [EMAIL PROTECTED]
> For additional commands, e-mail:
> [EMAIL PROTECTED]
> 
> 



   

Got a little couch potato? 
Check out fun summer activities for kids.
http://search.yahoo.com/search?fr=oni_on_mail&p=summer+activities+for+kids&cs=bz
 

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r568096 - /ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java

[Peter Reilly]

On 8/21/07, Matt Benson <[EMAIL PROTECTED]> wrote:
>
> --- [EMAIL PROTECTED] wrote:
>
> > Author: peterreilly
> > Date: Tue Aug 21 05:26:21 2007
> > New Revision: 568096
> >
> > URL:
> > http://svn.apache.org/viewvc?rev=568096&view=rev
> > Log:
> > Allow reflection on setX(Object x) to be an xml
> > attribute
> > Normally x will be of String type, however with the
> > new
> > PropertyHelper, x may be of other types.
> >   x="${el:path.main}" for example.
> >
> >
>
> Peter--I must be having an idiotic moment.  Can you
> explain this one?  :)

I am playing around the jexl - it is pretty neat.
It is easy to integrate with the new PropertyHelper ;-)

My test code does something like this:



  



  



  item is @{item}



Peter



>
> -Matt
>
> (Not so brilliant now, am I?)
>
> > Modified:
> >
> >
> ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
> >
> > Modified:
> >
> ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
> > URL:
> >
> http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java?rev=568096&r1=568095&r2=568096&view=diff
> >
> ==
> > ---
> >
> ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
> > (original)
> > +++
> >
> ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
> > Tue Aug 21 05:26:21 2007
> > @@ -943,6 +943,17 @@
> >  final Class reflectedArg =
> > PRIMITIVE_TYPE_MAP.containsKey(arg)
> >  ? (Class) PRIMITIVE_TYPE_MAP.get(arg) :
> > arg;
> >
> > +// Object.class - it gets handled
> > differently by AttributeSetter
> > +if (java.lang.Object.class == reflectedArg)
> > {
> > +return new AttributeSetter(m, arg) {
> > +public void set(Project p, Object
> > parent, String value)
> > +throws
> > InvocationTargetException,
> > +IllegalAccessException {
> > +throw new BuildException(
> > +"Internal ant problem -
> > this should not get called");
> > +}
> > +};
> > +}
> >  // simplest case - setAttribute expects
> > String
> >  if
> > (java.lang.String.class.equals(reflectedArg)) {
> >  return new AttributeSetter(m, arg) {
> >
> >
> >
> >
> -
> > To unsubscribe, e-mail:
> > [EMAIL PROTECTED]
> > For additional commands, e-mail:
> > [EMAIL PROTECTED]
> >
> >
>
>
>
>
> 
> Got a little couch potato?
> Check out fun summer activities for kids.
> http://search.yahoo.com/search?fr=oni_on_mail&p=summer+activities+for+kids&cs=bz
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r568200 - /ant/core/trunk/src/etc/checkstyle/checkstyle-config

[peterreilly]

Author: peterreilly
Date: Tue Aug 21 10:19:50 2007
New Revision: 568200

URL: http://svn.apache.org/viewvc?rev=568200&view=rev
Log:
allow redundant throws, do not allow illegalimport

Modified:
ant/core/trunk/src/etc/checkstyle/checkstyle-config

Modified: ant/core/trunk/src/etc/checkstyle/checkstyle-config
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/checkstyle/checkstyle-config?rev=568200&r1=568199&r2=568200&view=diff
==
--- ant/core/trunk/src/etc/checkstyle/checkstyle-config (original)
+++ ant/core/trunk/src/etc/checkstyle/checkstyle-config Tue Aug 21 10:19:50 2007
@@ -34,7 +34,7 @@
 
 
 
-
+
 
 
 
@@ -83,9 +83,11 @@
 
 
 
+
 
 
 
@@ -113,4 +115,4 @@
 
 
   
-
\ No newline at end of file
+



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r568201 - in /ant/core/trunk/src/main/org/apache/tools: ant/util/Base64Converter.java zip/ZipFile.java

[peterreilly]

Author: peterreilly
Date: Tue Aug 21 10:21:45 2007
New Revision: 568201

URL: http://svn.apache.org/viewvc?rev=568201&view=rev
Log:
checkstyle: some magic numbers

Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/Base64Converter.java
ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/Base64Converter.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/Base64Converter.java?rev=568201&r1=568200&r2=568201&view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/util/Base64Converter.java 
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/Base64Converter.java Tue 
Aug 21 10:21:45 2007
@@ -25,6 +25,8 @@
  **/
 public class Base64Converter {
 
+private static final BYTE_MASK = 0xFF;
+
 private static final char[] ALPHABET = {
 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',  //  0 to  7
 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',  //  8 to 15
@@ -65,8 +67,8 @@
 
 while ((i + 3) <= octetString.length) {
 // store the octets
-bits24 = (octetString[i++] & 0xFF) << 16;
-bits24 |= (octetString[i++] & 0xFF) << 8;
+bits24 = (octetString[i++] & BYTE_MASK) << 16;
+bits24 |= (octetString[i++] & BYTE_MASK) << 8;
 bits24 |= octetString[i++];
 
 bits6 = (bits24 & 0x00FC) >> 18;
@@ -80,8 +82,8 @@
 }
 if (octetString.length - i == 2) {
 // store the octets
-bits24 = (octetString[i] & 0xFF) << 16;
-bits24 |= (octetString[i + 1] & 0xFF) << 8;
+bits24 = (octetString[i] & BYTE_MASK) << 16;
+bits24 |= (octetString[i + 1] & BYTE_MASK) << 8;
 bits6 = (bits24 & 0x00FC) >> 18;
 out[outIndex++] = ALPHABET[bits6];
 bits6 = (bits24 & 0x0003F000) >> 12;
@@ -93,7 +95,7 @@
 out[outIndex++] = '=';
 } else if (octetString.length - i == 1) {
 // store the octets
-bits24 = (octetString[i] & 0xFF) << 16;
+bits24 = (octetString[i] & BYTE_MASK) << 16;
 bits6 = (bits24 & 0x00FC) >> 18;
 out[outIndex++] = ALPHABET[bits6];
 bits6 = (bits24 & 0x0003F000) >> 12;

Modified: ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java?rev=568201&r1=568200&r2=568201&view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java Tue Aug 21 
10:21:45 2007
@@ -59,17 +59,20 @@
  *
  */
 public class ZipFile {
+private static final int HASH_SIZE = 509;
+private static final int SHORT =   2;
+private static final int WORD  =   4;
 
 /**
  * Maps ZipEntrys to Longs, recording the offsets of the local
  * file headers.
  */
-private Hashtable entries = new Hashtable(509);
+private Hashtable entries = new Hashtable(HASH_SIZE);
 
 /**
  * Maps String to ZipEntrys, name -> actual entry.
  */
-private Hashtable nameMap = new Hashtable(509);
+private Hashtable nameMap = new Hashtable(HASH_SIZE);
 
 private static final class OffsetEntry {
 private long headerOffset = -1;
@@ -232,22 +235,22 @@
 }
 
 private static final int CFH_LEN =
-/* version made by */ 2
-/* version needed to extract   */ + 2
-/* general purpose bit flag*/ + 2
-/* compression method  */ + 2
-/* last mod file time  */ + 2
-/* last mod file date  */ + 2
-/* crc-32  */ + 4
-/* compressed size */ + 4
-/* uncompressed size   */ + 4
-/* filename length */ + 2
-/* extra field length  */ + 2
-/* file comment length */ + 2
-/* disk number start   */ + 2
-/* internal file attributes*/ + 2
-/* external file attributes*/ + 4
-/* relative offset of local header */ + 4;
+/* version made by */ SHORT
+/* version needed to extract   */ + SHORT
+/* general purpose bit flag*/ + SHORT
+/* compression method  */ + SHORT
+/* last mod file time  */ + SHORT
+/* last mod file date  */ + SHORT
+/* crc-32  */ + WORD
+/* compressed size */ + WORD
+/* uncompressed size   */ + WORD
+/* filename length */ + SHORT
+/* extra field length  *

svn commit: r568203 - in /ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools: ant/util/Base64Converter.java zip/ZipFile.java

[peterreilly]

Author: peterreilly
Date: Tue Aug 21 10:32:42 2007
New Revision: 568203

URL: http://svn.apache.org/viewvc?rev=568203&view=rev
Log:
sync

Modified:

ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/Base64Converter.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/zip/ZipFile.java

Modified: 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/Base64Converter.java
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/Base64Converter.java?rev=568203&r1=568202&r2=568203&view=diff
==
--- 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/Base64Converter.java
 (original)
+++ 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/Base64Converter.java
 Tue Aug 21 10:32:42 2007
@@ -25,6 +25,8 @@
  **/
 public class Base64Converter {
 
+private static final BYTE_MASK = 0xFF;
+
 private static final char[] ALPHABET = {
 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',  //  0 to  7
 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',  //  8 to 15
@@ -65,8 +67,8 @@
 
 while ((i + 3) <= octetString.length) {
 // store the octets
-bits24 = (octetString[i++] & 0xFF) << 16;
-bits24 |= (octetString[i++] & 0xFF) << 8;
+bits24 = (octetString[i++] & BYTE_MASK) << 16;
+bits24 |= (octetString[i++] & BYTE_MASK) << 8;
 bits24 |= octetString[i++];
 
 bits6 = (bits24 & 0x00FC) >> 18;
@@ -80,8 +82,8 @@
 }
 if (octetString.length - i == 2) {
 // store the octets
-bits24 = (octetString[i] & 0xFF) << 16;
-bits24 |= (octetString[i + 1] & 0xFF) << 8;
+bits24 = (octetString[i] & BYTE_MASK) << 16;
+bits24 |= (octetString[i + 1] & BYTE_MASK) << 8;
 bits6 = (bits24 & 0x00FC) >> 18;
 out[outIndex++] = ALPHABET[bits6];
 bits6 = (bits24 & 0x0003F000) >> 12;
@@ -93,7 +95,7 @@
 out[outIndex++] = '=';
 } else if (octetString.length - i == 1) {
 // store the octets
-bits24 = (octetString[i] & 0xFF) << 16;
+bits24 = (octetString[i] & BYTE_MASK) << 16;
 bits6 = (bits24 & 0x00FC) >> 18;
 out[outIndex++] = ALPHABET[bits6];
 bits6 = (bits24 & 0x0003F000) >> 12;

Modified: 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/zip/ZipFile.java
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/zip/ZipFile.java?rev=568203&r1=568202&r2=568203&view=diff
==
--- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/zip/ZipFile.java 
(original)
+++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/zip/ZipFile.java 
Tue Aug 21 10:32:42 2007
@@ -59,17 +59,20 @@
  *
  */
 public class ZipFile {
+private static final int HASH_SIZE = 509;
+private static final int SHORT =   2;
+private static final int WORD  =   4;
 
 /**
  * Maps ZipEntrys to Longs, recording the offsets of the local
  * file headers.
  */
-private Hashtable entries = new Hashtable(509);
+private Hashtable entries = new Hashtable(HASH_SIZE);
 
 /**
  * Maps String to ZipEntrys, name -> actual entry.
  */
-private Hashtable nameMap = new Hashtable(509);
+private Hashtable nameMap = new Hashtable(HASH_SIZE);
 
 private static final class OffsetEntry {
 private long headerOffset = -1;
@@ -232,22 +235,22 @@
 }
 
 private static final int CFH_LEN =
-/* version made by */ 2
-/* version needed to extract   */ + 2
-/* general purpose bit flag*/ + 2
-/* compression method  */ + 2
-/* last mod file time  */ + 2
-/* last mod file date  */ + 2
-/* crc-32  */ + 4
-/* compressed size */ + 4
-/* uncompressed size   */ + 4
-/* filename length */ + 2
-/* extra field length  */ + 2
-/* file comment length */ + 2
-/* disk number start   */ + 2
-/* internal file attributes*/ + 2
-/* external file attributes*/ + 4
-/* relative offset of local header */ + 4;
+/* version made by */ SHORT
+/* version needed to extract   */ + SHORT
+/* general purpose bit flag*/ + SHORT
+/* compression method  */ + SHORT
+/* last mod file time  */ + SHORT
+/* last mod file date  */ + SHORT
+/* crc-32  */ + WORD
+/* compressed size */ + WORD
+   

svn commit: r568204 - /ant/core/trunk/src/main/org/apache/tools/ant/util/Base64Converter.java

[peterreilly]

Author: peterreilly
Date: Tue Aug 21 10:39:20 2007
New Revision: 568204

URL: http://svn.apache.org/viewvc?rev=568204&view=rev
Log:
opps

Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/Base64Converter.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/Base64Converter.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/Base64Converter.java?rev=568204&r1=568203&r2=568204&view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/util/Base64Converter.java 
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/Base64Converter.java Tue 
Aug 21 10:39:20 2007
@@ -25,7 +25,7 @@
  **/
 public class Base64Converter {
 
-private static final BYTE_MASK = 0xFF;
+private static final int BYTE_MASK = 0xFF;
 
 private static final char[] ALPHABET = {
 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',  //  0 to  7



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r568205 - /ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/Base64Converter.java

[peterreilly]

Author: peterreilly
Date: Tue Aug 21 10:39:49 2007
New Revision: 568205

URL: http://svn.apache.org/viewvc?rev=568205&view=rev
Log:
sync

Modified:

ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/Base64Converter.java

Modified: 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/Base64Converter.java
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/Base64Converter.java?rev=568205&r1=568204&r2=568205&view=diff
==
--- 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/Base64Converter.java
 (original)
+++ 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/Base64Converter.java
 Tue Aug 21 10:39:49 2007
@@ -25,7 +25,7 @@
  **/
 public class Base64Converter {
 
-private static final BYTE_MASK = 0xFF;
+private static final int BYTE_MASK = 0xFF;
 
 private static final char[] ALPHABET = {
 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',  //  0 to  7



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 34633] - ReplaceRegExp periodically errors out with "Couldn't rename temporary file"

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=34633


[EMAIL PROTECTED] changed:

   What|Removed |Added

 OS/Version|other   |Windows XP




--- Additional Comments From [EMAIL PROTECTED]  2007-08-21 11:55 ---
Marking as windows xp, but it applies to all windows versions.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Turning off old vmbuild.apache.org in 24 hours

[Brett Porter]

Hi,

While the Ant nightlies haven't been moved yet, I believe Antoine is  
working on it. All of the content that exists on the existing machine  
resides on the new one so nothing will be lost when the old server is  
turned off.


We're planning to do that in 24 hours, so this might mean you are  
without nightlies for a period until the new ones are set up. Any  
issues?


Thanks,
Brett

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]