[seam-commits] Seam SVN: r9003 - in trunk: build and 1 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Wed Sep 17 05:21:39 EDT 2008 

Author: pete.muir at jboss.org
Date: 2008-09-17 05:21:39 -0400 (Wed, 17 Sep 2008)
New Revision: 9003

Modified:
   trunk/build.xml
   trunk/build/common.build.xml
   trunk/seam-gen/build.xml
Log:
JBSEAM-3290

Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml	2008-09-17 09:21:20 UTC (rev 9002)
+++ trunk/build/common.build.xml	2008-09-17 09:21:39 UTC (rev 9003)
@@ -124,7 +124,7 @@
 		<copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="runtime" />
 		<copyDependencies id="resteasy" pom="${resteasy.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="wicket" pom="${wicket.pom}" todir="${lib.dir}" scope="compile" />
@@ -135,7 +135,7 @@
 		<copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="compile" />
 		<copyDependencies id="resteasy" pom="${resteasy.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: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-09-17 09:21:20 UTC (rev 9002)
+++ trunk/build.xml	2008-09-17 09:21:39 UTC (rev 9003)
@@ -349,7 +349,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>
 
 
@@ -1081,7 +1081,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: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml	2008-09-17 09:21:20 UTC (rev 9002)
+++ trunk/seam-gen/build.xml	2008-09-17 09:21:39 UTC (rev 9003)
@@ -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" 
@@ -610,23 +610,23 @@
     	
         <copy todir="${project.home}/lib" overwrite="true">
             <fileset dir="../lib">
-                <exclude name="jsf-facelets.jar" if="icefaces.property"/>
-                <exclude name="ajax4jsf*.jar" if="icefaces.property"/>
-                <exclude name="richfaces*.jar" if="icefaces.property"/>
+               <exclude name="jsf-facelets.jar" if="icefaces.property"/>
+               <exclude name="ajax4jsf*.jar" if="icefaces.property"/>
+               <exclude name="richfaces*.jar" if="icefaces.property"/>
             	<exclude name="jboss-container.jar" />
             	<exclude name="jboss-seam-wicket.jar" />
             	<exclude name="jboss-seam-resteasy.jar" />
             	<exclude name="test/jboss-deplyers.jar" />
             	<exclude name="test/jboss-embedded-api.jar" />
-                <exclude name="interop/**/*" />
+               <exclude name="interop/**/*" />
             	<exclude name="gen/**/*" />
             </fileset>
             <fileset file="${driver.jar}"/>
         </copy>
 
         <echo message="Copying JBoss Embedded configuration to the ${project.home}/bootstrap directory..." />
-          <copy todir="${project.home}/bootstrap" overwrite="true">
-            <fileset dir="../bootstrap" />
+        <copy todir="${project.home}/bootstrap" overwrite="true">
+           <fileset dir="../bootstrap" />
         </copy>
         
     </target>
@@ -1073,21 +1073,21 @@
 	</target>
 		
 	<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/jboss-seam.jar"/>
-            <pathelement path="../lib/runtime.jar"/>
-            <pathelement path="../lib/common.jar"/>
-            <pathelement path="../lib/text.jar"/>  
+      <path id="htools.classpath">
+         <pathelement path="../lib/ant.jar"/>
+         <pathelement path="../lib/gen/hibernate-tools.jar"/>
+         <pathelement path="../lib/gen/freemarker.jar"/>
+         <pathelement path="../lib/jboss-seam.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/hibernate.jar" />
         	<pathelement path="../lib/hibernate-commons-annotations.jar" />
         	<pathelement path="../lib/hibernate-annotations.jar" />
         	<pathelement path="../lib/hibernate-entitymanager.jar" />
-            <pathelement path="../lib/hibernate-validator.jar"/>
+         <pathelement path="../lib/hibernate-validator.jar"/>
         	<pathelement path="../lib/commons-collections.jar" />
         	<pathelement path="../lib/commons-logging.jar" />
         	<pathelement path="../lib/javassist.jar" />
@@ -1095,9 +1095,9 @@
         	<pathelement path="../lib/asm.jar" />
         	<pathelement path="../lib/core.jar" />
         	<pathelement path="../lib/jboss-common-core.jar" />
-		    <pathelement path="../lib/concurrent.jar"/>
-            <pathelement path="${driver.jar}"/>
-        	<pathelement path="../lib/jboss-seam-gen.jar"/>
+         <pathelement path="../lib/concurrent.jar"/>
+         <pathelement path="${driver.jar}"/>
+        	<pathelement path="../lib/gen/jboss-seam-gen.jar"/>
         </path>
 		<taskdef name="hibernate" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="htools.classpath"/>
 	</target>

More information about the seam-commits mailing list