Author: xavier
Date: Mon Nov 19 12:18:46 2007
New Revision: 596425
URL: http://svn.apache.org/viewvc?rev=596425&view=rev
Log:
review chain and dual resolver tutorials (IVY-591)
Added:
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build/
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build/example/
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build/example/Hello.class
(with props)
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/lib/
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/lib/commons-lang-2.0.jar
(with props)
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/lib/test-1.0.jar
(with props)
incubator/ivy/core/trunk/src/example/chained-resolvers/settings/
- copied from r596329,
incubator/ivy/core/trunk/src/example/chained-resolvers/config/
incubator/ivy/core/trunk/src/example/dual/project/build/
incubator/ivy/core/trunk/src/example/dual/project/build/example/
incubator/ivy/core/trunk/src/example/dual/project/build/example/Hello.class
(with props)
incubator/ivy/core/trunk/src/example/dual/project/lib/
incubator/ivy/core/trunk/src/example/dual/project/lib/commons-httpclient-2.0.2.jar
(with props)
incubator/ivy/core/trunk/src/example/dual/project/lib/commons-lang-2.0.jar
(with props)
incubator/ivy/core/trunk/src/example/dual/project/lib/commons-logging-1.0.4.jar
(with props)
incubator/ivy/core/trunk/src/example/dual/settings/
- copied from r596329, incubator/ivy/core/trunk/src/example/dual/config/
Removed:
incubator/ivy/core/trunk/src/example/chained-resolvers/config/
incubator/ivy/core/trunk/src/example/dual/config/
Modified:
incubator/ivy/core/trunk/src/example/chained-resolvers/build.xml
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build.xml
incubator/ivy/core/trunk/src/example/chained-resolvers/settings/ivysettings.xml
incubator/ivy/core/trunk/src/example/dual/build.xml
incubator/ivy/core/trunk/src/example/dual/project/build.xml
incubator/ivy/core/trunk/src/example/dual/repository/commons-httpclient-ivy-2.0.2.xml
incubator/ivy/core/trunk/src/example/dual/settings/ivysettings.xml
Modified: incubator/ivy/core/trunk/src/example/chained-resolvers/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/chained-resolvers/build.xml?rev=596425&r1=596424&r2=596425&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/chained-resolvers/build.xml (original)
+++ incubator/ivy/core/trunk/src/example/chained-resolvers/build.xml Mon Nov 19
12:18:46 2007
@@ -29,7 +29,7 @@
target: clean-cache
================================= -->
<target name="clean-cache" description="--> clean the ivy cache">
- <property name="ivy.settings.dir" value="config" />
+ <property name="ivy.settings.dir" value="settings" />
<ivy:settings file="${ivy.settings.dir}/ivysettings.xml"
id="ivy.instance"/>
<ivy:cleancache />
</target>
Modified:
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build.xml?rev=596425&r1=596424&r2=596425&view=diff
==============================================================================
---
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build.xml
(original)
+++
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build.xml
Mon Nov 19 12:18:46 2007
@@ -23,7 +23,7 @@
<property name="src.dir" value="${basedir}/src" />
<!-- ivy properties used -->
- <property name="ivy.settings.dir" value="../config" />
+ <property name="ivy.settings.dir" value="../settings" />
<!-- paths used for compilation and run -->
<path id="lib.path.id">
@@ -39,7 +39,7 @@
<!-- =================================
target: resolve
================================= -->
- <target name="resolve" description="--> retreive dependencies with ivy">
+ <target name="resolve" description="--> resolve and retrieve dependencies
with ivy">
<ivy:retrieve/>
</target>
Added:
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build/example/Hello.class
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build/example/Hello.class?rev=596425&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/build/example/Hello.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/lib/commons-lang-2.0.jar
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/lib/commons-lang-2.0.jar?rev=596425&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/lib/commons-lang-2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/lib/test-1.0.jar
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/lib/test-1.0.jar?rev=596425&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/lib/test-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/ivy/core/trunk/src/example/chained-resolvers/settings/ivysettings.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/chained-resolvers/settings/ivysettings.xml?rev=596425&r1=596329&r2=596425&view=diff
==============================================================================
---
incubator/ivy/core/trunk/src/example/chained-resolvers/settings/ivysettings.xml
(original)
+++
incubator/ivy/core/trunk/src/example/chained-resolvers/settings/ivysettings.xml
Mon Nov 19 12:18:46 2007
@@ -23,7 +23,7 @@
<filesystem name="libraries">
<artifact
pattern="${ivy.settings.dir}/repository/[artifact]-[revision].[ext]" />
</filesystem>
- <ibiblio name="ibiblio" />
+ <ibiblio name="ibiblio" m2compatible="true" />
</chain>
</resolvers>
</ivysettings>
Modified: incubator/ivy/core/trunk/src/example/dual/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dual/build.xml?rev=596425&r1=596424&r2=596425&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/dual/build.xml (original)
+++ incubator/ivy/core/trunk/src/example/dual/build.xml Mon Nov 19 12:18:46 2007
@@ -29,7 +29,7 @@
target: clean-cache
================================= -->
<target name="clean-cache" description="--> clean the ivy cache">
- <property name="ivy.settings.dir" value="config" />
+ <property name="ivy.settings.dir" value="settings" />
<ivy:settings file="${ivy.settings.dir}/ivysettings.xml"
id="ivy.instance"/>
<ivy:cleancache />
</target>
Modified: incubator/ivy/core/trunk/src/example/dual/project/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dual/project/build.xml?rev=596425&r1=596424&r2=596425&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/dual/project/build.xml (original)
+++ incubator/ivy/core/trunk/src/example/dual/project/build.xml Mon Nov 19
12:18:46 2007
@@ -23,7 +23,7 @@
<property name="src.dir" value="${basedir}/src" />
<!-- ivy properties used -->
- <property name="ivy.settings.dir" value="../config" />
+ <property name="ivy.settings.dir" value="../settings" />
<!-- paths used for compilation and run -->
<path id="lib.path.id">
@@ -39,7 +39,7 @@
<!-- =================================
target: resolve
================================= -->
- <target name="resolve" description="--> retrieve dependencies with ivy">
+ <target name="resolve" description="--> resolve and retrieve dependencies
with ivy">
<ivy:retrieve />
</target>
@@ -76,6 +76,6 @@
target: clean-cache
================================= -->
<target name="clean-cache" description="--> clean the ivy cache">
- <delete dir="${user.home}/.ivy-cache"/>
+ <ivy:cleancache />
</target>
</project>
Added:
incubator/ivy/core/trunk/src/example/dual/project/build/example/Hello.class
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dual/project/build/example/Hello.class?rev=596425&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/ivy/core/trunk/src/example/dual/project/build/example/Hello.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/ivy/core/trunk/src/example/dual/project/lib/commons-httpclient-2.0.2.jar
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dual/project/lib/commons-httpclient-2.0.2.jar?rev=596425&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/ivy/core/trunk/src/example/dual/project/lib/commons-httpclient-2.0.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/ivy/core/trunk/src/example/dual/project/lib/commons-lang-2.0.jar
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dual/project/lib/commons-lang-2.0.jar?rev=596425&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/ivy/core/trunk/src/example/dual/project/lib/commons-lang-2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/ivy/core/trunk/src/example/dual/project/lib/commons-logging-1.0.4.jar
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dual/project/lib/commons-logging-1.0.4.jar?rev=596425&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/ivy/core/trunk/src/example/dual/project/lib/commons-logging-1.0.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/ivy/core/trunk/src/example/dual/repository/commons-httpclient-ivy-2.0.2.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dual/repository/commons-httpclient-ivy-2.0.2.xml?rev=596425&r1=596424&r2=596425&view=diff
==============================================================================
---
incubator/ivy/core/trunk/src/example/dual/repository/commons-httpclient-ivy-2.0.2.xml
(original)
+++
incubator/ivy/core/trunk/src/example/dual/repository/commons-httpclient-ivy-2.0.2.xml
Mon Nov 19 12:18:46 2007
@@ -24,6 +24,6 @@
status="release"
publication="20041010174300"/>
<dependencies>
- <dependency name="commons-logging" rev="1.0.4" conf="default"/>
+ <dependency org="commons-logging" name="commons-logging" rev="1.0.4"
conf="default"/>
</dependencies>
</ivy-module>
Modified: incubator/ivy/core/trunk/src/example/dual/settings/ivysettings.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dual/settings/ivysettings.xml?rev=596425&r1=596329&r2=596425&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/dual/settings/ivysettings.xml
(original)
+++ incubator/ivy/core/trunk/src/example/dual/settings/ivysettings.xml Mon Nov
19 12:18:46 2007
@@ -23,7 +23,7 @@
<filesystem name="ivys">
<ivy
pattern="${ivy.settings.dir}/../repository/[module]-ivy-[revision].xml" />
</filesystem>
- <ibiblio name="ibiblio" />
+ <ibiblio name="ibiblio" m2compatible="true" usepoms="false" />
</dual>
</resolvers>
</ivysettings>
