SMACK-436 Moved workgroups to its own source location and jar since it is not (and never will be) part of the specification.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13867 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -132,6 +132,23 @@
                                 <pathelement path="${compile.dir}"/>
             </classpath>
         </javac>
+
+    	<mkdir dir="${compile.dir}/workgroup" />
+        <javac
+            destdir="${compile.dir}/workgroup"
+            includeAntRuntime="no"
+            debug="on"
+            source="1.6"
+            target="1.6"
+        >
+            <src path="${basedir}/workgroup/source" />
+            <classpath>
+                <fileset dir="${merge.lib.dir}">
+                    <include name="*.jar"/>
+                </fileset>
+                <pathelement path="${compile.dir}"/>
+            </classpath>
+        </javac>
     </target>
 
     <!-- compile-test -->
@@ -221,7 +238,7 @@
         <bndwrap jars="${debug.jar.name}" output="${debug.jar.name}" />
         <jar file="${debug.jar.name}" update="true">
             <manifest>
-                <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext-debug" />
+                <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-debug" />
             </manifest>
         </jar>
     	
@@ -237,9 +254,27 @@
         <bndwrap jars="${jingle.jar.name}" output="${jingle.jar.name}" />
         <jar file="${jingle.jar.name}" update="true">
             <manifest>
-                <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext-jingle" />
+                <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-jingle" />
             </manifest>
         </jar>
+
+    	<property name="workgroup.jar.name" value="${jar.dest.dir}/smackx-workgroup.jar" />
+        <copy todir="${compile.dir}/workgroup/META-INF" file="${basedir}/workgroup/resources/META-INF/workgroup.providers" />
+        <jar destfile="${workgroup.jar.name}"
+            basedir="${compile.dir}/workgroup"
+            includes="org/jivesoftware/smackx/workgroup/**/*.class, **/workgroup.providers">
+            <manifest>
+                <attribute name="Class-Path" value="smack.jar, smackx.jar" />
+            </manifest>
+        </jar>
+        <bndwrap jars="${workgroup.jar.name}" output="${workgroup.jar.name}" />
+        <jar file="${workgroup.jar.name}" update="true">
+            <manifest>
+                <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-workgroup" />
+            </manifest>
+        </jar>
+
+    <!--
     	<delete file="${compile.dir}/META-INF/smack-config.xml" />
         <delete file="${compile.dir}/META-INF/*.providers" />
         <delete>
@@ -247,6 +282,7 @@
                 <include name="*.png"/>
             </fileset>
         </delete>
+        -->
     </target>
 
     <!-- jar -->
@@ -292,7 +328,7 @@
             <link href="http://java.sun.com/j2se/1.3/docs/api/" />
             <link href="http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api/" />
         </javadoc>
-    </target>
+</target>
 
 
     <!-- test -->

build/eclipse/classpath

@@ -5,6 +5,7 @@
 	<classpathentry kind="src" path="source"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="src" path="test-unit"/>
+	<classpathentry kind="src" path="workgroup/source"/>
 	<classpathentry kind="lib" path="build/ant-contrib.jar"/>
 	<classpathentry kind="lib" path="build/asm.jar"/>
 	<classpathentry kind="lib" path="build/build/java-xmlbuilder-0.3.jar"/>

build/release.xml

@@ -53,6 +53,7 @@
             <fileset dir="${jar.dest.dir}" includes="smackx.jar" />
             <fileset dir="${jar.dest.dir}" includes="smackx-debug.jar" />
 			<fileset dir="${jar.dest.dir}" includes="smackx-jingle.jar" />
+			<fileset dir="${jar.dest.dir}" includes="smackx-workgroup.jar" />
         </copy>
         <copy todir="${release.samples.dir}">
             <fileset dir="${basedir}/build/resources/META-INF" includes="sample.providers" />

build/resources/META-INF/extension.providers

@@ -266,217 +266,6 @@
         <className>org.jivesoftware.smackx.provider.AdHocCommandDataProvider$SessionExpiredError</className>
     </extensionProvider>
     
