Author: xavier
Date: Mon May 21 15:12:32 2007
New Revision: 540318
URL: http://svn.apache.org/viewvc?view=rev&rev=540318
Log:
IMPROVEMENT: Remove use of deprecated elements in ivysettings.xml (IVY-505)
(with contribution from Jan Materne)
Added:
incubator/ivy/core/trunk/.classpath.default
incubator/ivy/core/trunk/.classpath.ivyde
Removed:
incubator/ivy/core/trunk/.classpath
Modified:
incubator/ivy/core/trunk/CHANGES.txt
incubator/ivy/core/trunk/build.xml
incubator/ivy/core/trunk/doc/doc/dev.html
incubator/ivy/core/trunk/doc/toc.json
incubator/ivy/core/trunk/ivy.xml
incubator/ivy/core/trunk/ivysettings.xml
Added: incubator/ivy/core/trunk/.classpath.default
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/.classpath.default?view=auto&rev=540318
==============================================================================
--- incubator/ivy/core/trunk/.classpath.default (added)
+++ incubator/ivy/core/trunk/.classpath.default Mon May 21 15:12:32 2007
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="test/java"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/ant-launcher.jar"/>
+ <classpathentry kind="lib" path="lib/ant.jar"/>
+ <classpathentry kind="lib" path="lib/commons-cli.jar"/>
+ <classpathentry kind="lib" path="lib/commons-codec.jar"/>
+ <classpathentry kind="lib" path="lib/commons-httpclient.jar"/>
+ <classpathentry kind="lib" path="lib/commons-lang.jar"/>
+ <classpathentry kind="lib" path="lib/commons-logging.jar"/>
+ <classpathentry kind="lib" path="lib/commons-vfs.jar"/>
+ <classpathentry kind="lib" path="lib/jdom.jar"/>
+ <classpathentry kind="lib" path="lib/jsch.jar"/>
+ <classpathentry kind="lib" path="lib/junit.jar"/>
+ <classpathentry kind="lib" path="lib/oro.jar"/>
+ <classpathentry kind="lib" path="lib/slide-webdavlib.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: incubator/ivy/core/trunk/.classpath.ivyde
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/.classpath.ivyde?view=auto&rev=540318
==============================================================================
--- incubator/ivy/core/trunk/.classpath.ivyde (added)
+++ incubator/ivy/core/trunk/.classpath.ivyde Mon May 21 15:12:32 2007
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="test/java"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/ivy.xml/*"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: incubator/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/CHANGES.txt?view=diff&rev=540318&r1=540317&r2=540318
==============================================================================
--- incubator/ivy/core/trunk/CHANGES.txt (original)
+++ incubator/ivy/core/trunk/CHANGES.txt Mon May 21 15:12:32 2007
@@ -27,6 +27,7 @@
Costin Leau
Antoine Levy-Lambert
William Lyvers
+ Jan Materne
Stephen Nesbitt
Joshua Nichols
Bernard Niset
@@ -51,6 +52,7 @@
- IMPROVEMENT: Allow "main" parameters to be passed directly (instead of using
-args flag) (IVY-480) (thanks to Archie Cobbs)
- IMPROVEMENT: Remove @author tags (thanks to Stephane Bailliez)
+- IMPROVEMENT: Remove use of deprecated elements in ivysettings.xml (IVY-505)
(with contribution from Jan Materne)
- FIX: ${revision} property not recognized in poms (IVY-512)
- FIX: Bug on handling dependency artifacts when a module configuration is
specified (IVY-507)
Modified: incubator/ivy/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/build.xml?view=diff&rev=540318&r1=540317&r2=540318
==============================================================================
--- incubator/ivy/core/trunk/build.xml (original)
+++ incubator/ivy/core/trunk/build.xml Mon May 21 15:12:32 2007
@@ -147,7 +147,7 @@
DEPENDENCY MNGT, COMPILATION AND JAR
================================================================= -->
<target name="resolve" depends="init-ivy" unless="no.resolve">
- <ivy:retrieve conf="default,test" />
+ <ivy:retrieve conf="default,test"
pattern="${lib.dir}/[artifact].[ext]"/>
</target>
<target name="compile-core" depends="prepare">
@@ -432,5 +432,29 @@
<fileset dir="${doc.src.dir}"
includes="**/*.html,**/*.json" excludes="samples/**,presentations/**" />
</apply>
-->
+ </target>
+
+ <!-- =================================================================
+ IDE SPECIFIC
+ ================================================================= -->
+ <available file="${basedir}/.classpath"
property="eclipse.classpath.exists"/>
+ <target name="check-eclipse-classpath-overwrite"
if="eclipse.classpath.exists">
+ <input message=".classpath file already
exists.${line.separator}Are you sure you want to overwrite it and loose your
original file?"
+ validargs="Y,N,y,n"
addproperty="eclipse.classpath.confirm"/>
+ <condition property="eclipse.classpath.abort">
+ <equals arg1="${eclipse.classpath.confirm}" arg2="N"
casesensitive="false"/>
+ </condition>
+ </target>
+
+ <target name="eclipse-default" depends="resolve,
check-eclipse-classpath-overwrite"
+ unless="eclipse.classpath.abort"
+ description="--> creates a default .classpath for
eclipse, using jars resolved by this ant build">
+ <copy file="${basedir}/.classpath.default"
tofile="${basedir}/.classpath" overwrite="true"/>
+ </target>
+
+ <target name="eclipse-ivyde" depends="check-eclipse-classpath-overwrite"
+ unless="eclipse.classpath.abort"
+ description="--> creates a .classpath for eclipse using
Apache IvyDE version">
+ <copy file="${basedir}/.classpath.ivyde"
tofile="${basedir}/.classpath" overwrite="true"/>
</target>
</project>
Modified: incubator/ivy/core/trunk/doc/doc/dev.html
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/doc/dev.html?view=diff&rev=540318&r1=540317&r2=540318
==============================================================================
--- incubator/ivy/core/trunk/doc/doc/dev.html (original)
+++ incubator/ivy/core/trunk/doc/doc/dev.html Mon May 21 15:12:32 2007
@@ -64,6 +64,32 @@
This is a work in progress though (see IVY-511), but patches helping migration
to these conventions are welcome.
+<h1>Developing with eclipse</h1>
+Even though you can develop Ivy with your IDE of choice, we support eclipse
development by providing ad hoc metadata.
+
+We currently provide two options:
+<h2>Eclipse alone</h2>
+To develop with a simple eclipse install all you need is eclipse 3.1 or
greater, with no particular plugin.
+First call the following ant target in your Ivy workspace:
+<code>
+ant eclipse-default
+</code>
+This will resolve the dependencies of Ivy and produce a .classpath using the
resolved jars for the build path.
+Then you can use the "Import->Existing project into workspace" eclipse feature
to import the Ivy project in your workspace.
+<h2>Eclipse + IvyDE</h2>
+You can also leverage the latest IvyDE version to be able to easily resolve
the ivy dependencies from Eclipse.
+To do so all you need is call the following ant target in your Ivy workspace:
+<code>
+ant eclipse-ivyde
+</code>
+or if you don't have ant installed you can simply copy the file
.classpath.ivyde and rename it to .classpath
+Then you can import the project using "Import->Existing project into
workspace" as long as you already have latest IvyDE installed.
+
+To install latest IvyDE version compatible with the latest Ivy used to resolve
Ivy dependencies, you will need to use a snapshot build, not endorsed by the
ASF, available here:
+http://people.apache.org/~xavier/ivyde/snapshot/
+
+Download the file and unzip its content in your eclipse installation directory.
+
<h1>Making a release</h1>
<h2>Requirements</h2>
Requirements for making a release are similar to the requirements for building
from source, except that sun jdk 1.6 and ant 1.7 are required.
Modified: incubator/ivy/core/trunk/doc/toc.json
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/toc.json?view=diff&rev=540318&r1=540317&r2=540318
==============================================================================
--- incubator/ivy/core/trunk/doc/toc.json (original)
+++ incubator/ivy/core/trunk/doc/toc.json Mon May 21 15:12:32 2007
@@ -999,4 +999,4 @@
]
}
]
-}
+}
\ No newline at end of file
Modified: incubator/ivy/core/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/ivy.xml?view=diff&rev=540318&r1=540317&r2=540318
==============================================================================
--- incubator/ivy/core/trunk/ivy.xml (original)
+++ incubator/ivy/core/trunk/ivy.xml Mon May 21 15:12:32 2007
@@ -43,6 +43,7 @@
<dependency org="apache" name="oro" rev="2.0.8"
conf="default,oro->default"/>
<dependency org="apache" name="commons-vfs" rev="20060920"
conf="vfs->default;default,webdav->webdav" />
<dependency org="jcraft" name="jsch" rev="0.1.25"
conf="default,sftp->default" />
+ <dependency org="ant" name="ant-launcher" rev="1.6.5"
conf="test->default"/>
<dependency org="junit" name="junit" rev="3.8.2"
conf="test->default" />
</dependencies>
</ivy-module>
Modified: incubator/ivy/core/trunk/ivysettings.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/ivysettings.xml?view=diff&rev=540318&r1=540317&r2=540318
==============================================================================
--- incubator/ivy/core/trunk/ivysettings.xml (original)
+++ incubator/ivy/core/trunk/ivysettings.xml Mon May 21 15:12:32 2007
@@ -16,20 +16,15 @@
specific language governing permissions and limitations
under the License.
-->
-<ivyconf>
+<ivysettings>
<include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
- <conf defaultResolver="public" />
+ <settings defaultResolver="public" />
<resolvers>
- <!--
- we use ivyrep for ivy and some artifacts, and ibiblio
for other artifacts
- The reason for that is that commons vfs is still not
released, thus we depend on an integration
- version only available on ivyrep, but not on ivyrep
- As soon as vfs will be available on ibiblio, the
default configuration could be used again
- -->
<url name="public">
<ivy
pattern="http://ivyrep.jayasoft.org/[organisation]/[module]/ivy-[revision].xml"/>
<artifact
pattern="http://ivyrep.jayasoft.org/[organisation]/[module]/[revision]/[artifact].[ext]"/>
<artifact
pattern="http://repo1.maven.org/maven/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ <artifact
pattern="http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
</url>
</resolvers>
-</ivyconf>
+</ivysettings>
