aspectwerkz2-build_xml.patch

   1 --- build.xml.sav       2005-03-10 12:05:48.000000000 +0100
   2 +++ build.xml   2005-11-12 12:10:17.000000000 +0100
   3 @@ -44,7 +44,7 @@
   4      <!--    <property name="aspectwerkz.classpath" refid="aspectwerkz.classpath" />-->
   5
   6      <!--    define the jarjar task we use to remap ASM -->
   7 -    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/lib/jarjar-0.3.jar"/>
   8 +    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/lib/jarjar.jar"/>
   9
  10      <target name="cleandist" depends="clean, dist"/>
  11
  12 @@ -261,8 +261,8 @@
  13              <fileset dir="${main.classes}">
  14                  <exclude name="**/aspectwerkz/hook/**/*"/>
  15              </fileset>
  16 -            <zipfileset src="${basedir}/lib/asm-1.5.4-snapshot.jar"/>
  17 -            <zipfileset src="${basedir}/lib/asm-attrs-1.5.4-snapshot.jar"/>
  18 +            <zipfileset src="${basedir}/lib/asm_asm.jar"/>
  19 +            <zipfileset src="${basedir}/lib/asm_asm-attrs.jar"/>
  20              <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
  21          </jarjar>
  22          <copy tofile="${lib.dir}/aspectwerkz-${version}.jar" file="${build.dir}/aspectwerkz-${version}.jar" overwrite="true"/>
  23 @@ -279,8 +279,8 @@
  24              <fileset dir="${main.classes}">
  25                  <include name="**/aspectwerkz/hook/**/*"/>
  26              </fileset>
  27 -            <zipfileset src="${basedir}/lib/asm-1.5.4-snapshot.jar"/>
  28 -            <zipfileset src="${basedir}/lib/asm-attrs-1.5.4-snapshot.jar"/>
  29 +            <zipfileset src="${basedir}/lib/asm_asm.jar"/>
  30 +            <zipfileset src="${basedir}/lib/asm_asm-attrs.jar"/>
  31              <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
  32          </jarjar>
  33          <copy tofile="${lib.dir}/aspectwerkz-core-${version}.jar" file="${build.dir}/aspectwerkz-core-${version}.jar" overwrite="true"/>
  34 @@ -297,18 +297,18 @@
  35              <zipfileset src="${build.dir}/aspectwerkz-${version}.jar"/>
  36              <zipfileset src="${build.dir}/aspectwerkz-extensions-${version}.jar"/>
  37              <zipgroupfileset dir="${lib.dir}">
  38 -                <exclude name="jarjar*"/>
  39 -                <exclude name="aspectwerkz*"/>
  40 -                <exclude name="ant*"/>
  41 -                <exclude name="asm*"/>
  42 -                <exclude name="concurrent*"/>
  43 -                <exclude name="junit*"/>
  44 -                <exclude name="managementapi*"/>
  45 -                <exclude name="qdox*"/>
  46 +                <exclude name="jarjar*.jar"/>
  47 +                <exclude name="aspectwerkz*.jar"/>
  48 +                <exclude name="ant*.jar"/>
  49 +                <exclude name="asm_asm*.jar"/>
  50 +                <exclude name="concurrent*.jar"/>
  51 +                <exclude name="junit*.jar"/>
  52 +                <exclude name="management*.jar"/>
  53 +                <exclude name="qdox*.jar"/>
  54                  <include name="*.jar"/>
  55              </zipgroupfileset>
  56              <!-- add qdox manually to remove its META-INF/LICENSE.txt that is not the one of AW -->
  57 -            <zipfileset src="${lib.dir}/qdox-1.4.jar" excludes="META-INF/*"/>
  58 +            <zipfileset src="${lib.dir}/qdox.jar" excludes="META-INF/*"/>
  59          </jar>
  60          <!-- nodeps -->
  61          <jar destfile="${build.dir}/aspectwerkz-nodeps-jdk14-${version}.jar">
  62 @@ -347,7 +347,7 @@
  63      </target>
  64
  65      <target name="test:weave" depends="init, dist, test:annotationc">
  66 -        <property name="weave.classpath" value="${java.home}/../lib/tools.jar${pathseparator}${lib.dir}/ant-1.5.2.jar${pathseparator}${test.classes}${pathseparator}${lib.dir}/aspectwerkz-core-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-jdk14-${version}.jar${pathseparator}${lib.dir}/piccolo-1.03.jar${pathseparator}${lib.dir}/qdox-1.4.jar${pathseparator}${lib.dir}/junit-3.8.1.jar${pathseparator}${lib.dir}/dom4j-1.4.jar"/>
  67 +        <property name="weave.classpath" value="${java.home}/../lib/tools.jar${pathseparator}${lib.dir}/ant.jar${pathseparator}${test.classes}${pathseparator}${lib.dir}/aspectwerkz-core-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-jdk14-${version}.jar${pathseparator}${lib.dir}/piccolo.jar${pathseparator}${lib.dir}/qdox.jar${pathseparator}${lib.dir}/junit.jar${pathseparator}${lib.dir}/dom4j.jar"/>
  68          <echo>${weave.classpath}</echo>
  69
  70          <java classname="org.codehaus.aspectwerkz.compiler.AspectWerkzC" fork="true" classpath="${weave.classpath}">
  71 @@ -370,10 +370,10 @@
  72      <!--  tests that have been weaved offline -->
  73      <!-- =================================================== -->
  74      <target name="test:offline" depends="init, dist, test:annotationc, test:weave">
  75 -        <property name="offline.classpath" value="${java.home}/../lib/tools.jar${pathseparator}${lib.dir}/ant-1.5.2.jar${pathseparator}${test.classes}${pathseparator}${lib.dir}/aspectwerkz-core-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-jdk14-${version}.jar${pathseparator}${lib.dir}/piccolo-1.03.jar${pathseparator}${lib.dir}/qdox-1.4.jar${pathseparator}${lib.dir}/junit-3.8.1.jar${pathseparator}${lib.dir}/dom4j-1.4.jar"/>
  76 +        <property name="offline.classpath" value="${java.home}/../lib/tools.jar${pathseparator}${lib.dir}/ant.jar${pathseparator}${test.classes}${pathseparator}${lib.dir}/aspectwerkz-core-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-jdk14-${version}.jar${pathseparator}${lib.dir}/piccolo.jar${pathseparator}${lib.dir}/qdox.jar${pathseparator}${lib.dir}/junit.jar${pathseparator}${lib.dir}/dom4j.jar"/>
  77          <java
  78              classname="test.AllTests"
  79 -            classpath="${offline.classpath}${pathseparator}${extensions.classes}${pathseparator}${test.classes}${pathseparator}${testdata.classes}${pathseparator}${samples.classes}${pathseparator}${lib.dir}/junit-3.8.1.jar${pathseparator}${lib.dir}/junitperf.jar"
  80 +            classpath="${offline.classpath}${pathseparator}${extensions.classes}${pathseparator}${test.classes}${pathseparator}${testdata.classes}${pathseparator}${samples.classes}${pathseparator}${lib.dir}/junit.jar${pathseparator}${lib.dir}/junitperf.jar"
  81              fork="true">
  82              <jvmarg value="-Daspectwerkz.transform.dump=*"/>
  83              <jvmarg value="-Daspectwerkz.definition.file=${src.dir}/test/aop.xml"/>
  84 @@ -388,10 +388,10 @@
  85          <antcall target="test:offline:jdk15"/>
  86      </target>
  87      <target name="test:offline:jdk15" depends="init, dist, test:annotationc, test:weave" if="jdk15">
  88 -        <property name="offline.classpath" value="${java.home}/../lib/tools.jar${pathseparator}${lib.dir}/ant-1.5.2.jar${pathseparator}${test.classes}${pathseparator}${lib.dir}/aspectwerkz-jdk5-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-core-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-${version}.jar${pathseparator}${lib.dir}/qdox-1.4.jar${pathseparator}${lib.dir}/junit-3.8.1.jar${pathseparator}${lib.dir}/dom4j-1.4.jar"/>
  89 +        <property name="offline.classpath" value="${java.home}/../lib/tools.jar${pathseparator}${lib.dir}/ant.jar${pathseparator}${test.classes}${pathseparator}${lib.dir}/aspectwerkz-jdk5-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-core-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-${version}.jar${pathseparator}${lib.dir}/qdox.jar${pathseparator}${lib.dir}/junit.jar${pathseparator}${lib.dir}/dom4j.jar"/>
  90          <java
  91              classname="test.AllJdk5Tests"
  92 -            classpath="${offline.classpath}${pathseparator}${extensions.classes}${pathseparator}${test.classes}${pathseparator}${samples.classes}${pathseparator}${lib.dir}/junit-3.8.1.jar${pathseparator}${lib.dir}/junitperf.jar"
  93 +            classpath="${offline.classpath}${pathseparator}${extensions.classes}${pathseparator}${test.classes}${pathseparator}${samples.classes}${pathseparator}${lib.dir}/junit.jar${pathseparator}${lib.dir}/junitperf.jar"
  94              fork="true">
  95              <jvmarg value="-Daspectwerkz.transform.dump=*"/>
  96              <jvmarg value="-Daspectwerkz.definition.file=${src.dir}/jdk15/test/aop.xml"/>
  97 @@ -438,7 +438,7 @@
  98      <!-- =================================================== -->
  99      <target name="test" depends="clean, dist, test:annotationc">
 100          <exec executable="${bin.dir}/aspectwerkz${executableSuffix}">
 101 -            <arg line="-cp ${basedir}/lib/aspectwerkz-extensions-${version}.jar${pathseparator}${test.src.dir}${pathseparator}${test.classes}${pathseparator}${testdata.classes}${pathseparator}${samples.classes}${pathseparator}${lib.dir}/junit-3.8.1.jar${pathseparator}${lib.dir}/junitperf.jar -Daspectwerkz.transform.dump=* -Daspectwerkz.definition.file=${src.dir}/test/aop.xml test.AllTests"/>
 102 +            <arg line="-cp ${basedir}/lib/aspectwerkz-extensions-${version}.jar${pathseparator}${test.src.dir}${pathseparator}${test.classes}${pathseparator}${testdata.classes}${pathseparator}${samples.classes}${pathseparator}${lib.dir}/junit.jar${pathseparator}${lib.dir}/junitperf.jar -Daspectwerkz.transform.dump=* -Daspectwerkz.definition.file=${src.dir}/test/aop.xml test.AllTests"/>
 103          </exec>
 104          <antcall target="test:jdk15:call"/>
 105      </target>
 106 @@ -466,7 +466,7 @@
 107      <!-- =================================================== -->
 108      <target name="test:perf" depends="clean, dist, test:annotationc">
 109          <exec executable="${bin.dir}/aspectwerkz${executableSuffix}">
 110 -            <arg line="-cp ${test.classes}${pathseparator}${samples.classes}${pathseparator}${lib.dir}/junit-3.8.1.jar${pathseparator}${lib.dir}/junitperf.jar -Daspectwerkz.definition.file=${src.dir}/test/aop.xml test.xmldef.AllPerfTests"/>
 111 +            <arg line="-cp ${test.classes}${pathseparator}${samples.classes}${pathseparator}${lib.dir}/junit.jar${pathseparator}${lib.dir}/junitperf.jar -Daspectwerkz.definition.file=${src.dir}/test/aop.xml test.xmldef.AllPerfTests"/>
 112          </exec>
 113      </target>
 114
 115 @@ -624,7 +624,7 @@
 116      <!-- =================================================== -->
 117      <target name="samples:remote:server" depends="clean, dist, compile:samples, samples:annotationc">
 118          <exec executable="${bin.dir}/aspectwerkz${executableSuffix}">
 119 -            <arg line="-cp ${basedir}${pathseparator}${lib.dir}/aspectwerkz-extensions-${version}.jar${pathseparator}${lib.dir}/ant-1.5.2.jar${pathseparator}${samples.classes} -Daspectwerkz.transform.dump=* -Daspectwerkz.resource.bundle=${src.dir}/samples/aspectwerkz.properties -Daspectwerkz.remote.server.run=true -Daspectwerkz.definition.file=${src.dir}/samples/aspectwerkz.xml examples.connectivity.Server"/>
 120 +            <arg line="-cp ${basedir}${pathseparator}${lib.dir}/aspectwerkz-extensions-${version}.jar${pathseparator}${lib.dir}/ant.jar${pathseparator}${samples.classes} -Daspectwerkz.transform.dump=* -Daspectwerkz.resource.bundle=${src.dir}/samples/aspectwerkz.properties -Daspectwerkz.remote.server.run=true -Daspectwerkz.definition.file=${src.dir}/samples/aspectwerkz.xml examples.connectivity.Server"/>
 121          </exec>
 122      </target>
 123