Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkuppe2010-08-05 03:25:45 -0400
committermkuppe2010-08-05 03:25:45 -0400
commit0d5c1fe4fae7df0d35522b84bc1d4062391cd9f4 (patch)
tree1b542d6b36abf5baeeffb27c4502e41a493dd870 /providers/bundles/org.eclipse.ecf.provider.xmpp
parentf884d2e494fb2afcd7949101f3dba8ae7ecfe057 (diff)
downloadorg.eclipse.ecf-0d5c1fe4fae7df0d35522b84bc1d4062391cd9f4.tar.gz
org.eclipse.ecf-0d5c1fe4fae7df0d35522b84bc1d4062391cd9f4.tar.xz
org.eclipse.ecf-0d5c1fe4fae7df0d35522b84bc1d4062391cd9f4.zip
RESOLVED - bug 321708: Modularize XMPP provider WRT to remoteservices and datashare dependencies
https://bugs.eclipse.org/bugs/show_bug.cgi?id=321708
Diffstat (limited to 'providers/bundles/org.eclipse.ecf.provider.xmpp')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF12
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/plugin.xml36
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPRemoteServiceAdapterFactory.java53
3 files changed, 4 insertions, 97 deletions
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 619e01220..7bae26278 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
@@ -6,17 +6,12 @@ Bundle-Version: 3.2.0.qualifier
Bundle-Activator: org.eclipse.ecf.internal.provider.xmpp.XmppPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.equinox.common,
- org.eclipse.ecf;bundle-version="3.1.0",
+Require-Bundle: org.eclipse.ecf;bundle-version="3.1.0",
org.eclipse.ecf.provider,
org.eclipse.ecf.presence,
org.eclipse.ecf.filetransfer,
- org.eclipse.ecf.sharedobject,
- org.eclipse.ecf.datashare,
- org.eclipse.ecf.provider.datashare,
org.jivesoftware.smack;bundle-version="3.1.0",
- org.eclipse.ecf.remoteservice,
- org.eclipse.ecf.provider.remoteservice
+ org.eclipse.ecf.sharedobject
Eclipse-LazyStart: true
Export-Package: org.eclipse.ecf.internal.provider.xmpp;x-internal:=true,
org.eclipse.ecf.internal.provider.xmpp.events;x-internal:=true,
@@ -27,7 +22,8 @@ Export-Package: org.eclipse.ecf.internal.provider.xmpp;x-internal:=true,
Eclipse-BuddyPolicy: global
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-ExtensibleAPI: true
-Import-Package: org.eclipse.core.runtime.jobs,
+Import-Package: org.eclipse.core.runtime,
+ org.eclipse.core.runtime.jobs,
org.eclipse.equinox.concurrent.future;version="1.0.0",
org.eclipse.osgi.util;version="1.0.0",
org.osgi.framework;version="1.3.0",
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/plugin.xml b/providers/bundles/org.eclipse.ecf.provider.xmpp/plugin.xml
index 99fb1ef98..b1703832c 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/plugin.xml
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/plugin.xml
@@ -47,42 +47,6 @@
name="ecf.provider.filetransfer.xmpp"/>
</extension>
- <extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.ecf.provider.xmpp.XMPPContainer"
- class="org.eclipse.ecf.provider.datashare.DatashareContainerAdapterFactory">
- <adapter type="org.eclipse.ecf.datashare.IChannelContainerAdapter"/>
- </factory>
- </extension>
-
- <extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.ecf.provider.xmpp.XMPPSContainer"
- class="org.eclipse.ecf.provider.datashare.DatashareContainerAdapterFactory">
- <adapter type="org.eclipse.ecf.datashare.IChannelContainerAdapter"/>
- </factory>
- </extension>
-
- <extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.ecf.provider.xmpp.XMPPContainer"
- class="org.eclipse.ecf.internal.provider.xmpp.XMPPRemoteServiceAdapterFactory">
- <adapter type="org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter"/>
- </factory>
- </extension>
-
- <extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.ecf.provider.xmpp.XMPPSContainer"
- class="org.eclipse.ecf.internal.provider.xmpp.XMPPRemoteServiceAdapterFactory">
- <adapter type="org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter"/>
- </factory>
- </extension>
-
<extension-point id="iqProviders" name="IQ Providers" schema="schema/iqProvider.exsd"/>
<extension-point id="extensionProviders" name="Extension Providers" schema="schema/extensionProvider.exsd"/>
<extension-point id="providerDirectories" name="Provider Directories" schema="schema/providerDirectories.exsd"/>
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPRemoteServiceAdapterFactory.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPRemoteServiceAdapterFactory.java
deleted file mode 100644
index c24f2c12a..000000000
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPRemoteServiceAdapterFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2004 Composent, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Composent, Inc. - initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.ecf.internal.provider.xmpp;
-
-import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.core.sharedobject.ISharedObject;
-import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer;
-import org.eclipse.ecf.provider.remoteservice.generic.RegistrySharedObject;
-import org.eclipse.ecf.provider.remoteservice.generic.RemoteServiceContainerAdapterFactory;
-import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter;
-
-public class XMPPRemoteServiceAdapterFactory extends
- RemoteServiceContainerAdapterFactory {
-
- class XMPPRegistrySharedObject extends RegistrySharedObject {
- protected ID getLocalContainerID() {
- // For XMPP, the local container ID is its connected ID.
- return getContext().getConnectedID();
- }
-
- }
-
- public XMPPRemoteServiceAdapterFactory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ecf.provider.remoteservice.generic.
- * RemoteServiceContainerAdapterFactory
- * #createAdapter(org.eclipse.ecf.core.sharedobject.ISharedObjectContainer,
- * java.lang.Class, org.eclipse.ecf.core.identity.ID)
- */
- protected ISharedObject createAdapter(ISharedObjectContainer container,
- Class adapterType, ID adapterID) {
- if (adapterType.equals(IRemoteServiceContainerAdapter.class)) {
- return new XMPPRegistrySharedObject();
- } else {
- return null;
- }
- }
-
-}

Back to the top