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

Author: pete.muir(a)jboss.org Date: 2008-07-13 10:33:30 -0400 (Sun, 13 Jul 2008) New Revision: 8451 Added: trunk/build/resteasy.pom.xml trunk/src/resteasy/ Modified: trunk/build.xml trunk/build/build.xml trunk/build/ci.build.xml trunk/build/classpath.tmpl trunk/build/common.build.xml trunk/build/root.pom.xml Log: Add resteasy module Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2008-07-13 14:32:53 UTC (rev 8450) +++ trunk/build/build.xml 2008-07-13 14:33:30 UTC (rev 8451) @@ -49,6 +49,7 @@ <deployWithSources pom="${ui.pom}" jar="${lib.dir}/jboss-seam-ui.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-ui-sources.jar"/> <deployWithSources pom="${jbas5.pom}" jar="${lib.dir}/interop/jboss-seam-jbas5.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/interop/jboss-seam-jbas5-sources.jar"/> <deployWithSources pom="${jul.pom}" jar="${lib.dir}/interop/jboss-seam-jul.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/interop/jboss-seam-jul-sources.jar"/> + <deployWithSources pom="${resteasy.pom}" jar="${lib.dir}/jboss-seam-resteasy.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-resteasy-sources.jar"/> <deployExample name="booking" repositoryId="offline.repository.jboss.org"/> <deployExampleNoDs name="numberguess" repositoryId="offline.repository.jboss.org"/> <deployExample name="dvd" path="${seam.dir}/examples/dvdstore" repositoryId="offline.repository.jboss.org"/> Modified: trunk/build/ci.build.xml =================================================================== --- trunk/build/ci.build.xml 2008-07-13 14:32:53 UTC (rev 8450) +++ trunk/build/ci.build.xml 2008-07-13 14:33:30 UTC (rev 8451) @@ -26,6 +26,7 @@ <deploySnapshot pom="${jbas5.pom}" jar="${lib.dir}/interop/jboss-seam-jbas5.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jbas5-sources.jar"/> <deploySnapshot pom="${jul.pom}" jar="${lib.dir}/interop/jboss-seam-jul.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jul-sources.jar"/> <deploySnapshot pom="${wicket.pom}" jar="${lib.dir}/jboss-seam-wicket.jar" srcjar="${lib.dir}/src/jboss-seam-wicket-sources.jar"/> + <deploySnapshot pom="${resteasy.pom}" jar="${lib.dir}/jboss-seam-resteasy.jar" srcjar="${lib.dir}/src/jboss-seam-resteasy-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 =================================================================== --- trunk/build/classpath.tmpl 2008-07-13 14:32:53 UTC (rev 8450) +++ trunk/build/classpath.tmpl 2008-07-13 14:33:30 UTC (rev 8451) @@ -4,6 +4,7 @@ <classpathentry kind="src" path="ui/src/main/java"/> <classpathentry kind="src" path="src/wicket"/> <classpathentry kind="src" path="src/remoting"/> + <classpathentry kind="src" path="src/resteasy"/> <classpathentry kind="src" path="src/ioc" excluding="org/jboss/seam/ioc/microcontainer/**/*"/> <classpathentry kind="src" path="src/mail"/> <classpathentry kind="src" path="src/pdf"/> Modified: trunk/build/common.build.xml =================================================================== --- trunk/build/common.build.xml 2008-07-13 14:32:53 UTC (rev 8450) +++ trunk/build/common.build.xml 2008-07-13 14:33:30 UTC (rev 8451) @@ -102,6 +102,7 @@ <pomfile name="wicket.pom" value="${build.dir}/wicket.pom.xml" /> <pomfile name="jbas5.pom" value="${build.dir}/jbas5.pom.xml" /> <pomfile name="jul.pom" value="${build.dir}/jul.pom.xml" /> + <pomfile name="resteasy.pom" value="${build.dir}/resteasy.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" /> @@ -120,8 +121,9 @@ <copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="runtime" /> <copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="runtime" /> <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}" 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" /> @@ -129,6 +131,7 @@ <copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" /> <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" /> <property name="copyseamdependenciesdone" value="true" /> @@ -143,6 +146,7 @@ <dependency groupId="org.jboss.seam" artifactId="jboss-seam-mail" version="${complete.version}" /> <dependency groupId="org.jboss.seam" artifactId="jboss-seam-pdf" version="${complete.version}" /> <dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" /> + <dependency groupId="org.jboss.seam" artifactId="jboss-seam-resteasy" version="${complete.version}" /> <dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="${complete.version}" /> </copyInlineDependencies> <property name="copyseamdone" value="true" /> @@ -178,6 +182,7 @@ <deploy pom="${core.pom}" jar="${seam.dir}/lib/jboss-seam.jar" repositoryId="@{repositoryId}" /> <deploy pom="${ui.pom}" jar="${seam.dir}/lib/jboss-seam-ui.jar" repositoryId="@{repositoryId}" /> <deploy pom="${remoting.pom}" jar="${seam.dir}/lib/jboss-seam-remoting.jar" repositoryId="@{repositoryId}" /> + <deploy pom="${resteasy.pom}" jar="${seam.dir}/lib/jboss-seam-resteasy.jar" repositoryId="@{repositoryId}" /> <deploy pom="${pdf.pom}" jar="${seam.dir}/lib/jboss-seam-pdf.jar" repositoryId="@{repositoryId}" /> <deploy pom="${mail.pom}" jar="${seam.dir}/lib/jboss-seam-mail.jar" repositoryId="@{repositoryId}" /> <deploy pom="${ioc.pom}" jar="${seam.dir}/lib/jboss-seam-ioc.jar" repositoryId="@{repositoryId}" /> @@ -202,6 +207,7 @@ <propertyref name="parent.pom" /> <propertyref name="ui.pom" /> <propertyref name="remoting.pom" /> + <propertyref name="resteasy.pom" /> <propertyref name="gen.pom" /> <propertyref name="pdf.pom" /> <propertyref name="ioc.pom" /> @@ -237,6 +243,7 @@ <propertyref name="parent.pom" /> <propertyref name="ui.pom" /> <propertyref name="remoting.pom" /> + <propertyref name="resteasy.pom" /> <propertyref name="gen.pom" /> <propertyref name="pdf.pom" /> <propertyref name="ioc.pom" /> @@ -271,6 +278,7 @@ <propertyref name="parent.pom" /> <propertyref name="ui.pom" /> <propertyref name="remoting.pom" /> + <propertyref name="resteasy.pom" /> <propertyref name="gen.pom" /> <propertyref name="pdf.pom" /> <propertyref name="ioc.pom" /> @@ -339,6 +347,7 @@ <outputDependencyReport module="pdf" /> <outputDependencyReport module="ioc" /> <outputDependencyReport module="wicket" /> + <outputDependencyReport module="resteasy" /> <outputDependencyReport module="jbas5" /> <outputDependencyReport module="jul" /> <echo>Dependency Report written to ${seam.dir}/dependency-report.txt</echo> Added: trunk/build/resteasy.pom.xml =================================================================== --- trunk/build/resteasy.pom.xml (rev 0) +++ trunk/build/resteasy.pom.xml 2008-07-13 14:33:30 UTC (rev 8451) @@ -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-resteasy</artifactId> + <parent> + <groupId>org.jboss.seam</groupId> + <artifactId>parent</artifactId> + <version&gt;@seam.version(a)&lt;/version&gt; + </parent> + + <!-- See root pom for notes on how to declare dependencies --> + + <dependencies> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + </dependency> + + </dependencies> + +</project> \ No newline at end of file Property changes on: trunk/build/resteasy.pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/build/root.pom.xml =================================================================== --- trunk/build/root.pom.xml 2008-07-13 14:32:53 UTC (rev 8450) +++ trunk/build/root.pom.xml 2008-07-13 14:33:30 UTC (rev 8451) @@ -88,6 +88,12 @@ <artifactId>jboss-seam-remoting</artifactId> <version&gt;@seam.version(a)&lt;/version&gt; </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-resteasy</artifactId> + <version&gt;@seam.version(a)&lt;/version&gt; + </dependency> <dependency> <groupId>org.jboss.seam</groupId> Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-07-13 14:32:53 UTC (rev 8450) +++ trunk/build.xml 2008-07-13 14:33:30 UTC (rev 8451) @@ -21,6 +21,7 @@ <property name="classes.wicket.dir" value="${classes.dir}/wicketclasses" /> <property name="classes.jbas5.dir" value="${classes.dir}/jbas5classes" /> <property name="classes.jul.dir" value="${classes.dir}/julclasses" /> + <property name="classes.resteasy.dir" value="${classes.dir}/resteasyclasses" /> <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" /> @@ -39,6 +40,7 @@ <property name="src.wicket.dir" value="src/wicket" /> <property name="src.jbas5.dir" value="src/interop/jbas5" /> <property name="src.jul.dir" value="src/interop/jul" /> + <property name="src.resteasy.dir" value="src/resteasy" /> <property name="src.gen.dir" value="src/gen" /> <property name="src.remoting.dir" value="src/remoting" /> <property name="src.test.dir" value="src/test" /> @@ -72,6 +74,7 @@ <property name="dist.src.wicket.dir" value="${dist.dir}/src/wicket" /> <property name="dist.src.jbas5.dir" value="${dist.dir}/src/interop/jbas5" /> <property name="dist.src.jul.dir" value="${dist.dir}/src/interop/jul" /> + <property name="dist.src.resteasy.dir" value="${dist.dir}/src/resteasy" /> <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" /> @@ -155,7 +158,7 @@ <delete dir="${lib.dir}" quiet="${quietclean}" /> </target> - <target name="build" depends="jarcore,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarjbas5,jarwicket, jarjul" description="Build all distribution .jar files" /> + <target name="build" depends="jarcore,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarjbas5,jarwicket, jarjul, jarresteasy" 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" /> @@ -302,7 +305,21 @@ <target name="jarjul" depends="compilejul" description="Build the distribution .jar file for the JUL -> Log4J bridge integration package"> <archive classesdir="${classes.jul.dir}" module="jboss-seam-jul" pom="${jul.pom}" srcdir="${src.jul.dir}" outputdir="${lib.dir}/interop" /> </target> + + <!-- ########################### RESTeasy TARGETS ###########################--> + <target name="initresteasy" depends="init, jarcore"> + <init classesdir="${classes.resteasy.dir}" srcdir="${src.resteasy.dir}" modulename="resteasy" pom="${resteasy.pom}" /> + </target> + + <target name="compileresteasy" depends="initresteasy, select-compiler"> + <compile classesdir="${classes.resteasy.dir}" srcdir="${src.resteasy.dir}" classpath="compile.resteasy.path" /> + </target> + + <target name="jarresteasy" depends="compileresteasy" description="Build the distribution .jar file for the resteasy -> Log4J bridge integration package"> + <archive classesdir="${classes.resteasy.dir}" module="jboss-seam-resteasy" pom="${resteasy.pom}" srcdir="${src.resteasy.dir}" outputdir="${lib.dir}" /> + </target> + <!-- ########################### GEN TARGETS ###########################--> <target name="initgen" depends="init"> @@ -469,6 +486,7 @@ <copysource destdir="${dist.src.wicket.dir}" srcdir="${src.wicket.dir}" /> <copysource destdir="${dist.src.jbas5.dir}" srcdir="${src.jbas5.dir}" /> <copysource destdir="${dist.src.jul.dir}" srcdir="${src.jul.dir}" /> + <copysource destdir="${dist.src.resteasy.dir}" srcdir="${src.resteasy.dir}" /> <copysource destdir="${dist.src.gen.dir}" srcdir="${src.gen.dir}" /> <copysource destdir="${dist.src.test.dir}" srcdir="${src.test.dir}" /> @@ -976,6 +994,7 @@ <propertyref name="debug.pom" /> <propertyref name="wicket.pom" /> <propertyref name="jbas5.pom" /> + <propertyref name="resteasy.pokm" /> <propertyref name="testng.jvmargs"/> </propertyset> </ant> @@ -988,6 +1007,7 @@ <dependenciesWithSources id="wicket" scope="compile" pom="${wicket.pom}" /> <dependenciesWithSources id="jbas5" scope="compile" pom="${jbas5.pom}" /> <dependenciesWithSources id="jul" scope="compile" pom="${jul.pom}" /> + <dependenciesWithSources id="resteasy" scope="compile" pom="${resteasy.pom}" /> <dependenciesWithSources id="gen" scope="compile" pom="${gen.pom}" /> <dependenciesWithSources id="ioc" scope="compile" pom="${ioc.pom}" /> <dependenciesWithSources id="mail" scope="compile" pom="${mail.pom}" /> @@ -1007,6 +1027,7 @@ <dependencies id="wicket" scope="compile" pom="${wicket.pom}" /> <dependencies id="jbas5" scope="compile" pom="${jbas5.pom}" /> <dependencies id="jul" scope="compile" pom="${jul.pom}" /> + <dependencies id="resteasy" scope="compile" pom="${resteasy.pom}" /> <dependencies id="gen" scope="compile" pom="${gen.pom}" /> <dependencies id="ioc" scope="compile" pom="${ioc.pom}" /> <dependencies id="mail" scope="compile" pom="${mail.pom}" /> @@ -1024,6 +1045,7 @@ <path refid="compile.ui.path" /> <path refid="compile.jbas5.path" /> <path refid="compile.jul.path" /> + <path refid="compile.resteasy.path" /> <path refid="compile.wicket.path" /> </eclipseClasspath> </target>