Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2006-05-13 02:26:49 -0400
committerslewis2006-05-13 02:26:49 -0400
commit363b815f74693900be5eeb2c9efaf46082b9a2c5 (patch)
treee6e353a226e9e49c4c4f6b6cbe1d9671ac8bb804
parenta1c3d6762a74fe9d9384b00075661d7f218b4967 (diff)
downloadorg.eclipse.ecf-363b815f74693900be5eeb2c9efaf46082b9a2c5.tar.gz
org.eclipse.ecf-363b815f74693900be5eeb2c9efaf46082b9a2c5.tar.xz
org.eclipse.ecf-363b815f74693900be5eeb2c9efaf46082b9a2c5.zip
Datashare API additions (IChannelContainerListener and associateed events). Also changed version to 0.8.1
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF2
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/META-INF/MANIFEST.MF2
-rw-r--r--examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF2
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab.editor/META-INF/MANIFEST.MF2
-rw-r--r--examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF2
-rw-r--r--examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BasicChannelConfig.java4
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannel.java12
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainer.java24
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java8
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerListener.java28
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelListener.java12
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelActivatedEvent.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelDeactivatedEvent.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerEvent.java24
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelEvent.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelGroupDepartEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelGroupJoinEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelInitializeEvent.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelMessageEvent.java8
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.datashare/META-INF/MANIFEST.MF2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java13
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java7
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java65
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF2
-rw-r--r--releng/features/org.eclipse.ecf.core-feature/feature.xml2
-rw-r--r--server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF2
-rw-r--r--server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd32
-rw-r--r--server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd30
-rw-r--r--server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh30
-rw-r--r--server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh30
-rw-r--r--server-side/features/org.eclipse.ecf.server-feature/feature.xml2
35 files changed, 364 insertions, 87 deletions
diff --git a/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF b/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF
index c2c6790b4..636a584f2 100644
--- a/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF
+++ b/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ECF Documentation
Bundle-SymbolicName: org.eclipse.ecf.doc; singleton:=true
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/META-INF/MANIFEST.MF b/doc/bundles/org.eclipse.ecf.tutorial/META-INF/MANIFEST.MF
index b5a452d9a..8871b58b4 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/META-INF/MANIFEST.MF
+++ b/doc/bundles/org.eclipse.ecf.tutorial/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ECF Tutorial Plug-in
Bundle-SymbolicName: org.eclipse.ecf.tutorial;singleton:=true
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
Bundle-Activator: org.eclipse.ecf.tutorial.Activator
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF
index 84c00d750..46bb8030f 100644
--- a/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ECF Example Clients
Bundle-SymbolicName: org.eclipse.ecf.example.clients;singleton:=true
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Export-Package: org.eclipse.ecf.example.clients
diff --git a/examples/bundles/org.eclipse.ecf.example.collab.editor/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.collab.editor/META-INF/MANIFEST.MF
index 00e0270e7..5cb611c36 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab.editor/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.example.collab.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ECF Shared Editor Plug-in
Bundle-SymbolicName: org.eclipse.ecf.example.collab.editor; singleton:=true
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
Bundle-Activator: org.eclipse.ecf.example.collab.editor.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF
index 1e675fe26..b11b8e4ca 100644
--- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Name: ECF SDO Editor Example
Bundle-SymbolicName: org.eclipse.ecf.example.sdo.editor;singleton=true
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
Bundle-ClassPath: editor.jar
Bundle-Activator: org.eclipse.ecf.example.sdo.editor.EditorPlugin
Bundle-Vendor: Eclipse.org
diff --git a/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF
index 4155e7ee8..c32ef7f96 100644
--- a/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Name: ECF SDO API
Bundle-SymbolicName: org.eclipse.ecf.sdo;singleton=true
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
Bundle-ClassPath: ecf.sdo.jar
Bundle-Activator: org.eclipse.ecf.sdo.SDOPlugin$EclipsePlugin
Bundle-Vendor: Eclipse.org
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 4262b313c..440e7720e 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ECF DataShare
Bundle-SymbolicName: org.eclipse.ecf.datashare;singleton:=true
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
Bundle-ClassPath: datashare.jar
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BasicChannelConfig.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BasicChannelConfig.java
index e3897c3b7..62e549ecc 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BasicChannelConfig.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BasicChannelConfig.java
@@ -11,6 +11,10 @@ package org.eclipse.ecf.datashare;
import org.eclipse.ecf.core.ISharedObjectTransactionConfig;
import org.eclipse.ecf.core.SharedObjectDescription;
+/**
+ * Channel configuration
+ *
+ */
public class BasicChannelConfig implements IChannelConfig {
protected SharedObjectDescription description = null;
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannel.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannel.java
index a87ef1875..621d082ad 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannel.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannel.java
@@ -1,8 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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.datashare;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.ecf.core.IIdentifiable;
+/**
+ * Abstract channel
+ *
+ */
public interface IAbstractChannel extends IAdaptable, IIdentifiable {
/**
* Get IChannelListener instance for this IAbstractChannel
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainer.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainer.java
index 30cae3f08..d39a1aaeb 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainer.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainer.java
@@ -1,10 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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.datashare;
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.core.identity.Namespace;
+/**
+ * Abstract channel container
+ *
+ */
public interface IAbstractChannelContainer {
/**
+ * Add listener for IChannelContainer events.
+ *
+ * @param listener the listener to by synchronously called back by this channel container
+ */
+ public void addChannelContainerListener(IChannelContainerListener listener);
+ /**
+ * Remove listener for IChannelContainer events
+ *
+ * @param listener to be removed.
+ */
+ public void removeChannelContainerListener(IChannelContainerListener listener);
+ /**
* Get expected Namespace for channel ID creation
* @return Namespace that can be used to create channel ID instances
* for this channel container
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java
index 85f59e2d0..c37863c37 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java
@@ -1,3 +1,11 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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.datashare;
import org.eclipse.core.runtime.IAdaptable;
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerListener.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerListener.java
new file mode 100644
index 000000000..bf8de7d57
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerListener.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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.datashare;
+
+import org.eclipse.ecf.datashare.events.IChannelContainerEvent;
+
+/**
+ * Listener for channel container events. The following types of events
+ * can be received via this listener:
+ * <p>
+ * IChannelContainerChannelActivatedEvent - delivered when a channel within this container is activated
+ * <p>
+ * IChannelContainerChannelDeactivatedEvent - delivered when a channel within this container is deactivated
+ *
+ */
+public interface IChannelContainerListener {
+ /**
+ * Handle channel container events.
+ * @param event IChannelContainer event
+ */
+ public void handleChannelContainerEvent(IChannelContainerEvent event);
+}
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelListener.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelListener.java
index 67d9f7e73..728f9ccee 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelListener.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelListener.java
@@ -11,7 +11,17 @@ package org.eclipse.ecf.datashare;
import org.eclipse.ecf.datashare.events.IChannelEvent;
/**
- * Listener for receiving messages sent to a given channel
+ * Listener for receiving messages sent to a given channel. The following types of events
+ * can be received via this listener:
+ * <p>
+ * IChannelInitializeEvent - delivered when channel is first initialized
+ * <p>
+ * IChannelMessageEvent - delivered when channel receives a message
+ * <p>
+ * IChannelGroupJoinEvent - delivered when container channel is in joins
+ * a group
+ * <p>
+ * IChannelGroupDepartEvent - delivered when container channel is in departs
*
*/
public interface IChannelListener {
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelActivatedEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelActivatedEvent.java
new file mode 100644
index 000000000..88519e091
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelActivatedEvent.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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.datashare.events;
+
+/**
+ * Event delivered to IChannelContainerListener when channel is
+ * activated
+ */
+public interface IChannelContainerChannelActivatedEvent extends IChannelContainerEvent {
+}
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelDeactivatedEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelDeactivatedEvent.java
new file mode 100644
index 000000000..27b1f9e94
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelDeactivatedEvent.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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.datashare.events;
+
+/**
+ * Event delivered to channel container when channel deactivated
+ *
+ */
+public interface IChannelContainerChannelDeactivatedEvent extends IChannelContainerEvent {
+}
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerEvent.java
new file mode 100644
index 000000000..e5b75e3b2
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerEvent.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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.datashare.events;
+
+import org.eclipse.ecf.core.identity.ID;
+
+public interface IChannelContainerEvent {
+ /**
+ * Get the id of the channel associated with this event
+ * @return ID of the channel
+ */
+ public ID getChannelID();
+ /**
+ * Get the id of the channel container associated with this event
+ * @return ID of the channel container
+ */
+ public ID getChannelContainerID();
+}
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelEvent.java
index 03bba00ca..17a5148ad 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelEvent.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelEvent.java
@@ -1,7 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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.datashare.events;
import org.eclipse.ecf.core.identity.ID;
+/**
+ * Super interface for events delivered to channels
+ *
+ */
public interface IChannelEvent {
+ /**
+ * Get the id of the channel associated with this event
+ * @return ID of the channel
+ */
public ID getChannelID();
}
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelGroupDepartEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelGroupDepartEvent.java
index 1863aa49b..ed65209c5 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelGroupDepartEvent.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelGroupDepartEvent.java
@@ -1,7 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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.datashare.events;
import org.eclipse.ecf.core.identity.ID;
+/**
+ * Event delivered to IChannelListener when the container for channel
+ * departs from group
+ *
+ */
public interface IChannelGroupDepartEvent extends IChannelEvent {
+ /**
+ * Get ID of target group that departed
+ * @return ID of target group that departed
+ */
public ID getTargetID();
}
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelGroupJoinEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelGroupJoinEvent.java
index 650c58b81..c53843e6f 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelGroupJoinEvent.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelGroupJoinEvent.java
@@ -1,7 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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.datashare.events;
import org.eclipse.ecf.core.identity.ID;
+/**
+ * Event delivered to IChannelListener when the container for channel
+ * joins/connects to a group
+ *
+ */
public interface IChannelGroupJoinEvent extends IChannelEvent {
+ /**
+ * Get ID of target group joined
+ * @return ID of target group joined
+ */
public ID getTargetID();
}
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelInitializeEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelInitializeEvent.java
index 78230c615..a8b3d4681 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelInitializeEvent.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelInitializeEvent.java
@@ -1,7 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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.datashare.events;
-import org.eclipse.ecf.core.identity.ID;
+/**
+ * Event delivered to channel listener when the channel is initialized.
+ *
+ */
public interface IChannelInitializeEvent extends IChannelEvent {
- public ID[] getGroupMembers();
}
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelMessageEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelMessageEvent.java
index 442fa3a64..4d741d547 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelMessageEvent.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelMessageEvent.java
@@ -1,3 +1,11 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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.datashare.events;
import org.eclipse.ecf.core.identity.ID;
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 cd2073d21..bb53e1d5f 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.0
+Bundle-Version: 0.8.1
Bundle-ClassPath: discovery.jar
Bundle-Activator: org.eclipse.ecf.discovery.DiscoveryPlugin
Bundle-Vendor: Eclipse.org
diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.datashare/META-INF/MANIFEST.MF
index 89879e2a2..6861fbc7d 100644
--- a/providers/bundles/org.eclipse.ecf.provider.datashare/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.datashare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ECF Datashare Provider Plug-in
Bundle-SymbolicName: org.eclipse.ecf.provider.datashare;singleton:=true
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
Bundle-Activator: org.eclipse.ecf.provider.datashare.Activator
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java
index d56ed36a8..56ab45cf4 100644
--- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java
+++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java
@@ -9,7 +9,6 @@
package org.eclipse.ecf.provider.datashare;
import java.io.Serializable;
-import java.util.Arrays;
import java.util.Map;
import org.eclipse.ecf.core.ISharedObjectTransactionConfig;
import org.eclipse.ecf.core.ReplicaSharedObjectDescription;
@@ -126,16 +125,12 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
});
IChannelListener l = getListener();
IChannelInitializeEvent initEvent = new IChannelInitializeEvent() {
- public ID[] getGroupMembers() {
- return getContext().getGroupMemberIDs();
- }
public ID getChannelID() {
return getID();
}
public String toString() {
StringBuffer buf = new StringBuffer("ChannelInitializeEvent[");
- buf.append("chid=").append(getChannelID()).append(
- ";groupMembers=").append(Arrays.asList(getGroupMembers())).append("]");
+ buf.append("channelid=").append(getChannelID()).append("]");
return buf.toString();
}
};
@@ -166,7 +161,7 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
}
public String toString() {
StringBuffer buf = new StringBuffer("ChannelGroupJoinEvent[");
- buf.append("chid=").append(getChannelID()).append(";targetid=")
+ buf.append("channelid=").append(getChannelID()).append(";targetid=")
.append(getTargetID()).append("]");
return buf.toString();
}
@@ -185,7 +180,7 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
public String toString() {
StringBuffer buf = new StringBuffer(
"ChannelGroupDepartedEvent[");
- buf.append("chid=").append(getChannelID()).append(";targetid=")
+ buf.append("channelid=").append(getChannelID()).append(";targetid=")
.append(getTargetID()).append("]");
return buf.toString();
}
@@ -214,7 +209,7 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
public String toString() {
StringBuffer buf = new StringBuffer(
"ChannelMessageEvent[");
- buf.append("chid=").append(getChannelID()).append(
+ buf.append("channelid=").append(getChannelID()).append(
";fromid=").append(getFromContainerID())
.append(";data=").append(getData()).append("]");
return buf.toString();
diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java
index ee2c8689d..da4244bfb 100644
--- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java
@@ -19,6 +19,7 @@ import org.eclipse.ecf.core.util.ECFException;
import org.eclipse.ecf.datashare.IChannel;
import org.eclipse.ecf.datashare.IChannelConfig;
import org.eclipse.ecf.datashare.IChannelContainer;
+import org.eclipse.ecf.datashare.IChannelContainerListener;
import org.eclipse.ecf.datashare.IChannelListener;
import org.eclipse.ecf.provider.generic.TCPClientSOContainer;
@@ -90,4 +91,10 @@ public class DatashareContainer extends TCPClientSOContainer implements
public Namespace getChannelNamespace() {
return adapter.getChannelNamespace();
}
+ public void addChannelContainerListener(IChannelContainerListener listener) {
+ adapter.addChannelContainerListener(listener);
+ }
+ public void removeChannelContainerListener(IChannelContainerListener listener) {
+ adapter.removeChannelContainerListener(listener);
+ }
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java
index 7683eec94..81b308eec 100644
--- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java
+++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java
@@ -1,8 +1,13 @@
package org.eclipse.ecf.provider.datashare;
import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import org.eclipse.ecf.core.IContainerListener;
import org.eclipse.ecf.core.ISharedObject;
import org.eclipse.ecf.core.ISharedObjectTransactionConfig;
import org.eclipse.ecf.core.ISharedObjectTransactionParticipantsFilter;
@@ -10,6 +15,9 @@ import org.eclipse.ecf.core.SharedObjectCreateException;
import org.eclipse.ecf.core.SharedObjectDescription;
import org.eclipse.ecf.core.SharedObjectFactory;
import org.eclipse.ecf.core.SharedObjectTypeDescription;
+import org.eclipse.ecf.core.events.IContainerEvent;
+import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent;
+import org.eclipse.ecf.core.events.ISharedObjectDeactivatedEvent;
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.core.identity.IDFactory;
import org.eclipse.ecf.core.identity.IDInstantiationException;
@@ -19,7 +27,11 @@ import org.eclipse.ecf.core.util.ECFException;
import org.eclipse.ecf.datashare.IChannel;
import org.eclipse.ecf.datashare.IChannelConfig;
import org.eclipse.ecf.datashare.IChannelContainer;
+import org.eclipse.ecf.datashare.IChannelContainerListener;
import org.eclipse.ecf.datashare.IChannelListener;
+import org.eclipse.ecf.datashare.events.IChannelContainerChannelActivatedEvent;
+import org.eclipse.ecf.datashare.events.IChannelContainerEvent;
+import org.eclipse.ecf.datashare.events.IChannelContainerChannelDeactivatedEvent;
import org.eclipse.ecf.provider.generic.SOContainer;
public class DatashareContainerAdapter implements IChannelContainer {
@@ -27,8 +39,55 @@ public class DatashareContainerAdapter implements IChannelContainer {
protected SOContainer container = null;
protected static final int DEFAULT_TRANSACTION_WAIT = 30000;
+ protected List channelContainerListener = Collections.synchronizedList(new ArrayList());
+
+ protected void fireChannelContainerListeners(IChannelContainerEvent event) {
+ synchronized (channelContainerListener) {
+ for(Iterator i=channelContainerListener.iterator(); i.hasNext(); ) {
+ IChannelContainerListener l = (IChannelContainerListener) i.next();
+ if (l != null) l.handleChannelContainerEvent(event);
+ }
+ }
+ }
public DatashareContainerAdapter(SOContainer container) {
this.container = container;
+ this.container.addListener(new ContainerListener(), null);
+ }
+
+ protected class ContainerListener implements IContainerListener {
+ public void handleEvent(final IContainerEvent evt) {
+ if (evt instanceof ISharedObjectActivatedEvent) {
+ final ISharedObjectActivatedEvent soae = (ISharedObjectActivatedEvent) evt;
+ fireChannelContainerListeners(new IChannelContainerChannelActivatedEvent() {
+ public ID getChannelID() {
+ return soae.getActivatedID();
+ }
+ public ID getChannelContainerID() {
+ return soae.getLocalContainerID();
+ }
+ public String toString() {
+ StringBuffer buf = new StringBuffer("ChannelActivatedEvent[");
+ buf.append("channelid=").append(soae.getActivatedID()).append(";");
+ buf.append("containerid=").append(soae.getLocalContainerID()).append("]");
+ return buf.toString();
+ }});
+ } else if (evt instanceof ISharedObjectDeactivatedEvent) {
+ final ISharedObjectDeactivatedEvent sode = (ISharedObjectDeactivatedEvent) evt;
+ fireChannelContainerListeners(new IChannelContainerChannelDeactivatedEvent() {
+ public ID getChannelID() {
+ return sode.getDeactivatedID();
+ }
+ public ID getChannelContainerID() {
+ return sode.getLocalContainerID();
+ }
+ public String toString() {
+ StringBuffer buf = new StringBuffer("ChannelDeactivatedEvent[");
+ buf.append("channelid=").append(sode.getDeactivatedID()).append(";");
+ buf.append("containerid=").append(sode.getLocalContainerID()).append("]");
+ return buf.toString();
+ }});
+ }
+ }
}
/*
* (non-Javadoc)
@@ -160,4 +219,10 @@ public class DatashareContainerAdapter implements IChannelContainer {
public Namespace getChannelNamespace() {
return IDFactory.getDefault().getNamespaceByName(StringID.class.getName());
}
+ public void addChannelContainerListener(IChannelContainerListener listener) {
+ channelContainerListener.add(listener);
+ }
+ public void removeChannelContainerListener(IChannelContainerListener listener) {
+ channelContainerListener.add(listener);
+ }
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF
index 0008ef015..b5a4b5681 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ECF Zeroconf Discovery Provider
Bundle-SymbolicName: org.eclipse.ecf.provider.jmdns;singleton:=true
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
Bundle-Activator: org.eclipse.ecf.provider.jmdns.JmdnsPlugin
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
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 097babebb..1d4c32fa9 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
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Name: ECF XMPP Provider
Bundle-SymbolicName: org.eclipse.ecf.provider.xmpp;singleton=true
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
Bundle-ClassPath: xmpp.jar
Bundle-Activator: org.eclipse.ecf.provider.xmpp.XmppPlugin
Bundle-Vendor: Eclipse.org
diff --git a/releng/features/org.eclipse.ecf.core-feature/feature.xml b/releng/features/org.eclipse.ecf.core-feature/feature.xml
index c185ad699..6caf3e25c 100644
--- a/releng/features/org.eclipse.ecf.core-feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.core-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.core"
label="ECF Core"
- version="0.8.0"
+ version="0.8.1"
provider-name="Eclipse.org">
<description url="http://www.eclipse.org/ecf">
diff --git a/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF
index 18a83d51a..96de27b6b 100644
--- a/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF
+++ b/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ECF Server Plug-in
Bundle-SymbolicName: org.eclipse.ecf.server
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
Bundle-Activator: org.eclipse.ecf.server.Activator
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd b/server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd
index ede19d207..e564ff1b1 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd
+++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd
@@ -1,23 +1,23 @@
setlocal
cd %~dp0
set RP=..\..\..\plugins
-set JMS=%RP%\org.eclipse.ecf.provider.jms_0.8.0
-set ECF=%RP%\org.eclipse.ecf_0.8.0\ecf.jar
+set JMS=%RP%\org.eclipse.ecf.provider.jms_0.8.1
+set ECF=%RP%\org.eclipse.ecf_0.8.1\ecf.jar
set JMSP=%JMS%\jmsprovider.jar
-set UI=%RP%\org.eclipse.ecf.ui_0.8.0\ui.jar
-set SDO=%RP%\org.eclipse.ecf.sdo_0.8.0\ecf.sdo.jar
-set DS=%RP%\org.eclipse.ecf.datashare_0.8.0\datashare.jar
-set DSP=%RP%\org.eclipse.ecf.provider.datashare_0.8.0\dsprovider.jar
-set FS=%RP%\org.eclipse.ecf.fileshare_0.8.0\fileshare.jar
-set FSP=%RP%\org.eclipse.ecf.provider.fileshare_0.8.0\fsprovider.jar
-set PROVIDER=%RP%\org.eclipse.ecf.provider_0.8.0\provider.jar
-set PRESENCE=%RP%\org.eclipse.ecf.presence_0.8.0\presence.jar
-set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.8.0\editor.jar
-set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.8.0\editor.jar
-set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.8.0\runtime\org.eclipse.ecf.example.library.jar
-set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.8.0\discovery.jar
-set HELLO=%RP%\org.eclipse.ecf.example.hello_0.8.0\hello.jar
-set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.8.0\client.jar
+set UI=%RP%\org.eclipse.ecf.ui_0.8.1\ui.jar
+set SDO=%RP%\org.eclipse.ecf.sdo_0.8.1\ecf.sdo.jar
+set DS=%RP%\org.eclipse.ecf.datashare_0.8.1\datashare.jar
+set DSP=%RP%\org.eclipse.ecf.provider.datashare_0.8.1\dsprovider.jar
+set FS=%RP%\org.eclipse.ecf.fileshare_0.8.1\fileshare.jar
+set FSP=%RP%\org.eclipse.ecf.provider.fileshare_0.8.1\fsprovider.jar
+set PROVIDER=%RP%\org.eclipse.ecf.provider_0.8.1\provider.jar
+set PRESENCE=%RP%\org.eclipse.ecf.presence_0.8.1\presence.jar
+set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.8.1\editor.jar
+set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.8.1\editor.jar
+set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.8.1\runtime\org.eclipse.ecf.example.library.jar
+set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.8.1\discovery.jar
+set HELLO=%RP%\org.eclipse.ecf.example.hello_0.8.1\hello.jar
+set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.8.1\client.jar
set JMSL=%JMS%\lib\activemq3.1M5
diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd
index 5bc371897..2e758de63 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd
+++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd
@@ -2,21 +2,21 @@ echo off
setlocal
cd %~dp0
set RP=..\..\..\plugins
-set ECF=%RP%\org.eclipse.ecf_0.8.0\ecf.jar
-set UI=%RP%\org.eclipse.ecf.ui_0.8.0\ui.jar
-set SDO=%RP%\org.eclipse.ecf.sdo_0.8.0\ecf.sdo.jar
-set DS=%RP%\org.eclipse.ecf.datashare_0.8.0\datashare.jar
-set DSP=%RP%\org.eclipse.ecf.provider.datashare_0.8.0\dsprovider.jar
-set FS=%RP%\org.eclipse.ecf.fileshare_0.8.0\fileshare.jar
-set FSP=%RP%\org.eclipse.ecf.provider.fileshare_0.8.0\fsprovider.jar
-set PROVIDER=%RP%\org.eclipse.ecf.provider_0.8.0\provider.jar
-set PRESENCE=%RP%\org.eclipse.ecf.presence_0.8.0\presence.jar
-set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.8.0\editor.jar
-set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.8.0\editor.jar
-set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.8.0\runtime\org.eclipse.ecf.example.library.jar
-set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.8.0\discovery.jar
-set HELLO=%RP%\org.eclipse.ecf.example.hello_0.8.0\hello.jar
-set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.8.0\client.jar
+set ECF=%RP%\org.eclipse.ecf_0.8.1\ecf.jar
+set UI=%RP%\org.eclipse.ecf.ui_0.8.1\ui.jar
+set SDO=%RP%\org.eclipse.ecf.sdo_0.8.1\ecf.sdo.jar
+set DS=%RP%\org.eclipse.ecf.datashare_0.8.1\datashare.jar
+set DSP=%RP%\org.eclipse.ecf.provider.datashare_0.8.1\dsprovider.jar
+set FS=%RP%\org.eclipse.ecf.fileshare_0.8.1\fileshare.jar
+set FSP=%RP%\org.eclipse.ecf.provider.fileshare_0.8.1\fsprovider.jar
+set PROVIDER=%RP%\org.eclipse.ecf.provider_0.8.1\provider.jar
+set PRESENCE=%RP%\org.eclipse.ecf.presence_0.8.1\presence.jar
+set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.8.1\editor.jar
+set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.8.1\editor.jar
+set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.8.1\runtime\org.eclipse.ecf.example.library.jar
+set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.8.1\discovery.jar
+set HELLO=%RP%\org.eclipse.ecf.example.hello_0.8.1\hello.jar
+set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.8.1\client.jar
set CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%ECF%;%UI%;%SDO%;%PROVIDER%;%PRESENCE%;%GED%;%ED%;%LIBRARY%;%HELLO%;%DS%;%DSP%;%FS%;%FsSP%;%DISCOVERY%;%COLLAB%;."
diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh
index 7123cbf70..dd67ee6a4 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh
+++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh
@@ -4,21 +4,21 @@ RP=../../../plugins
CURRENT=`pwd`
cd ${CURRENT}
# Relative path for accessing plugins
-ECF=${RP}/org.eclipse.ecf_0.8.0/ecf.jar
-UI=${RP}/org.eclipse.ecf.ui_0.8.0/ui.jar
-SDO=${RP}/org.eclipse.ecf.sdo_0.8.0/ecf.sdo.jar
-DS=${RP}/org.eclipse.ecf.datashare_0.8.0/datashare.jar
-DSP=${RP}/org.eclipse.ecf.provider.datashare_0.8.0/dsprovider.jar
-FS=${RP}/org.eclipse.ecf.fileshare_0.8.0/fileshare.jar
-FSP=${RP}/org.eclipse.ecf.provider.fileshare_0.8.0/fsprovider.jar
-PROVIDER=${RP}/org.eclipse.ecf.provider_0.8.0/provider.jar
-PRESENCE=${RP}/org.eclipse.ecf.presence_0.8.0/presence.jar
-GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.8.0/editor.jar
-ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.8.0/editor.jar
-LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.8.0/runtime/org.eclipse.ecf.example.library.jar
-DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.8.0/discovery.jar
-HELLO=${RP}/org.eclipse.ecf.example.hello_0.8.0/hello.jar
-COLLAB=${RP}/org.eclipse.ecf.example.collab_0.8.0/client.jar
+ECF=${RP}/org.eclipse.ecf_0.8.1/ecf.jar
+UI=${RP}/org.eclipse.ecf.ui_0.8.1/ui.jar
+SDO=${RP}/org.eclipse.ecf.sdo_0.8.1/ecf.sdo.jar
+DS=${RP}/org.eclipse.ecf.datashare_0.8.1/datashare.jar
+DSP=${RP}/org.eclipse.ecf.provider.datashare_0.8.1/dsprovider.jar
+FS=${RP}/org.eclipse.ecf.fileshare_0.8.1/fileshare.jar
+FSP=${RP}/org.eclipse.ecf.provider.fileshare_0.8.1/fsprovider.jar
+PROVIDER=${RP}/org.eclipse.ecf.provider_0.8.1/provider.jar
+PRESENCE=${RP}/org.eclipse.ecf.presence_0.8.1/presence.jar
+GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.8.1/editor.jar
+ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.8.1/editor.jar
+LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.8.1/runtime/org.eclipse.ecf.example.library.jar
+DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.8.1/discovery.jar
+HELLO=${RP}/org.eclipse.ecf.example.hello_0.8.1/hello.jar
+COLLAB=${RP}/org.eclipse.ecf.example.collab_0.8.1/client.jar
CP="../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${DSP}:${FS}:${FSP}:${HELLO}:${DISCOVERY}:${COLLAB}:."
diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh b/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh
index f6094a09e..c7dd1d1e9 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh
+++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh
@@ -4,21 +4,21 @@ RP=../../../plugins
CURRENT=`pwd`
cd ${CURRENT}
# Relative path for accessing plugins
-ECF=${RP}/org.eclipse.ecf_0.8.0/ecf.jar
-UI=${RP}/org.eclipse.ecf.ui_0.8.0/ui.jar
-SDO=${RP}/org.eclipse.ecf.sdo_0.8.0/ecf.sdo.jar
-DS=${RP}/org.eclipse.ecf.datashare_0.8.0/datashare.jar
-DSP=${RP}/org.eclipse.ecf.provider.datashare_0.8.0/dsprovider.jar
-FS=${RP}/org.eclipse.ecf.fileshare_0.8.0/fileshare.jar
-FSP=${RP}/org.eclipse.ecf.provider.fileshare_0.8.0/fsprovider.jar
-PROVIDER=${RP}/org.eclipse.ecf.provider_0.8.0/provider.jar
-PRESENCE=${RP}/org.eclipse.ecf.presence_0.8.0/presence.jar
-GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.8.0/editor.jar
-ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.8.0/editor.jar
-LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.8.0/runtime/org.eclipse.ecf.example.library.jar
-DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.8.0/discovery.jar
-HELLO=${RP}/org.eclipse.ecf.example.hello_0.8.0/hello.jar
-COLLAB=${RP}/org.eclipse.ecf.example.collab_0.8.0/client.jar
+ECF=${RP}/org.eclipse.ecf_0.8.1/ecf.jar
+UI=${RP}/org.eclipse.ecf.ui_0.8.1/ui.jar
+SDO=${RP}/org.eclipse.ecf.sdo_0.8.1/ecf.sdo.jar
+DS=${RP}/org.eclipse.ecf.datashare_0.8.1/datashare.jar
+DSP=${RP}/org.eclipse.ecf.provider.datashare_0.8.1/dsprovider.jar
+FS=${RP}/org.eclipse.ecf.fileshare_0.8.1/fileshare.jar
+FSP=${RP}/org.eclipse.ecf.provider.fileshare_0.8.1/fsprovider.jar
+PROVIDER=${RP}/org.eclipse.ecf.provider_0.8.1/provider.jar
+PRESENCE=${RP}/org.eclipse.ecf.presence_0.8.1/presence.jar
+GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.8.1/editor.jar
+ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.8.1/editor.jar
+LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.8.1/runtime/org.eclipse.ecf.example.library.jar
+DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.8.1/discovery.jar
+HELLO=${RP}/org.eclipse.ecf.example.hello_0.8.1/hello.jar
+COLLAB=${RP}/org.eclipse.ecf.example.collab_0.8.1/client.jar
CP="../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${DSP}:${FS}:${FSP}:${HELLO}:${DISCOVERY}:${COLLAB}:."
diff --git a/server-side/features/org.eclipse.ecf.server-feature/feature.xml b/server-side/features/org.eclipse.ecf.server-feature/feature.xml
index 8c74dd746..f90c7fa70 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/feature.xml
+++ b/server-side/features/org.eclipse.ecf.server-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.serverfeature"
label="ECF Server"
- version="0.8.0"
+ version="0.8.1"
provider-name="Eclipse.org">
<description url="http://www.eclipse.org/ecf">

Back to the top