Author: pete.muir(a)jboss.org Date: 2008-02-02 19:04:21 -0500 (Sat, 02 Feb 2008) New Revision: 7338 Removed: trunk/examples/seamdiscs/resources/WEB-INF/lib/trinidad-impl-1.2.1.jar trunk/examples/seamdiscs/resources/ear-lib/ Modified: trunk/examples/seamdiscs/ trunk/examples/seamdiscs/build.xml Log: Use maven to pull in trinidad for example Property changes on: trunk/examples/seamdiscs ___________________________________________________________________ Name: svn:ignore + lib exploded-archives dist test-build Modified: trunk/examples/seamdiscs/build.xml =================================================================== --- trunk/examples/seamdiscs/build.xml 2008-02-03 00:04:08 UTC (rev 7337) +++ trunk/examples/seamdiscs/build.xml 2008-02-03 00:04:21 UTC (rev 7338) @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<project name="Seamdiscs" default="restart" basedir="."> +<project name="Seamdiscs" default="restart" basedir="." xmlns:artifact="urn:maven-artifact-ant"> <!-- Example name --> <property name="Name" value="Seamdiscs"/> @@ -13,24 +13,56 @@ <property name="richfaces.lib" value="yes"/> <import file="../build.xml"/> + + <property name="example.tmp.lib.dir" value="${basedir}/lib" /> - <fileset id="ear.lib.extras" dir="resources/ear-lib"> - <include name="*.jar"/> + <fileset id="ear.lib.extras" dir="${example.tmp.lib.dir}"> + <include name="trinidad-api.jar"/> </fileset> - <fileset id="war.extras" dir="resources"> + <fileset id="war.lib.extras" dir="${example.tmp.lib.dir}"> + <include name="trinidad-impl.jar"/> + </fileset> + + <fileset id="war.extras" dir="${resources.dir}"> <include name="WEB-INF/lib/*.jar"/> </fileset> <path id="build.classpath.extras"> - <fileset dir="resources/ear-lib"> - <include name="*.jar"/> + <fileset dir="${example.tmp.lib.dir}"> + <include name="trinidad-api.jar"/> </fileset> </path> <patternset id="test.resources.files"> <exclude name="import.sql" /> </patternset> + + <target name="copyextradependencies"> + + <artifact:dependencies filesetId="trinidad.fileset" versionsId="trinidad.versions" sourcesfilesetid="trinidad.sources"> + <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-api" version="1.2.1"> + <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" /> + <exclusion groupId="javax.servlet" artifactId="servlet-api" /> + <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/> + <exclusion groupId="javax.faces" artifactId="jsf-api"/> + </dependency> + <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-impl" version="1.2.1"> + <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" /> + <exclusion groupId="javax.servlet" artifactId="servlet-api" /> + <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/> + <exclusion groupId="portlet-api" artifactId="portlet-api"/> + <exclusion groupId="jstl" artifactId="jstl"/> + <exclusion groupId="commons-beanutils" artifactId="commons-beanutils"/> + <exclusion groupId="javax.faces" artifactId="jsf-api"/> + <exclusion groupId="com.sun.facelets" artifactId="jsf-facelets"/> + </dependency> + </artifact:dependencies> + <copy todir="${example.tmp.lib.dir}"> + <fileset refid="trinidad.fileset" /> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${trinidad.versions}" to="flatten" /> + </copy> + </target> </project> Deleted: trunk/examples/seamdiscs/resources/WEB-INF/lib/trinidad-impl-1.2.1.jar =================================================================== (Binary files differ)