dev-java/aspectwerkz removal (bug #546288)

4 files changed, 0 insertions, 387 deletions

diff --git a/dev-java/aspectwerkz/files/aspectwerkz-2.0-gentoo.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0-gentoo.patch
deleted file mode 100644
index eb745c3afde2..000000000000
--- a/dev-java/aspectwerkz/files/aspectwerkz-2.0-gentoo.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- build.xml.orig	2005-03-10 12:05:48.000000000 +0300
-+++ build.xml	2006-01-28 12:22:12.436634250 +0300
-@@ -44,8 +44,6 @@
-     <!--    <property name="aspectwerkz.classpath" refid="aspectwerkz.classpath" />-->
- 
-     <!--    define the jarjar task we use to remap ASM -->
--    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/lib/jarjar-0.3.jar"/>
--
-     <target name="cleandist" depends="clean, dist"/>
- 
-     <!-- =================================================== -->
-@@ -124,7 +122,7 @@
-     <!-- ============================================================== -->
-     <!-- compiles the distribution  -->
-     <!-- ============================================================== -->
--    <target name="compile" depends="init">
-+    <target name="compile" depends="clean">
-         <mkdir dir="${build.dir}"/>
-         <mkdir dir="${main.classes}"/>
-         <javac destdir="${jdk14.classes}" debug="on" source="1.3" target="1.3">
-@@ -156,12 +154,6 @@
-                 <path refid="project.class.path"/>
-             </classpath>
-         </javac>
--        <!-- remap ASM since it is used directly in the tests for some -->
--        <jarjar destfile="${test.classes}.jar">
--            <fileset dir="${test.classes}" includes="**/*"/>
--            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
--        </jarjar>
--        <unjar src="${test.classes}.jar" dest="${test.classes}" overwrite="true"/>
-     </target>
- 
-     <!-- ============================================================== -->
-@@ -253,49 +245,36 @@
-     <!-- ============================================================== -->
-     <!-- create distribution -->
-     <!-- ============================================================== -->
--    <target name="dist" depends="compile, compile:jdk15, compile:test, compile:extensions"><!-- not samples since Java 1.4 -->
-+    <target name="dist" depends="compile, compile:jdk15"><!-- not samples since Java 1.4 -->
-         <copy file="${src.dir}/main/aspectwerkz2.dtd" todir="${main.classes}"/>
- 
-         <!-- we embed jarjar version of ASM in it as well in case the aspectwerkz-core jar is not used -->
--        <jarjar destfile="${build.dir}/aspectwerkz-${version}.jar" manifest="${lib.dir}/manifest.mf">
-+        <jar destfile="${build.dir}/aspectwerkz.jar" manifest="${lib.dir}/manifest.mf">
-             <fileset dir="${main.classes}">
-                 <exclude name="**/aspectwerkz/hook/**/*"/>
-             </fileset>
--            <zipfileset src="${basedir}/lib/asm-1.5.4-snapshot.jar"/>
--            <zipfileset src="${basedir}/lib/asm-attrs-1.5.4-snapshot.jar"/>
--            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
--        </jarjar>
--        <copy tofile="${lib.dir}/aspectwerkz-${version}.jar" file="${build.dir}/aspectwerkz-${version}.jar" overwrite="true"/>
-+        </jar>
-+        <copy tofile="${lib.dir}/aspectwerkz-${version}.jar" file="${build.dir}/aspectwerkz.jar" overwrite="true"/>
- 
-         <!-- JDK 1.4 annotations only -->
--        <jar destfile="${build.dir}/aspectwerkz-jdk14-${version}.jar">
-+        <jar destfile="${build.dir}/aspectwerkz-jdk14.jar">
-             <fileset dir="${jdk14.classes}"/>
-         </jar>
--        <copy tofile="${lib.dir}/aspectwerkz-jdk14-${version}.jar" file="${build.dir}/aspectwerkz-jdk14-${version}.jar" overwrite="true"/>
-+        <copy tofile="${lib.dir}/aspectwerkz-jdk14-${version}.jar" file="${build.dir}/aspectwerkz-jdk14.jar" overwrite="true"/>
- 
-         <!-- core contains the hook part -->
-         <!-- we embed jarjar version of ASM in it as well so that it will be in the bootclasspath for the asm hook -->
--        <jarjar destfile="${build.dir}/aspectwerkz-core-${version}.jar">
-+        <jar destfile="${build.dir}/aspectwerkz-core.jar">
-             <fileset dir="${main.classes}">
-                 <include name="**/aspectwerkz/hook/**/*"/>
-             </fileset>
--            <zipfileset src="${basedir}/lib/asm-1.5.4-snapshot.jar"/>
--            <zipfileset src="${basedir}/lib/asm-attrs-1.5.4-snapshot.jar"/>
--            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
--        </jarjar>
--        <copy tofile="${lib.dir}/aspectwerkz-core-${version}.jar" file="${build.dir}/aspectwerkz-core-${version}.jar" overwrite="true"/>
--
--        <!-- extensions embeds ASM as well -->
--        <jarjar jarfile="${build.dir}/aspectwerkz-extensions-${version}.jar" basedir="${extensions.classes}">
--            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
--        </jarjar>
--        <copy tofile="${lib.dir}/aspectwerkz-extensions-${version}.jar" file="${build.dir}/aspectwerkz-extensions-${version}.jar" overwrite="true"/>
-+        </jar>
-+        <copy tofile="${lib.dir}/aspectwerkz-core-${version}.jar" file="${build.dir}/aspectwerkz-core.jar" overwrite="true"/>
- 
-         <!-- build a jdk neutral nodeps for the main jar (extensions + deps)
-              (not core, jdk14, jdk15, Ant, JUnit,) -->
--        <jar destfile="${build.dir}/aspectwerkz-nodeps-${version}.jar">
--            <zipfileset src="${build.dir}/aspectwerkz-${version}.jar"/>
--            <zipfileset src="${build.dir}/aspectwerkz-extensions-${version}.jar"/>
-+        <jar destfile="${build.dir}/aspectwerkz-nodeps.jar">
-+            <zipfileset src="${build.dir}/aspectwerkz.jar"/>
-             <zipgroupfileset dir="${lib.dir}">
-                 <exclude name="jarjar*"/>
-                 <exclude name="aspectwerkz*"/>
-@@ -308,32 +287,32 @@
-                 <exclude name="qdox*"/>
-                 <include name="*.jar"/>
-             <!-- add qdox manually to remove its META-INF/LICENSE.txt that is not the one of AW -->
--            <zipfileset src="${lib.dir}/qdox-1.4.jar" excludes="META-INF/*"/>
-+            <!-- <zipfileset src="${lib.dir}/qdox.jar" excludes="META-INF/*"/> -->
-         </jar>
-         <!-- nodeps -->
--        <jar destfile="${build.dir}/aspectwerkz-nodeps-jdk14-${version}.jar">
--            <zipfileset src="${build.dir}/aspectwerkz-nodeps-${version}.jar"/>
--            <zipfileset src="${build.dir}/aspectwerkz-jdk14-${version}.jar"/>
-+        <jar destfile="${build.dir}/aspectwerkz-nodeps-jdk14.jar">
-+            <zipfileset src="${build.dir}/aspectwerkz-nodeps.jar"/>
-+            <zipfileset src="${build.dir}/aspectwerkz-jdk14.jar"/>
-         </jar>
--        <copy tofile="${lib.dir}/aspectwerkz-nodeps-jdk14-${version}.jar" file="${build.dir}/aspectwerkz-nodeps-jdk14-${version}.jar" overwrite="true"/>
-+        <copy tofile="${lib.dir}/aspectwerkz-nodeps-jdk14-${version}.jar" file="${build.dir}/aspectwerkz-nodeps-jdk14.jar" overwrite="true"/>
-
-         <antcall target="dist:jdk15"/>
-
-     </target>
-
-     <target name="dist:jdk15" if="jdk15">
-         <!-- Java 5 annotation and JVMTI agent if J2SE 5 build -->
--        <jar destfile="${build.dir}/aspectwerkz-jdk5-${version}.jar" manifest="${lib.dir}/manifest-core.mf">
-+        <jar destfile="${build.dir}/aspectwerkz-jdk5.jar" manifest="${lib.dir}/manifest-core.mf">
-             <fileset dir="${jdk15.classes}"/>
-         </jar>
--        <copy tofile="${lib.dir}/aspectwerkz-jdk5-${version}.jar" file="${build.dir}/aspectwerkz-jdk5-${version}.jar" overwrite="true"/>
-+        <copy tofile="${lib.dir}/aspectwerkz-jdk5-${version}.jar" file="${build.dir}/aspectwerkz-jdk5.jar" overwrite="true"/>
-
-         <!-- nodeps -->
--        <jar destfile="${build.dir}/aspectwerkz-nodeps-jdk5-${version}.jar" manifest="${lib.dir}/manifest-core.mf">
--            <zipfileset src="${build.dir}/aspectwerkz-nodeps-${version}.jar"/>
--            <zipfileset src="${build.dir}/aspectwerkz-jdk5-${version}.jar"/>
-+        <jar destfile="${build.dir}/aspectwerkz-nodeps-jdk5.jar" manifest="${lib.dir}/manifest-core.mf">
-+            <zipfileset src="${build.dir}/aspectwerkz-nodeps.jar"/>
-+            <zipfileset src="${build.dir}/aspectwerkz-jdk5.jar"/>
-         </jar>
--        <copy tofile="${lib.dir}/aspectwerkz-nodeps-jdk5-${version}.jar" file="${build.dir}/aspectwerkz-nodeps-jdk5-${version}.jar" overwrite="true"/>
-+        <copy tofile="${lib.dir}/aspectwerkz-nodeps-jdk5-${version}.jar" file="${build.dir}/aspectwerkz-nodeps-jdk5.jar" overwrite="true"/>
-     </target>
-
-     <!-- ============================================================== -->
diff --git a/dev-java/aspectwerkz/files/aspectwerkz-2.0-modernise_api.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0-modernise_api.patch
deleted file mode 100644
index 8d930e8520cd..000000000000
--- a/dev-java/aspectwerkz/files/aspectwerkz-2.0-modernise_api.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/main/org/codehaus/aspectwerkz/connectivity/RemoteProxyServer.java.old	2013-09-30 02:03:20.703138370 +0100
-+++ src/main/org/codehaus/aspectwerkz/connectivity/RemoteProxyServer.java	2013-09-30 05:49:54.768369910 +0100
-@@ -7,9 +7,13 @@
-  **************************************************************************************/
- package org.codehaus.aspectwerkz.connectivity;
- 
--import EDU.oswego.cs.dl.util.concurrent.BoundedBuffer;
--import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
--import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
-+import java.util.concurrent.ArrayBlockingQueue;
-+import java.util.concurrent.BlockingQueue;
-+import java.util.concurrent.LinkedBlockingQueue;
-+import java.util.concurrent.RejectedExecutionHandler;
-+import java.util.concurrent.ThreadPoolExecutor;
-+import java.util.concurrent.TimeUnit;
-+
- import org.codehaus.aspectwerkz.exception.WrappedRuntimeException;
- 
- import java.io.FileInputStream;
-@@ -152,7 +156,7 @@
-     /**
-      * The thread pool.
-      */
--    private PooledExecutor m_threadPool = null;
-+    private ThreadPoolExecutor m_threadPool = null;
- 
-     /**
-      * The class loader to use.
-@@ -262,13 +266,30 @@
-                                          final int threadPoolInitSize,
-                                          final int keepAliveTime,
-                                          final boolean waitWhenBlocked) {
--        m_threadPool = new PooledExecutor(new BoundedBuffer(threadPoolInitSize), threadPoolMaxSize);
--        m_threadPool.setKeepAliveTime(keepAliveTime);
--        m_threadPool.createThreads(threadPoolInitSize);
--        m_threadPool.setMinimumPoolSize(threadPoolMinSize);
-+        m_threadPool = new ThreadPoolExecutor(threadPoolInitSize, threadPoolMaxSize,
-+					      keepAliveTime, TimeUnit.MILLISECONDS,
-+					      new ArrayBlockingQueue(threadPoolInitSize) {
-+		protected void afterExecute(Runnable r, ThreadPoolExecutor e) {
-+		    if (waitWhenBlocked) e.notifyAll();
-+		}
-+	    });
-+        m_threadPool.prestartAllCoreThreads();
-+	m_threadPool.setCorePoolSize(threadPoolMinSize);
-         if (waitWhenBlocked) {
--            m_threadPool.waitWhenBlocked();
--        }
-+            m_threadPool.setRejectedExecutionHandler(new RejectedExecutionHandler() {
-+		    public void rejectedExecution(Runnable r, ThreadPoolExecutor e) {
-+			if (e.isTerminating() || e.isTerminated())
-+			    return;
-+			BlockingQueue<Runnable> tasks = e.getQueue();
-+			int maxSize = e.getMaximumPoolSize();
-+			while (tasks.remainingCapacity() == 0 || e.getPoolSize() == maxSize)
-+			    try { e.wait(); } catch (InterruptedException ex) {}
-+			e.execute(r);
-+		    }
-+		});
-+	} else {
-+	    m_threadPool.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-+	}
-     }
- 
-     /**
-@@ -281,9 +302,10 @@
-     private void createDynamicThreadPool(final int threadPoolMinSize,
-                                          final int threadPoolInitSize,
-                                          final int keepAliveTime) {
--        m_threadPool = new PooledExecutor(new LinkedQueue());
--        m_threadPool.setKeepAliveTime(keepAliveTime);
--        m_threadPool.createThreads(threadPoolInitSize);
--        m_threadPool.setMinimumPoolSize(threadPoolMinSize);
-+        m_threadPool = new ThreadPoolExecutor(threadPoolInitSize, Integer.MAX_VALUE,
-+					      keepAliveTime, TimeUnit.MILLISECONDS,
-+					      new LinkedBlockingQueue());
-+        m_threadPool.prestartAllCoreThreads();
-+	m_threadPool.setCorePoolSize(threadPoolMinSize);
-     }
--}
-\ No newline at end of file
-+}
diff --git a/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-gentoo.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-gentoo.patch
deleted file mode 100644
index 273bb22e7272..000000000000
--- a/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-gentoo.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- build.xml.orig	2005-01-05 22:09:52.421137168 +0100
-+++ build.xml	2005-01-05 22:17:04.298481832 +0100
-@@ -42,8 +42,6 @@
-     <!--    <property name="aspectwerkz.classpath" refid="aspectwerkz.classpath" />-->
- 
-     <!--    define the jarjar task we use to remap ASM -->
--    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/lib/jarjar-0.3.jar"/>
--
-     <target name="cleandist" depends="clean, dist"/>
- 
-     <!-- =================================================== -->
-@@ -121,7 +119,7 @@
-     <!-- ============================================================== -->
-     <!-- compiles the distribution  -->
-     <!-- ============================================================== -->
--    <target name="compile" depends="init">
-+    <target name="compile" depends="clean">
-         <mkdir dir="${build.dir}"/>
-         <mkdir dir="${main.classes}"/>
-         <javac destdir="${jdk14.classes}" debug="on" source="1.3" target="1.3">
-@@ -153,12 +151,6 @@
-                 <path refid="project.class.path"/>
-             </classpath>
-         </javac>
--        <!-- remap ASM since it is used directly in the tests for some -->
--        <jarjar destfile="${test.classes}.jar">
--            <fileset dir="${test.classes}" includes="**/*"/>
--            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
--        </jarjar>
--        <unjar src="${test.classes}.jar" dest="${test.classes}" overwrite="true"/>
-     </target>
- 
-     <!-- ============================================================== -->
-@@ -250,42 +242,31 @@
-     <!-- ============================================================== -->
-     <!-- create distribution -->
-     <!-- ============================================================== -->
--    <target name="dist" depends="compile, compile:jdk15, compile:test, compile:extensions"><!-- not samples since Java 1.4 -->
-+    <target name="dist" depends="compile, compile:jdk15"><!-- not samples since Java 1.4 -->
-         <copy file="${src.dir}/main/aspectwerkz2.dtd" todir="${main.classes}"/>
- 
-         <!-- we embed jarjar version of ASM in it as well in case the aspectwerkz-core jar is not used -->
--        <jarjar destfile="${build.dir}/aspectwerkz-${version}.jar" manifest="${lib.dir}/manifest.mf">
-+        <jar destfile="${build.dir}/aspectwerkz.jar" manifest="${lib.dir}/manifest.mf">
-             <fileset dir="${main.classes}">
-                 <exclude name="**/aspectwerkz/hook/**/*"/>
-             </fileset>
--            <zipfileset src="${basedir}/lib/asm-1.5.2.jar"/>
--            <zipfileset src="${basedir}/lib/asm-attrs-1.5.2.jar"/>
--            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
--        </jarjar>
--        <copy tofile="${lib.dir}/aspectwerkz-${version}.jar" file="${build.dir}/aspectwerkz-${version}.jar" overwrite="true"/>
-+        </jar>
-+        <copy tofile="${lib.dir}/aspectwerkz.jar" file="${build.dir}/aspectwerkz.jar" overwrite="true"/>
- 
-         <!-- JDK 1.4 annotations only -->
--        <jar destfile="${build.dir}/aspectwerkz-jdk14-${version}.jar">
-+        <jar destfile="${build.dir}/aspectwerkz-jdk14.jar">
-             <fileset dir="${jdk14.classes}"/>
-         </jar>
--        <copy tofile="${lib.dir}/aspectwerkz-jdk14-${version}.jar" file="${build.dir}/aspectwerkz-jdk14-${version}.jar" overwrite="true"/>
-+        <copy tofile="${lib.dir}/aspectwerkz-jdk14.jar" file="${build.dir}/aspectwerkz-jdk14.jar" overwrite="true"/>
- 
-         <!-- core contains the hook part -->
-         <!-- we embed jarjar version of ASM in it as well so that it will be in the bootclasspath for the asm hook -->
--        <jarjar destfile="${build.dir}/aspectwerkz-core-${version}.jar">
-+        <jar destfile="${build.dir}/aspectwerkz-core.jar">
-             <fileset dir="${main.classes}">
-                 <include name="**/aspectwerkz/hook/**/*"/>
-             </fileset>
--            <zipfileset src="${basedir}/lib/asm-1.5.2.jar"/>
--            <zipfileset src="${basedir}/lib/asm-attrs-1.5.2.jar"/>
--            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
--        </jarjar>
--        <copy tofile="${lib.dir}/aspectwerkz-core-${version}.jar" file="${build.dir}/aspectwerkz-core-${version}.jar" overwrite="true"/>
--
--        <jarjar jarfile="${build.dir}/aspectwerkz-extensions-${version}.jar" basedir="${extensions.classes}">
--            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
--        </jarjar>
--        <copy tofile="${lib.dir}/aspectwerkz-extensions-${version}.jar" file="${build.dir}/aspectwerkz-extensions-${version}.jar" overwrite="true"/>
-+        </jar>
-+        <copy tofile="${lib.dir}/aspectwerkz-core.jar" file="${build.dir}/aspectwerkz-core.jar" overwrite="true"/>
- 
-         <antcall target="dist:jdk15"/>
-     </target>
diff --git a/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-jdk15.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-jdk15.patch
deleted file mode 100644
index 855fd132e365..000000000000
--- a/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-jdk15.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -ru aw_2_0_2/build.xml aw_2_0_2-patched/build.xml
---- aw_2_0_2/build.xml	2004-12-10 10:44:44.000000000 -0500
-+++ aw_2_0_2-patched/build.xml	2006-08-05 11:43:03.000000000 -0400
-@@ -145,7 +145,7 @@
-     <target name="compile:test" depends="init, compile">
-         <mkdir dir="${build.dir}"/>
-         <mkdir dir="${test.classes}"/>
--        <javac destdir="${test.classes}" debug="on">
-+        <javac destdir="${test.classes}" debug="on" target="1.3" source="1.3">
-             <src path="${test.src.dir}"/>
-             <classpath>
-                 <path path="${jdk14.classes}"/>
-@@ -164,9 +164,9 @@
-     <!-- ============================================================== -->
-     <!-- compiles the Java5 stuff -->
-     <!-- ============================================================== -->
--    <target name="compile:jdk15" depends="init" if="jdk15">
-+    <target name="compile:jdk15" depends="init" if="jdk15" unless="nojdk15">
-         <echo message="** Found jdk15 specific compilation..."/>
--        <javac destdir="${jdk15.classes}" deprecation="true" debug="true" optimize="false" source="1.5">
-+        <javac destdir="${jdk15.classes}" deprecation="true" debug="true" optimize="false" source="1.5" target="1.5">
-             <src>
-                 <pathelement location="src/jdk15/main">
-                 </pathelement>
-@@ -290,7 +290,7 @@
-         <antcall target="dist:jdk15"/>
-     </target>
- 
--    <target name="dist:jdk15" if="jdk15">
-+    <target name="dist:jdk15" if="jdk15" unless="nojdk15">
-         <!-- Java 5 annotation and JVMTI agent if J2SE 5 build -->
-         <jar destfile="${build.dir}/aspectwerkz-jdk5-${version}.jar" manifest="${lib.dir}/manifest-core.mf">
-             <fileset dir="${jdk15.classes}"/>
-@@ -344,10 +344,10 @@
-     <!-- =================================================== -->
-     <!--  JDK 5 tests that have been weaved offline -->
-     <!-- =================================================== -->
--    <target name="test:offline:jdk15:call" if="jdk15">
-+    <target name="test:offline:jdk15:call" if="jdk15" unless="nojdk15">
-         <antcall target="test:offline:jdk15"/>
-     </target>
--    <target name="test:offline:jdk15" depends="init, dist, test:annotationc, test:weave" if="jdk15">
-+    <target name="test:offline:jdk15" depends="init, dist, test:annotationc, test:weave" if="jdk15" unless="nojdk15">
-         <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}/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"/>
-         <java
-             classname="test.AllJdk5Tests"
-@@ -406,7 +406,7 @@
-     <!-- =================================================== -->
-     <!--  all tests for JDK 5 -->
-     <!-- =================================================== -->
--    <target name="test:jdk15:call" if="jdk15">
-+    <target name="test:jdk15:call" if="jdk15" unless="nojdk15">
-         <antcall target="test:jdk15"/>
-     </target>
-     <target name="test:jdk15" depends="clean, dist, test:annotationc" if="jdk15">
-@@ -634,7 +634,7 @@
-         </java>
-     </target>
- 
--    <target name="samples:jdk5:callback" depends="init, clean, dist" if="jdk15" >
-+    <target name="samples:jdk5:callback" depends="init, clean, dist" if="jdk15" unless="nojdk15" >
-         <java classname="examples.callback.Callback" fork="true">
-             <classpath>
-                 <pathelement path="${jdk15.classes}"/>
-@@ -646,7 +646,7 @@
-         </java>
-     </target>
- 
--    <target name="samples:jdk5:callback:hook" depends="init, clean, dist" if="jdk15">
-+    <target name="samples:jdk5:callback:hook" depends="init, clean, dist" if="jdk15" unless="nojdk15">
-         <java classname="examples.callback.Callback" fork="true">
-             <classpath>
-                 <pathelement path="${samples.classes}"/>
-@@ -657,7 +657,7 @@
-         </java>
-     </target>
- 
--    <target name="samples:jdk5:proxy" depends="init, clean, dist" if="jdk15">
-+    <target name="samples:jdk5:proxy" depends="init, clean, dist" if="jdk15" unless="nojdk15">
-         <java classname="examples.proxy.Proxy5" fork="true">
-             <classpath>
-                 <pathelement path="${jdk15.classes}"/>