Author: xavier
Date: Mon Nov 19 13:26:45 2007
New Revision: 596454
URL: http://svn.apache.org/viewvc?rev=596454&view=rev
Log:
review projects dependency tutorial (IVY-591)
Added:
incubator/ivy/core/trunk/src/example/dependence/dependee/ (props changed)
- copied from r596329,
incubator/ivy/core/trunk/src/example/dependence/standalone/
incubator/ivy/core/trunk/src/example/dependence/depender/ (props changed)
- copied from r596329,
incubator/ivy/core/trunk/src/example/dependence/depending/
incubator/ivy/core/trunk/src/example/dependence/settings/ (props changed)
- copied from r596329,
incubator/ivy/core/trunk/src/example/dependence/config/
Removed:
incubator/ivy/core/trunk/src/example/dependence/config/
incubator/ivy/core/trunk/src/example/dependence/depending/
incubator/ivy/core/trunk/src/example/dependence/standalone/
Modified:
incubator/ivy/core/trunk/src/example/dependence/build.xml
incubator/ivy/core/trunk/src/example/dependence/dependee/build.xml
incubator/ivy/core/trunk/src/example/dependence/dependee/ivy.xml
incubator/ivy/core/trunk/src/example/dependence/depender/build.xml
incubator/ivy/core/trunk/src/example/dependence/depender/ivy.xml
incubator/ivy/core/trunk/src/example/dependence/settings/ivysettings.xml
Modified: incubator/ivy/core/trunk/src/example/dependence/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/build.xml?rev=596454&r1=596453&r2=596454&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/build.xml (original)
+++ incubator/ivy/core/trunk/src/example/dependence/build.xml Mon Nov 19
13:26:45 2007
@@ -23,20 +23,20 @@
================================= -->
<target name="clean" description="--> clean directories">
<delete includeemptydirs="true">
- <fileset dir="config" excludes="ivysettings.*" />
+ <fileset dir="settings" excludes="ivysettings.*" />
</delete>
- <ant dir="standalone" antfile="build.xml" target="clean"
inheritall="false" inheritrefs="false" />
- <ant dir="depending" antfile="build.xml" target="clean"
inheritall="false" inheritrefs="false" />
+ <ant dir="dependee" antfile="build.xml" target="clean"
inheritall="false" inheritrefs="false" />
+ <ant dir="depender" antfile="build.xml" target="clean"
inheritall="false" inheritrefs="false" />
</target>
<!-- =================================
target: all
================================= -->
<target name="all" depends="clean" description="--> make the whole example
of dependency">
- <ant dir="standalone" antfile="build.xml" target="publish"
inheritall="false" inheritrefs="false" />
- <ant dir="depending" antfile="build.xml" inheritall="false"
inheritrefs="false" />
- <ant dir="standalone" antfile="build.xml" target="publish"
inheritall="false" inheritrefs="false" />
- <ant dir="depending" antfile="build.xml" inheritall="false"
inheritrefs="false" />
+ <ant dir="dependee" antfile="build.xml" target="publish"
inheritall="false" inheritrefs="false" />
+ <ant dir="depender" antfile="build.xml" inheritall="false"
inheritrefs="false" />
+ <ant dir="dependee" antfile="build.xml" target="publish"
inheritall="false" inheritrefs="false" />
+ <ant dir="depender" antfile="build.xml" inheritall="false"
inheritrefs="false" />
</target>
</project>
Propchange: incubator/ivy/core/trunk/src/example/dependence/dependee/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 19 13:26:45 2007
@@ -0,0 +1,3 @@
+lib
+
+build
Modified: incubator/ivy/core/trunk/src/example/dependence/dependee/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/dependee/build.xml?rev=596454&r1=596329&r2=596454&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/dependee/build.xml
(original)
+++ incubator/ivy/core/trunk/src/example/dependence/dependee/build.xml Mon Nov
19 13:26:45 2007
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project name="standalone" default="run" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="dependee" default="run" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- some variables used -->
<property name="lib.dir" value="${basedir}/lib" />
<property name="build.dir" value="${basedir}/build" />
@@ -24,7 +24,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" />
<property file="${ivy.settings.dir}/ivysettings.properties" />
<!-- paths used for compilation and run -->
@@ -41,7 +41,7 @@
<!-- =================================
target: resolve
================================= -->
- <target name="resolve" description="--> retreive dependencies with ivy">
+ <target name="resolve" description="--> resolve and retrieve dependencies
with ivy">
<ivy:retrieve />
</target>
Modified: incubator/ivy/core/trunk/src/example/dependence/dependee/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/dependee/ivy.xml?rev=596454&r1=596329&r2=596454&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/dependee/ivy.xml (original)
+++ incubator/ivy/core/trunk/src/example/dependence/dependee/ivy.xml Mon Nov 19
13:26:45 2007
@@ -17,7 +17,7 @@
under the License.
-->
<ivy-module version="1.0">
- <info organisation="org.apache" module="standalone"/>
+ <info organisation="org.apache" module="dependee"/>
<dependencies>
<dependency org="commons-lang" name="commons-lang" rev="2.0"/>
</dependencies>
Propchange: incubator/ivy/core/trunk/src/example/dependence/depender/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 19 13:26:45 2007
@@ -0,0 +1,3 @@
+build
+
+lib
Modified: incubator/ivy/core/trunk/src/example/dependence/depender/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/depender/build.xml?rev=596454&r1=596329&r2=596454&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/depender/build.xml
(original)
+++ incubator/ivy/core/trunk/src/example/dependence/depender/build.xml Mon Nov
19 13:26:45 2007
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project name="depending" default="run" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="depender" default="run" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- some variables used -->
<property name="lib.dir" value="${basedir}/lib" />
<property name="build.dir" value="${basedir}/build" />
@@ -24,7 +24,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" />
<property file="${ivy.settings.dir}/ivysettings.properties" />
<!-- paths used for compilation and run -->
@@ -41,7 +41,7 @@
<!-- =================================
target: resolve
================================= -->
- <target name="resolve" description="--> retreive dependencies with ivy">
+ <target name="resolve" description="--> resolve and retrieve dependencies
with ivy">
<ivy:retrieve />
</target>
Modified: incubator/ivy/core/trunk/src/example/dependence/depender/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/depender/ivy.xml?rev=596454&r1=596329&r2=596454&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/depender/ivy.xml (original)
+++ incubator/ivy/core/trunk/src/example/dependence/depender/ivy.xml Mon Nov 19
13:26:45 2007
@@ -17,8 +17,8 @@
under the License.
-->
<ivy-module version="1.0">
- <info organisation="org.apache" module="depending"/>
+ <info organisation="org.apache" module="depender"/>
<dependencies>
- <dependency name="standalone" rev="latest.integration" />
+ <dependency name="dependee" rev="latest.integration" />
</dependencies>
</ivy-module>
Propchange: incubator/ivy/core/trunk/src/example/dependence/settings/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 19 13:26:45 2007
@@ -0,0 +1,3 @@
+repository
+
+ivy-cache
Modified:
incubator/ivy/core/trunk/src/example/dependence/settings/ivysettings.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/example/dependence/settings/ivysettings.xml?rev=596454&r1=596329&r2=596454&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/example/dependence/settings/ivysettings.xml
(original)
+++ incubator/ivy/core/trunk/src/example/dependence/settings/ivysettings.xml
Mon Nov 19 13:26:45 2007
@@ -24,9 +24,9 @@
<artifact
pattern="${repository.dir}/[artifact]-[revision].[ext]" />
<ivy
pattern="${repository.dir}/[module]-[revision].xml" />
</filesystem>
- <ibiblio name="libraries" />
+ <ibiblio name="libraries" m2compatible="true" usepoms="false" />
</resolvers>
<modules>
- <module organisation="org.apache" name="standalone"
resolver="projects"/>
+ <module organisation="org.apache" name="dependee"
resolver="projects"/>
</modules>
</ivysettings>
