Author: pete.muir(a)jboss.org Date: 2008-01-19 17:52:43 -0500 (Sat, 19 Jan 2008) New Revision: 7157 Added: trunk/build/jbas5.pom.xml trunk/src/jbas5/ Modified: trunk/build.xml trunk/build/ci.build.xml trunk/build/classpath.tmpl trunk/build/common.build.xml Log: Add jbas5 module for JBoss AS5 integration code Modified: trunk/build/ci.build.xml =================================================================== --- trunk/build/ci.build.xml 2008-01-19 22:24:19 UTC (rev 7156) +++ trunk/build/ci.build.xml 2008-01-19 22:52:43 UTC (rev 7157) @@ -20,6 +20,7 @@ <deploySnapshotPom pom="${parent.pom}" /> <deploySnapshot pom="${core.pom}" jar="${lib.dir}/jboss-seam.jar" srcjar="${lib.dir}/src/jboss-seam-sources.jar" /> <deploySnapshot pom="${debug.pom}" jar="${lib.dir}/jboss-seam-debug.jar" srcjar="${lib.dir}/src/jboss-seam-debug-sources.jar"/> + <deploySnapshot pom="${jbas5.pom}" jar="${lib.dir}/jboss-seam-jbas5.jar" srcjar="${lib.dir}/src/jboss-seam-jbas5-sources.jar"/> <deploySnapshot pom="${gen.pom}" jar="${lib.dir}/jboss-seam-gen.jar" srcjar="${lib.dir}/src/jboss-seam-gen-sources.jar"/> <deploySnapshot pom="${ioc.pom}" jar="${lib.dir}/jboss-seam-ioc.jar" srcjar="${lib.dir}/src/jboss-seam-ioc-sources.jar"/> <deploySnapshot pom="${mail.pom}" jar="${lib.dir}/jboss-seam-mail.jar" srcjar="${lib.dir}/src/jboss-seam-mail-sources.jar"/> Modified: trunk/build/classpath.tmpl =================================================================== (Binary files differ) Modified: trunk/build/common.build.xml =================================================================== --- trunk/build/common.build.xml 2008-01-19 22:24:19 UTC (rev 7156) +++ trunk/build/common.build.xml 2008-01-19 22:52:43 UTC (rev 7157) @@ -95,6 +95,7 @@ <install pom="${parent.pom}" /> <pomfile name="core.pom" value="${build.dir}/core.pom.xml" /> <pomfile name="debug.pom" value="${build.dir}/debug.pom.xml" /> + <pomfile name="jbas5.pom" value="${build.dir}/jbas5.pom.xml" /> <pomfile name="gen.pom" value="${build.dir}/gen.pom.xml" /> <pomfile name="ioc.pom" value="${build.dir}/ioc.pom.xml" /> <pomfile name="mail.pom" value="${build.dir}/mail.pom.xml" /> @@ -108,6 +109,7 @@ <target name="copyseamdependencies" if="mavenized.property" unless="copyseamdependenciesdone" depends="initcopy, initpoms"> <copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="runtime" /> <copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="runtime" /> + <copyDependencies id="jbas5" pom="${jbas5.pom}" todir="${lib.dir}" scope="runtime" /> <copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="runtime" /> <copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="runtime" /> <copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="runtime" /> @@ -115,6 +117,7 @@ <copyDependencies id="ui" pom="${ui.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="jbas5" pom="${jbas5.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" /> @@ -127,6 +130,7 @@ <artifact:dependencies filesetId="seam.fileset" versionsId="seam.versions"> <dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="${complete.version}" /> <dependency groupId="org.jboss.seam" artifactId="jboss-seam-debug" version="${complete.version}" /> + <dependency groupId="org.jboss.seam" artifactId="jboss-seam-jbas5" version="${complete.version}" /> <dependency groupId="org.jboss.seam" artifactId="jboss-seam-ioc" version="${complete.version}" /> <dependency groupId="org.jboss.seam" artifactId="jboss-seam-mail" version="${complete.version}" /> <dependency groupId="org.jboss.seam" artifactId="jboss-seam-pdf" version="${complete.version}" /> @@ -196,6 +200,7 @@ <propertyref name="ioc.pom" /> <propertyref name="mail.pom" /> <propertyref name="debug.pom" /> + <propertyref name="jbas5.pom" /> <propertyref name="testng.jvmargs"/> </propertyset> </ant> @@ -229,6 +234,7 @@ <propertyref name="ioc.pom" /> <propertyref name="mail.pom" /> <propertyref name="debug.pom" /> + <propertyref name="jbas5.pom" /> <propertyref name="testng.jvmargs"/> </propertyset> </ant> Added: trunk/build/jbas5.pom.xml =================================================================== --- trunk/build/jbas5.pom.xml (rev 0) +++ trunk/build/jbas5.pom.xml 2008-01-19 22:52:43 UTC (rev 7157) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-jbas5</artifactId> + <parent> + <groupId>org.jboss.seam</groupId> + <artifactId>parent</artifactId> + <version&gt;@seam.version(a)&lt;/version&gt; + </parent> + <description>Seam integration with JBoss AS 5</description> + + <!-- See parent pom for notes on how to declare dependencies --> + + <dependencies> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + </dependency> + + </dependencies> + +</project> \ No newline at end of file Property changes on: trunk/build/jbas5.pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-01-19 22:24:19 UTC (rev 7156) +++ trunk/build.xml 2008-01-19 22:52:43 UTC (rev 7157) @@ -18,6 +18,7 @@ <property name="classes.ioc.dir" value="${classes.dir}/iocclasses" /> <property name="classes.mail.dir" value="${classes.dir}/mailclasses" /> <property name="classes.debug.dir" value="${classes.dir}/debugclasses" /> + <property name="classes.jbas5.dir" value="${classes.dir}/jbas5classes" /> <property name="classes.remoting.dir" value="${classes.dir}/remotingclasses" /> <property name="classes.gen.dir" value="${classes.dir}/genclasses" /> <property name="classes.test.dir" value="${classes.dir}/testclasses" /> @@ -32,6 +33,7 @@ <property name="src.ioc.dir" value="src/ioc" /> <property name="src.mail.dir" value="src/mail" /> <property name="src.debug.dir" value="src/debug" /> + <property name="src.jbas5.dir" value="src/jbas5" /> <property name="src.gen.dir" value="src/gen" /> <property name="src.remoting.dir" value="src/remoting" /> <property name="src.test.dir" value="src/test" /> @@ -62,6 +64,7 @@ <property name="dist.src.ioc.dir" value="${dist.dir}/src/ioc" /> <property name="dist.src.mail.dir" value="${dist.dir}/src/mail" /> <property name="dist.src.debug.dir" value="${dist.dir}/src/debug" /> + <property name="dist.src.jbas5.dir" value="${dist.dir}/src/jbas5" /> <property name="dist.src.gen.dir" value="${dist.dir}/src/gen" /> <property name="dist.src.remoting.dir" value="${dist.dir}/src/remoting" /> <property name="dist.src.test.dir" value="${dist.dir}/src/test" /> @@ -150,7 +153,7 @@ <delete dir="${lib.dir}" quiet="${quietclean}" /> </target> - <target name="build" depends="jarcore,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui" description="Build all four distribution .jar files" /> + <target name="build" depends="jarcore,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarjbas5" description="Build all distribution .jar files" /> <target name="select-compiler"> <available classname="org.eclipse.jdt.core.JDTCompilerAdapter" property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" /> @@ -239,8 +242,21 @@ <target name="jardebug" depends="compiledebug" description="Build the distribution .jar file for the Debug package"> <archive classesdir="${classes.debug.dir}" module="jboss-seam-debug" pom="${debug.pom}" srcdir="${src.debug.dir}"/> </target> + + <!-- ########################### JBAS5 TARGETS ###########################--> + <target name="initjbas5" depends="init, jarcore"> + <init classesdir="${classes.jbas5.dir}" srcdir="${src.jbas5.dir}" modulename="jbas5" pom="${jbas5.pom}" /> + </target> + <target name="compilejbas5" depends="initjbas5, select-compiler"> + <compile classesdir="${classes.jbas5.dir}" srcdir="${src.jbas5.dir}" classpath="compile.jbas5.path" /> + </target> + + <target name="jarjbas5" depends="compilejbas5" description="Build the distribution .jar file for the JBAS5 integration package"> + <archive classesdir="${classes.jbas5.dir}" module="jboss-seam-jbas5" pom="${jbas5.pom}" srcdir="${src.jbas5.dir}"/> + </target> + <!-- ########################### GEN TARGETS ###########################--> <target name="initgen" depends="init">