[jboss-cvs] JBossCache ...
Manik Surtani
msurtani at jboss.com
Tue Oct 24 13:22:07 EDT 2006
User: msurtani
Date: 06/10/24 13:22:07
Modified: JBossCache build.xml
Log:
JBoss-Retro enabled
Revision Changes Path
1.143 +186 -41 JBossCache/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/JBossCache/build.xml,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- build.xml 12 Oct 2006 03:34:33 -0000 1.142
+++ build.xml 24 Oct 2006 17:22:06 -0000 1.143
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: build.xml,v 1.142 2006/10/12 03:34:33 bstansberry Exp $ -->
+<!-- $Id: build.xml,v 1.143 2006/10/24 17:22:06 msurtani Exp $ -->
<project default="compile" name="JBossCache">
@@ -28,8 +28,11 @@
<property name="output.interop.dir" value="${output.dir}/interop"/>
<property name="compile.dir" value="${output.dir}/classes"/>
<property name="compiletest.dir" value="${output.dir}/test-classes"/>
+ <property name="retro.compile.dir" value="${output.dir}/classes14"/>
+ <property name="retro.compiletest.dir" value="${output.dir}/test-classes14"/>
<property name="lib.dir" value="${root.dir}/lib"/>
- <property name="sleepycat.dir" value="${lib.dir}/sleepycat"/>
+ <property name="berkeleydb.lib.dir" value="${lib.dir}/berkeleydb"/>
+ <property name="retro.lib.dir" value="${lib.dir}/retro"/>
<property name="dist.dir" value="${root.dir}/dist"/>
<property name="dist.lib" value="${dist.dir}/lib"/>
<property name="build.reports" value="${output.dir}/reports"/>
@@ -87,7 +90,13 @@
<fileset dir="${lib.dir}">
<include name="*.jar"/>
</fileset>
- <fileset dir="${sleepycat.dir}">
+ <fileset dir="${berkeleydb.lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="retro.library.classpath">
+ <fileset dir="${retro.lib.dir}">
<include name="*.jar"/>
</fileset>
</path>
@@ -99,6 +108,16 @@
<pathelement location="${output.resources.dir}"/>
</path>
+ <path id="retro.output.classpath">
+ <pathelement location="${retro.compile.dir}"/>
+ <pathelement location="${output.etc.dir}"/>
+ <pathelement location="${retro.compiletest.dir}"/>
+ <pathelement location="${output.resources.dir}"/>
+ <fileset dir="${retro.lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
<path id="previous.version.classpath">
<pathelement location="${output.etc.dir}"/>
<pathelement location="${compiletest.dir}"/>
@@ -114,7 +133,7 @@
<fileset dir="${lib.dir}">
<include name="*.jar"/>
</fileset>
- <fileset dir="${sleepycat.dir}">
+ <fileset dir="${berkeleydb.lib.dir}">
<include name="*.jar"/>
</fileset>
<pathelement location="${compile.dir}"/>
@@ -190,6 +209,7 @@
<target name="aopc-pojocache" depends="compile-pojocache-1"
description="Precompile aop classes">
+ <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="library.classpath"/>
<aopc compilerclasspathref="library.classpath" verbose="false">
<src path="${compile.dir}"/>
<include name="org/jboss/cache/pojo/impl/*.class"/>
@@ -233,31 +253,69 @@
</javac>
</target>
- <!-- <target name="generate-rmi">-->
- <!-- <rmic classname="org.jboss.cache.loader.rmi.RemoteTreeCacheImpl" base="${compile.dir}"/> -->
- <!-- </target>-->
+ <target name="jbossretro" depends="compile" description="Weave the classes compiled in the compile-cache target for JDK 1.4.0 compatibility">
+ <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro">
+ <classpath refid="retro.library.classpath" />
+ </taskdef>
+
+ <mkdir dir="${retro.compile.dir}"/>
+
+ <retro destdir="${retro.compile.dir}">
+ <classpath refid="library.classpath" />
+ <classpath refid="retro.library.classpath" />
+ <classpath path="${compile.dir}" />
+ <src path="${compile.dir}"/>
+ <exclude name="**/obsolete/**"/>
+ </retro>
+
+ <!-- now the tests -->
+ <mkdir dir="${retro.compiletest.dir}"/>
+ <retro destdir="${retro.compiletest.dir}">
+ <classpath refid="library.classpath" />
+ <classpath refid="retro.library.classpath" />
+ <classpath path="${retro.compile.dir}"/>
+ <classpath path="${compiletest.dir}" />
+ <src path="${compiletest.dir}"/>
+ <exclude name="**/obsolete/**"/>
+ </retro>
+
+ </target>
<!-- ================================================================== -->
- <!-- Create jboss-cache.jar -->
+ <!-- Create jbosscache.jar -->
<!-- ================================================================== -->
- <target name="jar" description="Builds jboss-cache.jar" depends="compile, manifest, jar-cache, jar-pojocache">
+ <target name="jar" description="Builds jbosscache.jar" depends="compile, manifest, jar-cache, jar-pojocache">
+ </target>
+
+ <target name="jar-retro" description="Builds JDK 1.4.0-compatible jbosscache.jar" depends="jbossretro, manifest-retro">
+ <mkdir dir="${dist.lib}"/>
+ <jar jarfile="${dist.lib}/jboss-cache-JDK140.jar" manifest="${manifest.file}">
+ <fileset dir="${retro.compile.dir}">
+ <include name="org/jboss/cache/**"/>
+ <exclude name="org/jboss/cache/aop/**"/>
+ <exclude name="org/jboss/cache/pojo/**"/>
+ </fileset>
+ <fileset dir="${etc.dir}">
+ <include name="${dependencies}"/>
+ </fileset>
+ </jar>
+ <delete file="${manifest.file}" />
</target>
- <target name="jar-cache" depends="compile-cache, manifest" description="Builds core jboss-cache.jar">
+ <target name="jar-cache" depends="compile-cache, manifest" description="Builds core jbosscache.jar">
<mkdir dir="${dist.lib}"/>
- <jar jarfile="${dist.lib}/jboss-cache.jar" manifest="${manifest.file}">
+ <jar jarfile="${dist.lib}/jbosscache.jar" manifest="${manifest.file}">
<fileset dir="${compile.dir}">
<include name="org/jboss/cache/**"/>
<exclude name="org/jboss/cache/aop/**"/>
<exclude name="org/jboss/cache/pojo/**"/>
- <!-- this exclude is now unnecessary since tests are compiled to a separate output dir -->
- <!-- <exclude name="org/jboss/cache/**/*Test*"/> -->
</fileset>
<fileset dir="${etc.dir}">
<include name="${dependencies}"/>
</fileset>
</jar>
+ <delete file="${manifest.file}" />
</target>
<target name="jar-pojocache" depends="compile-pojocache, manifest-pc" description="Builds pojocache.jar">
@@ -265,16 +323,12 @@
<jar jarfile="${dist.lib}/pojocache.jar" manifest="${manifest.file}">
<fileset dir="${compile.dir}">
<include name="org/jboss/cache/pojo/**"/>
- <!--exclude name="org/jboss/cache/aop/AopMarker.class"/-->
- <!--exclude name="org/jboss/cache/aop/InstanceOfAopMarker.class"/-->
- <!--exclude name="org/jboss/cache/aop/annotation/*.class"/-->
- <!-- this exclude is now unnecessary since tests are compiled to a separate output dir -->
- <!-- <exclude name="org/jboss/cache/**/*Test*"/> -->
</fileset>
<fileset dir="${etc.dir}">
<include name="${dependencies}"/>
</fileset>
</jar>
+ <delete file="${manifest.file}" />
</target>
<target name="manifest">
@@ -293,6 +347,22 @@
</manifest>
</target>
+ <target name="manifest-retro">
+ <tstamp/>
+ <mkdir dir="${dist.lib}"/>
+ <manifest file="${manifest.file}">
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Created-On" value="${TODAY}"/>
+ <attribute name="Main-Class" value="org.jboss.cache.Version$Retro"/>
+ <attribute name="Specification-Title" value="JBossCache"/>
+ <attribute name="Specification-Version" value="${module.version}"/>
+ <attribute name="Specification-Vendor" value="JBoss Inc."/>
+ <attribute name="Implementation-Title" value="${module.name}"/>
+ <attribute name="Implementation-Version" value="${module.version}"/>
+ <attribute name="Implementation-Vendor" value="JBoss Inc."/>
+ </manifest>
+ </target>
+
<target name="manifest-pc">
<tstamp/>
<mkdir dir="${dist.lib}"/>
@@ -487,8 +557,8 @@
</target>
<!-- pre-compile directory with aopc -->
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="library.classpath"/>
<target name="aopcWithAnnoc" depends="annoc" description="Precompile aop test classes after annoc">
+ <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="library.classpath"/>
<aopc compilerclasspathref="library.classpath" verbose="true">
<src path="${compiletest.dir}/org/jboss/cache/aop/test"/>
<src path="${compiletest.dir}/org/jboss/cache/data"/>
@@ -504,6 +574,7 @@
<!-- pre-compile directory with aopc -->
<target name="aopc" depends="compile" description="Precompile aop test classes">
+ <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="library.classpath"/>
<aopc compilerclasspathref="library.classpath" classpathref="library.classpath" verbose="true">
<src path="${compiletest.dir}/org/jboss/cache/aop/test"/>
<aoppath path="${output.resources.dir}/pojocache-aop.xml"/>
@@ -515,6 +586,7 @@
<!-- pre-compile directory with aopc50 -->
<target name="aopc50" depends="compile" description="Precompile aop test classes">
+ <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="library.classpath"/>
<aopc compilerclasspathref="library.classpath" classpathref="library.classpath" verbose="true">
<src path="${compiletest.dir}/org/jboss/cache/pojo/test"/>
<!--src path="${compiletest.dir}/org/jboss/cache/data"/-->
@@ -525,9 +597,9 @@
</aopc>
</target>
- <target name="functionaltests" depends="compile,test-jar,unittests-init"
+ <target name="functionaltests" depends="compile-cache,test-jar,unittests-init"
description="Runs all core Cache functional tests">
- <junit printsummary="yes" timeout="${junit.timeout}" fork="yes" maxmemory="256m">
+ <junit printsummary="yes" timeout="${junit.timeout}" fork="yes" maxmemory="512m">
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
@@ -538,6 +610,7 @@
<fileset dir="${functional.tests.dir}">
<include name="**/*Test.*"/>
<exclude name="**/aop/**/*"/>
+ <exclude name="**/pojo/**/*"/>
<patternset refid="junit.excludes"/>
</fileset>
</batchtest>
@@ -784,7 +857,7 @@
<!-- Download the cache version against which we check interop -->
<mkdir dir="${output.interop.dir}"/>
- <get dest="${output.interop.dir}/jboss-cache.jar"
+ <get dest="${output.interop.dir}/jbosscache.jar"
src="http://repository.jboss.com/jboss/cache/1.2.3.1/lib/jboss-cache.jar" verbose="true"/>
<start-interop-target name="previous version" conf="META-INF/interopPrevSync-service.xml"
@@ -883,16 +956,32 @@
<target name="all-unittests-cc"
description="Run all unit tests, including AOP-based ones (functional, perf, stress) for CruiseControl, (excludes 'known failures')">
- <!--<patternset id="my.junit.excludes">-->
- <!--<patternset refid="known.failures" />-->
- <!--<exclude name="org/jboss/cache/C*" />-->
- <!--</patternset>-->
<antcall target="all-unittests" inheritrefs="false">
- <!--<param name="junit.excludes" id="junit.excludes" refid="my.junit.excludes" />-->
<reference refid="known.failures" torefid="junit.excludes"/>
</antcall>
</target>
+ <target name="all-unittests-retro-cc" depends="unittests-init"
+ description="Run retroweaved codebase and unit tests, excluding AOP-based ones (functional, perf, stress) for CruiseControl, (excludes 'known failures'). Meant to be run under JDK 1.4.0.">
+
+ <junit printsummary="yes" timeout="${junit.timeout}" fork="yes" maxmemory="512m">
+ <classpath refid="library.classpath"/>
+ <classpath refid="retro.output.classpath"/>
+ <jvmarg value="-Dbind.address=${bind.address}"/>
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <!--<jvmarg value="-Dtest.jar.dir=${output.dir}"/>-->
+ <formatter type="xml" usefile="true"/>
+ <batchtest todir="${build.reports}">
+ <fileset dir="${retro.compiletest.dir}">
+ <include name="**/*Test.*"/>
+ <exclude name="**/aop/**/*"/>
+ <exclude name="**/pojo/**/*"/>
+ <patternset refid="known.failures"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<target name="findxalan">
<available property="xalan.available" classname="org.apache.xalan.Version"/>
<fail unless="xalan.available"
@@ -933,7 +1022,7 @@
<!-- Install & Release -->
<!-- ================================================================== -->
- <target name="dist" description="Creates a full standalone distribution" depends="jar, docs, javadocs, javadocs50">
+ <target name="dist" description="Creates a full standalone distribution" depends="jar, jar-retro, docs, javadocs, javadocs50">
<!--target name="dist" description="Creates a full standalone distribution" depends="jar"-->
<!-- Now make temp dirs, copy files and create the zip files -->
@@ -996,6 +1085,16 @@
<include name="**/*.java"/>
<exclude name="**/loader/Bdbje*.java"/>
<exclude name="**/aop/**"/>
+ <exclude name="**/pojo/**"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${tmp.dir}/tests14" filtering="no">
+ <fileset dir="${retro.compiletest.dir}">
+ <include name="**/*.class"/>
+ <exclude name="**/loader/Bdbje*.class"/>
+ <exclude name="**/aop/**"/>
+ <exclude name="**/pojo/**"/>
</fileset>
</copy>
@@ -1023,9 +1122,14 @@
<include name="**/licenses/*"/>
</fileset>
<fileset dir="${dist.lib}">
- <include name="jboss-cache.jar"/>
+ <include name="jbosscache.jar"/>
+ <include name="jbosscache-JDK140.jar"/>
<include name="pojocache.jar"/>
</fileset>
+ <fileset dir="${retro.lib.dir}">
+ <exclude name="jbossretro.jar" />
+ </fileset>
+
</copy>
<copy todir="${tmp.dir}/docs/javadoc" filtering="no">
@@ -1070,7 +1174,15 @@
</fileset>
</copy>
+ <copy todir="${tmp.dir}/lib">
+ <fileset dir="${retro.lib.dir}">
+ <exclude name="jbossretro.jar" />
+ </fileset>
+ </copy>
+
+
<delete file="${dist.dir}/jboss-cache-core-${module.version}.zip"/>
+ <delete file="${dist.dir}/jboss-cache-core-JDK140-${module.version}.zip"/>
<delete file="${dist.dir}/jboss-cache-pojo-${module.version}.zip"/>
<delete file="${dist.dir}/jboss-cache-all-${module.version}.zip"/>
<delete file="${dist.dir}/bdbje-for-jbosscache-${module.version}.zip"/>
@@ -1083,19 +1195,23 @@
</fileset>
</chmod>
- <zip zipfile="${dist.dir}/jboss-cache-all-${module.version}.zip">
- <zipfileset dir="${tmp.dir}" prefix="${module.name}-${module.version}" filemode="755">
+ <zip zipfile="${dist.dir}/${module.name}-all-${module.version}.zip">
+ <zipfileset dir="${tmp.dir}" prefix="${module.name}-all-${module.version}" filemode="755">
<include name="**/**"/>
</zipfileset>
</zip>
- <zip zipfile="${dist.dir}/jboss-cache-core-${module.version}.zip">
- <zipfileset dir="${tmp.dir}" prefix="${module.name}-${module.version}" filemode="755">
+ <zip zipfile="${dist.dir}/${module.name}-core-${module.version}.zip">
+ <zipfileset dir="${tmp.dir}" prefix="${module.name}-core-${module.version}" filemode="755">
<include name="**/*"/>
<include name="org/jboss/cache/**"/>
<exclude name="org/jboss/cache/pojo/**"/>
<exclude name="src/**"/>
+ <exclude name="pojocache*" />
+ <exclude name="lib/jboss-cache-JDK140.jar"/>
<exclude name="lib/pojocache.jar"/>
+ <exclude name="lib/jbossretro*"/>
+ <exclude name="lib/jboss-backport*"/>
<exclude name="lib/jboss-aop*.jar"/>
<exclude name="lib/trove.jar"/>
<exclude name="lib/qdox.jar"/>
@@ -1107,31 +1223,60 @@
<exclude name="docs/faq-pojo/**"/>
<exclude name="docs/tutorial-pojo/**"/>
<exclude name="tests/org/jboss/cache/pojo/**"/>
+ <exclude name="tests14"/>
</zipfileset>
</zip>
- <zip zipfile="${dist.dir}/jboss-cache-pojo-${module.version}.zip">
- <zipfileset dir="${tmp.dir}" prefix="${module.name}-${module.version}" filemode="755">
+ <zip zipfile="${dist.dir}/${module.name}-pojo-${module.version}.zip">
+ <zipfileset dir="${tmp.dir}" prefix="${module.name}-pojo-${module.version}" filemode="755">
<exclude name="src/**"/>
+ <exclude name="lib/jboss-cache-JDK140.jar"/>
+ <exclude name="lib/jbossretro*"/>
+ <exclude name="lib/jboss-backport*"/>
<exclude name="examples/annotated14/**"/>
<exclude name="docs/javadoc/**"/>
+ <exclude name="tests14"/>
</zipfileset>
</zip>
- <zip zipfile="${dist.dir}/bdbje-for-jbosscache-${module.version}.zip">
- <zipfileset dir="${sleepycat.dir}">
+ <zip zipfile="${dist.dir}/bdbje-for-${module.name}-${module.version}.zip">
+ <zipfileset dir="${berkeleydb.lib.dir}" prefix="bdbje-for-${module.name}-${module.version}">
<include name="*"/>
</zipfileset>
</zip>
+ <zip zipfile="${dist.dir}/${module.name}-core-JDK140-${module.version}.zip">
+ <zipfileset dir="${tmp.dir}" prefix="${module.name}-core-JDK140-${module.version}" filemode="755">
+ <include name="**/*"/>
+ <include name="org/jboss/cache/**"/>
+ <exclude name="pojocache*" />
+ <exclude name="org/jboss/cache/pojo/**"/>
+ <exclude name="src/**"/>
+ <exclude name="lib/pojocache.jar"/>
+ <exclude name="lib/jbosscache.jar"/>
+ <exclude name="lib/jboss-aop*.jar"/>
+ <exclude name="lib/trove.jar"/>
+ <exclude name="lib/qdox.jar"/>
+ <exclude name="examples/**"/>
+ <exclude name="resources/**"/>
+ <exclude name="docs/javadoc/**"/>
+ <exclude name="docs/PojoCache/**"/>
+ <exclude name="docs/faq-pojo/**"/>
+ <exclude name="docs/tutorial-pojo/**"/>
+ <exclude name="tests"/>
+ </zipfileset>
+ </zip>
+
+
<!-- Remove temp dirs -->
<delete dir="${tmp.dir}"/>
<!-- build checksums -->
- <checksum file="${dist.dir}/jboss-cache-all-${module.version}.zip"/>
- <checksum file="${dist.dir}/jboss-cache-core-${module.version}.zip"/>
- <checksum file="${dist.dir}/jboss-cache-pojo-${module.version}.zip"/>
- <checksum file="${dist.dir}/bdbje-for-jbosscache-${module.version}.zip"/>
+ <checksum file="${dist.dir}/${module.name}-all-${module.version}.zip"/>
+ <checksum file="${dist.dir}/${module.name}-core-${module.version}.zip"/>
+ <checksum file="${dist.dir}/${module.name}-core-JDK140-${module.version}.zip"/>
+ <checksum file="${dist.dir}/${module.name}-pojo-${module.version}.zip"/>
+ <checksum file="${dist.dir}/bdbje-for-${module.name}-${module.version}.zip"/>
</target>
<target name="perfTestJar" depends="compile-cache, manifest" description="Builds jar file for the perf test">
More information about the jboss-cvs-commits
mailing list