[seam-commits] Seam SVN: r8026 - in trunk: build and 6 other directories.

Author: pete.muir(a)jboss.org Date: 2008-04-25 11:32:51 -0400 (Fri, 25 Apr 2008) New Revision: 8026 Removed: trunk/examples/dvdstore/lib/standard.jar trunk/examples/remoting/gwt/lib/ trunk/extras/emma/ trunk/seam-gen/lib/ Modified: trunk/build.xml trunk/build/common.build.xml trunk/build/gen.pom.xml trunk/build/root.pom.xml trunk/examples/build.xml trunk/examples/remoting/gwt/build.xml trunk/examples/wiki/build.xml trunk/seam-gen/build.xml Log: move more jars Modified: trunk/build/common.build.xml =================================================================== --- trunk/build/common.build.xml 2008-04-25 14:49:24 UTC (rev 8025) +++ trunk/build/common.build.xml 2008-04-25 15:32:51 UTC (rev 8026) @@ -156,6 +156,13 @@ </copyInlineDependencies> <property name="copyjbossembeddeddone" value="true" /> </target> + + <target name="getemma"> + <inlineDependency id="emma" scope="runtime"> + <dependency groupId="emma" artifactId="emma" version="2.0.5312" /> + <dependency groupId="emma" artifactId="emma_ant" version="2.0.5312" /> + </inlineDependency> + </target> <macrodef name="deploySeam"> <attribute name="repositoryId" /> Modified: trunk/build/gen.pom.xml =================================================================== --- trunk/build/gen.pom.xml 2008-04-25 14:49:24 UTC (rev 8025) +++ trunk/build/gen.pom.xml 2008-04-25 15:32:51 UTC (rev 8026) @@ -1,26 +1,63 @@ <?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-gen</artifactId> - <parent> - <groupId>org.jboss.seam</groupId> - <artifactId>parent</artifactId> - <version&gt;@seam.version(a)&lt;/version&gt; - </parent> - - <!-- See parent pom for notes on how to declare dependencies --> + 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-gen</artifactId> + <parent> + <groupId>org.jboss.seam</groupId> + <artifactId>parent</artifactId> + <version&gt;@seam.version(a)&lt;/version&gt; + </parent> - <dependencies> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - </dependencies> + <!-- See parent pom for notes on how to declare dependencies --> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-tools</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>freemarker</groupId> + <artifactId>freemarker</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.core</groupId> + <artifactId>runtime</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.eclipse</groupId> + <artifactId>text</artifactId> + <scope>runtime</scope> + </dependency> + + </dependencies> + + </project> \ No newline at end of file Modified: trunk/build/root.pom.xml =================================================================== --- trunk/build/root.pom.xml 2008-04-25 14:49:24 UTC (rev 8025) +++ trunk/build/root.pom.xml 2008-04-25 15:32:51 UTC (rev 8026) @@ -963,6 +963,65 @@ <version>1.4.2</version> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-tools</artifactId> + <version>3.2.0.ga</version> + </dependency> + + <dependency> + <groupId>freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.8</version> + </dependency> + + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.2</version> + </dependency> + + <dependency> + <groupId>org.eclipse.core</groupId> + <artifactId>runtime</artifactId> + <version>3.2.0-v20060303</version> + <exclusions> + <exclusion> + <groupId>org.eclipse</groupId> + <artifactId>osgi</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.core</groupId> + <artifactId>jobs</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.equinox</groupId> + <artifactId>registry</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.equinox</groupId> + <artifactId>preferences</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.core</groupId> + <artifactId>contenttype</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.eclipse</groupId> + <artifactId>text</artifactId> + <version>3.2.0-v20060605-1400</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.core</groupId> + <artifactId>commands</artifactId> + </exclusion> + </exclusions> + </dependency> + + </dependencies> </dependencyManagement> Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-04-25 14:49:24 UTC (rev 8025) +++ trunk/build.xml 2008-04-25 15:32:51 UTC (rev 8026) @@ -106,11 +106,6 @@ <property name="javac.debug" value="true" /> <property name="javac.deprecation" value="false" /> - <path id="classpath.emma"> - <pathelement location="${basedir}/extras/emma/emma.jar" /> - <pathelement location="${basedir}/extras/emma/emma_ant.jar" /> - </path> - <fileset id="eejb.conf" dir="${eejb.conf.dir}"> <include name="**/*.*" /> </fileset> @@ -666,7 +661,7 @@ </target> - <target name="unittest" depends="inittestcore,compiletest" description="Run the Unit tests"> + <target name="unittest" depends="inittestcore,compiletest,getemma" description="Run the Unit tests"> <taskdef resource="testngtasks" classpathref="test.core.path" /> <testng> <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" /> @@ -674,7 +669,7 @@ <classpath> <path path="${classes.test.core.dir}" /> <path path="${classes.test.dir}" /> - <path refid="classpath.emma" /> + <path refid="runtime.emma.path" /> <path refid="test.core.path" /> <pathelement location="${lib.dir}/jboss-seam-remoting.jar" /> </classpath> @@ -715,8 +710,8 @@ </copy> </target> - <target name="instrumentcore" depends="compilecore"> - <taskdef resource="emma_ant.properties" classpathref="classpath.emma" /> + <target name="instrumentcore" depends="compilecore,getemma"> + <taskdef resource="emma_ant.properties" classpathref="runtime.emma.path" /> <mkdir dir="${coverage.dir}/core" /> <emma> <instr instrpath="${classes.core.dir}" mode="overwrite" metadatafile="${coverage.dir}/coveragecore.em"> @@ -729,8 +724,8 @@ </emma> </target> - <target name="instrumentmail" depends="compilemail"> - <taskdef resource="emma_ant.properties" classpathref="classpath.emma" /> + <target name="instrumentmail" depends="compilemail,getemma"> + <taskdef resource="emma_ant.properties" classpathref="runtime.emma.path" /> <mkdir dir="${coverage.dir}/mail" /> <emma> <instr instrpath="${classes.mail.dir}" mode="overwrite" metadatafile="${coverage.dir}/coveragemail.em"> @@ -742,8 +737,8 @@ <!-- Deprecated --> <target name="coverage" depends="instrumentcore, instrumentmail, testall, coveragereport" /> - <target name="coveragereport" description="Create the coverage report"> - <taskdef resource="emma_ant.properties" classpathref="classpath.emma" /> + <target name="coveragereport" depends="getemma" description="Create the coverage report"> + <taskdef resource="emma_ant.properties" classpathref="runtime.emma.path" /> <emma> <report depth="method"> <sourcepath> Modified: trunk/examples/build.xml =================================================================== --- trunk/examples/build.xml 2008-04-25 14:49:24 UTC (rev 8025) +++ trunk/examples/build.xml 2008-04-25 15:32:51 UTC (rev 8026) @@ -465,10 +465,6 @@ <path refid="build.classpath.extras" /> </path> - <path id="emma.classpath"> - <fileset dir="${seam.dir}/extras/emma/*.jar" /> - </path> - <path id="test.classpath"> <path path="${test.dir}" /> <fileset dir="${lib.dir}/test"> @@ -483,7 +479,6 @@ <path path="${eejb.conf.dir}" /> <path refid="test.classpath.extras" /> <path refid="build.classpath.extras" /> - <path refid="emma.classpath" /> <path location="${seam.dir}/src/test/resources/log4j.xml" /> </path> @@ -912,11 +907,6 @@ You can test the example by running the test target. --> - <path id="emma.classpath"> - <pathelement location="${seam.dir}/extras/emma/emma.jar" /> - <pathelement location="${seam.dir}/extras/emma/emma_ant.jar" /> - </path> - <target name="validateConfiguration" description="Validate XML Configuration files"> <echo message="Validating configuaration files for ${Name}" /> <ant antfile="${build.dir}/validate.xml" target="validateConfiguration"> @@ -952,7 +942,7 @@ </copy> </target> - <target name="test" depends="buildtest, copyjbossembedded" description="Run the tests"> + <target name="test" depends="buildtest, copyjbossembedded,getemma" description="Run the tests"> <taskdef resource="testngtasks" classpathref="build.classpath" /> <testng outputdir="${test-report.dir}"> <jvmarg value="-Xmx800M" /> @@ -960,13 +950,16 @@ <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" /> <jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}" /> <jvmarg value="${testng.jvmargs}" /> - <classpath refid="test.classpath" /> + <classpath> + <path refid="test.classpath" /> + <path refid="runtime.emma.path" /> + </classpath> <xmlfileset dir="${src.test.dir}" includes="**/testng.xml" /> </testng> <echo>You can increase the logging by editing bootstrap/log4j.xml</echo> </target> - <target name="testclass" depends="buildtest, copyjbossembedded" description="Run a specific test"> + <target name="testclass" depends="buildtest, copyjbossembedded,getemma" description="Run a specific test"> <taskdef resource="testngtasks" classpathref="build.classpath" /> <testng outputdir="${test-report.dir}" testname="${className}" suitename="${className}" > <jvmarg value="-Xmx800M" /> @@ -974,7 +967,10 @@ <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" /> <jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}" /> <jvmarg value="${testng.jvmargs}" /> - <classpath refid="test.classpath" /> + <classpath> + <path refid="test.classpath" /> + <path refid="runtime.emma.path" /> + </classpath> <classfileset dir="${test.dir}" includes="**/${className}.class"/> </testng> <echo>You can increase the logging by editing bootstrap/log4j.xml</echo> Deleted: trunk/examples/dvdstore/lib/standard.jar =================================================================== (Binary files differ) Modified: trunk/examples/remoting/gwt/build.xml =================================================================== --- trunk/examples/remoting/gwt/build.xml 2008-04-25 14:49:24 UTC (rev 8025) +++ trunk/examples/remoting/gwt/build.xml 2008-04-25 15:32:51 UTC (rev 8026) @@ -11,12 +11,17 @@ <property name="gwt.lib" value="yes" /> <import file="../../build.xml" /> + + <inlineDependencies id="gwttasks" scope="runtime"> + <dependency groupId="de.samaflost" artifactId="gwttasks" version="1" /> + </inlineDependencies> <!-- EXTRAS --> <taskdef uri="antlib:de.samaflost.gwttasks" resource="de/samaflost/gwttasks/antlib.xml" - classpath="./lib/gwttasks.jar" /> + classpathref="runtime.gwttasks.path" + /> <property file="build.properties" /> Modified: trunk/examples/wiki/build.xml =================================================================== --- trunk/examples/wiki/build.xml 2008-04-25 14:49:24 UTC (rev 8025) +++ trunk/examples/wiki/build.xml 2008-04-25 15:32:51 UTC (rev 8026) @@ -78,9 +78,6 @@ <include name="*.jar" /> </fileset> - <!-- Add EMMA to the classpath for coverage support --> - <pathelement location="${seam.dir}/extras/emma/emma.jar" /> - <pathelement location="${seam.dir}/extras/emma/emma_ant.jar" /> </path> <path id="tools.classpath"> @@ -403,7 +400,7 @@ <!-- ######################## TESTS ################## --> - <target name="compiletests" depends="clean, compileclasses, copyjbossembedded" + <target name="compiletests" depends="clean, compileclasses, copyjbossembedded,getemma" description="Compile the test Java source code"> <javac classpathref="test.classpath" @@ -411,7 +408,10 @@ debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="${javac.nowarn}"> - <classpath path="${classes.dir}"/> + <classpath> + <path refid="test.classpath" /> + <path refid="runtime.emma.path" /> + </classpath> <src path="${src.test.dir}" /> </javac> @@ -470,11 +470,14 @@ </target> - <target name="test" depends="configuretests" + <target name="test" depends="configuretests,getemma" description="Run tests defined in *.tng.xml"> <taskdef resource="testngtasks" classpathref="test.classpath"/> <testng outputdir="${test.output.dir}"> - <classpath refid="test.classpath"/> + <classpath> + <path refid="test.classpath" /> + <path refid="runtime.emma.path" /> + </classpath> <xmlfileset dir="${src.test.dir}" includes="*.tng.xml" /> <jvmarg line="${testng.jvmargs}"/> <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" /> Modified: trunk/seam-gen/build.xml =================================================================== --- trunk/seam-gen/build.xml 2008-04-25 14:49:24 UTC (rev 8025) +++ trunk/seam-gen/build.xml 2008-04-25 15:32:51 UTC (rev 8026) @@ -8,8 +8,8 @@ <property file="./build.properties" /> <import file="${seam.dir}/build/common.build.xml" /> - <target name="init"> - <path id="seam-gen.path" path="${seam.dir}/lib/jboss-seam-gen.jar" /> + <target name="init" depends="initpoms"> + <path id="seam-gen.path" path="${seam.dir}/lib/jboss-seam-gen.jar" /> <!-- taskdefs --> <taskdef name="normalizeProjectName" @@ -38,7 +38,9 @@ <taskdef name="pathFixer" classname="org.jboss.seam.tool.FixPathTask" - classpathref="seam-gen.path"/> + classpathref="seam-gen.path"/> + + <copyDependencies pom="${gen.pom}" id="gen" scope="runtime" todir="${lib.dir}/gen" /> </target> <target name="init-properties" depends="init"> @@ -1048,7 +1050,7 @@ <target name="init-generate"> <path id="htools.classpath"> - <fileset dir="lib"> + <fileset dir="${lib.dir}/gen"> <include name="*.jar"/> </fileset> <pathelement path="../lib/dom4j.jar" />