diff options
14 files changed, 23 insertions, 11 deletions
diff --git a/doc/bundles/org.eclipse.ecf.doc/javadoc.xml b/doc/bundles/org.eclipse.ecf.doc/javadoc.xml index eb9d123eb..6dd3212be 100644 --- a/doc/bundles/org.eclipse.ecf.doc/javadoc.xml +++ b/doc/bundles/org.eclipse.ecf.doc/javadoc.xml @@ -12,7 +12,7 @@ noindex="false" nonavbar="false" notree="false" - packagenames="org.eclipse.ecf.fileshare,org.eclipse.ecf.filetransfer.identity,org.eclipse.ecf.provider.xmpp,org.eclipse.ecf.presence,org.eclipse.ecf.provider.jmdns.container,org.eclipse.ecf.ui.views,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.provider.app,org.eclipse.ecf.provider.xmpp.smack.test,org.eclipse.ecf.remoteservice,org.eclipse.ecf.presence.impl,org.eclipse.ecf.provider.irc.identity,org.eclipse.ecf.filetransfer,org.eclipse.ecf.core,org.eclipse.ecf.core.user,org.eclipse.ecf.provider.remoteservice,org.eclipse.ecf.server,org.eclipse.ecf.provider.irc.container,org.eclipse.ecf.core.sharedobject,org.eclipse.ecf.provider.xmpp.smack,org.eclipse.ecf.core.events,org.eclipse.ecf.provider.xmpp.container,org.eclipse.ecf.core.util,org.eclipse.ecf.datashare,org.eclipse.ecf.core.comm.provider,org.eclipse.ecf.datashare.events,org.eclipse.ecf.core.security,org.eclipse.ecf.core.comm,org.eclipse.ecf.ui.wizards,org.eclipse.ecf.discovery,org.eclipse.ecf.core.identity,org.eclipse.ecf.provider.jmdns,org.eclipse.ecf.core.start,org.eclipse.ecf.presence.provider,org.eclipse.ecf.call.events,org.eclipse.ecf.provider.fileshare,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.provider.generic,org.eclipse.ecf.remoteservice.events,org.eclipse.ecf.filetransfer.events,org.eclipse.ecf.provider.xmpp.events,org.eclipse.ecf.presence.chat,org.eclipse.ecf.fileshare.events,org.eclipse.ecf.datashare.mergeable,org.eclipse.ecf.call,org.eclipse.ecf.ui.util,org.eclipse.ecf.ui,org.eclipse.ecf.ui.dialogs,org.eclipse.ecf.provider.jmdns.identity,org.eclipse.ecf.provider.datashare,org.eclipse.ecf.provider.remoteservice.generic,org.eclipse.ecf.core.provider,org.eclipse.ecf.provider.xmpp.identity,org.eclipse.ecf.provider.irc" + packagenames="org.eclipse.ecf.fileshare,org.eclipse.ecf.filetransfer.identity,org.eclipse.ecf.provider.xmpp,org.eclipse.ecf.presence,org.eclipse.ecf.provider.jmdns.container,org.eclipse.ecf.ui.views,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.provider.app,org.eclipse.ecf.provider.xmpp.smack.test,org.eclipse.ecf.remoteservice,org.eclipse.ecf.presence.impl,org.eclipse.ecf.provider.irc.identity,org.eclipse.ecf.filetransfer,org.eclipse.ecf.core,org.eclipse.ecf.core.user,org.eclipse.ecf.provider.remoteservice,org.eclipse.ecf.server,org.eclipse.ecf.provider.irc.container,org.eclipse.ecf.core.sharedobject,org.eclipse.ecf.provider.xmpp.smack,org.eclipse.ecf.core.events,org.eclipse.ecf.provider.xmpp.container,org.eclipse.ecf.core.util,org.eclipse.ecf.datashare,org.eclipse.ecf.core.comm.provider,org.eclipse.ecf.datashare.events,org.eclipse.ecf.core.security,org.eclipse.ecf.core.comm,org.eclipse.ecf.ui.wizards,org.eclipse.ecf.discovery,org.eclipse.ecf.discovery.identity,org.eclipse.ecf.core.identity,org.eclipse.ecf.provider.jmdns,org.eclipse.ecf.core.start,org.eclipse.ecf.presence.provider,org.eclipse.ecf.call.events,org.eclipse.ecf.provider.fileshare,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.provider.generic,org.eclipse.ecf.remoteservice.events,org.eclipse.ecf.filetransfer.events,org.eclipse.ecf.provider.xmpp.events,org.eclipse.ecf.presence.chat,org.eclipse.ecf.fileshare.events,org.eclipse.ecf.datashare.mergeable,org.eclipse.ecf.call,org.eclipse.ecf.ui.util,org.eclipse.ecf.ui,org.eclipse.ecf.ui.dialogs,org.eclipse.ecf.provider.jmdns.identity,org.eclipse.ecf.provider.datashare,org.eclipse.ecf.provider.remoteservice.generic,org.eclipse.ecf.core.provider,org.eclipse.ecf.provider.xmpp.identity,org.eclipse.ecf.provider.irc" source="1.4" sourcefiles="../org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/ProviderPlugin.java,../org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/Trace.java" sourcepath="../org.eclipse.ecf.remoteservice/src;../org.eclipse.ecf.provider.remoteservice/src;../org.eclipse.ecf.fileshare/src;../org.eclipse.ecf.server/src;../org.eclipse.ecf.datashare/src;../org.eclipse.ecf.ui/src;../org.eclipse.ecf.example.collab.editor/src;../org.eclipse.ecf.presence/src;../org.eclipse.ecf.provider.datashare/src;../org.eclipse.ecf.example.clients/src;../org.eclipse.ecf.provider.xmpp/src;../org.eclipse.ecf.provider/src;../org.eclipse.ecf.call/src;../org.eclipse.ecf/src;../org.eclipse.ecf.provider.fileshare/src;../org.eclipse.ecf.example.hello/src;../org.eclipse.ecf.example.collab/src;../org.eclipse.ecf.provider.jmdns/src;../org.eclipse.ecf.discovery/src" diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabDiscoveryView.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabDiscoveryView.java index 4c0b8194e..e51680485 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabDiscoveryView.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabDiscoveryView.java @@ -14,7 +14,7 @@ import org.eclipse.ecf.discovery.IDiscoveryContainer; import org.eclipse.ecf.discovery.IServiceEvent; import org.eclipse.ecf.discovery.IServiceListener; import org.eclipse.ecf.discovery.IServiceTypeListener; -import org.eclipse.ecf.discovery.ServiceID; +import org.eclipse.ecf.discovery.identity.ServiceID; import org.eclipse.ecf.ui.views.DiscoveryView; import org.eclipse.ecf.ui.views.IDiscoveryController; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java index 1eb5ea70c..4e3b34708 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java @@ -22,9 +22,9 @@ import org.eclipse.ecf.core.ISharedObjectContainer; import org.eclipse.ecf.discovery.IDiscoveryContainer; import org.eclipse.ecf.discovery.IServiceInfo; import org.eclipse.ecf.discovery.IServiceProperties; -import org.eclipse.ecf.discovery.ServiceID; import org.eclipse.ecf.discovery.ServiceInfo; import org.eclipse.ecf.discovery.ServiceProperties; +import org.eclipse.ecf.discovery.identity.ServiceID; import org.eclipse.ecf.example.collab.actions.URIClientConnectAction; public class DiscoveryStartup { diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/start/Discovery.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/start/Discovery.java index 31f77ef36..8cd1a715c 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/start/Discovery.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/start/Discovery.java @@ -16,7 +16,7 @@ import org.eclipse.ecf.discovery.IDiscoveryContainer; import org.eclipse.ecf.discovery.IServiceEvent; import org.eclipse.ecf.discovery.IServiceListener; import org.eclipse.ecf.discovery.IServiceTypeListener; -import org.eclipse.ecf.discovery.ServiceID; +import org.eclipse.ecf.discovery.identity.ServiceID; public class Discovery { diff --git a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF index f084d264e..79bbe3203 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ecf Eclipse-LazyStart: true Eclipse-AutoStart: true -Export-Package: org.eclipse.ecf.discovery +Export-Package: org.eclipse.ecf.discovery, org.eclipse.ecf.discovery.identity Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java index ffeaf30b7..9ae99ddd3 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java @@ -11,6 +11,8 @@ package org.eclipse.ecf.discovery; import java.io.IOException; +import org.eclipse.ecf.discovery.identity.ServiceID; + /** * Adapter interface for shared object containers that support lookup and discovery. diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceInfo.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceInfo.java index 11649b621..cec94e152 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceInfo.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceInfo.java @@ -12,6 +12,8 @@ package org.eclipse.ecf.discovery; import java.net.InetAddress; import java.net.URI; import java.net.URISyntaxException; + +import org.eclipse.ecf.discovery.identity.ServiceID; /** * Service information contrace. Defines the information associated * with a remotely discoverable service diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceInfo.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceInfo.java index 998120740..357daad39 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceInfo.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceInfo.java @@ -14,6 +14,8 @@ import java.net.InetAddress; import java.net.URI; import java.net.URISyntaxException; +import org.eclipse.ecf.discovery.identity.ServiceID; + /** * Information provided by discovery protocol about a remote service diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceID.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceID.java index ff888f20a..6a5735fda 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceID.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceID.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.discovery; +package org.eclipse.ecf.discovery.identity; import java.net.URI; import java.net.URISyntaxException; @@ -14,9 +14,15 @@ import java.net.URISyntaxException; import org.eclipse.ecf.core.identity.BaseID; import org.eclipse.ecf.core.identity.Namespace; +/** + * Identity type to represent discovered service + * + */ public class ServiceID extends BaseID { private static final long serialVersionUID = 1L; + protected String type; + protected String name; protected ServiceID(Namespace namespace, String type, String name) { diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java index 4ef6a8040..4b92bc49c 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java @@ -21,7 +21,7 @@ import org.eclipse.ecf.core.IContainer; import org.eclipse.ecf.discovery.IDiscoveryContainer; import org.eclipse.ecf.discovery.IServiceInfo; import org.eclipse.ecf.discovery.IServiceProperties; -import org.eclipse.ecf.discovery.ServiceID; +import org.eclipse.ecf.discovery.identity.ServiceID; import org.eclipse.ecf.ui.UiPlugin; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuListener; diff --git a/framework/bundles/org.eclipse.ecf/javadoc.xml b/framework/bundles/org.eclipse.ecf/javadoc.xml index 817b36b61..04f891913 100644 --- a/framework/bundles/org.eclipse.ecf/javadoc.xml +++ b/framework/bundles/org.eclipse.ecf/javadoc.xml @@ -12,7 +12,7 @@ noindex="false" nonavbar="false" notree="false" - packagenames="org.eclipse.ecf.fileshare,org.eclipse.ecf.filetransfer.identity,org.eclipse.ecf.provider.xmpp,org.eclipse.ecf.presence,org.eclipse.ecf.provider.jmdns.container,org.eclipse.ecf.ui.views,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.provider.app,org.eclipse.ecf.provider.xmpp.smack.test,org.eclipse.ecf.remoteservice,org.eclipse.ecf.presence.impl,org.eclipse.ecf.provider.irc.identity,org.eclipse.ecf.filetransfer,org.eclipse.ecf.core,org.eclipse.ecf.core.user,org.eclipse.ecf.provider.remoteservice,org.eclipse.ecf.server,org.eclipse.ecf.provider.irc.container,org.eclipse.ecf.core.sharedobject,org.eclipse.ecf.provider.xmpp.smack,org.eclipse.ecf.core.events,org.eclipse.ecf.provider.xmpp.container,org.eclipse.ecf.core.util,org.eclipse.ecf.datashare,org.eclipse.ecf.core.comm.provider,org.eclipse.ecf.datashare.events,org.eclipse.ecf.core.security,org.eclipse.ecf.core.comm,org.eclipse.ecf.ui.wizards,org.eclipse.ecf.discovery,org.eclipse.ecf.core.identity,org.eclipse.ecf.provider.jmdns,org.eclipse.ecf.core.start,org.eclipse.ecf.presence.provider,org.eclipse.ecf.call.events,org.eclipse.ecf.provider.fileshare,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.provider.generic,org.eclipse.ecf.remoteservice.events,org.eclipse.ecf.filetransfer.events,org.eclipse.ecf.provider.xmpp.events,org.eclipse.ecf.presence.chat,org.eclipse.ecf.fileshare.events,org.eclipse.ecf.datashare.mergeable,org.eclipse.ecf.call,org.eclipse.ecf.ui.util,org.eclipse.ecf.ui,org.eclipse.ecf.ui.dialogs,org.eclipse.ecf.provider.jmdns.identity,org.eclipse.ecf.provider.datashare,org.eclipse.ecf.provider.remoteservice.generic,org.eclipse.ecf.core.provider,org.eclipse.ecf.provider.xmpp.identity,org.eclipse.ecf.provider.irc" + packagenames="org.eclipse.ecf.fileshare,org.eclipse.ecf.filetransfer.identity,org.eclipse.ecf.provider.xmpp,org.eclipse.ecf.presence,org.eclipse.ecf.provider.jmdns.container,org.eclipse.ecf.ui.views,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.provider.app,org.eclipse.ecf.provider.xmpp.smack.test,org.eclipse.ecf.remoteservice,org.eclipse.ecf.presence.impl,org.eclipse.ecf.provider.irc.identity,org.eclipse.ecf.filetransfer,org.eclipse.ecf.core,org.eclipse.ecf.core.user,org.eclipse.ecf.provider.remoteservice,org.eclipse.ecf.server,org.eclipse.ecf.provider.irc.container,org.eclipse.ecf.core.sharedobject,org.eclipse.ecf.provider.xmpp.smack,org.eclipse.ecf.core.events,org.eclipse.ecf.provider.xmpp.container,org.eclipse.ecf.core.util,org.eclipse.ecf.datashare,org.eclipse.ecf.core.comm.provider,org.eclipse.ecf.datashare.events,org.eclipse.ecf.core.security,org.eclipse.ecf.core.comm,org.eclipse.ecf.ui.wizards,org.eclipse.ecf.discovery,org.eclipse.ecf.discovery.identity,org.eclipse.ecf.core.identity,org.eclipse.ecf.provider.jmdns,org.eclipse.ecf.core.start,org.eclipse.ecf.presence.provider,org.eclipse.ecf.call.events,org.eclipse.ecf.provider.fileshare,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.provider.generic,org.eclipse.ecf.remoteservice.events,org.eclipse.ecf.filetransfer.events,org.eclipse.ecf.provider.xmpp.events,org.eclipse.ecf.presence.chat,org.eclipse.ecf.fileshare.events,org.eclipse.ecf.datashare.mergeable,org.eclipse.ecf.call,org.eclipse.ecf.ui.util,org.eclipse.ecf.ui,org.eclipse.ecf.ui.dialogs,org.eclipse.ecf.provider.jmdns.identity,org.eclipse.ecf.provider.datashare,org.eclipse.ecf.provider.remoteservice.generic,org.eclipse.ecf.core.provider,org.eclipse.ecf.provider.xmpp.identity,org.eclipse.ecf.provider.irc" source="1.4" sourcefiles="../org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/ProviderPlugin.java,../org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/Trace.java" sourcepath="../org.eclipse.ecf.provider.fileshare/src;../org.eclipse.ecf.provider.xmpp/src;../org.eclipse.ecf.server/src;../org.eclipse.ecf.provider.irc/src;../org.eclipse.ecf.provider.datashare/src;../org.eclipse.ecf.provider/src;../org.eclipse.ecf.presence/src;src;../org.eclipse.ecf.provider.jmdns/src;../org.eclipse.ecf.provider.remoteservice/src;../org.eclipse.ecf.ui/src;../org.eclipse.ecf.discovery/src;../org.eclipse.ecf.remoteservice/src;../org.eclipse.ecf.call/src;../org.eclipse.ecf.datashare/src;../org.eclipse.ecf.fileshare/src" diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java index a91c0460d..88eeee32b 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java @@ -47,8 +47,8 @@ import org.eclipse.ecf.discovery.IServiceListener; import org.eclipse.ecf.discovery.IServiceProperties; import org.eclipse.ecf.discovery.IServiceTypeListener; import org.eclipse.ecf.discovery.ServiceContainerEvent; -import org.eclipse.ecf.discovery.ServiceID; import org.eclipse.ecf.discovery.ServiceProperties; +import org.eclipse.ecf.discovery.identity.ServiceID; import org.eclipse.ecf.provider.jmdns.Messages; import org.eclipse.ecf.provider.jmdns.Trace; import org.eclipse.ecf.provider.jmdns.identity.JMDNSServiceID; diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSServiceInfo.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSServiceInfo.java index a485850d6..6615860a9 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSServiceInfo.java +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSServiceInfo.java @@ -14,8 +14,8 @@ import java.net.InetAddress; import java.net.URI; import java.net.URISyntaxException; import org.eclipse.ecf.discovery.IServiceProperties; -import org.eclipse.ecf.discovery.ServiceID; import org.eclipse.ecf.discovery.ServiceInfo; +import org.eclipse.ecf.discovery.identity.ServiceID; public class JMDNSServiceInfo extends ServiceInfo { diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/identity/JMDNSServiceID.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/identity/JMDNSServiceID.java index f10ee3826..fe074bbdf 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/identity/JMDNSServiceID.java +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/identity/JMDNSServiceID.java @@ -11,7 +11,7 @@ package org.eclipse.ecf.provider.jmdns.identity; import org.eclipse.ecf.core.identity.Namespace; -import org.eclipse.ecf.discovery.ServiceID; +import org.eclipse.ecf.discovery.identity.ServiceID; public class JMDNSServiceID extends ServiceID { |