diff options
author | slewis | 2006-05-26 20:16:14 +0000 |
---|---|---|
committer | slewis | 2006-05-26 20:16:14 +0000 |
commit | e9eedf6b11dc023a2255dc1de3eaa05a2e571fe8 (patch) | |
tree | c1c3cf9f0c0f731250c4614f967ee895c1e4e394 /framework | |
parent | 468681721067f4c8b5bcca77fce750606b5581ee (diff) | |
download | org.eclipse.ecf-e9eedf6b11dc023a2255dc1de3eaa05a2e571fe8.tar.gz org.eclipse.ecf-e9eedf6b11dc023a2255dc1de3eaa05a2e571fe8.tar.xz org.eclipse.ecf-e9eedf6b11dc023a2255dc1de3eaa05a2e571fe8.zip |
Update to 0.8.3. Added Eclipse-AutoStart to manifests to allow 3.1.2 Eclipse version. Generated javadocs for 0.8.3
Diffstat (limited to 'framework')
10 files changed, 93 insertions, 14 deletions
diff --git a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF index 39c159bdb..29f5c62d8 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF @@ -2,10 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF DataShare Bundle-SymbolicName: org.eclipse.ecf.datashare;singleton:=true -Bundle-Version: 0.8.2 +Bundle-Version: 0.8.3 Bundle-ClassPath: datashare.jar Bundle-Vendor: Eclipse.org Bundle-Localization: plugin +Eclipse-AutoStart: true Require-Bundle: org.eclipse.ecf;visibility:=reexport, org.eclipse.core.runtime Export-Package: org.eclipse.ecf.datashare, 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 0b6bd44ea..700e2eaa2 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF Discovery API Bundle-SymbolicName: org.eclipse.ecf.discovery -Bundle-Version: 0.8.2 +Bundle-Version: 0.8.3 Bundle-ClassPath: discovery.jar Bundle-Activator: org.eclipse.ecf.discovery.DiscoveryPlugin Bundle-Vendor: Eclipse.org @@ -10,4 +10,5 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.ecf Eclipse-LazyStart: true +Eclipse-AutoStart: true Export-Package: org.eclipse.ecf.discovery diff --git a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF index d98feac1f..8b654caa8 100644 --- a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: ECF Presence API Bundle-SymbolicName: org.eclipse.ecf.presence;singleton=true -Bundle-Version: 0.8.2 +Bundle-Version: 0.8.3 Bundle-ClassPath: presence.jar Bundle-Activator: org.eclipse.ecf.presence.PresencePlugin Bundle-Vendor: Eclipse.org @@ -9,5 +9,6 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.ecf Eclipse-LazyStart: true +Eclipse-AutoStart: true Export-Package: org.eclipse.ecf.presence, org.eclipse.ecf.presence.impl, org.eclipse.ecf.presence.chat Bundle-ManifestVersion: 2 diff --git a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF index 0c50f48a9..670b2cb99 100644 --- a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 -Bundle-SymbolicName: org.eclipse.ecf.provider;singleton=true -Bundle-Version: 0.8.2 +Bundle-SymbolicName: org.eclipse.ecf.provider;singleton:=true +Bundle-Version: 0.8.3 Bundle-Name: ECF Provider API Bundle-Vendor: Eclipse.org Bundle-ClassPath: provider.jar diff --git a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF index 5574f3d50..401146c9c 100644 --- a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: ECF UI API Bundle-SymbolicName: org.eclipse.ecf.ui;singleton=true -Bundle-Version: 0.8.2 +Bundle-Version: 0.8.3 Bundle-ClassPath: ui.jar Bundle-Activator: org.eclipse.ecf.ui.UiPlugin Bundle-Vendor: Eclipse.org diff --git a/framework/bundles/org.eclipse.ecf/.options b/framework/bundles/org.eclipse.ecf/.options index 00c551a37..6e495febc 100644 --- a/framework/bundles/org.eclipse.ecf/.options +++ b/framework/bundles/org.eclipse.ecf/.options @@ -7,4 +7,5 @@ org.eclipse.ecf/debug/idfactory = true org.eclipse.ecf/debug/connectionfactory = true org.eclipse.ecf/debug/factoryinit = true org.eclipse.ecf/debug/abstractsharedobject = true -org.eclipse.ecf/debug/twophasecommiteventprocessor = true
\ No newline at end of file +org.eclipse.ecf/debug/twophasecommiteventprocessor = true +org.eclipse.ecf/debug/optimisticsharedobject = true
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF index eaefe24f0..d11a8e222 100644 --- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF @@ -1,12 +1,13 @@ Manifest-Version: 1.0 Bundle-Name: ECF Core -Bundle-SymbolicName: org.eclipse.ecf;singleton=true -Bundle-Version: 0.8.2 +Bundle-SymbolicName: org.eclipse.ecf;singleton:=true +Bundle-Version: 0.8.3 Bundle-ClassPath: ecf.jar Bundle-Activator: org.eclipse.ecf.internal.core.ECFPlugin Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Eclipse-LazyStart: true +Eclipse-AutoStart: true Require-Bundle: org.eclipse.osgi, org.eclipse.core.runtime Eclipse-BuddyPolicy: registered diff --git a/framework/bundles/org.eclipse.ecf/javadoc.xml b/framework/bundles/org.eclipse.ecf/javadoc.xml index 545356bb6..1e3da048c 100644 --- a/framework/bundles/org.eclipse.ecf/javadoc.xml +++ b/framework/bundles/org.eclipse.ecf/javadoc.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project default="javadoc"> <target name="javadoc"> -<javadoc access="protected" additionalparam="-J-Xmx256m " author="false" classpath="C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.jdt.core_3.2.0.v_666.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.text_3.2.0.v20060512-1326.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.jface_3.2.0.I20060511-0800a.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.ui.workbench.texteditor_3.2.0.v20060512-1326.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.osgi_3.2.0.v20060510.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.core.resources_3.2.0.v20060512.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.core.contenttype_3.2.0.v20060511.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.core.runtime_3.2.0.v20060511.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.swt.win32.win32.x86_3.2.0.v3232g.jar;../org.jivesoftware.smack/bin;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.swt_3.2.0.v3232h.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.help.base_3.2.0.v20060510a.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.jdt_3.2.0.v20060511-1600.jar;../org.eclipse.ecf.presence/bin;bin;../org.eclipse.ecf.datashare/bin;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.core.commands_3.2.0.I20060511-0800a.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.ui.ide_3.2.0.I20060511-2000.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.core.runtime.compatibility.registry_3.2.0.v20060426\runtime_registry_compatibility.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.equinox.common_3.2.0.v20060512.jar;C:\eclipse3.2rc4\eclipse\plugins\org.apache.lucene_1.4.103.v20060510a\lucene-1.4.3.jar;../org.eclipse.ecf.fileshare/bin;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.equinox.preferences_3.2.0.v20060511.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.core.jobs_3.2.0.v20060511.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.ui.workbench_3.2.0.I20060511-1600.jar;../org.eclipse.ecf.provider.datashare/bin;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.help_3.2.0.v20060510b.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.jface.text_3.2.0.v20060512-1326.jar;C:\eclipse3.2rc4\eclipse\plugins\org.apache.lucene_1.4.103.v20060510a\parser.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.core.filebuffers_3.2.0.v20060512-1326.jar;../org.eclipse.ecf.discovery/bin;../org.eclipse.ecf.ui/bin;../org.eclipse.ecf.provider.jmdns/lib/jmdns-1.0.3.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.ui.editors_3.2.0.v20060512-1326.jar;../org.jivesoftware.smack/jars/xmlpull.v1.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.jdt.ui_3.2.0.v20060512-1326.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.ui_3.2.0.I20060511-0800a.jar;C:\eclipse3.2rc4\eclipse\plugins\org.eclipse.equinox.registry_3.2.0.v20060511.jar;../org.eclipse.ecf.provider/bin" destdir="../ecf documentation/org.eclipse.ecf.docs/api" doctitle="Eclipse Communication Framework (ECF) 0.8.2" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" - packagenames="org.eclipse.ecf.example.collab.editor.message,org.eclipse.ecf.provider.xmpp,org.eclipse.ecf.example.hello,org.eclipse.ecf.ui.views,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.example.collab.editor.wizards,org.eclipse.ecf.example.collab.editor.model,org.eclipse.ecf.core.util,org.eclipse.ecf.provider.xmpp.container,org.eclipse.ecf.core.comm.provider,org.eclipse.ecf.ui.wizards,org.eclipse.ecf.provider.jmdns,org.eclipse.ecf.presence.provider,org.eclipse.ecf.provider.fileshare,org.eclipse.ecf.example.collab.editor,org.eclipse.ecf.presence.chat,org.eclipse.ecf.fileshare.events,org.eclipse.ecf.datashare.mergeable,org.eclipse.ecf.example.collab.start,org.eclipse.ecf.provider.jmdns.identity,org.eclipse.ecf.provider.datashare,org.eclipse.ecf.example.collab.ui,org.eclipse.ecf.core.provider,org.eclipse.ecf.example.collab.actions,org.eclipse.ecf.provider.xmpp.identity,org.eclipse.ecf.fileshare,org.eclipse.ecf.example.collab.editor.preferences,org.eclipse.ecf.presence,org.eclipse.ecf.provider.jmdns.container,org.eclipse.ecf.example.collab.editor.actions,org.eclipse.ecf.provider.app,org.eclipse.ecf.provider.xmpp.smack.test,org.eclipse.ecf.presence.impl,org.eclipse.ecf.core,org.eclipse.ecf.core.user,org.eclipse.ecf.server,org.eclipse.ecf.provider.xmpp.smack,org.eclipse.ecf.core.sharedobject,org.eclipse.ecf.core.events,org.eclipse.ecf.example.collab.share.io,org.eclipse.ecf.example.collab.share,org.eclipse.ecf.datashare,org.eclipse.ecf.example.collab.editor.listeners,org.eclipse.ecf.datashare.events,org.eclipse.ecf.core.comm,org.eclipse.ecf.core.security,org.eclipse.ecf.discovery,org.eclipse.ecf.core.identity,org.eclipse.ecf.core.start,org.eclipse.ecf.call.events,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.example.hello.actions,org.eclipse.ecf.provider.generic,org.eclipse.ecf.example.clients,org.eclipse.ecf.provider.xmpp.events,org.eclipse.ecf.call,org.eclipse.ecf.example.collab.share.url,org.eclipse.ecf.ui,org.eclipse.ecf.ui.dialogs" - source="1.4" - sourcefiles="../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPluginConstants.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientEntry.java,../org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/ProviderPlugin.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Trace.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/SharedObjectContainerUI.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java,../org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/Trace.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/PresenceContainerUI.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ChatRoomManagerUI.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabDiscoveryView.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java" sourcepath="../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;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" - splitindex="true" use="true" version="true"/> +<javadoc access="protected" additionalparam="-J-Xmx256m " author="false" classpath="C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.jface_3.2.0.I20060511-0800a.jar;../org.eclipse.ecf.provider/bin;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.core.runtime_3.2.0.v20060511.jar;../org.eclipse.ecf.provider.jmdns/lib/jmdns-1.0.3.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.ui.workbench_3.2.0.I20060519-0010b.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.swt_3.2.0.v3232j.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.equinox.common_3.2.0.v20060512.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.help_3.2.0.v20060518.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.ui.workbench.texteditor_3.2.0.v20060518-0800.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.ui.editors_3.2.0.v20060518-0800.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.help.base_3.2.0.v20060510a.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.core.runtime.compatibility.registry_3.2.0.v20060426\runtime_registry_compatibility.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.jdt.core_3.2.0.v_667.jar;C:\eclipse3.2rc5\eclipse\plugins\org.apache.lucene_1.4.103.v20060510a\parser.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.jdt.ui_3.2.0.v20060518-0800.jar;../org.eclipse.ecf.provider.datashare/bin;../org.eclipse.ecf.datashare/bin;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.osgi_3.2.0.v20060510.jar;../org.eclipse.ecf.presence/bin;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.core.contenttype_3.2.0.v20060511.jar;../org.eclipse.ecf.discovery/bin;../org.jivesoftware.smack/bin;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.equinox.preferences_3.2.0.v20060511.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.core.commands_3.2.0.I20060511-0800a.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.core.resources_3.2.0.v20060512.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.text_3.2.0.v20060518-0800.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.swt.win32.win32.x86_3.2.0.v3232g.jar;bin;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.core.filebuffers_3.2.0.v20060518-0800.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.ui.ide_3.2.0.I20060519-0010.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.jdt_3.2.0.v20060518-0800.jar;../org.eclipse.ecf.ui/bin;../org.eclipse.ecf.fileshare/bin;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.core.jobs_3.2.0.v20060511.jar;../org.jivesoftware.smack/jars/xmlpull.v1.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.jface.text_3.2.0.v20060518-0800.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.ui_3.2.0.I20060519-0010.jar;C:\eclipse3.2rc5\eclipse\plugins\org.eclipse.equinox.registry_3.2.0.v20060511.jar;C:\eclipse3.2rc5\eclipse\plugins\org.apache.lucene_1.4.103.v20060510a\lucene-1.4.3.jar" destdir="../ecf documentation/org.eclipse.ecf.docs/api" doctitle="Eclipse Communication Framework (ECF) 0.8.3" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.eclipse.ecf.example.collab.editor.message,org.eclipse.ecf.provider.xmpp,org.eclipse.ecf.example.hello,org.eclipse.ecf.ui.views,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.example.collab.editor.wizards,org.eclipse.ecf.example.collab.editor.model,org.eclipse.ecf.core.util,org.eclipse.ecf.provider.xmpp.container,org.eclipse.ecf.core.comm.provider,org.eclipse.ecf.ui.wizards,org.eclipse.ecf.provider.jmdns,org.eclipse.ecf.presence.provider,org.eclipse.ecf.provider.fileshare,org.eclipse.ecf.example.collab.editor,org.eclipse.ecf.fileshare.events,org.eclipse.ecf.presence.chat,org.eclipse.ecf.datashare.mergeable,org.eclipse.ecf.example.collab.start,org.eclipse.ecf.provider.jmdns.identity,org.eclipse.ecf.provider.datashare,org.eclipse.ecf.example.collab.ui,org.eclipse.ecf.core.provider,org.eclipse.ecf.example.collab.actions,org.eclipse.ecf.provider.xmpp.identity,org.eclipse.ecf.fileshare,org.eclipse.ecf.example.collab.editor.preferences,org.eclipse.ecf.presence,org.eclipse.ecf.provider.jmdns.container,org.eclipse.ecf.example.collab.editor.actions,org.eclipse.ecf.provider.app,org.eclipse.ecf.provider.xmpp.smack.test,org.eclipse.ecf.presence.impl,org.eclipse.ecf.core,org.eclipse.ecf.core.user,org.eclipse.ecf.server,org.eclipse.ecf.provider.xmpp.smack,org.eclipse.ecf.core.sharedobject,org.eclipse.ecf.core.events,org.eclipse.ecf.example.collab.share.io,org.eclipse.ecf.example.collab.share,org.eclipse.ecf.datashare,org.eclipse.ecf.example.collab.editor.listeners,org.eclipse.ecf.datashare.events,org.eclipse.ecf.core.comm,org.eclipse.ecf.core.security,org.eclipse.ecf.discovery,org.eclipse.ecf.core.identity,org.eclipse.ecf.core.start,org.eclipse.ecf.call.events,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.example.hello.actions,org.eclipse.ecf.provider.generic,org.eclipse.ecf.example.clients,org.eclipse.ecf.provider.xmpp.events,org.eclipse.ecf.call,org.eclipse.ecf.example.collab.share.url,org.eclipse.ecf.ui,org.eclipse.ecf.ui.dialogs" source="1.4" sourcefiles="../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPluginConstants.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientEntry.java,../org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/ProviderPlugin.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Trace.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/SharedObjectContainerUI.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java,../org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/Trace.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/PresenceContainerUI.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ChatRoomManagerUI.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabDiscoveryView.java,../org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java" sourcepath="../org.eclipse.ecf.provider.fileshare/src;../org.eclipse.ecf.provider.xmpp/src;../org.eclipse.ecf.server/src;../org.eclipse.ecf.provider.datashare/src;../org.eclipse.ecf.example.collab.editor/src;../org.eclipse.ecf.provider/src;../org.eclipse.ecf.presence/src;../org.eclipse.ecf.example.collab/src;src;../org.eclipse.ecf.provider.jmdns/src;../org.eclipse.ecf.example.clients/src;../org.eclipse.ecf.ui/src;../org.eclipse.ecf.example.hello/src;../org.eclipse.ecf.discovery/src;../org.eclipse.ecf.call/src;../org.eclipse.ecf.datashare/src;../org.eclipse.ecf.fileshare/src" splitindex="true" use="true" version="true"/> </target> </project> diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObject.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObject.java index 49f3e054b..38f578316 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObject.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObject.java @@ -148,6 +148,9 @@ public class AbstractSharedObject implements ISharedObject, protected ID getGroupID() { return getContext().getConnectedID(); } + protected boolean isConnected() { + return (getContext().getConnectedID() != null); + } protected boolean isPrimary() { ID local = getLocalContainerID(); ID home = getHomeContainerID(); diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/OptimisticSharedObject.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/OptimisticSharedObject.java new file mode 100644 index 000000000..89448875c --- /dev/null +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/OptimisticSharedObject.java @@ -0,0 +1,75 @@ +/**************************************************************************** + * 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.core.sharedobject; + +import org.eclipse.ecf.core.SharedObjectInitException; +import org.eclipse.ecf.core.events.IContainerConnectedEvent; +import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; +import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.util.Event; +import org.eclipse.ecf.core.util.IEventProcessor; +import org.eclipse.ecf.internal.core.Trace; + +/** + * Superclass for shared object classes that replicate themselves + * optimistically. + * + */ +public class OptimisticSharedObject extends AbstractSharedObject { + + public static final Trace trace = Trace.create("optimisticsharedobject"); + public OptimisticSharedObject() { + super(); + } + protected void trace(String msg) { + if (Trace.ON && trace != null) { + trace.msg(getID() + ":" + + (isPrimary() ? "primary:" : "replica:") + + msg); + } + } + protected void traceStack(String msg, Throwable t) { + if (Trace.ON && trace != null) { + trace.dumpStack(t, getID() + ":" + + (isPrimary() ? "primary" : "replica") + + msg); + } + } + + protected void initialize() throws SharedObjectInitException { + super.initialize(); + trace("initialize()"); + addEventProcessor(new IEventProcessor() { + public boolean acceptEvent(Event event) { + return true; + } + public Event processEvent(Event event) { + if (event instanceof ISharedObjectActivatedEvent) { + ISharedObjectActivatedEvent soae = (ISharedObjectActivatedEvent) event; + if (isPrimary() && isConnected()) { + trace("replicating to all"); + OptimisticSharedObject.this + .replicateToRemoteContainers(null); + } + } else if (event instanceof IContainerConnectedEvent) { + if (isPrimary()) { + ID targetID = ((IContainerConnectedEvent) event) + .getTargetID(); + trace("replicating to target="+targetID); + OptimisticSharedObject.this + .replicateToRemoteContainers(new ID[] { targetID }); + } + } + return event; + } + }); + } +} |