Index: chatapp/build/build.xml
===================================================================
--- chatapp/build/build.xml	(revision 51082)
+++ chatapp/build/build.xml	(working copy)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="Web Client" default="plugin" basedir="..">
+<project name="ChatApp" default="plugin" basedir="..">
 
     <description>
         Build script for the Fastpath web chat client.
@@ -33,14 +33,15 @@
     <property name="jspc.dest.dir" value="${compile.dir}/jspc" />
     <property name="jspc.java.dest.dir" value="${compile.dir}/jspc/java" />
     <property name="jspc.classes.dest.dir" value="${compile.dir}/jspc/classes" />
-    <property name="jar.core.name" value="webclient.jar" />
-    <property name="jar.plugin.name" value="plugin-webclient.jar" />
-    <property name="war.plugin.name" value="webchat.war" />
-    <property name="war.core.name" value="webchat.war" />
+    <property name="jar.core.name" value="chatapp.jar" />
+    <property name="jar.plugin.name" value="plugin-chatapp.jar" />
+    <property name="war.plugin.name" value="chatapp.war" />
+    <property name="war.core.name" value="chatapp.war" />
     <property name="lib.build.dir" value="${basedir}/build/lib" />
     <property name="lib.merge.dir" value="${basedir}/build/lib/merge" />
     <property name="lib.web.dir" value="${src.webapp.dir}/WEB-INF/lib" />
     <property name="openfire.home" value="${basedir}/../openfire" />
+    <property name="smack.home" value="${basedir}/../smack" />
     <property name="deploy.dir" value="${target.dir}/deploy" />
 
     <!-- ======================================================================================= -->
@@ -52,9 +53,11 @@
     </patternset>
 
     <path id="compile.dependencies">
-        <fileset dir="${lib.build.dir}" includes="*.jar" />
-        <fileset dir="${lib.merge.dir}" includes="*.jar" />
-        <fileset dir="${lib.web.dir}" includes="*.jar" />
+	<pathelement location="${smack.home}/target/smack.jar"/>
+	<pathelement location="${smack.home}/target/smackx.jar"/>
+	<fileset dir="${lib.build.dir}" includes="*.jar" />
+	<fileset dir="${lib.merge.dir}" includes="*.jar" />
+	<fileset dir="${lib.web.dir}" includes="*.jar" />
     </path>
 
     <path id="jspc.dependencies">
@@ -195,6 +198,9 @@
             <fileset dir="${src.webapp.dir}" excludes="WEB-INF/**/*.*,*.iml" />
             <webinf dir="${src.webapp.dir}/WEB-INF" excludes="**/lib/*.txt,chat-settings.xml" />
             <lib dir="${target.dir}" includes="${jar.core.name}" />
+	    <lib dir="${smack.home}/target/" includes="smack.jar"/>
+	    <lib dir="${smack.home}/target/" includes="smackx.jar"/>
+	    <lib dir="${lib.build.dir}" includes="commons-logging.jar"/><!--Needed to run in Jetty 6-->
         </war>
     </target>
 
Index: chatapp/src/java/org/jivesoftware/webchat/ChatUtils.java
===================================================================
--- chatapp/src/java/org/jivesoftware/webchat/ChatUtils.java	(revision 51082)
+++ chatapp/src/java/org/jivesoftware/webchat/ChatUtils.java	(working copy)
@@ -11,7 +11,7 @@
  */
 package org.jivesoftware.webchat;
 
-import com.jivesoftware.smack.workgroup.user.Workgroup;
+import org.jivesoftware.smackx.workgroup.user.Workgroup;
 import org.jivesoftware.webchat.actions.ChatQueue;
 import org.jivesoftware.webchat.personal.ChatMessage;
 import org.jivesoftware.webchat.util.FormText;
Index: chatapp/src/java/org/jivesoftware/webchat/LoadTest.java
===================================================================
--- chatapp/src/java/org/jivesoftware/webchat/LoadTest.java	(revision 51082)
+++ chatapp/src/java/org/jivesoftware/webchat/LoadTest.java	(working copy)
@@ -1,10 +1,10 @@
 package org.jivesoftware.webchat;
 
-import com.jivesoftware.smack.workgroup.MetaData;
-import com.jivesoftware.smack.workgroup.agent.AgentSession;
-import com.jivesoftware.smack.workgroup.agent.Offer;
-import com.jivesoftware.smack.workgroup.agent.OfferListener;
-import com.jivesoftware.smack.workgroup.agent.RevokedOffer;
+import org.jivesoftware.smackx.workgroup.MetaData;
+import org.jivesoftware.smackx.workgroup.agent.AgentSession;
+import org.jivesoftware.smackx.workgroup.agent.Offer;
+import org.jivesoftware.smackx.workgroup.agent.OfferListener;
+import org.jivesoftware.smackx.workgroup.agent.RevokedOffer;
 import org.jivesoftware.smack.ConnectionListener;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.XMPPConnection;
Index: chatapp/src/java/org/jivesoftware/webchat/actions/WorkgroupStatus.java
===================================================================
--- chatapp/src/java/org/jivesoftware/webchat/actions/WorkgroupStatus.java	(revision 51082)
+++ chatapp/src/java/org/jivesoftware/webchat/actions/WorkgroupStatus.java	(working copy)
@@ -12,7 +12,7 @@
 
 package org.jivesoftware.webchat.actions;
 
