btrace-asm-3.1.jar contents are included in btrace-agent.jar and

A. Sundararajan · A. Sundararajan · commit 26981d180d13 · 2009-07-07T13:23:47.000+05:30
btrace-client.jar. This simplifies deployment of BTrace in embedding
scenarios.
diff --git a/bin/btrace b/bin/btrace
@@ -36,7 +36,7 @@ if [ -f "${BTRACE_HOME}/build/btrace-client.jar" ] ; then
               TOOLS_JAR="${JAVA_HOME}/lib/tools.jar"
           ;;
        esac
-       ${JAVA_HOME}/bin/java -Dcom.sun.btrace.probeDescPath=. -Dcom.sun.btrace.dumpClasses=false -Dcom.sun.btrace.debug=false -Dcom.sun.btrace.unsafe=false -cp ${BTRACE_HOME}/build/btrace-client.jar:${BTRACE_HOME}/build/btrace-asm-3.1.jar:${TOOLS_JAR}:/usr/share/lib/java/dtrace.jar com.sun.btrace.client.Main $*
+       ${JAVA_HOME}/bin/java -Dcom.sun.btrace.probeDescPath=. -Dcom.sun.btrace.dumpClasses=false -Dcom.sun.btrace.debug=false -Dcom.sun.btrace.unsafe=false -cp ${BTRACE_HOME}/build/btrace-client.jar:${TOOLS_JAR}:/usr/share/lib/java/dtrace.jar com.sun.btrace.client.Main $*
     else
        echo "Please set JAVA_HOME before running this script"
        exit 1
diff --git a/bin/btrace.bat b/bin/btrace.bat
@@ -9,7 +9,7 @@ set DEFAULT_BTRACE_HOME=
 if not exist "%BTRACE_HOME%\build\btrace-client.jar" goto noBTraceHome
 
 if "%JAVA_HOME%" == "" goto noJavaHome
-  %JAVA_HOME%/bin/java -Dcom.sun.btrace.probeDescPath=. -Dcom.sun.btrace.dumpClasses=false -Dcom.sun.btrace.debug=false -Dcom.sun.btrace.unsafe=false -cp %BTRACE_HOME%/build/btrace-client.jar;%BTRACE_HOME%/build/btrace-asm-3.1.jar;%JAVA_HOME%/lib/tools.jar com.sun.btrace.client.Main %*
+  %JAVA_HOME%/bin/java -Dcom.sun.btrace.probeDescPath=. -Dcom.sun.btrace.dumpClasses=false -Dcom.sun.btrace.debug=false -Dcom.sun.btrace.unsafe=false -cp %BTRACE_HOME%/build/btrace-client.jar;%JAVA_HOME%/lib/tools.jar com.sun.btrace.client.Main %*
   goto end
 :noJavaHome
   echo Please set JAVA_HOME before running this script
diff --git a/make/build.xml b/make/build.xml
@@ -68,15 +68,6 @@
            <pom file="${build.dir}/pom-btrace-client.xml"/>
            <localRepository path="${maven.repo.local}"/>
        </install>
-       <antcall target="create.pom.file" >
-          <param name="name" value="btrace-asm"/>
-          <param name="artifact" value="btrace-asm"/>
-          <param name="release.version" value="${asm.version}"/>
-       </antcall>
-       <install file="${build.dir}/btrace-asm-3.1.jar">
-           <pom file="${build.dir}/pom-btrace-asm.xml"/>
-           <localRepository path="${maven.repo.local}"/>
-       </install>
    </target>
 
    <target name="upload.maven" depends="create.poms" description="Publish btrace binaries to Maven2 repository">
@@ -95,10 +86,6 @@
            <localRepository path="${maven.repo.local}"/>
        </deploy>
 
-       <deploy file="${build.dir}/btrace-asm-3.1.jar" uniqueVersion="false" >
-           <pom file="${build.dir}/pom-btrace-asm.xml"/>
-           <localRepository path="${maven.repo.local}"/>
-       </deploy>
    </target> 
 
     <target name="clean" depends="load.properties">
@@ -136,16 +123,14 @@
         </javac>
     </target>
     <target name="build" depends="compile, dtrace-compile" description="Creates deployment bundles">
-        <copy todir="${build.dir}">
-            <fileset file="${lib.dir}/btrace-asm-3.1.jar"/>
-        </copy>
+        <unjar src="${lib.dir}/btrace-asm-3.1.jar" dest="${classes.dir}"/>
         <jar jarfile="${agent.jar}"         
          basedir="${classes.dir}"
          manifest="${share.src.dir}/META-INF/agent-manifest.mf"
          excludes="**/dtrace/* **/btrace/*.class **/aggregation/* **/annotations/* **/compiler/* **/client/* **/comm/*"/>
         <jar jarfile="${boot.jar}"         
          basedir="${classes.dir}"
-         excludes="**/dtrace/* **/agent/* **/compiler/* **/client/* **/resources/* **/runtime/* **/util/*"/>
+         excludes="**/dtrace/* **/agent/* **/compiler/* **/client/* **/resources/* **/runtime/* **/util/* **/asm/**"/>
         <jar jarfile="${client.jar}"
          basedir="${classes.dir}"
          manifest="${share.src.dir}/META-INF/client-manifest.mf"
diff --git a/src/share/classes/META-INF/agent-manifest.mf b/src/share/classes/META-INF/agent-manifest.mf
@@ -1,6 +1,5 @@
 Premain-Class: com.sun.btrace.agent.Main
 Agent-Class: com.sun.btrace.agent.Main
-Class-Path: btrace-asm-3.1.jar
 Boot-Class-Path: btrace-boot.jar
 Can-Redefine-Classes: true
 Can-Retransform-Classes: true
