--- build.xml.orig	2009-09-02 16:27:55.000000000 +0200
+++ build.xml	2009-09-03 17:24:23.000000000 +0200
@@ -73,7 +73,7 @@
   <target depends="prepare" description="Compile shareable components" 
           name="compile">
     <javac debug="${compile.debug}" deprecation="${compile.deprecation}" destdir="${build.home}/classes" optimize="${compile.optimize}" srcdir="${source.home}"
-      target="${compile.target}" bootclasspath="${compile.bootclasspath}" extdirs="${compile.extdirs}" source="${compile.source}">
+      target="${compile.target}" extdirs="${compile.extdirs}" source="${compile.source}">
       <classpath refid="compile.classpath"/>
       <compilerarg compiler="jikes" value="-nowarn"/>
     </javac>
@@ -122,16 +122,7 @@
     <jar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-${component.version}.jar" >
       <include name="**/*"/>
       <exclude name="samples/**" />
-    </jar> 
-
-    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
-    <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
-      <zipfileset dir="lib" includes="asm*.txt"/>
-      <zipfileset src="lib/asm-3.1.jar" excludes="META-INF"/>
-      <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
-      <include name="**/*"/>
-      <exclude name="samples/**"/>
-    </jarjar> 
+    </jar>
   </target>
 
   <target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">
@@ -239,16 +230,7 @@
           failonerror="${test.failonerror}"
           fork="yes" 
           >
-
-  <!-- jvmarg value="-Xrunhprof:heap=all,file=debug.txt"/ --> 
-  <!-- <jvmarg value="-verbose:gc"/> --> 
-  <!-- <jvmarg value="-verbose:class"/> -->
-  <!-- <jvmarg value="-Xprof"/> -->
-  <!-- <jvmarg value="-server"/> -->
-  <!-- <sysproperty key="cglib.debugLocation" value="debug"/> -->
-  <!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->
-  <!-- <jvmarg value="-Djava.security.manager" />  -->
- 
+		<sysproperty key="cglib.debugLocation" value="${debugLocation}"/>
       <arg value="${test.entry}"/>
         <classpath>
           <pathelement path="${build.home}/classes"/>