ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1049146 [7/19] - in /ant/ivy/core/trunk: ./ src/etc/checkstyle/ src/etc/license/ src/example/build-a-ivy-repository/ src/example/build-a-ivy-repository/settings/ src/example/chained-resolvers/ src/example/chained-resolvers/chainedresolvers...
Date Tue, 14 Dec 2010 16:28:36 GMT
Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/util/ResourceMDParser.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/util/ResourceMDParser.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/util/URLLister.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/util/URLLister.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/SignatureGenerator.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/SignatureGenerator.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/SignatureGenerator.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/SignatureGenerator.java Tue Dec 14 16:28:01 2010
@@ -1,31 +1,31 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You 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.apache.ivy.plugins.signer;
-
-import java.io.File;
-import java.io.IOException;
-
-public interface SignatureGenerator {
-    
-    String getName();
-    
-    void sign(File src, File dest) throws IOException;
-    
-    String getExtension();
-
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.apache.ivy.plugins.signer;
+
+import java.io.File;
+import java.io.IOException;
+
+public interface SignatureGenerator {
+    
+    String getName();
+    
+    void sign(File src, File dest) throws IOException;
+    
+    String getExtension();
+
+}

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/SignatureGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/SignatureGenerator.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/SignatureGenerator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java Tue Dec 14 16:28:01 2010
@@ -1,176 +1,176 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You 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.apache.ivy.plugins.signer.bouncycastle;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Security;
-import java.security.SignatureException;
-import java.util.Iterator;
-
-import org.apache.ivy.plugins.signer.SignatureGenerator;
-import org.bouncycastle.bcpg.ArmoredOutputStream;
-import org.bouncycastle.bcpg.BCPGOutputStream;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openpgp.PGPException;
-import org.bouncycastle.openpgp.PGPPrivateKey;
-import org.bouncycastle.openpgp.PGPSecretKey;
-import org.bouncycastle.openpgp.PGPSecretKeyRing;
-import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
-import org.bouncycastle.openpgp.PGPSignature;
-import org.bouncycastle.openpgp.PGPSignatureGenerator;
-import org.bouncycastle.openpgp.PGPUtil;
-
-public class OpenPGPSignatureGenerator implements SignatureGenerator {
-    
-    private static final long MASK = 0xFFFFFFFFL;
-
-    static {
-        Security.addProvider(new BouncyCastleProvider());
-    }
-
-    private String name;
-    private String secring;
-    private String password;
-    private String keyId;    
-    
-    private PGPSecretKey pgpSec;
-    
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    public String getExtension() {
-        return "asc";
-    }
-    
-    public void setPassword(String password) {
-        this.password = password;
-    }
-    
-    public void setSecring(String secring) {
-        this.secring = secring;
-    }
-    
-    public void setKeyId(String keyId) {
-        if (!"auto".equals(keyId)) {
-            this.keyId = keyId;
-        }
-    }
-    
-    public void sign(File src, File dest) throws IOException {
-        OutputStream out = null;
-        InputStream in = null;
-        InputStream keyIn = null;
-        
-        try {
-            if (secring == null) {
-                secring = System.getProperty("user.home") + "/.gnupg/secring.gpg";
-            }
-            
-            if (pgpSec == null) {
-                keyIn = new FileInputStream(secring);
-                pgpSec = readSecretKey(keyIn);
-            }
-            
-            PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(password.toCharArray(), BouncyCastleProvider.PROVIDER_NAME);        
-            PGPSignatureGenerator sGen = new PGPSignatureGenerator(pgpSec.getPublicKey().getAlgorithm(), PGPUtil.SHA1, BouncyCastleProvider.PROVIDER_NAME);
-            sGen.initSign(PGPSignature.BINARY_DOCUMENT, pgpPrivKey);
-    
-            in = new FileInputStream(src);
-            out = new BCPGOutputStream(new ArmoredOutputStream(new FileOutputStream(dest)));
-            
-            int ch = 0;
-            while ((ch = in.read()) >= 0) {
-                sGen.update((byte) ch);
-            }
-            
-            sGen.generate().encode(out);
-        } catch (SignatureException e) {
-            IOException ioexc = new IOException();
-            ioexc.initCause(e);
-            throw ioexc;
-        } catch (PGPException e) {
-            IOException ioexc = new IOException();
-            ioexc.initCause(e);
-            throw ioexc;
-        } catch (NoSuchAlgorithmException e) {
-            IOException ioexc = new IOException();
-            ioexc.initCause(e);
-            throw ioexc;
-        } catch (NoSuchProviderException e) {
-            IOException ioexc = new IOException();
-            ioexc.initCause(e);
-            throw ioexc;
-        } finally {
-            if (out != null) {
-                try {
-                    out.close();
-                } catch (IOException e) {}
-            }
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {}
-            }
-            if (keyIn != null) {
-                try {
-                    keyIn.close();
-                } catch (IOException e) {}
-            }
-        }
-    }
-
-    private PGPSecretKey readSecretKey(InputStream in) throws IOException, PGPException {
-        in = PGPUtil.getDecoderStream(in);
-        PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(in);
-
-        PGPSecretKey key = null; 
-        for (Iterator it = pgpSec.getKeyRings(); key == null && it.hasNext(); ) {
-            PGPSecretKeyRing kRing = (PGPSecretKeyRing) it.next();   
-            
-            for (Iterator it2 = kRing.getSecretKeys(); key == null && it2.hasNext(); ) {
-                PGPSecretKey k = (PGPSecretKey) it2.next();
-                if ((keyId == null) && k.isSigningKey()) {
-                    key = k;
-                }
-                if ((keyId != null) && (Long.valueOf(keyId, 16).longValue() == (k.getKeyID() & MASK))) {
-                    key = k;
-                }
-            }
-        }
-        
-        if (key == null) {
-            throw new IllegalArgumentException("Can't find encryption key" + 
-                (keyId != null ? " '" + keyId + "' " : " ") + "in key ring.");
-        }
-        
-        return key;
-    }
-
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.apache.ivy.plugins.signer.bouncycastle;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.Security;
+import java.security.SignatureException;
+import java.util.Iterator;
+
+import org.apache.ivy.plugins.signer.SignatureGenerator;
+import org.bouncycastle.bcpg.ArmoredOutputStream;
+import org.bouncycastle.bcpg.BCPGOutputStream;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPPrivateKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
+import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
+import org.bouncycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignatureGenerator;
+import org.bouncycastle.openpgp.PGPUtil;
+
+public class OpenPGPSignatureGenerator implements SignatureGenerator {
+    
+    private static final long MASK = 0xFFFFFFFFL;
+
+    static {
+        Security.addProvider(new BouncyCastleProvider());
+    }
+
+    private String name;
+    private String secring;
+    private String password;
+    private String keyId;    
+    
+    private PGPSecretKey pgpSec;
+    
+    public String getName() {
+        return name;
+    }
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+    public String getExtension() {
+        return "asc";
+    }
+    
+    public void setPassword(String password) {
+        this.password = password;
+    }
+    
+    public void setSecring(String secring) {
+        this.secring = secring;
+    }
+    
+    public void setKeyId(String keyId) {
+        if (!"auto".equals(keyId)) {
+            this.keyId = keyId;
+        }
+    }
+    
+    public void sign(File src, File dest) throws IOException {
+        OutputStream out = null;
+        InputStream in = null;
+        InputStream keyIn = null;
+        
+        try {
+            if (secring == null) {
+                secring = System.getProperty("user.home") + "/.gnupg/secring.gpg";
+            }
+            
+            if (pgpSec == null) {
+                keyIn = new FileInputStream(secring);
+                pgpSec = readSecretKey(keyIn);
+            }
+            
+            PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(password.toCharArray(), BouncyCastleProvider.PROVIDER_NAME);        
+            PGPSignatureGenerator sGen = new PGPSignatureGenerator(pgpSec.getPublicKey().getAlgorithm(), PGPUtil.SHA1, BouncyCastleProvider.PROVIDER_NAME);
+            sGen.initSign(PGPSignature.BINARY_DOCUMENT, pgpPrivKey);
+    
+            in = new FileInputStream(src);
+            out = new BCPGOutputStream(new ArmoredOutputStream(new FileOutputStream(dest)));
+            
+            int ch = 0;
+            while ((ch = in.read()) >= 0) {
+                sGen.update((byte) ch);
+            }
+            
+            sGen.generate().encode(out);
+        } catch (SignatureException e) {
+            IOException ioexc = new IOException();
+            ioexc.initCause(e);
+            throw ioexc;
+        } catch (PGPException e) {
+            IOException ioexc = new IOException();
+            ioexc.initCause(e);
+            throw ioexc;
+        } catch (NoSuchAlgorithmException e) {
+            IOException ioexc = new IOException();
+            ioexc.initCause(e);
+            throw ioexc;
+        } catch (NoSuchProviderException e) {
+            IOException ioexc = new IOException();
+            ioexc.initCause(e);
+            throw ioexc;
+        } finally {
+            if (out != null) {
+                try {
+                    out.close();
+                } catch (IOException e) {}
+            }
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {}
+            }
+            if (keyIn != null) {
+                try {
+                    keyIn.close();
+                } catch (IOException e) {}
+            }
+        }
+    }
+
+    private PGPSecretKey readSecretKey(InputStream in) throws IOException, PGPException {
+        in = PGPUtil.getDecoderStream(in);
+        PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(in);
+
+        PGPSecretKey key = null; 
+        for (Iterator it = pgpSec.getKeyRings(); key == null && it.hasNext(); ) {
+            PGPSecretKeyRing kRing = (PGPSecretKeyRing) it.next();   
+            
+            for (Iterator it2 = kRing.getSecretKeys(); key == null && it2.hasNext(); ) {
+                PGPSecretKey k = (PGPSecretKey) it2.next();
+                if ((keyId == null) && k.isSigningKey()) {
+                    key = k;
+                }
+                if ((keyId != null) && (Long.valueOf(keyId, 16).longValue() == (k.getKeyID() & MASK))) {
+                    key = k;
+                }
+            }
+        }
+        
+        if (key == null) {
+            throw new IllegalArgumentException("Can't find encryption key" + 
+                (keyId != null ? " '" + keyId + "' " : " ") + "in key ring.");
+        }
+        
+        return key;
+    }
+
+}

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/trigger/AbstractTrigger.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/trigger/AbstractTrigger.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/trigger/LogTrigger.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/trigger/LogTrigger.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/trigger/LogTrigger.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/trigger/LogTrigger.java Tue Dec 14 16:28:01 2010
@@ -1,125 +1,125 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You 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.apache.ivy.plugins.trigger;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-
-import org.apache.ivy.core.IvyPatternHelper;
-import org.apache.ivy.core.event.IvyEvent;
-import org.apache.ivy.core.resolve.ResolveProcessException;
-import org.apache.ivy.util.Message;
-
-/**
- * A trigger performing logging.
- * <p>
- * The implementation is widely inspired by Ant Echo task.
- * </p>
- */
-public class LogTrigger extends AbstractTrigger {
-    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
-
-    private String message = "";
-    
-    private File file = null;
-
-    private boolean append = true;
-    /** encoding; set to null or empty means 'default' */
-    private String encoding = "";
-
-    public void progress(IvyEvent event) {
-        log(IvyPatternHelper.substituteVariables(message, event.getAttributes()));
-    }
-
-    /**
-     * Logs the given message.
-     * 
-     * @param message the message to log
-     */
-    protected void log(String message) {
-        if (file == null) {
-            Message.info(message);
-        } else {
-            Writer out = null;
-            try {
-                // we add a line separator here for consistency with Message.info which creates a
-                // new line each time.
-                // we use the system dependent line separator to ease reading the log file
-                message += LINE_SEPARATOR;
-                String filename = file.getAbsolutePath();
-                if (encoding == null || encoding.length() == 0) {
-                    out = new FileWriter(filename, append);
-                } else {
-                    out = new BufferedWriter(
-                            new OutputStreamWriter(
-                                new FileOutputStream(filename, append), encoding));
-                }
-                out.write(message, 0, message.length());
-            } catch (IOException e) {
-                throw new ResolveProcessException(e);
-            } finally {
-                if (out != null) {
-                    try {
-                        out.close();
-                    } catch (IOException e) {
-                        throw new ResolveProcessException(e);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Message to write.
-     *
-     * @param msg Sets the value for the message variable.
-     */
-    public void setMessage(String msg) {
-        this.message = msg;
-    }
-
-    /**
-     * File to write to.
-     * @param file the file to write to, if not set, echo to standard Ivy logging
-     */
-    public void setFile(File file) {
-        this.file = file;
-    }
-
-    /**
-     * If true, append to existing file.
-     * @param append if true, append to existing file, default is false.
-     */
-    public void setAppend(boolean append) {
-        this.append = append;
-    }
-
-    /**
-     * Declare the encoding to use when outputting to a file;
-     * Use "" for the platform's default encoding.
-     * @param encoding the character encoding to use.
-     */
-    public void setEncoding(String encoding) {
-        this.encoding = encoding;
-    }
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.apache.ivy.plugins.trigger;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
+import org.apache.ivy.core.IvyPatternHelper;
+import org.apache.ivy.core.event.IvyEvent;
+import org.apache.ivy.core.resolve.ResolveProcessException;
+import org.apache.ivy.util.Message;
+
+/**
+ * A trigger performing logging.
+ * <p>
+ * The implementation is widely inspired by Ant Echo task.
+ * </p>
+ */
+public class LogTrigger extends AbstractTrigger {
+    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+
+    private String message = "";
+    
+    private File file = null;
+
+    private boolean append = true;
+    /** encoding; set to null or empty means 'default' */
+    private String encoding = "";
+
+    public void progress(IvyEvent event) {
+        log(IvyPatternHelper.substituteVariables(message, event.getAttributes()));
+    }
+
+    /**
+     * Logs the given message.
+     * 
+     * @param message the message to log
+     */
+    protected void log(String message) {
+        if (file == null) {
+            Message.info(message);
+        } else {
+            Writer out = null;
+            try {
+                // we add a line separator here for consistency with Message.info which creates a
+                // new line each time.
+                // we use the system dependent line separator to ease reading the log file
+                message += LINE_SEPARATOR;
+                String filename = file.getAbsolutePath();
+                if (encoding == null || encoding.length() == 0) {
+                    out = new FileWriter(filename, append);
+                } else {
+                    out = new BufferedWriter(
+                            new OutputStreamWriter(
+                                new FileOutputStream(filename, append), encoding));
+                }
+                out.write(message, 0, message.length());
+            } catch (IOException e) {
+                throw new ResolveProcessException(e);
+            } finally {
+                if (out != null) {
+                    try {
+                        out.close();
+                    } catch (IOException e) {
+                        throw new ResolveProcessException(e);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Message to write.
+     *
+     * @param msg Sets the value for the message variable.
+     */
+    public void setMessage(String msg) {
+        this.message = msg;
+    }
+
+    /**
+     * File to write to.
+     * @param file the file to write to, if not set, echo to standard Ivy logging
+     */
+    public void setFile(File file) {
+        this.file = file;
+    }
+
+    /**
+     * If true, append to existing file.
+     * @param append if true, append to existing file, default is false.
+     */
+    public void setAppend(boolean append) {
+        this.append = append;
+    }
+
+    /**
+     * Declare the encoding to use when outputting to a file;
+     * Use "" for the platform's default encoding.
+     * @param encoding the character encoding to use.
+     */
+    public void setEncoding(String encoding) {
+        this.encoding = encoding;
+    }
+}

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/trigger/LogTrigger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/trigger/LogTrigger.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/trigger/Trigger.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/trigger/Trigger.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/AbstractVersionMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/AbstractVersionMatcher.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/ChainVersionMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/ChainVersionMatcher.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/ExactVersionMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/ExactVersionMatcher.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/Match.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/Match.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/PatternVersionMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/PatternVersionMatcher.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/SubVersionMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/SubVersionMatcher.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/VersionMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/VersionMatcher.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/VersionRangeMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/version/VersionRangeMatcher.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/tools/analyser/DependencyAnalyser.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/tools/analyser/DependencyAnalyser.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/tools/analyser/JarJarDependencyAnalyser.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/tools/analyser/JarJarDependencyAnalyser.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/tools/analyser/JarModule.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/tools/analyser/JarModule.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/tools/analyser/JarModuleFinder.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/tools/analyser/JarModuleFinder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/tools/analyser/RepositoryAnalyser.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/tools/analyser/RepositoryAnalyser.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/AbstractMessageLogger.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/AbstractMessageLogger.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/Checks.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/Checks.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/ChecksumHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/ChecksumHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/ConfigurationUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/ConfigurationUtils.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/Configurator.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/Configurator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/ContextualSAXHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/ContextualSAXHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/CopyProgressEvent.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/CopyProgressEvent.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/CopyProgressListener.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/CopyProgressListener.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/Credentials.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/Credentials.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/CredentialsUtil.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/CredentialsUtil.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/DefaultMessageLogger.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/DefaultMessageLogger.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/EncrytedProperties.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/EncrytedProperties.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/FileResolver.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/FileUtil.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/FileUtil.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/HostUtil.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/HostUtil.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/util/MemoryUtil.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/util/MemoryUtil.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/util/MemoryUtil.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/util/MemoryUtil.java Tue Dec 14 16:28:01 2010
@@ -1,90 +1,90 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You 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.apache.ivy.util;
-
-/**
- * Memory related utilities.
- */
-public final class MemoryUtil {
-    private static final int SAMPLING_SIZE = 100;
-    private static final int SLEEP_TIME = 100;
-    
-    private MemoryUtil() {
-    }
-
-    /**
-     * Returns the approximate size of a default instance of the given class.
-     * 
-     * @param clazz
-     *            the class to evaluate.
-     * @return the estimated size of instance, in bytes.
-     */
-    public static long sizeOf(Class clazz) {
-        long size = 0;
-        Object[] objects = new Object[SAMPLING_SIZE];
-        try {
-            clazz.newInstance();
-            long startingMemoryUse = getUsedMemory();
-            for (int i = 0; i < objects.length; i++) {
-                objects[i] = clazz.newInstance();
-            }
-            long endingMemoryUse = getUsedMemory();
-            float approxSize = (endingMemoryUse - startingMemoryUse) / (float) objects.length;
-            size = Math.round(approxSize);
-        } catch (Exception e) {
-            System.out.println("WARNING:couldn't instantiate" + clazz);
-            e.printStackTrace();
-        }
-        return size;
-    }
-
-    /**
-     * Returns the currently used memory, after calling garbage collector and waiting enough to get
-     * maximal chance it is actually called. But since {@link Runtime#gc()} is only advisory,
-     * results returned by this method should be treated as rough approximation only.
-     * 
-     * @return the currently used memory, in bytes.
-     */
-    public static long getUsedMemory() {
-        gc();
-        long totalMemory = Runtime.getRuntime().totalMemory();
-        gc();
-        long freeMemory = Runtime.getRuntime().freeMemory();
-        long usedMemory = totalMemory - freeMemory;
-        return usedMemory;
-    }
-
-    private static void gc() {
-        try {
-            System.gc();
-            Thread.sleep(SLEEP_TIME);
-            System.runFinalization();
-            Thread.sleep(SLEEP_TIME);
-            System.gc();
-            Thread.sleep(SLEEP_TIME);
-            System.runFinalization();
-            Thread.sleep(SLEEP_TIME);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    public static void main(String[] args) throws ClassNotFoundException {
-        System.out.println(sizeOf(Class.forName(args[0])));
-    }
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.apache.ivy.util;
+
+/**
+ * Memory related utilities.
+ */
+public final class MemoryUtil {
+    private static final int SAMPLING_SIZE = 100;
+    private static final int SLEEP_TIME = 100;
+    
+    private MemoryUtil() {
+    }
+
+    /**
+     * Returns the approximate size of a default instance of the given class.
+     * 
+     * @param clazz
+     *            the class to evaluate.
+     * @return the estimated size of instance, in bytes.
+     */
+    public static long sizeOf(Class clazz) {
+        long size = 0;
+        Object[] objects = new Object[SAMPLING_SIZE];
+        try {
+            clazz.newInstance();
+            long startingMemoryUse = getUsedMemory();
+            for (int i = 0; i < objects.length; i++) {
+                objects[i] = clazz.newInstance();
+            }
+            long endingMemoryUse = getUsedMemory();
+            float approxSize = (endingMemoryUse - startingMemoryUse) / (float) objects.length;
+            size = Math.round(approxSize);
+        } catch (Exception e) {
+            System.out.println("WARNING:couldn't instantiate" + clazz);
+            e.printStackTrace();
+        }
+        return size;
+    }
+
+    /**
+     * Returns the currently used memory, after calling garbage collector and waiting enough to get
+     * maximal chance it is actually called. But since {@link Runtime#gc()} is only advisory,
+     * results returned by this method should be treated as rough approximation only.
+     * 
+     * @return the currently used memory, in bytes.
+     */
+    public static long getUsedMemory() {
+        gc();
+        long totalMemory = Runtime.getRuntime().totalMemory();
+        gc();
+        long freeMemory = Runtime.getRuntime().freeMemory();
+        long usedMemory = totalMemory - freeMemory;
+        return usedMemory;
+    }
+
+    private static void gc() {
+        try {
+            System.gc();
+            Thread.sleep(SLEEP_TIME);
+            System.runFinalization();
+            Thread.sleep(SLEEP_TIME);
+            System.gc();
+            Thread.sleep(SLEEP_TIME);
+            System.runFinalization();
+            Thread.sleep(SLEEP_TIME);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    
+    public static void main(String[] args) throws ClassNotFoundException {
+        System.out.println(sizeOf(Class.forName(args[0])));
+    }
 }
\ No newline at end of file

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/MemoryUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/MemoryUtil.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/Message.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/Message.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/MessageLogger.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/MessageLogger.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/MessageLoggerEngine.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/MessageLoggerEngine.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/MessageLoggerHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/MessageLoggerHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/PropertiesFile.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/PropertiesFile.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/StringUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/StringUtils.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/XMLHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/XMLHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/cli/CommandLine.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/cli/CommandLine.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/cli/CommandLineParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/cli/CommandLineParser.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/cli/Option.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/cli/Option.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/cli/OptionBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/cli/OptionBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/cli/ParseException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/cli/ParseException.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/extendable/DefaultExtendableItem.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/extendable/DefaultExtendableItem.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/extendable/ExtendableItem.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/extendable/ExtendableItem.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/extendable/ExtendableItemHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/extendable/ExtendableItemHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/AndFilter.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/AndFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/ArtifactTypeFilter.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/ArtifactTypeFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/Filter.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/Filter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/FilterHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/FilterHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/NoFilter.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/NoFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/NotFilter.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/NotFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/OrFilter.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/filter/OrFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/AbstractURLHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/AbstractURLHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/ApacheURLLister.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/ApacheURLLister.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/BasicURLHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/BasicURLHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/CredentialsStore.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/CredentialsStore.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/HttpClientHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/HttpClientHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/IvyAuthenticator.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/IvyAuthenticator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/URLHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/URLHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/URLHandlerDispatcher.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/URLHandlerDispatcher.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/URLHandlerRegistry.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/URLHandlerRegistry.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/buildlist/A/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/A/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/buildlist/A/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/A/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/buildlist/B/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/B/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/buildlist/B/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/B/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/buildlist/C/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/C/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/buildlist/C/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/C/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/buildlist/D/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/D/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/buildlist/D/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/D/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/buildlist/E/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/E/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/buildlist/E/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/E/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ant/ivy/core/trunk/test/buildlist/E2/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlist/E2/build.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/buildlist/E2/build.xml (original)
+++ ant/ivy/core/trunk/test/buildlist/E2/build.xml Tue Dec 14 16:28:01 2010
@@ -1,18 +1,18 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you 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.    
--->
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.    
+-->

Propchange: ant/ivy/core/trunk/test/buildlist/E2/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlist/E2/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/E2/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ant/ivy/core/trunk/test/buildlist/E2/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlist/E2/ivy.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/buildlist/E2/ivy.xml (original)
+++ ant/ivy/core/trunk/test/buildlist/E2/ivy.xml Tue Dec 14 16:28:01 2010
@@ -1,21 +1,21 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you 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.    
--->
-<ivy-module version="1.2">
-	<info organisation="apache2" module="E"/>
-</ivy-module>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.    
+-->
+<ivy-module version="1.2">
+	<info organisation="apache2" module="E"/>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/buildlist/E2/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlist/E2/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/E2/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/buildlist/F/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/F/build.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: ant/ivy/core/trunk/test/buildlist/F/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/F/ivy.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: ant/ivy/core/trunk/test/buildlist/G/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/G/build.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: ant/ivy/core/trunk/test/buildlist/G/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/G/ivy.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Modified: ant/ivy/core/trunk/test/buildlist/H/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlist/H/build.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/buildlist/H/build.xml (original)
+++ ant/ivy/core/trunk/test/buildlist/H/build.xml Tue Dec 14 16:28:01 2010
@@ -1,18 +1,18 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you 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.    
--->
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.    
+-->

Propchange: ant/ivy/core/trunk/test/buildlist/H/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlist/H/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlist/H/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/custom-classpath/org/apache/ivy/plugins/resolver/CustomResolver.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/custom-classpath/org/apache/ivy/plugins/resolver/CustomResolver.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/IvyTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/IvyTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/MainTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/MainTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/TestFixture.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/TestFixture.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/TestHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/TestHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/AntBuildTriggerTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/AntBuildTriggerTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/AntTestHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFile.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFile.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFile.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFile.xml Tue Dec 14 16:28:01 2010
@@ -1,48 +1,48 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you 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.    
--->
-<project xmlns:ivy="antlib:org.apache.ivy.ant" basedir="../../../../../..">
-  <target name="setUp">
-    <property name="ivy.cache.repository" value="build/cache" />
-  </target>
-
-  <target name="tearDown">
-  	<delete dir="build/cache" />
-  </target>
-
-  <target name="testOverrideNotSpecified">
-  	<ivy:configure settingsId="test1" file="test/repositories/ivysettings.xml" />
-  	<ivy:resolve settingsRef="test1" file="test/java/org/apache/ivy/ant/ivy-simple.xml" />
-  </target>
-
-  <target name="testOverrideSetToFalse">
-  	<ivy:configure settingsId="test2" file="test/repositories/ivysettings.xml" override="false" />
-  	<ivy:resolve settingsRef="test2" file="test/java/org/apache/ivy/ant/ivy-simple.xml" />
-  </target>
-	  
-  <target name="testUnnecessaryDefaultIvyInstance">
-	  	<ivy:configure settingsId="testUnnecessaryDefaultIvyInstance" file="test/repositories/ivysettings.xml" override="true" />
-	  	<ivy:cachepath settingsRef="testUnnecessaryDefaultIvyInstance" file="test/java/org/apache/ivy/ant/ivy-simple.xml" pathid="ptest" />
-	  </target>
-	
-  <target name="testSettingsWithPropertyAsId">
-  	<property name="my.property" value="whatever" />
-  	<ivy:settings id="${my.property}" file="test/repositories/ivysettings.xml" />
-  	<ivy:resolve settingsRef="${my.property}" file="test/java/org/apache/ivy/ant/ivy-simple.xml" />
-  </target>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.    
+-->
+<project xmlns:ivy="antlib:org.apache.ivy.ant" basedir="../../../../../..">
+  <target name="setUp">
+    <property name="ivy.cache.repository" value="build/cache" />
+  </target>
+
+  <target name="tearDown">
+  	<delete dir="build/cache" />
+  </target>
+
+  <target name="testOverrideNotSpecified">
+  	<ivy:configure settingsId="test1" file="test/repositories/ivysettings.xml" />
+  	<ivy:resolve settingsRef="test1" file="test/java/org/apache/ivy/ant/ivy-simple.xml" />
+  </target>
+
+  <target name="testOverrideSetToFalse">
+  	<ivy:configure settingsId="test2" file="test/repositories/ivysettings.xml" override="false" />
+  	<ivy:resolve settingsRef="test2" file="test/java/org/apache/ivy/ant/ivy-simple.xml" />
+  </target>
+	  
+  <target name="testUnnecessaryDefaultIvyInstance">
+	  	<ivy:configure settingsId="testUnnecessaryDefaultIvyInstance" file="test/repositories/ivysettings.xml" override="true" />
+	  	<ivy:cachepath settingsRef="testUnnecessaryDefaultIvyInstance" file="test/java/org/apache/ivy/ant/ivy-simple.xml" pathid="ptest" />
+	  </target>
+	
+  <target name="testSettingsWithPropertyAsId">
+  	<property name="my.property" value="whatever" />
+  	<ivy:settings id="${my.property}" file="test/repositories/ivysettings.xml" />
+  	<ivy:resolve settingsRef="${my.property}" file="test/java/org/apache/ivy/ant/ivy-simple.xml" />
+  </target>
 </project>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFile.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFile.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFile.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileStackOverflow.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileStackOverflow.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileStackOverflow.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileStackOverflow.xml Tue Dec 14 16:28:01 2010
@@ -1,33 +1,33 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you 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.    
--->
-<project xmlns:ivy="antlib:org.apache.ivy.ant" basedir="../../../../../..">
-  <target name="setUp">
-    <property name="ivy.cache.repository" value="build/cache" />
-  </target>
-
-  <target name="tearDown">
-  	<delete dir="build/cache" />
-  </target>
-
-  <target name="testStackOverflow">
-  	<ivy:settings id="ivy.instance" file="test/repositories/ivysettings.xml" />
-  	<ivy:resolve settingsRef="ivy.instance" file="test/java/org/apache/ivy/ant/ivy-simple.xml" />
-  </target>
-
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.    
+-->
+<project xmlns:ivy="antlib:org.apache.ivy.ant" basedir="../../../../../..">
+  <target name="setUp">
+    <property name="ivy.cache.repository" value="build/cache" />
+  </target>
+
+  <target name="tearDown">
+  	<delete dir="build/cache" />
+  </target>
+
+  <target name="testStackOverflow">
+  	<ivy:settings id="ivy.instance" file="test/repositories/ivysettings.xml" />
+  	<ivy:resolve settingsRef="ivy.instance" file="test/java/org/apache/ivy/ant/ivy-simple.xml" />
+  </target>
+
 </project>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileStackOverflow.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileStackOverflow.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileStackOverflow.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message