-
-    <!-- Fastpath providers -->
-    <iqProvider>
-        <elementName>offer</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.OfferRequestProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>offer-revoke</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.OfferRevokeProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>agent-status-request</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.AgentStatusRequest$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>transcripts</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.TranscriptsProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>transcript</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.TranscriptProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>workgroups</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.AgentWorkgroups$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>agent-info</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.AgentInfo$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>transcript-search</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.TranscriptSearch$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>occupants-info</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.OccupantsInfo$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>chat-settings</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.settings.ChatSettings$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>chat-notes</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.ext.notes.ChatNotes$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>chat-sessions</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.ext.history.AgentChatHistory$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>offline-settings</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.settings.OfflineSettings$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>sound-settings</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.settings.SoundSettings$InternalProvider</className>
-    </iqProvider>
-
-     <iqProvider>
-        <elementName>workgroup-properties</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.settings.WorkgroupProperties$InternalProvider</className>
-    </iqProvider>
-
-
-    <iqProvider>
-        <elementName>search-settings</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.settings.SearchSettings$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>workgroup-form</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.ext.forms.WorkgroupForm$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>macros</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.ext.macros.Macros$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>chat-metadata</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.ext.history.ChatMetadata$Provider</className>
-    </iqProvider>
-<!--
-	
-	org.jivesoftware.smackx.workgroup.site is missing ... 
-
-    <iqProvider>
-        <elementName>site-user</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.site.SiteUser$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>site-invite</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.site.SiteInvitation$Provider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>site-user-history</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.site.SiteUserHistory$Provider</className>
-    </iqProvider>
--->
-    <iqProvider>
-        <elementName>generic-metadata</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.settings.GenericSettings$InternalProvider</className>
-    </iqProvider>
-
-    <iqProvider>
-        <elementName>monitor</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.MonitorPacket$InternalProvider</className>
-    </iqProvider>
-
-    <!-- Packet Extension Providers -->
-    <extensionProvider>
-        <elementName>queue-status</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.QueueUpdate$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>workgroup</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.WorkgroupInformation$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>metadata</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.MetaDataProvider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>session</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.SessionID$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>user</elementName>
-        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.UserID$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>agent-status</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.AgentStatus$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>notify-queue-details</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.QueueDetails$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>notify-queue</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.QueueOverview$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>invite</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.RoomInvitation$Provider</className>
-    </extensionProvider>
-
-    <extensionProvider>
-        <elementName>transfer</elementName>
-        <namespace>http://jabber.org/protocol/workgroup</namespace>
-        <className>org.jivesoftware.smackx.workgroup.packet.RoomTransfer$Provider</className>
-    </extensionProvider>
-    
     <!-- SHIM -->
     <extensionProvider>
     	<elementName>headers</elementName>

workgroup/resources/META-INF/workgroup.providers

@@ -0,0 +1,214 @@
+<?xml version="1.0"?> 
+<!-- Providers for workgroup extensions -->
+<smackProviders> 
+    <!-- Fastpath providers -->
+    <iqProvider>
+        <elementName>offer</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.OfferRequestProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>offer-revoke</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.OfferRevokeProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>agent-status-request</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.AgentStatusRequest$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>transcripts</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.TranscriptsProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>transcript</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.TranscriptProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>workgroups</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.AgentWorkgroups$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>agent-info</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.AgentInfo$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>transcript-search</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.TranscriptSearch$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>occupants-info</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.OccupantsInfo$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>chat-settings</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.settings.ChatSettings$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>chat-notes</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.ext.notes.ChatNotes$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>chat-sessions</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.ext.history.AgentChatHistory$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>offline-settings</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.settings.OfflineSettings$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>sound-settings</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.settings.SoundSettings$InternalProvider</className>
+    </iqProvider>
+
+     <iqProvider>
+        <elementName>workgroup-properties</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.settings.WorkgroupProperties$InternalProvider</className>
+    </iqProvider>
+
+
+    <iqProvider>
+        <elementName>search-settings</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.settings.SearchSettings$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>workgroup-form</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.ext.forms.WorkgroupForm$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>macros</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.ext.macros.Macros$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>chat-metadata</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.ext.history.ChatMetadata$Provider</className>
+    </iqProvider>
+<!--
+	
+	org.jivesoftware.smackx.workgroup.site is missing ... 
+
+    <iqProvider>
+        <elementName>site-user</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.site.SiteUser$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>site-invite</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.site.SiteInvitation$Provider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>site-user-history</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.site.SiteUserHistory$Provider</className>
+    </iqProvider>
+-->
+    <iqProvider>
+        <elementName>generic-metadata</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.settings.GenericSettings$InternalProvider</className>
+    </iqProvider>
+
+    <iqProvider>
+        <elementName>monitor</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.MonitorPacket$InternalProvider</className>
+    </iqProvider>
+
+    <!-- Packet Extension Providers -->
+    <extensionProvider>
+        <elementName>queue-status</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.QueueUpdate$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>workgroup</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.WorkgroupInformation$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>metadata</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.MetaDataProvider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>session</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.SessionID$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>user</elementName>
+        <namespace>http://jivesoftware.com/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.UserID$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>agent-status</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.AgentStatus$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>notify-queue-details</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.QueueDetails$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>notify-queue</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.QueueOverview$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>invite</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.RoomInvitation$Provider</className>
+    </extensionProvider>
+
+    <extensionProvider>
+        <elementName>transfer</elementName>
+        <namespace>http://jabber.org/protocol/workgroup</namespace>
+        <className>org.jivesoftware.smackx.workgroup.packet.RoomTransfer$Provider</className>
+    </extensionProvider>
+    
+</smackProviders>