Author: jbalunas(a)redhat.com Date: 2008-05-27 13:11:11 -0400 (Tue, 27 May 2008) New Revision: 8289 Modified: tags/JBoss_Seam_2_0_2_SP1/build/common.build.xml tags/JBoss_Seam_2_0_2_SP1/seam-gen/build.xml Log: Port of JBSEAM-3017 to 2.0.2.SP1 Modified: tags/JBoss_Seam_2_0_2_SP1/build/common.build.xml =================================================================== --- tags/JBoss_Seam_2_0_2_SP1/build/common.build.xml 2008-05-27 16:41:08 UTC (rev 8288) +++ tags/JBoss_Seam_2_0_2_SP1/build/common.build.xml 2008-05-27 17:11:11 UTC (rev 8289) @@ -118,6 +118,7 @@ <copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="runtime" /> <copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="runtime" /> <copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="runtime" /> + <copyDependencies id="gen" pom="${gen.pom}" todir="${lib.dir}" scope="runtime" /> <copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="compile" /> @@ -125,6 +126,7 @@ <copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="compile" /> + <copyDependencies id="gen" pom="${gen.pom}" todir="${lib.dir}" scope="compile" /> <property name="copyseamdependenciesdone" value="true" /> </target> @@ -334,4 +336,4 @@ <artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2"/> </target> -</project> \ No newline at end of file +</project> Modified: tags/JBoss_Seam_2_0_2_SP1/seam-gen/build.xml =================================================================== --- tags/JBoss_Seam_2_0_2_SP1/seam-gen/build.xml 2008-05-27 16:41:08 UTC (rev 8288) +++ tags/JBoss_Seam_2_0_2_SP1/seam-gen/build.xml 2008-05-27 17:11:11 UTC (rev 8289) @@ -8,7 +8,7 @@ <property file="./build.properties" /> <import file="${seam.dir}/build/common.build.xml" /> - <target name="init" depends="initpoms"> + <target name="init"> <path id="seam-gen.path" path="${seam.dir}/lib/jboss-seam-gen.jar" /> <!-- taskdefs --> @@ -39,8 +39,6 @@ <taskdef name="pathFixer" classname="org.jboss.seam.tool.FixPathTask" classpathref="seam-gen.path"/> - - <copyDependencies pom="${gen.pom}" id="gen" scope="runtime" todir="${lib.dir}/gen" /> </target> <target name="init-properties" depends="init"> @@ -1060,9 +1058,13 @@ <target name="init-generate"> <path id="htools.classpath"> - <fileset dir="${lib.dir}/gen"> - <include name="*.jar"/> - </fileset> + <pathelement path="../lib/ant.jar"/> + <pathelement path="../lib/hibernate-tools.jar"/> + <pathelement path="../lib/freemarker.jar"/> + <pathelement path="../lib/jboss-seam.jar"/> + <pathelement path="../lib/runtime.jar"/> + <pathelement path="../lib/common.jar"/> + <pathelement path="../lib/text.jar"/> <pathelement path="../lib/dom4j.jar" /> <pathelement path="../lib/persistence-api.jar" /> <pathelement path="../lib/hibernate.jar" />