[webbeans-commits] Webbeans SVN: r2135 - ri/trunk/jboss-as.

Author: pete.muir(a)jboss.org Date: 2009-03-22 17:39:35 -0400 (Sun, 22 Mar 2009) New Revision: 2135 Modified: ri/trunk/jboss-as/build.xml Log: better clean up Modified: ri/trunk/jboss-as/build.xml =================================================================== --- ri/trunk/jboss-as/build.xml 2009-03-22 18:48:02 UTC (rev 2134) +++ ri/trunk/jboss-as/build.xml 2009-03-22 21:39:35 UTC (rev 2135) @@ -3,74 +3,77 @@ <path id="maven-ant-tasks.classpath" path="../lib/maven-ant-tasks.jar" /> <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" /> - + <property name="maven.dir" location="${basedir}/lib/maven" /> <property file="build.properties" /> - <property file="local.build.properties" /> - + <property file="local.build.properties" /> + <target name="clean" description="Clean up after the JBoss updater"> - <delete dir="target" failonerror="false"/> + <delete dir="target" failonerror="false" /> </target> <target name="update" depends="install-webbeans.deployer" description="Update JBoss 5 for the Web Beans RI" /> - + <target name="install-webbeans.deployer"> - <fail unless="jboss.home" message="Please pass in -Djboss.home=..."/> + <fail unless="jboss.home" message="Please pass in -Djboss.home=..." /> <delete dir="${jboss.home}/server/default/deployers/webbeans.deployer" failonerror="false" /> - <delete dir="target" failonerror="false"/> - - <artifact:dependencies filesetId="webbeans.deployer.fileset" versionsId="webbeans.deployer.versions"> - <dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-deployer" version="${webbeans-ri-int.version}" type="zip"/> - <dependency groupId="org.jboss.webbeans" artifactId="webbeans-core" version="${webbeans.version}" /> - <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" /> + <delete dir="target" failonerror="false" /> + + <artifact:dependencies filesetId="webbeans.deployer.fileset" versionsId="webbeans.deployer.versions" > + <dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-deployer" version="${webbeans-ri-int.version}" type="zip" /> + <dependency groupId="org.jboss.webbeans" artifactId="webbeans-core" version="${webbeans.version}" /> + <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" /> <remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2" /> - </artifact:dependencies> - - <mkdir dir="target" /> - <copy todir="target"> - <fileset refid="webbeans.deployer.fileset"/> + </artifact:dependencies> + + <mkdir dir="target/dependency/lib" /> + <copy todir="target/dependency/lib"> + <fileset refid="webbeans.deployer.fileset" /> <chainedmapper> - <flattenmapper /> - <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${webbeans.deployer.versions}" to="flatten" /> - </chainedmapper> + <flattenmapper /> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${webbeans.deployer.versions}" to="flatten" /> + </chainedmapper> </copy> + + <unzip dest="target" src="target/dependency/lib/webbeans-ri-int-deployer.zip" /> - <unzip dest="target" src="target/webbeans-ri-int-deployer.zip" /> + <copy todir="target/webbeans.deployer/lib-int/" overwrite="true"> + <fileset dir="target/dependency/lib"> + <include name="webbeans-core.jar" /> + </fileset> + </copy> + + <delete dir="target/dependency" /> <copy todir="${jboss.home}/server/default/deployers/webbeans.deployer"> <fileset dir="target/webbeans.deployer"> <include name="**/*" /> </fileset> </copy> - - <copy todir="${jboss.home}/server/default/deployers/webbeans.deployer/lib-int/" overwrite="true"> - <fileset dir="target"> - <include name="webbeans-core.jar" /> - </fileset> - </copy> + </target> - + <target name="install-jboss-ejb3-update"> - - <fail unless="jboss.home" message="Please pass in -Djboss.home=..."/> - + + <fail unless="jboss.home" message="Please pass in -Djboss.home=..." /> + <artifact:dependencies filesetId="jboss.ejb3.plugin.fileset" versionsId="jboss.ejb3.plugin.versions"> - <dependency groupId="org.jboss.ejb3" artifactId="jboss-ejb3-plugin" version="${jboss-ejb3.version}" classifier="installer"/> - <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" /> - </artifact:dependencies> - - <mkdir dir="target/ejb3.plugin"/> - <copy todir="target/ejb3.plugin"> - <fileset refid="jboss.ejb3.plugin.fileset"/> - <chainedmapper> - <flattenmapper /> - <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${jboss.ejb3.plugin.versions}" to="flatten" /> - </chainedmapper> - </copy> + <dependency groupId="org.jboss.ejb3" artifactId="jboss-ejb3-plugin" version="${jboss-ejb3.version}" classifier="installer" /> + <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" /> + </artifact:dependencies> + + <mkdir dir="target/ejb3.plugin" /> + <copy todir="target/ejb3.plugin"> + <fileset refid="jboss.ejb3.plugin.fileset" /> + <chainedmapper> + <flattenmapper /> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${jboss.ejb3.plugin.versions}" to="flatten" /> + </chainedmapper> + </copy> <java jar="target/ejb3.plugin/jboss-ejb3-plugin-installer.jar" fork="true" failonerror="true"> <arg line="${jboss.home}" /> </java>