Author: gscokart
Date: Sun Nov 4 12:05:47 2007
New Revision: 591827
URL: http://svn.apache.org/viewvc?rev=591827&view=rev
Log:
adapt tutorial for ivy 2.0 (IVY-591)
Modified:
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/ivy.xml
incubator/ivy/core/trunk/src/example/configurations/jdbc-example/ivy.xml
incubator/ivy/core/trunk/src/example/configurations/multi-projects/filter-framework/ivy.xml
incubator/ivy/core/trunk/src/example/configurations/multi-projects/myapp/ivy.xml
incubator/ivy/core/trunk/src/example/dependence/config/ivysettings.xml
incubator/ivy/core/trunk/src/example/dependence/depending/ivy.xml
incubator/ivy/core/trunk/src/example/dependence/standalone/ivy.xml
incubator/ivy/core/trunk/src/example/dual/project/ivy.xml
incubator/ivy/core/trunk/src/example/dual/repository/commons-httpclient-ivy-2.0.2.xml
incubator/ivy/core/trunk/src/example/go-ivy/build.xml
incubator/ivy/core/trunk/src/example/hello-ivy/ivy.xml
incubator/ivy/core/trunk/src/example/multi-project/projects/console/ivy.xml
incubator/ivy/core/trunk/src/example/multi-project/projects/find/ivy.xml
incubator/ivy/core/trunk/src/example/multi-project/projects/list/ivy.xml
incubator/ivy/core/trunk/src/example/multi-project/projects/size/ivy.xml
incubator/ivy/core/trunk/src/example/multi-project/projects/sizewhere/ivy.xml
incubator/ivy/core/trunk/src/example/multi-project/projects/version/ivy.xml
Modified:
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
---
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/ivy.xml
(original)
+++
incubator/ivy/core/trunk/src/example/chained-resolvers/chainedresolvers-project/ivy.xml
Sun Nov 4 12:05:47 2007
@@ -17,9 +17,9 @@
under the License.
-->
<ivy-module version="1.0">
- <info organisation="apache" module="chained-resolvers"/>
+ <info organisation="org.apache" module="chained-resolvers"/>
<dependencies>
- <dependency org="apache" name="commons-lang" rev="2.0"/>
+ <dependency org="commons-lang" name="commons-lang" rev="2.0"/>
<dependency name="test" rev="1.0"/>
</dependencies>
</ivy-module>
Modified:
incubator/ivy/core/trunk/src/example/configurations/jdbc-example/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/configurations/jdbc-example/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/configurations/jdbc-example/ivy.xml
(original)
+++ incubator/ivy/core/trunk/src/example/configurations/jdbc-example/ivy.xml
Sun Nov 4 12:05:47 2007
@@ -18,7 +18,7 @@
under the License.
-->
<ivy-module version="1.0">
- <info organisation="apache" module="configurations" >
+ <info organisation="org.apache" module="configurations" >
<description>
This is an example project that aims to demonstrate the usage
of the configuration in ivy.
This project provide 4 configurations. Each configurations
describe the requirement to build or run the project
@@ -33,7 +33,7 @@
<dependencies>
<!-- this dependency is needed for all configuration -->
- <dependency org="apache" name="commons-cli" rev="1.0" />
+ <dependency org="org.apache" name="commons-cli" rev="1.0" />
<!-- when launching our app in dev mode we use mckoi db and mckoi jdbc
client conf="run.dev->embedded, client"-->
<dependency org="mckoi" name="mckoi" rev="1.0.2"
conf="rundev->default"/>
<!-- when launching our app in production environement we needs other
jdbc driver -->
Modified:
incubator/ivy/core/trunk/src/example/configurations/multi-projects/filter-framework/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/configurations/multi-projects/filter-framework/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
---
incubator/ivy/core/trunk/src/example/configurations/multi-projects/filter-framework/ivy.xml
(original)
+++
incubator/ivy/core/trunk/src/example/configurations/multi-projects/filter-framework/ivy.xml
Sun Nov 4 12:05:47 2007
@@ -17,7 +17,7 @@
under the License.
-->
<ivy-module version="1.0">
- <info organisation="apache" module="filter-framework"/>
+ <info organisation="org.apache" module="filter-framework"/>
<configurations>
<conf name="api" description="only provide filter framework API"/>
<conf name="homemade-impl" extends="api" description="provide a home
made implementation of our api"/>
@@ -30,7 +30,7 @@
<artifact name="filter-ccimpl" type="jar" conf="cc-impl" ext="jar"/>
</publications>
<dependencies>
- <dependency org="apache" name="commons-collections" rev="3.1"
conf="cc-impl->default"/>
+ <dependency org="commons-collections" name="commons-collections"
rev="3.1" conf="cc-impl->default"/>
<dependency org="junit" name="junit" rev="3.8" conf="test->default"/>
</dependencies>
</ivy-module>
Modified:
incubator/ivy/core/trunk/src/example/configurations/multi-projects/myapp/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/configurations/multi-projects/myapp/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
---
incubator/ivy/core/trunk/src/example/configurations/multi-projects/myapp/ivy.xml
(original)
+++
incubator/ivy/core/trunk/src/example/configurations/multi-projects/myapp/ivy.xml
Sun Nov 4 12:05:47 2007
@@ -17,7 +17,7 @@
under the License.
-->
<ivy-module version="1.0">
- <info organisation="apache" module="myapp"/>
+ <info organisation="org.apache" module="myapp"/>
<configurations>
<conf name="build" visibility="private"
description="compilation only need api jar" />
@@ -26,6 +26,6 @@
</configurations>
<dependencies>
- <dependency org="apache" name="filter-framework"
rev="latest.integration" conf="build->api; noexternaljar->homemade-impl;
withexternaljar->cc-impl"/>
+ <dependency org="org.apache" name="filter-framework"
rev="latest.integration" conf="build->api; noexternaljar->homemade-impl;
withexternaljar->cc-impl"/>
</dependencies>
</ivy-module>
Modified: incubator/ivy/core/trunk/src/example/dependence/config/ivysettings.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/config/ivysettings.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/config/ivysettings.xml
(original)
+++ incubator/ivy/core/trunk/src/example/dependence/config/ivysettings.xml Sun
Nov 4 12:05:47 2007
@@ -24,9 +24,9 @@
<artifact
pattern="${repository.dir}/[artifact]-[revision].[ext]" />
<ivy
pattern="${repository.dir}/[module]-[revision].xml" />
</filesystem>
- <ivyrep name="libraries" />
+ <ibiblio name="libraries" />
</resolvers>
<modules>
- <module organisation="apache" name="standalone"
resolver="projects"/>
+ <module organisation="org.apache" name="standalone"
resolver="projects"/>
</modules>
</ivysettings>
Modified: incubator/ivy/core/trunk/src/example/dependence/depending/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/depending/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/depending/ivy.xml (original)
+++ incubator/ivy/core/trunk/src/example/dependence/depending/ivy.xml Sun Nov
4 12:05:47 2007
@@ -17,7 +17,7 @@
under the License.
-->
<ivy-module version="1.0">
- <info organisation="apache" module="depending"/>
+ <info organisation="org.apache" module="depending"/>
<dependencies>
<dependency name="standalone" rev="latest.integration" />
</dependencies>
Modified: incubator/ivy/core/trunk/src/example/dependence/standalone/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/standalone/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/standalone/ivy.xml
(original)
+++ incubator/ivy/core/trunk/src/example/dependence/standalone/ivy.xml Sun Nov
4 12:05:47 2007
@@ -17,8 +17,8 @@
under the License.
-->
<ivy-module version="1.0">
- <info organisation="apache" module="standalone"/>
+ <info organisation="org.apache" module="standalone"/>
<dependencies>
- <dependency org="apache" name="commons-lang" rev="2.0"/>
+ <dependency org="commons-lang" name="commons-lang" rev="2.0"/>
</dependencies>
</ivy-module>
Modified: incubator/ivy/core/trunk/src/example/dual/project/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dual/project/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/dual/project/ivy.xml (original)
+++ incubator/ivy/core/trunk/src/example/dual/project/ivy.xml Sun Nov 4
12:05:47 2007
@@ -17,9 +17,9 @@
under the License.
-->
<ivy-module version="1.0">
- <info organisation="apache" module="hello-ivy"/>
+ <info organisation="org.apache" module="hello-ivy"/>
<dependencies>
- <dependency org="apache" name="commons-httpclient" rev="2.0.2"/>
- <dependency org="apache" name="commons-lang" rev="2.0"/>
+ <dependency org="commons-httpclient" name="commons-httpclient"
rev="2.0.2"/>
+ <dependency org="commons-lang" name="commons-lang" rev="2.0"/>
</dependencies>
</ivy-module>
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=591827&r1=591826&r2=591827&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
Sun Nov 4 12:05:47 2007
@@ -18,7 +18,7 @@
-->
<ivy-module version="1.0">
<info
- organisation="apache"
+ organisation="commons-httpclient"
module="commons-httpclient"
revision="2.0.2"
status="release"
Modified: incubator/ivy/core/trunk/src/example/go-ivy/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/go-ivy/build.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/go-ivy/build.xml (original)
+++ incubator/ivy/core/trunk/src/example/go-ivy/build.xml Sun Nov 4 12:05:47
2007
@@ -33,7 +33,7 @@
After a successful build run "ant" again and you will see the build
will be
much faster.
- More information can be found at http://incubator.apache.org/ivy/
+ More information can be found at http://ant.apache.org/ivy/
-->
<!-- here is the version of ivy we will use. change this property to
try a newer
Modified: incubator/ivy/core/trunk/src/example/hello-ivy/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/hello-ivy/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/hello-ivy/ivy.xml (original)
+++ incubator/ivy/core/trunk/src/example/hello-ivy/ivy.xml Sun Nov 4 12:05:47
2007
@@ -17,7 +17,7 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="apache" module="hello-ivy"/>
+ <info organisation="org.apache" module="hello-ivy"/>
<dependencies>
<dependency org="commons-lang" name="commons-lang" rev="2.0"/>
<dependency org="commons-cli" name="commons-cli" rev="1.0"/>
Modified:
incubator/ivy/core/trunk/src/example/multi-project/projects/console/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/multi-project/projects/console/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/multi-project/projects/console/ivy.xml
(original)
+++ incubator/ivy/core/trunk/src/example/multi-project/projects/console/ivy.xml
Sun Nov 4 12:05:47 2007
@@ -18,7 +18,7 @@
-->
<ivy-module version="1.0">
<info
- organisation="apache"
+ organisation="org.apache"
module="console"
status="integration"/>
<dependencies>
Modified:
incubator/ivy/core/trunk/src/example/multi-project/projects/find/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/multi-project/projects/find/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/multi-project/projects/find/ivy.xml
(original)
+++ incubator/ivy/core/trunk/src/example/multi-project/projects/find/ivy.xml
Sun Nov 4 12:05:47 2007
@@ -18,7 +18,7 @@
-->
<ivy-module version="1.0">
<info
- organisation="apache"
+ organisation="org.apache"
module="find"
status="integration"/>
<configurations>
@@ -31,7 +31,7 @@
<dependencies>
<dependency name="version" rev="latest.integration" conf="core->default"
/>
<dependency name="list" rev="latest.integration" conf="core" />
- <dependency org="apache" name="commons-collections" rev="3.1"
conf="core->default" />
- <dependency org="apache" name="commons-cli" rev="1.0"
conf="standalone->default" />
+ <dependency org="org.apache" name="commons-collections" rev="3.1"
conf="core->default" />
+ <dependency org="org.apache" name="commons-cli" rev="1.0"
conf="standalone->default" />
</dependencies>
</ivy-module>
Modified:
incubator/ivy/core/trunk/src/example/multi-project/projects/list/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/multi-project/projects/list/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/multi-project/projects/list/ivy.xml
(original)
+++ incubator/ivy/core/trunk/src/example/multi-project/projects/list/ivy.xml
Sun Nov 4 12:05:47 2007
@@ -18,7 +18,7 @@
-->
<ivy-module version="1.0">
<info
- organisation="apache"
+ organisation="org.apache"
module="list"
status="integration"/>
<configurations>
@@ -30,6 +30,6 @@
</publications>
<dependencies>
<dependency name="version" rev="latest.integration" conf="core->default"
/>
- <dependency org="apache" name="commons-cli" rev="1.0"
conf="standalone->default" />
+ <dependency org="org.apache" name="commons-cli" rev="1.0"
conf="standalone->default" />
</dependencies>
</ivy-module>
Modified:
incubator/ivy/core/trunk/src/example/multi-project/projects/size/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/multi-project/projects/size/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/multi-project/projects/size/ivy.xml
(original)
+++ incubator/ivy/core/trunk/src/example/multi-project/projects/size/ivy.xml
Sun Nov 4 12:05:47 2007
@@ -18,7 +18,7 @@
-->
<ivy-module version="1.0">
<info
- organisation="apache"
+ organisation="org.apache"
module="size"
status="integration"/>
<dependencies>
Modified:
incubator/ivy/core/trunk/src/example/multi-project/projects/sizewhere/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/multi-project/projects/sizewhere/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
---
incubator/ivy/core/trunk/src/example/multi-project/projects/sizewhere/ivy.xml
(original)
+++
incubator/ivy/core/trunk/src/example/multi-project/projects/sizewhere/ivy.xml
Sun Nov 4 12:05:47 2007
@@ -18,7 +18,7 @@
-->
<ivy-module version="1.0">
<info
- organisation="apache"
+ organisation="org.apache"
module="sizewhere"
status="integration"/>
<configurations>
@@ -32,6 +32,6 @@
<dependency name="version" rev="latest.integration" conf="core->default"
/>
<dependency name="size" rev="latest.integration" conf="core->default" />
<dependency name="find" rev="latest.integration" conf="core" />
- <dependency org="apache" name="commons-cli" rev="1.0"
conf="standalone->default" />
+ <dependency org="org.apache" name="commons-cli" rev="1.0"
conf="standalone->default" />
</dependencies>
</ivy-module>
Modified:
incubator/ivy/core/trunk/src/example/multi-project/projects/version/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/multi-project/projects/version/ivy.xml?rev=591827&r1=591826&r2=591827&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/multi-project/projects/version/ivy.xml
(original)
+++ incubator/ivy/core/trunk/src/example/multi-project/projects/version/ivy.xml
Sun Nov 4 12:05:47 2007
@@ -18,7 +18,7 @@
-->
<ivy-module version="1.0">
<info
- organisation="apache"
+ organisation="org.apache"
module="version"
status="integration"/>
</ivy-module>