-import com.jivesoftware.smack.workgroup.user.Workgroup;
+import org.jivesoftware.smackx.workgroup.user.Workgroup;
 import org.jivesoftware.webchat.ChatManager;
 import org.jivesoftware.webchat.settings.ConnectionSettings;
 import org.jivesoftware.webchat.util.ModelUtil;
@@ -298,4 +298,4 @@
         return workgroup;
     }
 
-}
\ No newline at end of file
+}
Index: chatapp/src/java/org/jivesoftware/webchat/actions/ChatStarter.java
===================================================================
--- chatapp/src/java/org/jivesoftware/webchat/actions/ChatStarter.java	(revision 51082)
+++ chatapp/src/java/org/jivesoftware/webchat/actions/ChatStarter.java	(working copy)
@@ -12,8 +12,8 @@
 
 package org.jivesoftware.webchat.actions;
 
-import com.jivesoftware.smack.workgroup.settings.WorkgroupProperties;
-import com.jivesoftware.smack.workgroup.user.Workgroup;
+import org.jivesoftware.smackx.workgroup.settings.WorkgroupProperties;
+import org.jivesoftware.smackx.workgroup.user.Workgroup;
 import org.jivesoftware.webchat.ChatManager;
 import org.jivesoftware.webchat.ChatSession;
 import org.jivesoftware.webchat.providers.MetaDataProvider;
@@ -330,4 +330,4 @@
     }
 
 
-}
\ No newline at end of file
+}
Index: chatapp/src/java/org/jivesoftware/webchat/ChatSession.java
===================================================================
--- chatapp/src/java/org/jivesoftware/webchat/ChatSession.java	(revision 51082)
+++ chatapp/src/java/org/jivesoftware/webchat/ChatSession.java	(working copy)
@@ -12,9 +12,9 @@
 
 package org.jivesoftware.webchat;
 
-import com.jivesoftware.smack.workgroup.WorkgroupInvitation;
-import com.jivesoftware.smack.workgroup.WorkgroupInvitationListener;
-import com.jivesoftware.smack.workgroup.user.Workgroup;
+import org.jivesoftware.smackx.workgroup.WorkgroupInvitation;
+import org.jivesoftware.smackx.workgroup.WorkgroupInvitationListener;
+import org.jivesoftware.smackx.workgroup.user.Workgroup;
 import org.jivesoftware.webchat.history.Line;
 import org.jivesoftware.webchat.history.Transcript;
 import org.jivesoftware.webchat.personal.ChatMessage;
Index: chatapp/src/java/org/jivesoftware/webchat/sounds/SoundServlet.java
===================================================================
--- chatapp/src/java/org/jivesoftware/webchat/sounds/SoundServlet.java	(revision 51082)
+++ chatapp/src/java/org/jivesoftware/webchat/sounds/SoundServlet.java	(working copy)
@@ -1,7 +1,7 @@
 package org.jivesoftware.webchat.sounds;
 
-import com.jivesoftware.smack.workgroup.user.Workgroup;
-import com.jivesoftware.smack.workgroup.settings.SoundSettings;
+import org.jivesoftware.smackx.workgroup.user.Workgroup;
+import org.jivesoftware.smackx.workgroup.settings.SoundSettings;
 import org.jivesoftware.webchat.ChatManager;
 import org.jivesoftware.webchat.util.WebLog;
 
@@ -42,4 +42,4 @@
             WebLog.log("Could not load sound settings for workgroup " + workgroupName);
         }
     }
-}
\ No newline at end of file
+}
Index: chatapp/src/java/org/jivesoftware/webchat/util/FormText.java
===================================================================
--- chatapp/src/java/org/jivesoftware/webchat/util/FormText.java	(revision 51082)
+++ chatapp/src/java/org/jivesoftware/webchat/util/FormText.java	(working copy)
@@ -11,7 +11,7 @@
 
 package org.jivesoftware.webchat.util;
 
-import com.jivesoftware.smack.workgroup.settings.ChatSetting;
+import org.jivesoftware.smackx.workgroup.settings.ChatSetting;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
Index: chatapp/src/java/org/jivesoftware/webchat/util/SettingsManager.java
===================================================================
--- chatapp/src/java/org/jivesoftware/webchat/util/SettingsManager.java	(revision 51082)
+++ chatapp/src/java/org/jivesoftware/webchat/util/SettingsManager.java	(working copy)
@@ -12,9 +12,9 @@
 
 package org.jivesoftware.webchat.util;
 
-import com.jivesoftware.smack.workgroup.settings.ChatSetting;
-import com.jivesoftware.smack.workgroup.settings.ChatSettings;
-import com.jivesoftware.smack.workgroup.user.Workgroup;
+import org.jivesoftware.smackx.workgroup.settings.ChatSetting;
+import org.jivesoftware.smackx.workgroup.settings.ChatSettings;
+import org.jivesoftware.smackx.workgroup.user.Workgroup;
 import org.jivesoftware.webchat.ChatManager;
 import org.jivesoftware.webchat.actions.WorkgroupChangeListener;
 import org.jivesoftware.webchat.actions.WorkgroupStatus;
@@ -197,4 +197,4 @@
     public void workgroupUpdated(String workgroupName) {
         chatSettings.remove(workgroupName);
     }
-}
\ No newline at end of file
+}
Index: chatapp/src/webapp/WEB-INF/lib/smackx.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: chatapp/src/webapp/WEB-INF/lib/smackx-debug.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: chatapp/src/webapp/WEB-INF/lib/smack.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: chatapp/src/webapp/WEB-INF/lib/workgroup.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream