Author: manaRH Date: 2008-10-16 08:25:09 -0400 (Thu, 16 Oct 2008) New Revision: 9350 Modified: branches/enterprise/JBPAPP_4_3_FP01/build.xml branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml Log: JBPAPP-1096 Modified: branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml 2008-10-15 18:21:02 UTC (rev 9349) +++ branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml 2008-10-16 12:25:09 UTC (rev 9350) @@ -116,7 +116,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="gen" pom="${gen.pom}" todir="${lib.dir}/gen" 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" /> @@ -124,7 +124,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" /> + <copyDependencies id="gen" pom="${gen.pom}" todir="${lib.dir}/gen" scope="compile" /> <property name="copyseamdependenciesdone" value="true" /> </target> Modified: branches/enterprise/JBPAPP_4_3_FP01/build.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/build.xml 2008-10-15 18:21:02 UTC (rev 9349) +++ branches/enterprise/JBPAPP_4_3_FP01/build.xml 2008-10-16 12:25:09 UTC (rev 9350) @@ -258,7 +258,7 @@ </target> <target name="jargen" depends="compilegen" description="Build the distribution .jar file for the gen package"> - <archive classesdir="${classes.gen.dir}" module="jboss-seam-gen" pom="${gen.pom}" srcdir="${src.gen.dir}"/> + <archive classesdir="${classes.gen.dir}" module="jboss-seam-gen" pom="${gen.pom}" srcdir="${src.gen.dir}" outputdir="${lib.dir}/gen"/> </target> @@ -898,7 +898,7 @@ </target>--> <target name="eclipseclasspath" depends="init, jargen" description="Update eclipse classpath"> - <path id="seam-gen.path" path="${seam.dir}/lib/jboss-seam-gen.jar" /> + <path id="seam-gen.path" path="${seam.dir}/lib/gen/jboss-seam-gen.jar" /> <taskdef name="eclipseClasspath" classname="org.jboss.seam.tool.EclipseClasspathTask" Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml 2008-10-15 18:21:02 UTC (rev 9349) +++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml 2008-10-16 12:25:09 UTC (rev 9350) @@ -9,7 +9,7 @@ <import file="${seam.dir}/build/common.build.xml" /> <target name="init"> - <path id="seam-gen.path" path="${seam.dir}/lib/jboss-seam-gen.jar" /> + <path id="seam-gen.path" path="${seam.dir}/lib/gen/jboss-seam-gen.jar" /> <!-- taskdefs --> <taskdef name="normalizeProjectName" @@ -955,12 +955,12 @@ <target name="init-generate"> <path id="htools.classpath"> <pathelement path="../lib/ant.jar"/> - <pathelement path="../lib/hibernate-tools.jar"/> - <pathelement path="../lib/freemarker.jar"/> + <pathelement path="../lib/gen/hibernate-tools.jar"/> + <pathelement path="../lib/gen/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/gen/runtime.jar"/> + <pathelement path="../lib/gen/common.jar"/> + <pathelement path="../lib/gen/text.jar"/> <pathelement path="../lib/dom4j.jar" /> <pathelement path="../lib/persistence-api.jar" /> <pathelement path="../lib/hibernate3.jar" /> @@ -976,7 +976,7 @@ <pathelement path="../lib/core.jar" /> <pathelement path="../lib/jboss-common-core.jar" /> <pathelement path="${driver.jar}"/> - <pathelement path="../lib/jboss-seam-gen.jar"/> + <pathelement path="../lib/gen/jboss-seam-gen.jar"/> </path> <taskdef name="hibernate" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="htools.classpath"/> </target>