Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF4
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF4
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF4
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java4
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java13
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF7
-rw-r--r--framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF4
-rw-r--r--framework/bundles/org.eclipse.ecf/javadoc.xml2
8 files changed, 21 insertions, 21 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
index 1ef3bbffe..aa5da8e1f 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Name: ECF Collaboration Example
-Bundle-SymbolicName: org.eclipse.ecf.example.collab;singleton:=true
-Bundle-Version: 0.8.0
+Bundle-SymbolicName: org.eclipse.ecf.example.collab;singleton=true
+Bundle-Version: 0.8.1
Bundle-ClassPath: client.jar
Bundle-Activator: org.eclipse.ecf.example.collab.ClientPlugin
Bundle-Vendor: Eclipse.org
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 ebf17e6c9..020bb2415 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.0
+Bundle-SymbolicName: org.eclipse.ecf.presence;singleton=true
+Bundle-Version: 0.8.1
Bundle-ClassPath: presence.jar
Bundle-Activator: org.eclipse.ecf.presence.PresencePlugin
Bundle-Vendor: Eclipse.org
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 96769f69f..c0f83f58c 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.0
+Bundle-SymbolicName: org.eclipse.ecf.provider;singleton=true
+Bundle-Version: 0.8.1
Bundle-Name: ECF Provider API
Bundle-Vendor: Eclipse.org
Bundle-ClassPath: provider.jar
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java
index 75c89fc0d..3689aa61a 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java
@@ -33,7 +33,6 @@ import org.eclipse.ecf.core.SharedObjectDescription;
import org.eclipse.ecf.core.SharedObjectDisconnectException;
import org.eclipse.ecf.core.SharedObjectFactory;
import org.eclipse.ecf.core.SharedObjectTypeDescription;
-import org.eclipse.ecf.core.events.SharedObjectActivatedEvent;
import org.eclipse.ecf.core.events.SharedObjectManagerAddEvent;
import org.eclipse.ecf.core.events.SharedObjectManagerConnectEvent;
import org.eclipse.ecf.core.events.SharedObjectManagerCreateEvent;
@@ -155,8 +154,7 @@ public class SOManager implements ISharedObjectManager {
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.ISharedObjectManager#createSharedObject(org.eclipse.ecf.core.SharedObjectDescription,
- * org.eclipse.ecf.core.ISharedObjectContainerTransaction)
+ * @see org.eclipse.ecf.core.ISharedObjectManager#createSharedObject(org.eclipse.ecf.core.SharedObjectDescription)
*/
public ID createSharedObject(SharedObjectDescription sd)
throws SharedObjectCreateException {
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java
index c339cfab6..f4250dad9 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java
@@ -80,26 +80,27 @@ public class SOWrapper {
debug("activated");
thread = (Thread) AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
- // Get thread instance
Thread aThread = getThread();
return aThread;
}
});
+ // Notify container and listeners
+ container.notifySharedObjectActivated(sharedObjectID);
+ // Start thread
thread.start();
+ // Send message
send(new SharedObjectActivatedEvent(containerID, sharedObjectID));
- container.notifySharedObjectActivated(sharedObjectID);
}
protected void deactivated() {
debug("deactivated()");
- send(new SharedObjectDeactivatedEvent(containerID, sharedObjectID));
container.notifySharedObjectDeactivated(sharedObjectID);
+ send(new SharedObjectDeactivatedEvent(containerID, sharedObjectID));
destroyed();
}
protected void destroyed() {
if (!queue.isStopped()) {
- sharedObjectConfig.makeInactive();
if (thread != null)
queue.enqueue(new DisposeEvent());
queue.close();
@@ -196,6 +197,8 @@ public class SOWrapper {
protected void doDestroy() {
sharedObject.dispose(containerID);
+ // make config inactive
+ sharedObjectConfig.makeInactive();
}
protected void deliverSharedObjectMessage(ID fromID, Serializable data) {
@@ -237,7 +240,7 @@ public class SOWrapper {
protected void handleRuntimeException(Throwable except) {
except.printStackTrace(System.err);
dumpStack(
- "runner:unhandledexception(" + sharedObjectID.getName() + ")",
+ "runner:handleRuntimeException(" + sharedObjectID.getName() + ")",
except);
}
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 a695fc3dd..cd57c94a4 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.0
+Bundle-SymbolicName: org.eclipse.ecf.ui;singleton=true
+Bundle-Version: 0.8.1
Bundle-ClassPath: ui.jar
Bundle-Activator: org.eclipse.ecf.ui.UiPlugin
Bundle-Vendor: Eclipse.org
@@ -13,11 +13,10 @@ Require-Bundle: org.eclipse.ecf,
org.eclipse.ecf.presence,
org.eclipse.ecf.discovery,
org.eclipse.core.resources
-Eclipse-LazyStart: true
+Eclipse-AutoStart: true
Provide-Package: org.eclipse.ecf.ui,
org.eclipse.ecf.ui.dialogs,
org.eclipse.ecf.ui.views,
org.eclipse.ecf.ui.wizards
Export-Package: org.eclipse.ecf.ui.views, org.eclipse.ecf.ui.dialogs
-Bundle-ManifestVersion: 2
diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
index a4bb865d9..671333b29 100644
--- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Name: ECF Core
-Bundle-SymbolicName: org.eclipse.ecf;singleton:=true
-Bundle-Version: 0.8.0
+Bundle-SymbolicName: org.eclipse.ecf;singleton=true
+Bundle-Version: 0.8.1
Bundle-ClassPath: ecf.jar
Bundle-Activator: org.eclipse.ecf.internal.core.ECFPlugin
Bundle-Vendor: Eclipse.org
diff --git a/framework/bundles/org.eclipse.ecf/javadoc.xml b/framework/bundles/org.eclipse.ecf/javadoc.xml
index 61e3f4588..97329c006 100644
--- a/framework/bundles/org.eclipse.ecf/javadoc.xml
+++ b/framework/bundles/org.eclipse.ecf/javadoc.xml
@@ -1,6 +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.2rc2\eclipse\plugins\org.eclipse.core.runtime.compatibility.registry_3.2.0.v20060426\runtime_registry_compatibility.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.ui_3.2.0.I20060427-1600.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.jface_3.2.0.I20060427-0800.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.core.commands_3.2.0.I20060427-0800.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.equinox.registry_3.2.0.v20060426.jar;../org.jivesoftware.smack/bin;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.equinox.common_3.2.0.v20060426.jar;bin;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.equinox.preferences_3.2.0.v20060426.jar;../org.eclipse.ecf.presence/bin;../org.eclipse.ecf.datashare/bin;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.jface.text_3.2.0.v20060427-1600.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.core.contenttype_3.2.0.v20060426.jar;../org.eclipse.ecf.fileshare/bin;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.swt_3.2.0.v3231c.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.ui.workbench_3.2.0.I20060427-1600.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.core.resources_3.2.0.v20060426.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.swt.win32.win32.x86_3.2.0.v3231.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.osgi_3.2.0.v20060426.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.core.runtime_3.2.0.v20060426.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.text_3.2.0.v20060427-1600.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.core.jobs_3.2.0.v20060426.jar;../org.eclipse.ecf.discovery/bin;../org.eclipse.ecf.provider.jmdns/lib/jmdns-1.0.3.jar;../org.jivesoftware.smack/jars/xmlpull.v1.jar;../org.eclipse.ecf.provider/bin" destdir="../ecf documentation/org.eclipse.ecf.docs/api" doctitle="Eclipse Communication Framework (ECF) 0.8.0" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.eclipse.ecf.fileshare,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.presence.impl,org.eclipse.ecf.core,org.eclipse.ecf.core.user,org.eclipse.ecf.provider.xmpp.smack,org.eclipse.ecf.core.sharedobject,org.eclipse.ecf.core.util,org.eclipse.ecf.core.events,org.eclipse.ecf.provider.xmpp.container,org.eclipse.ecf.datashare,org.eclipse.ecf.core.comm.provider,org.eclipse.ecf.datashare.events,org.eclipse.ecf.core.comm,org.eclipse.ecf.core.security,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.provider.xmpp.events,org.eclipse.ecf.fileshare.events,org.eclipse.ecf.presence.chat,org.eclipse.ecf.call,org.eclipse.ecf.datashare.mergeable,org.eclipse.ecf.ui.dialogs,org.eclipse.ecf.ui,org.eclipse.ecf.provider.jmdns.identity,org.eclipse.ecf.provider.datashare,org.eclipse.ecf.core.provider,org.eclipse.ecf.provider.xmpp.identity" 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.datashare/src;../org.eclipse.ecf.presence/src;../org.eclipse.ecf.fileshare/src;../org.eclipse.ecf.provider.xmpp/src;../org.eclipse.ecf.provider/src;../org.eclipse.ecf.call/src;../org.eclipse.ecf.provider.fileshare/src;../org.eclipse.ecf.datashare/src;src;../org.eclipse.ecf.provider.jmdns/src;../org.eclipse.ecf.discovery/src;../org.eclipse.ecf.ui/src" splitindex="true" use="true" version="true"/>
+<javadoc access="protected" additionalparam="-J-Xmx256m " author="false" classpath="C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.core.runtime.compatibility.registry_3.2.0.v20060426\runtime_registry_compatibility.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.ui_3.2.0.I20060427-1600.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.jface_3.2.0.I20060427-0800.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.core.commands_3.2.0.I20060427-0800.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.equinox.registry_3.2.0.v20060426.jar;../org.jivesoftware.smack/bin;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.equinox.common_3.2.0.v20060426.jar;bin;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.equinox.preferences_3.2.0.v20060426.jar;../org.eclipse.ecf.presence/bin;../org.eclipse.ecf.datashare/bin;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.jface.text_3.2.0.v20060427-1600.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.core.contenttype_3.2.0.v20060426.jar;../org.eclipse.ecf.fileshare/bin;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.swt_3.2.0.v3231c.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.ui.workbench_3.2.0.I20060427-1600.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.core.resources_3.2.0.v20060426.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.swt.win32.win32.x86_3.2.0.v3231.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.osgi_3.2.0.v20060426.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.core.runtime_3.2.0.v20060426.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.text_3.2.0.v20060427-1600.jar;C:\eclipse3.2rc2\eclipse\plugins\org.eclipse.core.jobs_3.2.0.v20060426.jar;../org.eclipse.ecf.discovery/bin;../org.eclipse.ecf.provider.jmdns/lib/jmdns-1.0.3.jar;../org.jivesoftware.smack/jars/xmlpull.v1.jar;../org.eclipse.ecf.provider/bin" destdir="../ecf documentation/org.eclipse.ecf.docs/api" doctitle="Eclipse Communication Framework (ECF) 0.8.1" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.eclipse.ecf.fileshare,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.presence.impl,org.eclipse.ecf.core,org.eclipse.ecf.core.user,org.eclipse.ecf.provider.xmpp.smack,org.eclipse.ecf.core.sharedobject,org.eclipse.ecf.core.util,org.eclipse.ecf.core.events,org.eclipse.ecf.provider.xmpp.container,org.eclipse.ecf.datashare,org.eclipse.ecf.core.comm.provider,org.eclipse.ecf.datashare.events,org.eclipse.ecf.core.comm,org.eclipse.ecf.core.security,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.provider.xmpp.events,org.eclipse.ecf.fileshare.events,org.eclipse.ecf.presence.chat,org.eclipse.ecf.call,org.eclipse.ecf.datashare.mergeable,org.eclipse.ecf.ui.dialogs,org.eclipse.ecf.ui,org.eclipse.ecf.provider.jmdns.identity,org.eclipse.ecf.provider.datashare,org.eclipse.ecf.core.provider,org.eclipse.ecf.provider.xmpp.identity" 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.datashare/src;../org.eclipse.ecf.presence/src;../org.eclipse.ecf.fileshare/src;../org.eclipse.ecf.provider.xmpp/src;../org.eclipse.ecf.provider/src;../org.eclipse.ecf.call/src;../org.eclipse.ecf.provider.fileshare/src;../org.eclipse.ecf.datashare/src;src;../org.eclipse.ecf.provider.jmdns/src;../org.eclipse.ecf.discovery/src;../org.eclipse.ecf.ui/src" splitindex="true" use="true" version="true"/>
</target>
</project>

Back to the top