Added plugin org.jivesoftware.smack plugin (v 2.2.0). Changed dependencies in org.eclipse.ecf.provider.xmpp to this new plugin rather than to smack libraries in org.eclipse.ecf.provider.xmpp/lib. Added smack plugin to build. Changed xmpp feature to include smack plugin.

6 files changed, 5 insertions, 12 deletions

diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/.classpath b/providers/bundles/org.eclipse.ecf.provider.xmpp/.classpath
index 1c00cd28b..751c8f2e5 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/.classpath
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/.classpath
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/smackx-debug.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/smack.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/smackx.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF
index 128a005ab..c30eadf49 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF
@@ -2,16 +2,14 @@ Manifest-Version: 1.0
 Bundle-Name: ECF XMPP Provider
 Bundle-SymbolicName: org.eclipse.ecf.provider.xmpp;singleton=true
 Bundle-Version: 0.7.7
-Bundle-ClassPath: xmpp.jar,
- lib/smackx-debug.jar,
- lib/smack.jar,
- lib/smackx.jar
+Bundle-ClassPath: xmpp.jar
 Bundle-Activator: org.eclipse.ecf.provider.xmpp.XmppPlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ecf,
  org.eclipse.ecf.provider,
- org.eclipse.ecf.presence
+ org.eclipse.ecf.presence,
+ org.jivesoftware.smack
 Eclipse-AutoStart: true
 Export-Package: org.eclipse.ecf.provider.xmpp.container, org.eclipse.ecf.provider.xmpp.identity
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/build.properties b/providers/bundles/org.eclipse.ecf.provider.xmpp/build.properties
index f9e7d3ee0..bef9ff79e 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/build.properties
@@ -2,14 +2,12 @@ bin.includes = plugin.xml,\
                META-INF/,\
                xmpp.jar,\
                about.html,\
-               asl-v20.txt,\
-               lib/
+               asl-v20.txt
 src.includes = META-INF/,\
                xmpp.jar,\
                plugin.xml,\
                about.html,\
-               asl-v20.txt,\
-               lib/
+               asl-v20.txt
 source.xmpp.jar = src/
 output.xmpp.jar = bin/
 jars.compile.order = xmpp.jar
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/lib/smack.jar b/providers/bundles/org.eclipse.ecf.provider.xmpp/lib/smack.jar
deleted file mode 100644
index 917e36344..000000000
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/lib/smack.jar
+++ /dev/null
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/lib/smackx-debug.jar b/providers/bundles/org.eclipse.ecf.provider.xmpp/lib/smackx-debug.jar
deleted file mode 100644
index de58be97d..000000000
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/lib/smackx-debug.jar
+++ /dev/null
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/lib/smackx.jar b/providers/bundles/org.eclipse.ecf.provider.xmpp/lib/smackx.jar
deleted file mode 100644
index a9c58acf0..000000000
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/lib/smackx.jar
+++ /dev/null