6 a.m.
Author: dan.j.allen
Date: 2009-06-12 00:00:12 -0400 (Fri, 12 Jun 2009)
New Revision: 11133
Modified:
branches/community/Seam_2_1/seam-gen/ivy/ivy-build.xml
branches/community/Seam_2_1/seam-gen/ivy/ivy.settings.xml
branches/community/Seam_2_1/seam-gen/ivy/ivy.xml
Log:
leverage configuration mappings to make dependency metadata more concise (thanks to Jason
Porter)
Modified: branches/community/Seam_2_1/seam-gen/ivy/ivy-build.xml
===================================================================
--- branches/community/Seam_2_1/seam-gen/ivy/ivy-build.xml 2009-06-11 23:30:25 UTC (rev
11132)
+++ branches/community/Seam_2_1/seam-gen/ivy/ivy-build.xml 2009-06-12 04:00:12 UTC (rev
11133)
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<project basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"
name="@projectName@-ivy">
- <!-- At this point we cannot upgrade to 2.0.0-rc1 because of a bug regarding when the
variables are loaded -->
- <property name="ivy.install.version" value="2.0.0-beta2"/>
+ <property name="ivy.install.version" value="2.0.0"/>
<property name="ivy.jar.dir" value="${lib.dir}/ivy"/>
<property name="ivy.jar.file"
value="${ivy.jar.dir}/ivy.jar"/>
<property name="ivy.sync" value="false"/>
@@ -10,7 +9,7 @@
<property name="jboss.repo"
value="http://repository.jboss.org/maven2"/>
<!-- centralize some key artifact versions -->
- <property name="seam.version" value="2.1.1.GA"/>
+ <property name="seam.version" value="2.1.2"/>
<property name="jsf.version" value="1.2_12"/>
<property name="richfaces.version" value="3.3.0.GA"/>
<property name="jboss-embedded.version" value="beta3"/>
@@ -35,16 +34,16 @@
</target>
<target name="inflate-core" depends="load-ivy">
- <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" type="jar"
sync="${ivy.sync}" symlink="${ivy.use.symlinks}"/>
+ <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" type="jar"
sync="${ivy.sync}" symlink="${ivy.use.symlinks}"
conf="default"/>
<move file="${lib.dir}/mvel.jar" tofile="${lib.dir}/mvel14.jar"
failonerror="false"/>
</target>
<target name="inflate-source" depends="load-ivy">
- <ivy:retrieve pattern="${lib.dir}/src/[artifact]-[type]s.[ext]"
type="source" sync="${ivy.sync}"
symlink="${ivy.use.symlinks}"/>
+ <ivy:retrieve pattern="${lib.dir}/src/[artifact]-[type]s.[ext]"
type="source" sync="${ivy.sync}"
symlink="${ivy.use.symlinks}" conf="sources"/>
</target>
<target name="inflate-test" depends="load-ivy">
- <ivy:retrieve pattern="${lib.dir}/test/[artifact].[ext]"
type="test-jar" sync="${ivy.sync}"
symlink="${ivy.use.symlinks}"/>
+ <ivy:retrieve pattern="${lib.dir}/test/[artifact].[ext]"
type="test-jar" sync="${ivy.sync}"
symlink="${ivy.use.symlinks}" conf="test"/>
</target>
<target name="inflate"
depends="inflate-core,inflate-source,inflate-test"/>
Modified: branches/community/Seam_2_1/seam-gen/ivy/ivy.settings.xml
===================================================================
--- branches/community/Seam_2_1/seam-gen/ivy/ivy.settings.xml 2009-06-11 23:30:25 UTC (rev
11132)
+++ branches/community/Seam_2_1/seam-gen/ivy/ivy.settings.xml 2009-06-12 04:00:12 UTC (rev
11133)
@@ -3,11 +3,10 @@
<settings defaultResolver="seam"/>
<include url="${ivy.default.settings.dir}/ivysettings.xml" />
<resolvers>
- <ibiblio name="central" m2compatible="true"
usepoms="false" root="${central.repo}"
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
- <ibiblio name="jboss" m2compatible="true"
usepoms="false" root="${jboss.repo}"
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
- <chain name="seam" returnFirst="true">
- <!-- local is always checked; central is before jboss since Ivy will only get
sources from where it got binaries -->
- <resolver ref="central"/>
+ <ibiblio name="jboss" m2compatible="true"
usepoms="true" root="${jboss.repo}"
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
+ <chain name="seam" dual="true">
+ <!-- local is always checked; public needs to be before jboss to allow Ivy to
properly locate sources -->
+ <resolver ref="public"/>
<resolver ref="jboss"/>
</chain>
</resolvers>
Modified: branches/community/Seam_2_1/seam-gen/ivy/ivy.xml
===================================================================
--- branches/community/Seam_2_1/seam-gen/ivy/ivy.xml 2009-06-11 23:30:25 UTC (rev 11132)
+++ branches/community/Seam_2_1/seam-gen/ivy/ivy.xml 2009-06-12 04:00:12 UTC (rev 11133)
@@ -1,146 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module version="1.0"
xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="@projectName@" module="@projectName@"/>
- <configurations>
+ <configurations
defaultconfmapping="default->default;sources->sources;test->default">
+ <conf name="sources" transitive="false"
visibility="private"/>
+ <conf name="test" transitive="false"
visibility="private"/>
<conf name="default" transitive="false"/>
</configurations>
<dependencies defaultconf="default">
- <!-- Add your JDBC driver dependence here if you need it -->
- <dependency org="com.sun.facelets" name="jsf-facelets"
rev="1.1.15.B1">
- <artifact name="jsf-facelets" type="jar"/>
- <artifact name="jsf-facelets" type="source" ext="jar"
m:classifier="sources"/>
- </dependency>
- <dependency org="commons-beanutils" name="commons-beanutils"
rev="1.7.0">
- <artifact name="commons-beanutils" type="jar"/>
- <artifact name="commons-beanutils" type="source"
ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="commons-digester" name="commons-digester"
rev="1.7">
- <artifact name="commons-digester" type="jar"/>
- <artifact name="commons-digester" type="source"
ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="janino" name="janino"
rev="2.5.10">
- <artifact name="janino" type="jar"/>
- </dependency>
- <dependency org="javax.ejb" name="ejb-api"
rev="3.0">
- <artifact name="ejb-api" type="jar"/>
- </dependency>
- <dependency org="javax.el" name="el-api"
rev="1.0">
- <artifact name="el-api" type="jar"/>
- </dependency>
- <dependency org="javax.faces" name="jsf-api"
rev="${jsf.version}">
- <artifact name="jsf-api" type="jar"/>
- <artifact name="jsf-api" type="source" ext="jar"
m:classifier="sources"/>
- </dependency>
- <dependency org="javax.faces" name="jsf-impl"
rev="${jsf.version}">
- <artifact name="jsf-impl" type="jar"/>
- <artifact name="jsf-impl" type="source" ext="jar"
m:classifier="sources"/>
- </dependency>
- <dependency org="javax.persistence" name="persistence-api"
rev="1.0">
- <artifact name="persistence-api" type="jar"/>
- </dependency>
- <dependency org="javax.servlet" name="servlet-api"
rev="2.5">
- <artifact name="servlet-api" type="jar"/>
- </dependency>
- <dependency org="javax.transaction" name="jta"
rev="1.1">
- <artifact name="jta" type="jar"/>
- </dependency>
- <dependency org="net.sourceforge.jexcelapi" name="jxl"
rev="2.6.8-seam">
- <artifact name="jxl" type="jar"/>
- </dependency>
- <dependency org="org.antlr" name="antlr-runtime"
rev="3.0">
- <artifact name="antlr-runtime" type="jar"/>
- </dependency>
- <dependency org="org.drools" name="drools-compiler"
rev="4.0.4">
- <artifact name="drools-compiler" type="jar"/>
- </dependency>
- <dependency org="org.drools" name="drools-core"
rev="4.0.4">
- <artifact name="drools-core" type="jar"/>
- </dependency>
- <dependency org="org.eclipse.jdt" name="core"
rev="3.2.3.v_686_R32x">
- <artifact name="core" type="jar"/>
- </dependency>
- <dependency org="org.codehaus.groovy" name="groovy-all"
rev="1.5.4">
- <artifact name="groovy-all" type="jar"/>
- </dependency>
- <dependency org="org.hibernate" name="hibernate-validator"
rev="3.0.0.GA">
- <artifact name="hibernate-validator" type="jar"/>
- </dependency>
- <dependency org="org.jboss.el" name="jboss-el"
rev="1.0_02.CR3">
- <artifact name="jboss-el" type="jar"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam"
rev="${seam.version}">
- <artifact name="jboss-seam" type="jar"/>
+ <!-- Add your JDBC driver dependency here if you need it -->
+ <!--
+ <dependency org="hsqldb" name="hsqldb"
rev="1.8.0.8-brew" conf="default"/>
+ -->
+ <dependency org="com.sun.facelets" name="jsf-facelets"
rev="1.1.15.B1" conf="default,sources"/>
+ <dependency org="commons-beanutils" name="commons-beanutils"
rev="1.7.0" conf="default,sources"/>
+ <dependency org="commons-digester" name="commons-digester"
rev="1.7" conf="default,sources"/>
+ <dependency org="janino" name="janino" rev="2.5.10"
conf="default"/>
+ <dependency org="javax.ejb" name="ejb-api" rev="3.0"
conf="default"/>
+ <dependency org="javax.el" name="el-api" rev="1.0"
conf="default"/>
+ <dependency org="javax.faces" name="jsf-api"
rev="${jsf.version}" conf="default,sources"/>
+ <dependency org="javax.faces" name="jsf-impl"
rev="${jsf.version}" conf="default,sources"/>
+ <dependency org="javax.persistence" name="persistence-api"
rev="1.0" conf="default"/>
+ <dependency org="javax.servlet" name="servlet-api"
rev="2.5" conf="default"/>
+ <dependency org="javax.transaction" name="jta"
rev="1.1" conf="default"/>
+ <dependency org="net.sourceforge.jexcelapi" name="jxl"
rev="2.6.8-seam" conf="default"/>
+ <dependency org="org.antlr" name="antlr-runtime"
rev="3.0" conf="default"/>
+ <dependency org="org.drools" name="drools-compiler"
rev="4.0.4" conf="default"/>
+ <dependency org="org.drools" name="drools-core"
rev="4.0.4" conf="default"/>
+ <dependency org="org.eclipse.jdt" name="core"
rev="3.2.3.v_686_R32x" conf="default"/>
+ <dependency org="org.codehaus.groovy" name="groovy-all"
rev="1.5.4" conf="default"/>
+ <dependency org="org.hibernate" name="hibernate-validator"
rev="3.0.0.GA" conf="default"/>
+ <dependency org="org.jboss.el" name="jboss-el"
rev="1.0_02.CR3" conf="default"/>
+ <!-- Seam jar is a special case because it's an EJB type and Ivy (at least right
now)
+ believes the extension should be ejb, so we have to tell it the correct one. -->
+ <dependency org="org.jboss.seam" name="jboss-seam"
rev="${seam.version}" conf="default,sources">
+ <artifact name="jboss-seam" type="jar"
ext="jar"/>
<artifact name="jboss-seam" type="source" ext="jar"
m:classifier="sources"/>
</dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-debug"
rev="${seam.version}">
- <artifact name="jboss-seam-debug" type="jar"/>
- <artifact name="jboss-seam-debug" type="source"
ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-excel"
rev="${seam.version}">
- <artifact name="jboss-seam-excel" type="jar"/>
- <artifact name="jboss-seam-excel" type="source"
ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-ioc"
rev="${seam.version}">
- <artifact name="jboss-seam-ioc" type="jar"/>
- <artifact name="jboss-seam-ioc" type="source"
ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-jul"
rev="${seam.version}">
- <artifact name="jboss-seam-jul" type="jar"/>
- <artifact name="jboss-seam-jul" type="source"
ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-mail"
rev="${seam.version}">
- <artifact name="jboss-seam-mail" type="jar"/>
- <artifact name="jboss-seam-mail" type="source"
ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-pdf"
rev="${seam.version}">
- <artifact name="jboss-seam-pdf" type="jar"/>
- <artifact name="jboss-seam-pdf" type="source"
ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-remoting"
rev="${seam.version}">
- <artifact name="jboss-seam-remoting" type="jar"/>
- <artifact name="jboss-seam-remoting" type="source"
ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-rss"
rev="${seam.version}">
- <artifact name="jboss-seam-rss" type="jar"/>
- <artifact name="jboss-seam-rss" type="source"
ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-ui"
rev="${seam.version}">
- <artifact name="jboss-seam-ui" type="jar"/>
- <artifact name="jboss-seam-ui" type="source"
ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jbpm" name="jbpm-jpdl"
rev="3.2.2">
- <artifact name="jbpm-jpdl" type="jar"/>
- </dependency>
- <dependency org="org.mvel" name="mvel14"
rev="1.2.21">
- <artifact name="mvel14" type="jar"/>
- </dependency>
- <dependency org="org.richfaces.framework" name="richfaces-api"
rev="${richfaces.version}">
- <artifact name="richfaces-api" type="jar"/>
- <artifact name="richfaces-api" type="source"
ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.richfaces.framework" name="richfaces-impl"
rev="${richfaces.version}">
- <artifact name="richfaces-impl" type="jar"/>
- <artifact name="richfaces-impl" type="source"
ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.richfaces.ui" name="richfaces-ui"
rev="${richfaces.version}">
- <artifact name="richfaces-ui" type="jar"/>
- <artifact name="richfaces-ui" type="source" ext="jar"
m:classifier="sources"/>
- </dependency>
- <dependency org="org.testng" name="testng"
rev="5.6">
- <artifact name="testng" type="jar"/>
- </dependency>
- <!-- I tried to use conf="test" but I simply didn't understand how it
worked -->
- <dependency org="org.jboss.seam.embedded" name="hibernate-all"
rev="${jboss-embedded.version}">
- <artifact name="hibernate-all" type="test-jar"
ext="jar"/>
- </dependency>
- <dependency org="org.jboss.seam.embedded" name="thirdparty-all"
rev="${jboss-embedded.version}">
- <artifact name="thirdparty-all" type="test-jar"
ext="jar"/>
- </dependency>
- <dependency org="org.jboss.seam.embedded"
name="jboss-embedded-all" rev="${jboss-embedded.version}">
- <artifact name="jboss-embedded-all" type="test-jar"
ext="jar"/>
- </dependency>
- <dependency org="org.jboss.seam.embedded"
name="jboss-embedded-api" rev="${jboss-embedded.version}">
- <artifact name="jboss-embedded-api" type="test-jar"
ext="jar"/>
- </dependency>
+ <dependency org="org.jboss.seam" name="jboss-seam-debug"
rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-excel"
rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-ioc"
rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-jul"
rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-mail"
rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-pdf"
rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-remoting"
rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-rss"
rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-ui"
rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jbpm" name="jbpm-jpdl"
rev="3.2.2" conf="default"/>
+ <dependency org="org.mvel" name="mvel14" rev="1.2.21"
conf="default"/>
+ <dependency org="org.richfaces.framework" name="richfaces-api"
rev="${richfaces.version}" conf="default,sources"/>
+ <dependency org="org.richfaces.framework" name="richfaces-impl"
rev="${richfaces.version}" conf="default,sources"/>
+ <dependency org="org.richfaces.ui" name="richfaces-ui"
rev="${richfaces.version}" conf="default,sources"/>
+ <dependency org="org.richfaces.samples" name="glassX"
rev="${richfaces.version}" conf="default"/>
+ <dependency org="org.richfaces.samples" name="darkX"
rev="${richfaces.version}" conf="default"/>
+ <dependency org="org.richfaces.samples" name="laguna"
rev="${richfaces.version}" conf="default"/>
+ <dependency org="org.testng" name="testng" rev="5.6"
conf="test"/>
+ <dependency org="org.jboss.seam.embedded" name="hibernate-all"
rev="${jboss-embedded.version}" conf="test"/>
+ <dependency org="org.jboss.seam.embedded" name="thirdparty-all"
rev="${jboss-embedded.version}" conf="test"/>
+ <dependency org="org.jboss.seam.embedded"
name="jboss-embedded-all" rev="${jboss-embedded.version}"
conf="test"/>
+ <dependency org="org.jboss.seam.embedded"
name="jboss-embedded-api" rev="${jboss-embedded.version}"
conf="test"/>
</dependencies>
</ivy-module>