ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xav...@apache.org
Subject svn commit: r682317 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse: src/java/org/apache/ivyde/common/ivyfile/ test/java/org/apache/ivyde/common/ivyfile/ test/java/org/apache/ivyde/common/ivyfile/addDependency8/ test/java/org/apache/ivyde/common/ivy...
Date Mon, 04 Aug 2008 10:41:49 GMT
Author: xavier
Date: Mon Aug  4 03:41:48 2008
New Revision: 682317

URL: http://svn.apache.org/viewvc?rev=682317&view=rev
Log:
add removeOrExcludeDependency feature in IvyFileUpdater

Added:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/expected.xml
  (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/ivy.xml
  (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/expected.xml
  (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/ivy.xml
  (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/expected.xml
  (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/ivy.xml
  (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/expected.xml
  (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/ivy.xml
  (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/expected.xml
  (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/ivy.xml
  (with props)
Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/IvyFileUpdaterTest.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java?rev=682317&r1=682316&r2=682317&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java
Mon Aug  4 03:41:48 2008
@@ -36,6 +36,7 @@
         int insertToIndex = 0;
         String prefix = "";
         String suffix = "";
+        String insert = "";
     }
     
     public void addDependency(File ivyFile, String org, String name, String revision, String
confMapping) throws IOException {
@@ -46,20 +47,37 @@
     public void addDependency(File ivyFile, ModuleRevisionId depId, String confMapping) throws
IOException {
         String content = FileUtil.readEntirely(ivyFile);
         
-        UpdateInfo info = findUpdateInfoToAddDependency(content);
+        UpdateInfo info = findUpdateInfoToAddDependency(content, depId, confMapping);
         
-        String dep = getDependencyToAdd(depId, confMapping);
+        update(ivyFile, content, info);
+    }
+
+    /**
+     * Removes a direct dependency in the given Ivy file, or excludes it if it isn't a direct
+     * dependency, unless the Ivy file declares no dependency at all, in which case the file
isn't
+     * changed.
+     * 
+     * @param ivyFile
+     *            the file pointing to the Ivy file to update
+     * @param depId
+     *            the module id of the dependency to remove or exclude
+     */ 
+    public void removeOrExcludeDependency(File ivyFile, ModuleId depId) throws IOException
{
+        String content = FileUtil.readEntirely(ivyFile);
         
-        update(ivyFile, content, info, dep);
+        UpdateInfo info = findUpdateInfoToRemoveDependency(content, depId);
+        if (info != null) {
+            update(ivyFile, content, info);
+        }
     }
 
-    private void update(File ivyFile, String content, UpdateInfo info, String insert)
+    private void update(File ivyFile, String content, UpdateInfo info)
             throws FileNotFoundException {
         PrintWriter w = new PrintWriter(ivyFile);
         try {
             w.print(content.substring(0, info.insertFromIndex));
             w.print(info.prefix);
-            w.print(insert);
+            w.print(info.insert);
             w.print(info.suffix);
             w.print(content.substring(info.insertToIndex));
             w.flush();
@@ -68,26 +86,16 @@
         }
     }
 
-    private String getDependencyToAdd(ModuleRevisionId depId, String confMapping) {
-        String dep = "        <dependency org=\"" + depId.getOrganisation() + "\"";
-        dep += " name=\"" + depId.getName() + "\"";
-        dep += " rev=\"" + depId.getRevision() + "\"";
-        if (confMapping != null) {
-            dep += " conf=\"" + confMapping + "\"";
-        }
-        dep += " />";
-        return dep;
-    }
-
-    private UpdateInfo findUpdateInfoToAddDependency(String content) {
+    private UpdateInfo findUpdateInfoToAddDependency(String content, ModuleRevisionId depId,
String confMapping) {
         UpdateInfo info = new UpdateInfo();
+        info.insert = getDependencyToAdd(depId, confMapping);
         
         Pattern dependenciesClose = Pattern.compile("<\\s*/dependencies");
         Matcher depsCloseMatcher = dependenciesClose.matcher(content);
         if (depsCloseMatcher.find()) {
             info.insertFromIndex = findLastDependencyEnd(content, depsCloseMatcher.start());
             if (info.insertFromIndex == -1) {
-                info.insertFromIndex = getLastEndIndex(Pattern.compile("<\\s*dependencies.*?>"),

+                info.insertFromIndex = getLastMatchIndex(Pattern.compile("<\\s*dependencies.*?>"),

                                                         content, depsCloseMatcher.start());
                 if (info.insertFromIndex == -1) {
                     info.insertFromIndex = depsCloseMatcher.start();
@@ -120,14 +128,81 @@
         }
         return info;
     }
+    
+    private UpdateInfo findUpdateInfoToRemoveDependency(String content, ModuleId depId) {
+        UpdateInfo info = new UpdateInfo();
+        
+        Matcher depsMatcher = Pattern.compile("<\\s*dependencies").matcher(content);
+        if (!depsMatcher.find()) {
+            // no dependencies at all, nothing to do
+            return null;
+        }
+        Matcher depMatcher = Pattern.compile("<\\s*dependency\\s+.*name=[\"']([^\"']+)[\"']").matcher(content);
+        int start = depsMatcher.start();
+        while (depMatcher.find(start)) {
+            if (depId.getName().equals(depMatcher.group(1))) {
+                // we have found the dependency to remove: let's remove it
+                info.insertFromIndex = depMatcher.start();
+                Matcher m = Pattern.compile("</\\s*dependency\\s*>").matcher(content);
+                if (m.find(info.insertFromIndex)) {
+                    info.insertToIndex = m.end();
+                }
+                m = Pattern.compile("<\\s*dependency[^<]*?\\/\\>").matcher(content);
+                if (m.find(info.insertFromIndex)) {
+                    info.insertToIndex = info.insertToIndex > 0 
+                                        ? Math.min(info.insertToIndex, m.end()) : m.end();
+                }
+                info.insertFromIndex = findStartOfBlock(content, info.insertFromIndex);
+                info.insertToIndex = findEndOfBlock(content, info.insertToIndex);
+                return info;
+            }
+            start = depMatcher.end();
+        }
+        
+        // we haven't found the dependency in the list of declared dependencies
+        
+        if (start == depsMatcher.start()) {
+            // no dependencies at all, nothing to do
+            return null;
+        }
+        // there is at least one direct dependency, but not the one to remove, so we must
exclude it
+        Matcher depsCloseMatcher = Pattern.compile("<\\s*/dependencies").matcher(content);
+        if (!depsCloseMatcher.find()) {
+            // no closing tag for dependencies, probably malformed xml, nothing to do
+            return null;
+        }
+        info.insertFromIndex = findLastDependencyEnd(content, depsCloseMatcher.start());
+        info.insertToIndex = info.insertFromIndex;
+        info.prefix = NL;
+        info.insert = getDependencyToExclude(depId);
+        return info;
+    }
 
     private int findLastDependencyEnd(String content, int end) {
-        int depCloseIndex = getLastEndIndex(Pattern.compile("</\\s*dependency\\s*>"),
content, end);
-        int depOpCloseIndex = getLastEndIndex(Pattern.compile("\\<\\s*dependency.*?\\/\\>"),
content, end);
+        int depCloseIndex = getLastMatchIndex(Pattern.compile("</\\s*dependency\\s*>"),
content, end);
+        int depOpCloseIndex = getLastMatchIndex(Pattern.compile("\\<\\s*dependency.*?\\/\\>"),
content, end);
         return Math.max(depCloseIndex, depOpCloseIndex);
     }
+    
+    private String getDependencyToAdd(ModuleRevisionId depId, String confMapping) {
+        String dep = "        <dependency org=\"" + depId.getOrganisation() + "\"";
+        dep += " name=\"" + depId.getName() + "\"";
+        dep += " rev=\"" + depId.getRevision() + "\"";
+        if (confMapping != null) {
+            dep += " conf=\"" + confMapping + "\"";
+        }
+        dep += " />";
+        return dep;
+    }
 
-    private int getLastEndIndex(Pattern pattern, String content, int end) {
+    private String getDependencyToExclude(ModuleId depId) {
+        String dep = "        <exclude org=\"" + depId.getOrganisation() + "\"";
+        dep += " module=\"" + depId.getName() + "\"";
+        dep += " />";
+        return dep;
+    }
+
+    private int getLastMatchIndex(Pattern pattern, String content, int end) {
         Matcher matcher = pattern.matcher(content);
         int index = -1;
         while (matcher.find(index + 1)) {
@@ -140,4 +215,27 @@
         return index;
     }
 
+    private int findStartOfBlock(String content, int index) {
+        for (index--; index >= 0; index--) {
+            char c = content.charAt(index);
+            if (c != ' ' && c != '\t') {
+                return index + 1;
+            }
+        }
+        return 0;
+    }
+    
+    private int findEndOfBlock(String content, int index) {
+        for (; index < content.length(); index++) {
+            char c = content.charAt(index);
+            if (c != ' ' && c != '\t') {
+                if (c == '\n' || c == '\r') {
+                    return index + 1;
+                }
+                return index;
+            }
+        }
+        return index - 1;
+    }
+
 }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/IvyFileUpdaterTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/IvyFileUpdaterTest.java?rev=682317&r1=682316&r2=682317&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/IvyFileUpdaterTest.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/IvyFileUpdaterTest.java
Mon Aug  4 03:41:48 2008
@@ -20,6 +20,7 @@
 import java.io.File;
 import java.io.IOException;
 
+import org.apache.ivy.core.module.id.ModuleId;
 import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.apache.ivy.util.FileUtil;
 
@@ -36,6 +37,7 @@
         testAddDependency("addDependency5");
         testAddDependency("addDependency6");
         testAddDependency("addDependency7");
+        testAddDependency("addDependency8");
     }
 
     private void testAddDependency(String test) throws IOException {
@@ -48,4 +50,22 @@
             FileUtil.readEntirely(IvyFileUpdaterTest.class.getResourceAsStream(test + "/expected.xml")),
             FileUtil.readEntirely(dest));
     }
+    
+    public void testRemoveDependency() throws Exception {
+        testRemoveDependency("removeDependency1");
+        testRemoveDependency("removeDependency2");
+        testRemoveDependency("removeDependency3");
+        testRemoveDependency("removeDependency4");
+    }
+
+    private void testRemoveDependency(String test) throws IOException {
+        File dest = File.createTempFile("ivy", ".xml");
+        dest.deleteOnExit();
+        FileUtil.copy(IvyFileUpdaterTest.class.getResourceAsStream(test + "/ivy.xml"), dest,
null);
+        updater.removeOrExcludeDependency(dest, new ModuleId("apache", "newdep"));
+        assertEquals(
+            test + " failed",
+            FileUtil.readEntirely(IvyFileUpdaterTest.class.getResourceAsStream(test + "/expected.xml")),
+            FileUtil.readEntirely(dest));
+    }
 }

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/expected.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/expected.xml?rev=682317&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/expected.xml
(added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/expected.xml
Mon Aug  4 03:41:48 2008
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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.0">
+    <info 
+        organisation="acme"
+        module="test"
+	/>
+    <dependencies>
+        <dependency org="apache" name="commons-collections" rev="2.1.1" conf="default">
+            <exclude module="B"/>
+        </dependency>
+        <dependency org="apache" name="newdep" rev="1.0" conf="default->default" />
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/expected.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/expected.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/ivy.xml?rev=682317&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/ivy.xml
(added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/ivy.xml
Mon Aug  4 03:41:48 2008
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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.0">
+    <info 
+        organisation="acme"
+        module="test"
+	/>
+    <dependencies>
+        <dependency org="apache" name="commons-collections" rev="2.1.1" conf="default">
+            <exclude module="B"/>
+        </dependency>
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/addDependency8/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/expected.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/expected.xml?rev=682317&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/expected.xml
(added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/expected.xml
Mon Aug  4 03:41:48 2008
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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.0">
+    <info 
+        organisation="acme"
+        module="test"
+	/>
+    <dependencies>
+        <dependency org="apache" name="commons-collections" rev="2.1.1" conf="default"/>
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/expected.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/expected.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/ivy.xml?rev=682317&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/ivy.xml
(added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/ivy.xml
Mon Aug  4 03:41:48 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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.0">
+    <info 
+        organisation="acme"
+        module="test"
+	/>
+    <dependencies>
+        <dependency org="apache" name="commons-collections" rev="2.1.1" conf="default"/>
+        <dependency org="apache" name="newdep" rev="1.0" conf="default->default" />
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency1/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/expected.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/expected.xml?rev=682317&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/expected.xml
(added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/expected.xml
Mon Aug  4 03:41:48 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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.0">
+    <info 
+        organisation="acme"
+        module="test"
+	/>
+    <dependencies>
+        <dependency org="apache" name="commons-collections" rev="2.1.1" conf="default"/>
+        <exclude org="apache" module="newdep" />
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/expected.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/expected.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/ivy.xml?rev=682317&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/ivy.xml
(added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/ivy.xml
Mon Aug  4 03:41:48 2008
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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.0">
+    <info 
+        organisation="acme"
+        module="test"
+	/>
+    <dependencies>
+        <dependency org="apache" name="commons-collections" rev="2.1.1" conf="default"/>
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency2/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/expected.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/expected.xml?rev=682317&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/expected.xml
(added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/expected.xml
Mon Aug  4 03:41:48 2008
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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.0">
+    <info 
+        organisation="acme"
+        module="test"
+	/>
+</ivy-module>

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/expected.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/expected.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/ivy.xml?rev=682317&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/ivy.xml
(added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/ivy.xml
Mon Aug  4 03:41:48 2008
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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.0">
+    <info 
+        organisation="acme"
+        module="test"
+	/>
+</ivy-module>

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency3/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/expected.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/expected.xml?rev=682317&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/expected.xml
(added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/expected.xml
Mon Aug  4 03:41:48 2008
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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.0">
+    <info 
+        organisation="acme"
+        module="test"
+	/>
+    <dependencies>
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/expected.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/expected.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/ivy.xml?rev=682317&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/ivy.xml
(added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/ivy.xml
Mon Aug  4 03:41:48 2008
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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.0">
+    <info 
+        organisation="acme"
+        module="test"
+	/>
+    <dependencies>
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/test/java/org/apache/ivyde/common/ivyfile/removeDependency4/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message