Author: hibou
Date: Sat Jan 9 18:12:08 2010
New Revision: 897506
URL: http://svn.apache.org/viewvc?rev=897506&view=rev
Log:
IVYDE-212:
- add some test projects to reproduce the issue
- fix the issue by simply taking into account the revision constraints
Added:
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-common/
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-common/ivy-1.1.20100901120000-dev.xml
(with props)
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-common/jars/
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-common/jars/workspaceresolver-common-1.1.20100901120000-dev.jar
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-lib/
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-lib/ivy-1.1.20100901120000-dev.xml
(with props)
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-lib/jars/
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-lib/jars/workspaceresolver-lib-1.1.20100901120000-dev.jar
ant/ivy/ivyde/trunk/test/workspaceresolver-common/
ant/ivy/ivyde/trunk/test/workspaceresolver-common/.classpath
ant/ivy/ivyde/trunk/test/workspaceresolver-common/.project
ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivy.xml (with props)
ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivysettings.xml (with
props)
ant/ivy/ivyde/trunk/test/workspaceresolver-common/src/
ant/ivy/ivyde/trunk/test/workspaceresolver-lib/
ant/ivy/ivyde/trunk/test/workspaceresolver-lib/.classpath
ant/ivy/ivyde/trunk/test/workspaceresolver-lib/.project
ant/ivy/ivyde/trunk/test/workspaceresolver-lib/bin/
ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivy.xml (with props)
ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivysettings.xml (with
props)
ant/ivy/ivyde/trunk/test/workspaceresolver-lib/src/
ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/
ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/.classpath
ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/.project
ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/bin/
ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivy.xml (with props)
ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivysettings.xml (with
props)
ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/src/
Modified:
ant/ivy/ivyde/trunk/CHANGES.txt
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java
Modified: ant/ivy/ivyde/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/CHANGES.txt?rev=897506&r1=897505&r2=897506&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/CHANGES.txt Sat Jan 9 18:12:08 2010
@@ -25,6 +25,7 @@
- FIX: conf attributes must not be null (IVYDE-209) (thanks to Ivica Loncar)
- FIX: Errors are not reported when multiple resolve are launched (IVYDE-219)
- FIX: Ivy settings file cannot be loaded via http url (IVYDE-218)
+- FIX: The workspace resolver doesn't resolve conflicts correctly (IVYDE-212)
version 2.0.0 final
==========================
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java?rev=897506&r1=897505&r2=897506&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java
Sat Jan 9 18:12:08 2010
@@ -18,6 +18,7 @@
package org.apache.ivyde.eclipse.workspaceresolver;
import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.core.resolve.ResolveOptions;
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.plugins.resolver.ChainResolver;
import org.apache.ivy.plugins.resolver.DependencyResolver;
@@ -30,6 +31,7 @@
public WorkspaceIvySettings(IJavaProject javaProject) {
this.javaProject = javaProject;
setDefaultLatestStrategy(new IvyDEStrategy());
+ setDefaultResolveMode(ResolveOptions.RESOLVEMODE_DYNAMIC);
}
public DependencyResolver getResolver(ModuleRevisionId mrid) {
Added:
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-common/ivy-1.1.20100901120000-dev.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-common/ivy-1.1.20100901120000-dev.xml?rev=897506&view=auto
==============================================================================
---
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-common/ivy-1.1.20100901120000-dev.xml
(added)
+++
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-common/ivy-1.1.20100901120000-dev.xml
Sat Jan 9 18:12:08 2010
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="1.4">
+ <info organisation="org.apache.ivyde"
module="ivydetest-workspaceresolver-common" revision="1.1.20100901120000-dev"
status="integration" publication="20080811152510" />
+ <configurations>
+ <conf name="default" />
+ </configurations>
+ <publications>
+ <artifact name="workspaceresolver-common" type="jar" ext="jar"
conf="default" />
+ </publications>
+</ivy-module>
Propchange:
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-common/ivy-1.1.20100901120000-dev.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-common/ivy-1.1.20100901120000-dev.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange:
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-common/ivy-1.1.20100901120000-dev.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-common/jars/workspaceresolver-common-1.1.20100901120000-dev.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-common/jars/workspaceresolver-common-1.1.20100901120000-dev.jar?rev=897506&view=auto
==============================================================================
(empty)
Added:
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-lib/ivy-1.1.20100901120000-dev.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-lib/ivy-1.1.20100901120000-dev.xml?rev=897506&view=auto
==============================================================================
---
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-lib/ivy-1.1.20100901120000-dev.xml
(added)
+++
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-lib/ivy-1.1.20100901120000-dev.xml
Sat Jan 9 18:12:08 2010
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="1.4">
+ <info organisation="org.apache.ivyde"
module="ivydetest-workspaceresolver-lib" revision="1.1.20100901120000-dev"
status="integration" publication="20080811152510" />
+ <configurations>
+ <conf name="default" />
+ </configurations>
+ <publications>
+ <artifact name="workspaceresolver-lib" type="jar" ext="jar"
conf="default" />
+ </publications>
+ <dependencies>
+ <dependency org="org.apache.ivyde"
name="ivydetest-workspaceresolver-common" rev="1.1.20100901120000-dev"
revConstraint="[1.1,1.2)" conf="default" />
+ </dependencies>
+</ivy-module>
Propchange:
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-lib/ivy-1.1.20100901120000-dev.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-lib/ivy-1.1.20100901120000-dev.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange:
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-lib/ivy-1.1.20100901120000-dev.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-lib/jars/workspaceresolver-lib-1.1.20100901120000-dev.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/fakerepo/org.apache.ivyde/ivydetest-workspaceresolver-lib/jars/workspaceresolver-lib-1.1.20100901120000-dev.jar?rev=897506&view=auto
==============================================================================
(empty)
Added: ant/ivy/ivyde/trunk/test/workspaceresolver-common/.classpath
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/workspaceresolver-common/.classpath?rev=897506&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/workspaceresolver-common/.classpath (added)
+++ ant/ivy/ivyde/trunk/test/workspaceresolver-common/.classpath Sat Jan 9
18:12:08 2010
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=project%3A%2F%2F%2Fivysettings.xml&loadSettingsOnDemand=false&propertyFiles=&doRetrieve=false&retrievePattern=lib%2F%5Bconf%5D%2F%5Bartifact%5D.%5Bext%5D&retrieveSync=false&retrieveConfs=*&retrieveTypes=*&acceptedTypes=jar&sourceTypes=source&javadocTypes=javadoc&sourceSuffixes=-source%2C-sources%2C-src&javadocSuffixes=-javadoc%2C-javadocs%2C-doc%2C-docs&alphaOrder=false&resolveInWorkspace=true"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: ant/ivy/ivyde/trunk/test/workspaceresolver-common/.project
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/workspaceresolver-common/.project?rev=897506&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/workspaceresolver-common/.project (added)
+++ ant/ivy/ivyde/trunk/test/workspaceresolver-common/.project Sat Jan 9
18:12:08 2010
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<projectDescription>
+ <name>ivydetest-workspaceresolver-common</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivy.xml?rev=897506&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivy.xml (added)
+++ ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivy.xml Sat Jan 9
18:12:08 2010
@@ -0,0 +1,30 @@
+<!--
+ 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="org.apache.ivyde"
module="ivydetest-workspaceresolver-common" revision="1.1">
+ <description>
+ Project using the resolve in workspace feature
+ </description>
+ </info>
+ <configurations>
+ <conf name="default" />
+ </configurations>
+ <dependencies>
+ </dependencies>
+</ivy-module>
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivy.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivy.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivysettings.xml?rev=897506&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivysettings.xml (added)
+++ ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivysettings.xml Sat Jan
9 18:12:08 2010
@@ -0,0 +1,15 @@
+<ivysettings>
+ <caches defaultCacheDir="${ivy.settings.dir}/../cache-fakerepo"
useOrigin="false" checkUpToDate="true" />
+ <settings defaultResolver="chain" />
+ <resolvers>
+ <filesystem name="fakerepo" checkmodified="true">
+ <ivy
pattern="${ivy.settings.dir}/../fakerepo/[organisation]/[module]/ivy-[revision].xml"/>
+ <artifact
pattern="${ivy.settings.dir}/../fakerepo/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ </filesystem>
+ <ibiblio name="ibiblio" m2compatible="true" />
+ <chain name="chain">
+ <resolver ref="fakerepo" />
+ <resolver ref="ibiblio" />
+ </chain>
+ </resolvers>
+</ivysettings>
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivysettings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivysettings.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-common/ivysettings.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/ivy/ivyde/trunk/test/workspaceresolver-lib/.classpath
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/workspaceresolver-lib/.classpath?rev=897506&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/workspaceresolver-lib/.classpath (added)
+++ ant/ivy/ivyde/trunk/test/workspaceresolver-lib/.classpath Sat Jan 9
18:12:08 2010
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=project%3A%2F%2F%2Fivysettings.xml&loadSettingsOnDemand=false&propertyFiles=&doRetrieve=false&retrievePattern=lib%2F%5Bconf%5D%2F%5Bartifact%5D.%5Bext%5D&retrieveSync=false&retrieveConfs=*&retrieveTypes=*&acceptedTypes=jar&sourceTypes=source&javadocTypes=javadoc&sourceSuffixes=-source%2C-sources%2C-src&javadocSuffixes=-javadoc%2C-javadocs%2C-doc%2C-docs&alphaOrder=false&resolveInWorkspace=true"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: ant/ivy/ivyde/trunk/test/workspaceresolver-lib/.project
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/workspaceresolver-lib/.project?rev=897506&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/workspaceresolver-lib/.project (added)
+++ ant/ivy/ivyde/trunk/test/workspaceresolver-lib/.project Sat Jan 9 18:12:08
2010
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<projectDescription>
+ <name>ivydetest-workspaceresolver-lib</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivy.xml?rev=897506&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivy.xml (added)
+++ ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivy.xml Sat Jan 9 18:12:08
2010
@@ -0,0 +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.
+-->
+<ivy-module version="1.0">
+ <info organisation="org.apache.ivyde"
module="ivytest-workspaceresolver-lib">
+ <description>
+ Project using the resolve in workspace feature
+ </description>
+ </info>
+ <configurations>
+ <conf name="default" />
+ </configurations>
+ <dependencies>
+ <dependency org="org.apache.ivyde"
name="ivytest-workspaceresolver-common" rev="latest.integration" conf="default"
/>
+ </dependencies>
+</ivy-module>
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivy.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivy.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivysettings.xml?rev=897506&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivysettings.xml (added)
+++ ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivysettings.xml Sat Jan 9
18:12:08 2010
@@ -0,0 +1,15 @@
+<ivysettings>
+ <caches defaultCacheDir="${ivy.settings.dir}/../cache-fakerepo"
useOrigin="false" />
+ <settings defaultResolver="chain" checkUpToDate="false" />
+ <resolvers>
+ <filesystem name="fakerepo">
+ <ivy
pattern="${ivy.settings.dir}/../fakerepo/[organisation]/[module]/ivy-[revision].xml"/>
+ <artifact
pattern="${ivy.settings.dir}/../fakerepo/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ </filesystem>
+ <ibiblio name="ibiblio" m2compatible="true" />
+ <chain name="chain">
+ <resolver ref="fakerepo" />
+ <resolver ref="ibiblio" />
+ </chain>
+ </resolvers>
+</ivysettings>
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivysettings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivysettings.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-lib/ivysettings.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/.classpath
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/.classpath?rev=897506&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/.classpath (added)
+++ ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/.classpath Sat Jan 9
18:12:08 2010
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=project%3A%2F%2F%2Fivysettings.xml&loadSettingsOnDemand=false&propertyFiles=&doRetrieve=false&retrievePattern=lib%2F%5Bconf%5D%2F%5Bartifact%5D.%5Bext%5D&retrieveSync=false&retrieveConfs=*&retrieveTypes=*&acceptedTypes=jar&sourceTypes=source&javadocTypes=javadoc&sourceSuffixes=-source%2C-sources%2C-src&javadocSuffixes=-javadoc%2C-javadocs%2C-doc%2C-docs&alphaOrder=false&resolveInWorkspace=true"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/.project
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/.project?rev=897506&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/.project (added)
+++ ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/.project Sat Jan 9
18:12:08 2010
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<projectDescription>
+ <name>ivydetest-workspaceresolver-webapp</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivy.xml?rev=897506&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivy.xml (added)
+++ ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivy.xml Sat Jan 9
18:12:08 2010
@@ -0,0 +1,32 @@
+<!--
+ 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="org.apache.ivyde"
module="ivydetest-workspaceresolver-webapp">
+ <description>
+ Project using the resolve in workspace feature
+ </description>
+ </info>
+ <configurations>
+ <conf name="default" />
+ </configurations>
+ <dependencies>
+ <!--dependency org="org.apache.ivyde"
name="ivydetest-workspaceresolver-common" rev="latest.integration"
conf="default" /-->
+ <dependency org="org.apache.ivyde"
name="ivydetest-workspaceresolver-lib" rev="[1.1,1.2)" conf="default" />
+ </dependencies>
+</ivy-module>
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivy.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivy.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivysettings.xml?rev=897506&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivysettings.xml (added)
+++ ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivysettings.xml Sat Jan
9 18:12:08 2010
@@ -0,0 +1,15 @@
+<ivysettings>
+ <caches defaultCacheDir="${ivy.settings.dir}/../cache-fakerepo"
useOrigin="false" checkUpToDate="true" />
+ <settings defaultResolver="chain" />
+ <resolvers>
+ <filesystem name="fakerepo" checkmodified="true">
+ <ivy
pattern="${ivy.settings.dir}/../fakerepo/[organisation]/[module]/ivy-[revision].xml"/>
+ <artifact
pattern="${ivy.settings.dir}/../fakerepo/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ </filesystem>
+ <ibiblio name="ibiblio" m2compatible="true" />
+ <chain name="chain">
+ <resolver ref="fakerepo" />
+ <resolver ref="ibiblio" />
+ </chain>
+ </resolvers>
+</ivysettings>
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivysettings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivysettings.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/workspaceresolver-webapp/ivysettings.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
