From 3a3e784a7054d5ac15dcdd3176c34c0367e30ccb Mon Sep 17 00:00:00 2001
From: Matt Tucker <matt@jivesoftware.com>
Date: Fri, 9 Mar 2007 04:19:11 +0000
Subject: [PATCH] Jingle build cleanup.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7420 b35dd754-fafc-0310-a699-88a17e54d16e
---
 build/build.xml                                   |  14 +++++++-------
 .../build/merge/{jstun-0.6.1.jar => jstun.jar}    | Bin
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename jingle/extension/build/merge/{jstun-0.6.1.jar => jstun.jar} (100%)

diff --git a/build/build.xml b/build/build.xml
index e0d596479..a26bc0b5f 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -28,7 +28,7 @@
     <property name="version.major" value="3" />
     <property name="version.minor" value="0" />
     <property name="version.revision" value="0" />
-    <property name="version.extra" value="beta2" /> 
+    <property name="version.extra" value="beta3" /> 
 
     <if>
         <equals arg1="${version.extra}" arg2=""/>
@@ -208,21 +208,21 @@
                 <attribute name="Class-Path" value="smack.jar" />
             </manifest>
         </jar>
-		<jar destfile="${jar.dest.dir}/jingleExtension.jar"
+		<jar destfile="${jar.dest.dir}/smackx-jingle.jar"
             basedir="${compile.dir}/jingle/extension"
             includes="org/jivesoftware/smackx/**/*.class"
         >
             <manifest>
                 <attribute name="Class-Path" value="smack.jar, smackx.jar" />
             </manifest>
-            <zipfileset src="${jingle.extension.merge.lib.dir}/jstun-0.6.1.jar"/>
+            <zipfileset src="${jingle.extension.merge.lib.dir}/jstun.jar"/>
         </jar>
-		<jar destfile="${jar.dest.dir}/jingleMedia.jar"
+		<jar destfile="${jar.dest.dir}/smackx-jingleMedia.jar"
             basedir="${compile.dir}/jingle/media"
             includes="org/jivesoftware/**/*.class"
         >
             <manifest>
-                <attribute name="Class-Path" value="smack.jar,smackx.jar,jingleExtension.jar" />
+                <attribute name="Class-Path" value="smack.jar,smackx.jar,smackx-jingle.jar" />
             </manifest>
         </jar>
         <delete file="${compile.dir}/META-INF/smack-config.xml" />
@@ -381,8 +381,8 @@
         <delete file="${basedir}/smackx.jar" />
         <delete file="${basedir}/smackx-debug.jar" />
         <delete file="${basedir}/smack-test.jar" />
-		<delete file="${basedir}/jingleExtension.jar" />
-		<delete file="${basedir}/jingleMedia.jar" />
+		<delete file="${basedir}/smackx-jingle.jar" />
+		<delete file="${basedir}/smackx-jingleMedia.jar" />
         <delete dir="${basedir}/target" />
     </target>
 
diff --git a/jingle/extension/build/merge/jstun-0.6.1.jar b/jingle/extension/build/merge/jstun.jar
similarity index 100%
rename from jingle/extension/build/merge/jstun-0.6.1.jar
rename to jingle/extension/build/merge/jstun.jar