Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4258 - in labs/jbossrules/trunk: . documentation/manual drools-compiler drools-core drools-decisiontables drools-jsr94 lib
|
From: <jbo...@li...> - 2006-05-16 23:32:42
|
Author: mar...@jb... Date: 2006-05-16 19:32:23 -0400 (Tue, 16 May 2006) New Revision: 4258 Added: labs/jbossrules/trunk/build.xml labs/jbossrules/trunk/lib/ labs/jbossrules/trunk/lib/maven-artifact-ant-2.0.4-dep.jar Modified: labs/jbossrules/trunk/documentation/manual/build.xml labs/jbossrules/trunk/drools-compiler/pom.xml labs/jbossrules/trunk/drools-core/pom.xml labs/jbossrules/trunk/drools-decisiontables/pom.xml labs/jbossrules/trunk/drools-jsr94/pom.xml labs/jbossrules/trunk/pom.xml Log: -moved to ant build system Added: labs/jbossrules/trunk/build.xml =================================================================== --- labs/jbossrules/trunk/build.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/build.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -0,0 +1,424 @@ +<project name="Drools" basedir="." xmlns:artifact="urn:maven-artifact-ant"> + <property name="version" value="3.0-RC-3"/> + + <target name="init" depends="init-maven"> + <mkdir dir="target/dist" /> + <mkdir dir="target/docs" /> + </target> + + <target name="init-maven"> + <path id="maven.classpath"> + <pathelement location="lib/maven-artifact-ant-2.0.4-dep.jar" /> + </path> + + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"> + <classpath refid="maven.classpath"/> + </typedef> + + <artifact:remoteRepository id="jboss.repository" url="http://repository.jboss.com/maven2" /> + + <artifact:remoteRepository id="ibiblio.repository" url="http://www.ibiblio.org/maven2" /> + + <artifact:remoteRepository id="local.repository" url="file://${basedir}/repository" /> + + <artifact:dependencies pathId="parent.dependency.classpath" filesetId="parent.dependency.fileset" verbose="false"> + <pom file="pom.xml"/> + </artifact:dependencies> + + </target> + + <!-- Note this is a hack because maven from ant will not install the parent pom !!!! --> + <target name="install-parent-pom"> + <mkdir dir="${user.home}/.m2/repository/org/drools/drools/${version}" /> + <copy file="pom.xml" tofile="${user.home}/.m2/repository/org/drools/drools/${version}/drools-${version}.pom" /> + </target> + + <target name="compile-core" depends="init,install-parent-pom"> + <antcall target="compile-module"> + <param name="module" value="drools-core"/> + </antcall> + </target> + + <target name="test-core" depends="compile-core"> + <antcall target="test-module"> + <param name="module" value="drools-core"/> + </antcall> + </target> + + <target name="build-core" depends="test-core"> + <antcall target="build-module"> + <param name="module" value="drools-core"/> + </antcall> + </target> + + <target name="clean-core"> + <delete dir="drools-core/target"/> + </target> + + <target name="compile-compiler" depends="build-core"> + <antcall target="compile-module"> + <param name="module" value="drools-compiler"/> + </antcall> + </target> + + <target name="test-compiler" depends="compile-compiler"> + <antcall target="test-module"> + <param name="module" value="drools-compiler"/> + </antcall> + </target> + + <target name="build-compiler" depends="test-compiler"> + <antcall target="build-module"> + <param name="module" value="drools-compiler"/> + </antcall> + </target> + + <target name="clean-compiler"> + <delete dir="drools-target/target"/> + </target> + + <target name="compile-decisiontables" depends="build-compiler"> + <antcall target="compile-module"> + <param name="module" value="drools-decisiontables"/> + </antcall> + </target> + + <target name="test-decisiontables" depends="compile-decisiontables"> + <antcall target="test-module"> + <param name="module" value="drools-decisiontables"/> + </antcall> + </target> + + <target name="build-decisiontables" depends="test-decisiontables"> + <antcall target="build-module"> + <param name="module" value="drools-decisiontables"/> + </antcall> + </target> + + <target name="clean-decisiontables"> + <delete dir="drools-decisiontables/target"/> + </target> + + <target name="compile-jsr94" depends="init"> + <antcall target="compile-module"> + <param name="module" value="drools-jsr94"/> + </antcall> + </target> + + <target name="test-jsr94" depends="compile-jsr94"> + <antcall target="test-module"> + <param name="module" value="drools-jsr94"/> + </antcall> + </target> + + <target name="build-jsr94" depends="test-jsr94"> + <antcall target="build-module"> + <param name="module" value="drools-jsr94"/> + </antcall> + </target> + + <target name="clean-jsr94"> + <delete dir="drools-jsr94/target"/> + </target> + + <target name="compile-all" depends="compile-core, compile-compiler, compile-decisiontables, compile-jsr94"> + </target> + + <target name="test-all" depends="test-core, test-compiler, test-decisiontables, test-jsr94"> + </target> + + <target name="build-all" depends="build-core, build-compiler, build-decisiontables, build-jsr94"> + </target> + + <target name="clean-all" depends="clean-core, clean-compiler, clean-decisiontables, clean-jsr94"> + <delete dir="target" /> + + <delete> + <fileset dir="drools-ide/lib" includes="*"/> + </delete> + + <delete> + <fileset dir="repository" includes="*"/> + </delete> + + </target> + + <target name="compile-module"> + <mkdir dir="${module}/target"/> + <mkdir dir="${module}/target/classes"/> + + <artifact:dependencies pathId="${module}.dependency.classpath" filesetId="${module}.dependency.fileset" verbose="false"> + <pom file="${module}/pom.xml"/> + </artifact:dependencies> + + <copy todir="${module}/target/classes"> + <fileset dir="${module}/src/main/resources"/> + </copy> + + <javac srcdir="${module}/src/main/java" + destdir="${module}/target/classes"> + <classpath> + <path refid="${module}.dependency.classpath" /> + <fileset dir="target"> + <include name="drools-*-{version}.jar"/> + </fileset> + </classpath> + </javac> + </target> + + <target name="test-module" unless="test.skip"> + <mkdir dir="${module}/target/test-classes"/> + <mkdir dir="${module}/target/test-reports"/> + + <artifact:dependencies pathId="${module}.dependency.classpath" filesetId="${module}.dependency.fileset" verbose="false"> + <pom file="${module}/pom.xml"/> + </artifact:dependencies> + + <copy todir="${module}/target/test-classes"> + <fileset dir="${module}/src/test/resources"/> + </copy> + + <javac srcdir="${module}/src/test/java" + destdir="${module}/target/test-classes"> + <classpath> + <path refid="${module}.dependency.classpath" /> + <pathelement location="${module}/target/classes"/> + <fileset dir="target"> + <include name="drools-*-{version}.jar"/> + </fileset> + </classpath> + </javac> + + <junit printsummary="yes" haltonfailure="yes"> + <sysproperty key="jsr94.tck.configuration" value="${module}/target/test-classes/org/drools/jsr94/tck"/> + <classpath> + <path refid="${module}.dependency.classpath"/> + <pathelement location="${module}/target/classes"/> + <pathelement location="${module}/target/test-classes"/> + <fileset dir="target"> + <include name="drools-*-{version}.jar"/> + </fileset> + </classpath> + + <formatter type="plain"/> + + <batchtest fork="no" todir="${module}/target/test-reports"> + <fileset dir="${module}/target/test-classes"> + <include name="**/*Test.class"/> + <exclude name="**/AllTests.class"/> + <exclude name="**/Base*.class"/> + <exclude name="**/ClassLoaderTest.java" /> + <exclude name="**/RuleExecutionSetProviderTest.java" /> + </fileset> + </batchtest> + </junit> + </target> + + <target name="build-module"> + <jar destfile="${module}/target/${module}-${version}.jar" basedir="${module}/target/classes"/> + <copy file="${module}/target/${module}-${version}.jar" todir="target" /> + + <artifact:install file="target/${module}-${version}.jar"> + <pom file="${module}/pom.xml" /> + </artifact:install> + </target> + + <target name="manual" unless="skip.manual"> + <ant dir="documentation/manual" /> + </target> + + <target name="javadocs" unless="skip.javadocs"> + <javadoc + packagenames="org.drools.*" + excludepackagenames="org.drools.asm.*" + destdir="target/docs/apidocs" + author="false" + version="false"> + + <sourcepath> + <pathelement path="drools-core/src/main/java" /> + <pathelement path="drools-compiler/src/main/java" /> + <pathelement path="drools-decisiontables/src/main/java" /> + </sourcepath> + + <classpath> + <fileset dir="."> + <include name="target/drools-*.jar" /> + </fileset> + </classpath> + </javadoc> + </target> + + <target name="ydocs" unless="skip.javadocs"> + <javadoc + packagenames="org.drools.*" + excludepackagenames="org.drools.asm.*" + destdir="target/docs/apidocs" + author="false" + version="false"> + + <sourcepath> + <pathelement path="drools-core/src/main/java" /> + <pathelement path="drools-compiler/src/main/java" /> + <pathelement path="drools-decisiontables/src/main/java" /> + </sourcepath> + + <classpath> + <fileset dir="."> + <include name="target/drools-*.jar" /> + </fileset> + </classpath> + + <doclet name="ydoc.doclets.YStandard"> + <path> + <pathelement location="./ydoc/lib/ydoc.jar" /> + <pathelement location="./ydoc/lib/class2svg.jar" /> + <pathelement location="./ydoc/lib/styleed.jar" /> + <pathelement location="./ydoc/resources"/> + </path> + + <param name="-generic" value=""/> + <param name="-umlautogen" value=""/> + <param name="-filter" value="ydoc.filters.ExcludeFilter"/> + <param name="-tag" value="y.precondition"/> + <param name="-tag" value="y.postcondition"/> + <param name="-tag" value="y.complexity"/> + <param name="-tag" value="param"/> + <param name="-tag" value="return"/> + <param name="-tag" value="see"/> + <param name="-tag" value="y.uml"/> + <param name="-breakiterator"/> + </doclet> + </javadoc> + </target> + + + <target name="dist-all" depends="build-all, copy-deps, ydocs, manual, dist-src, dist-bin, dist-bin-withdeps, dist-examples"> + </target> + + <target name="dist-examples"> + <delete> + <fileset dir="drools-examples/log" includes="*"/> + </delete> + + <zip destfile="target/dist/drools-examples-${version}-src.zip"> + <zipfileset dir="." + includes="drools-examples/**" + excludes="drools-examples/target/**"/> + </zip> + </target> + + <target name="dist-src"> + <zip destfile="target/dist/drools-${version}-src.zip"> + <zipfileset dir="." + includes="*.xml" /> + <zipfileset dir="." + includes="drools-core/**" + excludes="drools-core/target/**" /> + <zipfileset dir="." + includes="drools-compiler/**" + excludes="drools-compiler/target/**" /> + <zipfileset dir="." + includes="drools-decisiontables/**" + excludes="drools-decisiontables/target/**" /> + <zipfileset dir="." + includes="drools-jsr94/**" + excludes="drools-jsr94/target/**" /> + <zipfileset dir="." + includes="drools-ide/**" + excludes="drools-ide/bin/** drools-ide/lib/**" /> + <zipfileset dir="." + includes="drools-examples/**" + excludes="drools-examples/target/**" /> + <zipfileset dir="." + includes="documentation/manual/**" + excludes="documentation/manual/build/**" /> + </zip> + </target> + + <target name="dist-bin"> + <zip destfile="target/dist/drools-${version}-bin.zip"> + <zipfileset dir="target/docs" + prefix="docs" /> + + <zipfileset dir="documentation/manual/build/en/shared" + excludes="**/*.svg **/*.db" + prefix="docs/shared" /> + + <zipfileset dir="documentation/manual/build/en/html_single" + prefix="docs/html_single" /> + + <zipfileset dir="documentation/manual/build/en/html" + prefix="docs/html" /> + + <zipfileset dir="target" + includes="**/drools-*.jar" /> + </zip> + </target> + + <target name="dist-bin-withdeps"> + <zip destfile="target/dist/drools-${version}-bin-withdeps.zip"> + + <zipfileset dir="target/docs" + prefix="docs" /> + + <zipfileset dir="documentation/manual/build/en/shared" + excludes="**/*.svg **/*.db" + prefix="docs/shared" /> + + <zipfileset dir="documentation/manual/build/en/html_single" + prefix="docs/html_single" /> + + <zipfileset dir="documentation/manual/build/en/html" + prefix="docs/html" /> + + <zipfileset dir="target" + includes="**/drools-*.jar" /> + + <zipfileset dir="drools-ide/lib" + includes="**/*.jar" + excludes="**/drools-*.jar" + prefix="lib" /> + </zip> + + </target> + + <target name="copy-deps" depends="init-maven"> + <artifact:dependencies filesetId="drools-core.dependency.fileset" verbose="false"> + <pom file="drools-core/pom.xml"/> + </artifact:dependencies> + + <artifact:dependencies filesetId="drools-compiler.dependency.fileset" verbose="false"> + <pom file="drools-compiler/pom.xml"/> + </artifact:dependencies> + + <artifact:dependencies filesetId="drools-decisiontables.dependency.fileset" verbose="false"> + <pom file="drools-decisiontables/pom.xml"/> + </artifact:dependencies> + + <artifact:dependencies filesetId="drools-jsr94.dependency.fileset" verbose="false"> + <pom file="drools-jsr94/pom.xml"/> + </artifact:dependencies> + + <copy todir="repository"> + <fileset refid="parent.dependency.fileset"/> + <fileset refid="drools-core.dependency.fileset"/> + <fileset refid="drools-compiler.dependency.fileset"/> + <fileset refid="drools-decisiontables.dependency.fileset"/> + <fileset refid="drools-jsr94.dependency.fileset"/> + </copy> + + <delete> + <fileset dir="drools-ide/lib" includes="*"/> + </delete> + + <copy todir="drools-ide/lib" + flatten="true"> + <fileset dir="repository" includes="**/*.jar" excludes="**/jsr94-sigtest-1.1.jar **/jsr94-tck-1.0.3.jar" /> + </copy> + </target> + + + + +</project> \ No newline at end of file Modified: labs/jbossrules/trunk/documentation/manual/build.xml =================================================================== --- labs/jbossrules/trunk/documentation/manual/build.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/documentation/manual/build.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -66,10 +66,10 @@ <target name="lang.all"> <!-- Compile the documentation for a single language in all formats. --> <antcall target="lang.misc"/> - <antcall target="lang.docpdf"/> + <!--antcall target="lang.docpdf"/--> <antcall target="lang.dochtml"/> <antcall target="lang.dochtmlsingle"/> - <antcall target="lang.doceclipse"/> + <!--antcall target="lang.doceclipse"/--> </target> <target name="lang.docpdf.prepare"> Modified: labs/jbossrules/trunk/drools-compiler/pom.xml =================================================================== --- labs/jbossrules/trunk/drools-compiler/pom.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/drools-compiler/pom.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -2,7 +2,7 @@ <parent> <artifactId>drools</artifactId> <groupId>org.drools</groupId> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -10,7 +10,7 @@ <artifactId>drools-compiler</artifactId> <name>Drools :: Compiler</name> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> <repositories> <repository> @@ -30,20 +30,14 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jci-janino</artifactId> - <version>2.4.1</version> + <version>2.4.3</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jci-eclipse</artifactId> - <version>3.2.0.658</version> - </dependency> - - <dependency> - <groupId>janino</groupId> - <artifactId>janino</artifactId> - <version>2.4.1</version> - </dependency> + <version>3.2.0.666</version> + </dependency> <!-- only needed for the default expander in parser/lang.. to remove when it is refactored into another module. --> <dependency> Modified: labs/jbossrules/trunk/drools-core/pom.xml =================================================================== --- labs/jbossrules/trunk/drools-core/pom.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/drools-core/pom.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -2,7 +2,7 @@ <parent> <artifactId>drools</artifactId> <groupId>org.drools</groupId> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -10,7 +10,7 @@ <artifactId>drools-core</artifactId> <name>Drools :: Rete-OO Core</name> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> <repositories> <repository> Modified: labs/jbossrules/trunk/drools-decisiontables/pom.xml =================================================================== --- labs/jbossrules/trunk/drools-decisiontables/pom.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/drools-decisiontables/pom.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -2,7 +2,7 @@ <parent> <artifactId>drools</artifactId> <groupId>org.drools</groupId> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -10,7 +10,7 @@ <artifactId>drools-decisiontables</artifactId> <name>Drools :: Decision Tables</name> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> <repositories> <repository> @@ -23,7 +23,7 @@ <dependency> <groupId>poi</groupId> <artifactId>poi</artifactId> - <version>2.5.1</version> + <version>2.5.1-final-20040804</version> </dependency> <dependency> <groupId>org.drools</groupId> Modified: labs/jbossrules/trunk/drools-jsr94/pom.xml =================================================================== --- labs/jbossrules/trunk/drools-jsr94/pom.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/drools-jsr94/pom.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -2,7 +2,7 @@ <parent> <artifactId>drools</artifactId> <groupId>org.drools</groupId> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -10,7 +10,7 @@ <artifactId>drools-jsr94</artifactId> <name>Drools :: JSR-94 API Module</name> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> <repositories> <repository> Added: labs/jbossrules/trunk/lib/maven-artifact-ant-2.0.4-dep.jar =================================================================== (Binary files differ) Property changes on: labs/jbossrules/trunk/lib/maven-artifact-ant-2.0.4-dep.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: labs/jbossrules/trunk/pom.xml =================================================================== --- labs/jbossrules/trunk/pom.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/pom.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -4,7 +4,7 @@ <artifactId>drools</artifactId> <packaging>pom</packaging> <name>Drools</name> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> <issueManagement> <system>jira</system> @@ -51,135 +51,39 @@ <developers> <developer> - <name>Bob McWhirter</name> - <id>bob</id> - <email>bo...@we...</email> - <organization>The Werken Company</organization> - <roles> - <role>Founder</role> - <role>Lead Developer</role> - </roles> - </developer> - <developer> <name>Mark Proctor</name> - <id>mark</id> - <email>mpr...@co...</email> - <organization>Codehaus</organization> + <id>5</id> + <email>mar...@jb...</email> <roles> - <role>Lead Developer</role> + <role>Project Lead</role> </roles> - </developer> + <timezone>0</timezone> + <organization>JBoss Inc.</organization> + </developer> + <developer> - <name>James Strachan</name> - <id>jstrachan</id> - <email>jam...@ya...</email> - <organization>Spiritsoft</organization> + <name>Michael Neale</name> + <id>5</id> + <email>mic...@gm...</email> <roles> - <role>Pontificator</role> - </roles> - </developer> - <developer> - <name>David Cramer</name> - <id>dcramer</id> - <email>da...@fa...</email> - <roles> - <role>Instigator</role> - </roles> - </developer> - <developer> - <name>Martin Hald</name> - <id>mhald</id> - <email>mar...@bi...</email> - <roles> <role>Developer</role> </roles> + <timezone>+10</timezone> + <organization>JBoss Inc.</organization> </developer> + <developer> - <name>Pete Kazmier</name> - <id>kaz</id> - <email>pet...@ka...</email> + <name>Bob McWhirter</name> + <id>bob</id> + <email>bo...@we...</email> + <organization>The Werken Company</organization> <roles> - <role>Developer</role> + <role>Founder</role> </roles> </developer> + + <developer> - <name>James Roome</name> - <id>0</id> - <email>re...@ho...</email> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Christiaan ten Klooster</name> - <id>1</id> - <email>chr...@da...</email> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Tom Vasak</name> - <id>2</id> - <email>to...@ai...</email> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Matt Ho</name> - <id>savaki</id> - <email>ma...@in...</email> - <organization>Indigo Egg</organization> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Thomas Diesler</name> - <id>tdiesler</id> - <email>tho...@so...</email> - <roles> - <role>JCA Lead</role> - </roles> - </developer> - <developer> - <name>Robert Searle</name> - <id>3</id> - <email>Rob...@ho...</email> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>N. Alex Rupp</name> - <id>4</id> - <email>al...@nr...</email> - <roles> - <role>JSR-94 Lead</role> - </roles> - </developer> - <developer> - <name>Andy Barnett</name> - <id>dbarnett</id> - <email>aba...@ca...</email> - <roles> - <role>Developer</role> - </roles> - <timezone>-5</timezone> - <organization>Cantilever Technologies</organization> - </developer> - <developer> - <name>Michael Neale</name> - <id>5</id> - <email>mic...@gm...</email> - <roles> - <role>Developer</role> - </roles> - <timezone>+10</timezone> - <organization>JBoss Inc.</organization> - </developer> - <developer> <name>Edson Tirelli</name> <id>tirelli</id> <email>ti...@po...</email> @@ -204,11 +108,6 @@ <repositories> <repository> - <id>apache</id> - <url>http://cvs.apache.org/maven-snapshot-repository/</url> - </repository> - - <repository> <id>ibiblio</id> <url>http://www.ibiblio.org/maven2/</url> </repository> @@ -267,6 +166,17 @@ <build> <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.0-beta-1</version> + <configuration> + <descriptor>bin.xml</descriptor> + <finalName>final_name</finalName> + <outputDirectory>output/directory</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>dependency-maven-plugin</artifactId> |
