Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2012-05-07 18:19:09 -0400
committerslewis2012-05-07 18:19:09 -0400
commitf11211a924617d0831976658efddc7c0ef425135 (patch)
tree7c276e32551684292c96b5ad78f92d64309bc2e2
parentdecf7ec31644641fe0324ae010250d7af8dde1d3 (diff)
downloadorg.eclipse.ecf-f11211a924617d0831976658efddc7c0ef425135.tar.gz
org.eclipse.ecf-f11211a924617d0831976658efddc7c0ef425135.tar.xz
org.eclipse.ecf-f11211a924617d0831976658efddc7c0ef425135.zip
Changes to remove invalid warnings
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java18
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceTypeContainerEvent.java18
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters11
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/AsynchEvent.java2
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionEvent.java2
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/DisconnectEvent.java2
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/SynchEvent.java2
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java3
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageReceivingEvent.java11
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageSendingEvent.java11
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectActivatedEvent.java2
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCallEvent.java2
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectDeactivatedEvent.java5
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerAddEvent.java2
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerConnectEvent.java8
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerCreateEvent.java5
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerDisconnectEvent.java11
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerRemoveEvent.java5
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectedEvent.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectingEvent.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectedEvent.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectingEvent.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisposeEvent.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEjectedEvent.java2
-rw-r--r--protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/NotificationSession.java2
-rw-r--r--protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/internal/encode/MD5HashImpl.java9
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.bittorrent/src/org/eclipse/ecf/internal/provider/bittorrent/BitTorrentContainer.java2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.bittorrent/src/org/eclipse/ecf/internal/provider/bittorrent/TorrentFileTransfer.java4
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java6
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.dnssd/build.properties3
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.efs/src/org/eclipse/ecf/internal/provider/filetransfer/efs/RetrieveFileTransfer.java2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/.settings/org.eclipse.pde.prefs10
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java6
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java10
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.irc/META-INF/MANIFEST.MF1
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/Activator.java63
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/container/IRCRootContainer.java9
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/ChatMembershipEvent.java43
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/IQEvent.java32
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/InvitationReceivedEvent.java16
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/MessageEvent.java47
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/PresenceEvent.java32
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPFileTransferRequestListener.java218
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPIncomingFileTransfer.java102
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPOutgoingFileTransfer.java15
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/smack/ECFConnectionObjectPacketEvent.java22
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/smack/ECFConnectionPacketEvent.java14
-rw-r--r--server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/.api_filters11
-rw-r--r--tests/bundles/org.eclipse.ecf.tests.filetransfer/org.eclipse.ecf.tests.filetransfer.launch169
-rw-r--r--tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/internal/tests/remoteservice/rpc/HttpServiceConnector.java10
-rw-r--r--tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/tests/remoteservice/rpc/RpcRemoteServiceTest.java1
52 files changed, 512 insertions, 481 deletions
diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java
index b980615c0..8edea5cd2 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java
+++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java
@@ -12,13 +12,11 @@ package org.eclipse.ecf.discovery;
import org.eclipse.ecf.core.identity.ID;
/**
- * Base event implementation of {@link IServiceEvent}. Subclasses
- * may be created as appropriate.
+ * Base event implementation of {@link IServiceEvent}. Subclasses may be created
+ * as appropriate.
*/
public class ServiceContainerEvent implements IServiceEvent {
- private static final long serialVersionUID = -2704247495748252242L;
-
protected IServiceInfo info;
protected ID containerID;
@@ -28,21 +26,27 @@ public class ServiceContainerEvent implements IServiceEvent {
this.containerID = containerID;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.ecf.discovery.IServiceEvent#getServiceInfo()
*/
public IServiceInfo getServiceInfo() {
return info;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.ecf.core.events.IContainerEvent#getLocalContainerID()
*/
public ID getLocalContainerID() {
return containerID;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
public String toString() {
diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceTypeContainerEvent.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceTypeContainerEvent.java
index 18e901b98..21d1018b6 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceTypeContainerEvent.java
+++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceTypeContainerEvent.java
@@ -13,13 +13,11 @@ import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.discovery.identity.IServiceTypeID;
/**
- * Base event implementation of {@link IServiceEvent}. Subclasses
- * may be created as appropriate.
+ * Base event implementation of {@link IServiceEvent}. Subclasses may be created
+ * as appropriate.
*/
public class ServiceTypeContainerEvent implements IServiceTypeEvent {
- private static final long serialVersionUID = -2989101661453584041L;
-
protected IServiceTypeID serviceType;
protected ID containerID;
@@ -29,14 +27,18 @@ public class ServiceTypeContainerEvent implements IServiceTypeEvent {
this.containerID = containerID;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.ecf.core.events.IContainerEvent#getLocalContainerID()
*/
public ID getLocalContainerID() {
return containerID;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
public String toString() {
@@ -45,7 +47,9 @@ public class ServiceTypeContainerEvent implements IServiceTypeEvent {
return buf.toString();
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.ecf.discovery.IServiceTypeEvent#getServiceTypeID()
*/
public IServiceTypeID getServiceTypeID() {
diff --git a/framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters b/framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters
new file mode 100644
index 000000000..dfeb7bea6
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.ecf.identity" version="2">
+ <resource path="src/org/eclipse/ecf/core/util/SystemLogService.java" type="org.eclipse.ecf.core.util.SystemLogService">
+ <filter id="574619656">
+ <message_arguments>
+ <message_argument value="LogService"/>
+ <message_argument value="SystemLogService"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/AsynchEvent.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/AsynchEvent.java
index 5940dea64..7d89d0660 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/AsynchEvent.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/AsynchEvent.java
@@ -15,8 +15,6 @@ package org.eclipse.ecf.provider.comm;
*
*/
public class AsynchEvent extends ConnectionEvent {
- private static final long serialVersionUID = 3618136762325873465L;
-
public AsynchEvent(IAsynchConnection conn, Object data) {
super(conn, data);
}
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionEvent.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionEvent.java
index ef6bfea3c..a5763711a 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionEvent.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionEvent.java
@@ -17,8 +17,6 @@ import org.eclipse.ecf.core.util.Event;
*
*/
public class ConnectionEvent implements Event {
- private static final long serialVersionUID = 3257290214476362291L;
-
private final Object data;
private final IConnection connection;
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/DisconnectEvent.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/DisconnectEvent.java
index c1ad17135..b2b54cb0f 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/DisconnectEvent.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/DisconnectEvent.java
@@ -15,8 +15,6 @@ package org.eclipse.ecf.provider.comm;
*
*/
public class DisconnectEvent extends ConnectionEvent {
- private static final long serialVersionUID = 3545519491132832050L;
-
Throwable exception = null;
public DisconnectEvent(IAsynchConnection conn, Throwable e, Object data) {
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/SynchEvent.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/SynchEvent.java
index e6638b803..67c7a6c53 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/SynchEvent.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/SynchEvent.java
@@ -15,8 +15,6 @@ package org.eclipse.ecf.provider.comm;
*
*/
public class SynchEvent extends ConnectionEvent {
- private static final long serialVersionUID = 3257288019714324532L;
-
public SynchEvent(ISynchConnection conn, Object data) {
super(conn, data);
}
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 6f76dbac3..6874604e0 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
@@ -161,7 +161,6 @@ public class SOWrapper {
}
public static class ProcEvent implements Event {
- private static final long serialVersionUID = 3257002142513378616L;
Event theEvent = null;
public ProcEvent(Event event) {
@@ -174,8 +173,6 @@ public class SOWrapper {
}
protected static class DisposeEvent implements Event {
- private static final long serialVersionUID = 3688503311859135536L;
-
DisposeEvent() {
//
}
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageReceivingEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageReceivingEvent.java
index 8b21f7e50..1dda0fc9e 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageReceivingEvent.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageReceivingEvent.java
@@ -16,18 +16,14 @@ import org.eclipse.ecf.core.identity.ID;
/**
* Event class implementing {@link IContainerSharedObjectMessageReceivingEvent}.
*/
-public class ContainerSharedObjectMessageReceivingEvent implements
- IContainerSharedObjectMessageReceivingEvent {
-
- private static final long serialVersionUID = -2224760745950682934L;
+public class ContainerSharedObjectMessageReceivingEvent implements IContainerSharedObjectMessageReceivingEvent {
protected ID sendingContainerID;
protected ID sharedObjectID;
protected ID localContainerID;
protected Object message;
- public ContainerSharedObjectMessageReceivingEvent(ID localContainerID,
- ID sendingContainerID, ID sharedObjectID, Object message) {
+ public ContainerSharedObjectMessageReceivingEvent(ID localContainerID, ID sendingContainerID, ID sharedObjectID, Object message) {
this.localContainerID = localContainerID;
this.sendingContainerID = sendingContainerID;
this.sharedObjectID = sharedObjectID;
@@ -71,8 +67,7 @@ public class ContainerSharedObjectMessageReceivingEvent implements
}
public String toString() {
- StringBuffer buf = new StringBuffer(
- "ContainerSharedObjectMessageReceivingEvent["); //$NON-NLS-1$
+ StringBuffer buf = new StringBuffer("ContainerSharedObjectMessageReceivingEvent["); //$NON-NLS-1$
buf.append("localContainerID=").append(localContainerID); //$NON-NLS-1$
buf.append(";sendingContainerID=").append(sendingContainerID); //$NON-NLS-1$
buf.append(";sharedObjectID=").append(sharedObjectID); //$NON-NLS-1$
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageSendingEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageSendingEvent.java
index b3813a805..20640ad12 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageSendingEvent.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageSendingEvent.java
@@ -16,18 +16,14 @@ import org.eclipse.ecf.core.identity.ID;
/**
* Event class implementing {@link IContainerSharedObjectMessageSendingEvent}.
*/
-public class ContainerSharedObjectMessageSendingEvent implements
- IContainerSharedObjectMessageSendingEvent {
-
- private static final long serialVersionUID = 3500128303573538068L;
+public class ContainerSharedObjectMessageSendingEvent implements IContainerSharedObjectMessageSendingEvent {
protected ID localContainerID;
protected ID targetContainerID;
protected ID sharedObjectID;
protected Object message;
- public ContainerSharedObjectMessageSendingEvent(ID localContainerID,
- ID targetContainerID, ID sharedObjectID, Object message) {
+ public ContainerSharedObjectMessageSendingEvent(ID localContainerID, ID targetContainerID, ID sharedObjectID, Object message) {
this.localContainerID = localContainerID;
this.targetContainerID = targetContainerID;
this.sharedObjectID = sharedObjectID;
@@ -71,8 +67,7 @@ public class ContainerSharedObjectMessageSendingEvent implements
}
public String toString() {
- StringBuffer buf = new StringBuffer(
- "ContainerSharedObjectMessageSendingEvent["); //$NON-NLS-1$
+ StringBuffer buf = new StringBuffer("ContainerSharedObjectMessageSendingEvent["); //$NON-NLS-1$
buf.append("localContainerID=").append(localContainerID); //$NON-NLS-1$
buf.append(";targetContainerID=").append(targetContainerID); //$NON-NLS-1$
buf.append(";sharedObjectID=").append(sharedObjectID); //$NON-NLS-1$
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectActivatedEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectActivatedEvent.java
index c00552313..99e9edff7 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectActivatedEvent.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectActivatedEvent.java
@@ -11,8 +11,6 @@ package org.eclipse.ecf.core.sharedobject.events;
import org.eclipse.ecf.core.identity.ID;
public class SharedObjectActivatedEvent implements ISharedObjectActivatedEvent {
- private static final long serialVersionUID = 6880286157835412766L;
-
private final ID activatedID;
private final ID localContainerID;
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCallEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCallEvent.java
index b08c56d90..6b7379e9c 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCallEvent.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCallEvent.java
@@ -16,8 +16,6 @@ import org.eclipse.ecf.core.util.Event;
import org.eclipse.equinox.concurrent.future.IFuture;
public class SharedObjectCallEvent implements ISharedObjectCallEvent {
- private static final long serialVersionUID = 3904674977264250933L;
-
ID sender;
Event event;
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectDeactivatedEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectDeactivatedEvent.java
index a1c519dff..40da70e02 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectDeactivatedEvent.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectDeactivatedEvent.java
@@ -10,10 +10,7 @@ package org.eclipse.ecf.core.sharedobject.events;
import org.eclipse.ecf.core.identity.ID;
-public class SharedObjectDeactivatedEvent implements
- ISharedObjectDeactivatedEvent {
- private static final long serialVersionUID = 3257291344119476786L;
-
+public class SharedObjectDeactivatedEvent implements ISharedObjectDeactivatedEvent {
private final ID deactivatedID;
private final ID localContainerID;
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerAddEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerAddEvent.java
index 877a385e6..e270b0fcb 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerAddEvent.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerAddEvent.java
@@ -18,8 +18,6 @@ import org.eclipse.ecf.core.sharedobject.ISharedObjectManager;
* is called
*/
public class SharedObjectManagerAddEvent implements ISharedObjectManagerEvent {
- private static final long serialVersionUID = 3258413923916330551L;
-
ID localContainerID = null;
ID sharedObjectID = null;
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerConnectEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerConnectEvent.java
index 337ed9846..ab6e1a5e3 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerConnectEvent.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerConnectEvent.java
@@ -19,16 +19,12 @@ import org.eclipse.ecf.core.sharedobject.ISharedObjectManager;
* is called.
*
*/
-public class SharedObjectManagerConnectEvent implements
- ISharedObjectManagerConnectionEvent {
- private static final long serialVersionUID = 3544670676712633650L;
-
+public class SharedObjectManagerConnectEvent implements ISharedObjectManagerConnectionEvent {
ID localContainerID = null;
ISharedObjectConnector connector = null;
- public SharedObjectManagerConnectEvent(ID localContainerID,
- ISharedObjectConnector connector) {
+ public SharedObjectManagerConnectEvent(ID localContainerID, ISharedObjectConnector connector) {
this.localContainerID = localContainerID;
this.connector = connector;
}
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerCreateEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerCreateEvent.java
index 18471a3c9..ba8d88905 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerCreateEvent.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerCreateEvent.java
@@ -16,10 +16,7 @@ import org.eclipse.ecf.core.sharedobject.ISharedObjectManager;
* {@link ISharedObjectManager#createSharedObject(org.eclipse.ecf.core.sharedobject.SharedObjectDescription)}
* is called
*/
-public class SharedObjectManagerCreateEvent implements
- ISharedObjectManagerEvent {
- private static final long serialVersionUID = 3905527103070878006L;
-
+public class SharedObjectManagerCreateEvent implements ISharedObjectManagerEvent {
ID localContainerID = null;
ID sharedObjectID = null;
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerDisconnectEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerDisconnectEvent.java
index 64fe7f208..b94f5a952 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerDisconnectEvent.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerDisconnectEvent.java
@@ -19,16 +19,12 @@ import org.eclipse.ecf.core.sharedobject.ISharedObjectManager;
* is called.
*
*/
-public class SharedObjectManagerDisconnectEvent implements
- ISharedObjectManagerConnectionEvent {
- private static final long serialVersionUID = 3257008743777448761L;
-
+public class SharedObjectManagerDisconnectEvent implements ISharedObjectManagerConnectionEvent {
ID localContainerID = null;
ISharedObjectConnector connector = null;
- public SharedObjectManagerDisconnectEvent(ID localContainerID,
- ISharedObjectConnector connector) {
+ public SharedObjectManagerDisconnectEvent(ID localContainerID, ISharedObjectConnector connector) {
this.localContainerID = localContainerID;
this.connector = connector;
}
@@ -61,8 +57,7 @@ public class SharedObjectManagerDisconnectEvent implements
}
public String toString() {
- StringBuffer buf = new StringBuffer(
- "SharedObjectManagerDisconnectEvent["); //$NON-NLS-1$
+ StringBuffer buf = new StringBuffer("SharedObjectManagerDisconnectEvent["); //$NON-NLS-1$
buf.append(getLocalContainerID()).append(";"); //$NON-NLS-1$
buf.append(getSharedObjectID()).append(";"); //$NON-NLS-1$
buf.append(getConnector()).append("]"); //$NON-NLS-1$
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerRemoveEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerRemoveEvent.java
index c9148d0b8..9e2f8c260 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerRemoveEvent.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerRemoveEvent.java
@@ -16,10 +16,7 @@ import org.eclipse.ecf.core.sharedobject.ISharedObjectManager;
* from a container via {@link ISharedObjectManager#removeSharedObject(ID)} is
* called
*/
-public class SharedObjectManagerRemoveEvent implements
- ISharedObjectManagerEvent {
- private static final long serialVersionUID = 3256728389754106931L;
-
+public class SharedObjectManagerRemoveEvent implements ISharedObjectManagerEvent {
ID sharedObjectID = null;
ID localContainerID = null;
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectedEvent.java
index ae679b26c..79deb2a4b 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectedEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectedEvent.java
@@ -15,8 +15,6 @@ import org.eclipse.ecf.core.identity.ID;
*
*/
public class ContainerConnectedEvent implements IContainerConnectedEvent {
- private static final long serialVersionUID = 3833467322827617078L;
-
private final ID joinedContainerID;
private final ID localContainerID;
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectingEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectingEvent.java
index b1f6dceaf..e7d68e1bd 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectingEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectingEvent.java
@@ -11,8 +11,6 @@ package org.eclipse.ecf.core.events;
import org.eclipse.ecf.core.identity.ID;
public class ContainerConnectingEvent implements IContainerConnectingEvent {
- private static final long serialVersionUID = 3544952173248263729L;
-
ID localContainerID;
ID targetID;
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectedEvent.java
index 41d87f4ac..ce8e6a4f1 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectedEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectedEvent.java
@@ -16,8 +16,6 @@ import org.eclipse.ecf.core.identity.ID;
* Container disconnected event.
*/
public class ContainerDisconnectedEvent implements IContainerDisconnectedEvent {
- private static final long serialVersionUID = 3256437002059527733L;
-
private final ID departedContainerID;
private final ID localContainerID;
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectingEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectingEvent.java
index 851e47ad1..c5497bee3 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectingEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectingEvent.java
@@ -11,8 +11,6 @@ package org.eclipse.ecf.core.events;
import org.eclipse.ecf.core.identity.ID;
public class ContainerDisconnectingEvent implements IContainerDisconnectingEvent {
- private static final long serialVersionUID = 3257570607204742200L;
-
ID localContainerID;
ID groupID;
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisposeEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisposeEvent.java
index 34508a3f7..583729a14 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisposeEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisposeEvent.java
@@ -11,8 +11,6 @@ package org.eclipse.ecf.core.events;
import org.eclipse.ecf.core.identity.ID;
public class ContainerDisposeEvent implements IContainerDisposeEvent {
- private static final long serialVersionUID = 3618138961349062706L;
-
private final ID localContainerID;
public ContainerDisposeEvent(ID localContainerID) {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEjectedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEjectedEvent.java
index 2d348c7c0..79ee375c7 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEjectedEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEjectedEvent.java
@@ -12,8 +12,6 @@ import java.io.Serializable;
import org.eclipse.ecf.core.identity.ID;
public class ContainerEjectedEvent implements IContainerEjectedEvent {
- private static final long serialVersionUID = 3257567299946033970L;
-
private final ID localContainerID;
private final ID groupID;
diff --git a/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/NotificationSession.java b/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/NotificationSession.java
index 8ef37c8e5..9e7a573f0 100644
--- a/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/NotificationSession.java
+++ b/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/NotificationSession.java
@@ -275,7 +275,7 @@ final class NotificationSession extends DispatchSession {
} else if (input.indexOf("CHL") != -1) { //$NON-NLS-1$
// the read input is a challenge string
// String query = Challenge.createQuery(StringUtils.splitSubstring(input, " ", 2)); //$NON-NLS-1$
- String query = MD5HashImpl.getMD5(StringUtils.splitSubstring(input, " ", 2));
+ String query = MD5HashImpl.getMD5(StringUtils.splitSubstring(input, " ", 2)); //$NON-NLS-1$
// Even this is wrong. we need to create a 64bit hash out of 128bit hash according to http://bit.ly/wdzdkd
write("QRY", Challenge.PRODUCT_ID + ' ' + query.length() + "\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+ query, false);
diff --git a/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/internal/encode/MD5HashImpl.java b/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/internal/encode/MD5HashImpl.java
index 78393ed68..0be5e3f76 100644
--- a/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/internal/encode/MD5HashImpl.java
+++ b/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/internal/encode/MD5HashImpl.java
@@ -7,13 +7,13 @@ import java.security.NoSuchAlgorithmException;
public class MD5HashImpl {
public static String getMD5(String input) {
try {
- MessageDigest md = MessageDigest.getInstance("MD5");
+ MessageDigest md = MessageDigest.getInstance("MD5"); //$NON-NLS-1$
byte[] messageDigest = md.digest(input.getBytes());
BigInteger number = new BigInteger(1, messageDigest);
String hashtext = number.toString(16);
// Now we need to zero pad it if you actually want the full 32 chars.
while (hashtext.length() < 32) {
- hashtext = "0" + hashtext;
+ hashtext = "0" + hashtext; //$NON-NLS-1$
}
return hashtext;
} catch (NoSuchAlgorithmException e) {
@@ -21,7 +21,10 @@ public class MD5HashImpl {
}
}
+ /**
+ * @throws NoSuchAlgorithmException
+ */
public static void main(String[] args) throws NoSuchAlgorithmException {
- System.out.println(getMD5("22210219642164014968YMM8C_H7KCQ2S_KL"));
+ System.out.println(getMD5("22210219642164014968YMM8C_H7KCQ2S_KL")); //$NON-NLS-1$
}
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.bittorrent/src/org/eclipse/ecf/internal/provider/bittorrent/BitTorrentContainer.java b/providers/bundles/org.eclipse.ecf.provider.bittorrent/src/org/eclipse/ecf/internal/provider/bittorrent/BitTorrentContainer.java
index dc86af634..6b6ac8f89 100644
--- a/providers/bundles/org.eclipse.ecf.provider.bittorrent/src/org/eclipse/ecf/internal/provider/bittorrent/BitTorrentContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.bittorrent/src/org/eclipse/ecf/internal/provider/bittorrent/BitTorrentContainer.java
@@ -113,8 +113,6 @@ public final class BitTorrentContainer implements IContainer, IRetrieveFileTrans
transferListener.handleTransferEvent(new IIncomingFileTransferReceiveStartEvent() {
- private static final long serialVersionUID = 5195806924769910246L;
-
private IIncomingFileTransfer transfer;
private boolean cancelled = false;
diff --git a/providers/bundles/org.eclipse.ecf.provider.bittorrent/src/org/eclipse/ecf/internal/provider/bittorrent/TorrentFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.bittorrent/src/org/eclipse/ecf/internal/provider/bittorrent/TorrentFileTransfer.java
index 56dca77bb..0bb9025c8 100644
--- a/providers/bundles/org.eclipse.ecf.provider.bittorrent/src/org/eclipse/ecf/internal/provider/bittorrent/TorrentFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.bittorrent/src/org/eclipse/ecf/internal/provider/bittorrent/TorrentFileTransfer.java
@@ -55,8 +55,6 @@ final class TorrentFileTransfer implements IFileTransferPausable, IFileTransferR
public void blockDownloaded(int piece, int index, int blockLength) {
TorrentFileTransfer.this.listener.handleTransferEvent(new IIncomingFileTransferReceiveDataEvent() {
- private static final long serialVersionUID = -7666111308704272599L;
-
public IIncomingFileTransfer getSource() {
return TorrentFileTransfer.this;
}
@@ -90,8 +88,6 @@ final class TorrentFileTransfer implements IFileTransferPausable, IFileTransferR
listener.handleTransferEvent(new IIncomingFileTransferReceiveDoneEvent() {
- private static final long serialVersionUID = -6685158329789351560L;
-
public Exception getException() {
return TorrentFileTransfer.this.exception;
}
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 e3c8df691..c3918b359 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
@@ -129,8 +129,6 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
IChannelConnectEvent createChannelGroupJoinEvent(final boolean hasJoined, final ID targetID) {
return new IChannelConnectEvent() {
- private static final long serialVersionUID = -1085237280463725283L;
-
public ID getTargetID() {
return targetID;
}
@@ -149,8 +147,6 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
IChannelDisconnectEvent createChannelGroupDepartEvent(final boolean hasJoined, final ID targetID) {
return new IChannelDisconnectEvent() {
- private static final long serialVersionUID = -1085237280463725283L;
-
public ID getTargetID() {
return targetID;
}
@@ -178,8 +174,6 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
if (l == null)
return event;
listener.handleChannelEvent(new IChannelMessageEvent() {
- private static final long serialVersionUID = -2270885918818160970L;
-
public ID getFromContainerID() {
return event.getRemoteContainerID();
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/build.properties b/providers/bundles/org.eclipse.ecf.provider.dnssd/build.properties
index 08578c87c..5f1cc8ee3 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/build.properties
@@ -6,5 +6,4 @@ bin.includes = META-INF/,\
plugin.properties,\
about.html
additional.bundles = org.eclipse.equinox.concurrent
-src.includes = plugin.properties,\
- about.html
+src.includes = about.html
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.efs/src/org/eclipse/ecf/internal/provider/filetransfer/efs/RetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer.efs/src/org/eclipse/ecf/internal/provider/filetransfer/efs/RetrieveFileTransfer.java
index 9e363ce71..f10280412 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.efs/src/org/eclipse/ecf/internal/provider/filetransfer/efs/RetrieveFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.efs/src/org/eclipse/ecf/internal/provider/filetransfer/efs/RetrieveFileTransfer.java
@@ -78,8 +78,6 @@ public class RetrieveFileTransfer extends AbstractRetrieveFileTransfer {
setLastModifiedTime(info.getLastModified());
fileName = info.getName();
listener.handleTransferEvent(new IIncomingFileTransferReceiveStartEvent() {
- private static final long serialVersionUID = 590077256618427122L;
-
public IIncomingFileTransfer getSource() {
return RetrieveFileTransfer.this;
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/.settings/org.eclipse.pde.prefs b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/.settings/org.eclipse.pde.prefs
index 05ef9da1a..5560427e8 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/.settings/org.eclipse.pde.prefs
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/.settings/org.eclipse.pde.prefs
@@ -1,9 +1,15 @@
-#Fri Jan 29 14:33:19 PST 2010
compilers.f.unresolved-features=1
compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
+compilers.incompatible-environment=2
compilers.p.build=2
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
compilers.p.deprecated=1
compilers.p.discouraged-class=0
compilers.p.internal=1
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java
index 6e2ca6b34..2acf74f3f 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java
@@ -179,8 +179,6 @@ public abstract class AbstractOutgoingFileTransfer implements IOutgoingFileTrans
protected void fireTransferSendDoneEvent() {
listener.handleTransferEvent(new IOutgoingFileTransferSendDoneEvent() {
- private static final long serialVersionUID = -2686266564645210722L;
-
public IOutgoingFileTransfer getSource() {
return AbstractOutgoingFileTransfer.this;
}
@@ -202,8 +200,6 @@ public abstract class AbstractOutgoingFileTransfer implements IOutgoingFileTrans
protected void fireTransferSendDataEvent() {
listener.handleTransferEvent(new IOutgoingFileTransferSendDataEvent() {
- private static final long serialVersionUID = -2916500675859842392L;
-
public IOutgoingFileTransfer getSource() {
return AbstractOutgoingFileTransfer.this;
}
@@ -317,8 +313,6 @@ public abstract class AbstractOutgoingFileTransfer implements IOutgoingFileTrans
protected void fireSendStartEvent() {
listener.handleTransferEvent(new IOutgoingFileTransferResponseEvent() {
- private static final long serialVersionUID = 2171381825030082432L;
-
public String toString() {
final StringBuffer sb = new StringBuffer("IOutgoingFileTransferResponseEvent["); //$NON-NLS-1$
sb.append("isdone=").append(done).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java
index 6924d3b41..3ecfd66f4 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java
@@ -346,8 +346,6 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans
protected void fireTransferReceivePausedEvent() {
listener.handleTransferEvent(new IIncomingFileTransferReceivePausedEvent() {
- private static final long serialVersionUID = -1317411290525985140L;
-
public IIncomingFileTransfer getSource() {
return AbstractRetrieveFileTransfer.this;
}
@@ -364,8 +362,6 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans
protected void fireTransferReceiveDoneEvent() {
listener.handleTransferEvent(new IIncomingFileTransferReceiveDoneEvent() {
- private static final long serialVersionUID = 6925524078226825710L;
-
public IIncomingFileTransfer getSource() {
return AbstractRetrieveFileTransfer.this;
}
@@ -386,8 +382,6 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans
protected void fireTransferReceiveDataEvent() {
listener.handleTransferEvent(new IIncomingFileTransferReceiveDataEvent() {
- private static final long serialVersionUID = -5656328374614130161L;
-
public IIncomingFileTransfer getSource() {
return AbstractRetrieveFileTransfer.this;
}
@@ -669,8 +663,6 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans
protected void fireReceiveStartEvent() {
listener.handleTransferEvent(new IIncomingFileTransferReceiveStartEvent() {
- private static final long serialVersionUID = -513800598918052184L;
-
/*
* (non-Javadoc)
*
@@ -770,8 +762,6 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans
protected void fireReceiveResumedEvent() {
listener.handleTransferEvent(new IIncomingFileTransferReceiveResumedEvent() {
- private static final long serialVersionUID = 7111739642849612839L;
-
public IIncomingFileTransfer getSource() {
return AbstractRetrieveFileTransfer.this;
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.irc/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.irc/META-INF/MANIFEST.MF
index dd843ab6a..2114e9755 100644
--- a/providers/bundles/org.eclipse.ecf.provider.irc/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.irc/META-INF/MANIFEST.MF
@@ -23,6 +23,5 @@ Import-Package: org.eclipse.equinox.concurrent.future;version="1.0.0",
org.eclipse.osgi.util;version="1.0.0",
org.osgi.framework;version="1.3.0",
org.osgi.service.log;version="1.3.0",
- org.osgi.service.packageadmin;version="1.2.0",
org.osgi.util.tracker;version="1.3.2"
Bundle-ActivationPolicy: lazy
diff --git a/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/Activator.java b/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/Activator.java
index d56dfb8c1..94385afa8 100644
--- a/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/Activator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/Activator.java
@@ -1,23 +1,21 @@
/****************************************************************************
-* Copyright (c) 2004, 2009 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
-*****************************************************************************/
+ * Copyright (c) 2004, 2009 Composent, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Composent, Inc. - initial API and implementation
+ *****************************************************************************/
package org.eclipse.ecf.internal.provider.irc;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.ecf.core.util.LogHelper;
import org.eclipse.ecf.core.util.SystemLogService;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
+import org.osgi.framework.*;
import org.osgi.service.log.LogService;
-import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.util.tracker.ServiceTracker;
/**
@@ -27,23 +25,22 @@ public class Activator implements BundleActivator {
public static final String PLUGIN_ID = "org.eclipse.ecf.provider.irc"; //$NON-NLS-1$
- //The shared instance.
+ // The shared instance.
private static Activator plugin;
private BundleContext bundleContext = null;
-
private ServiceTracker logServiceTracker = null;
- private ServiceTracker packageServiceTracker = null;
-
private LogService logService;
- private PackageAdmin packageService;
public static void log(String message) {
- getDefault().log(new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, null));
+ getDefault().log(
+ new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, null));
}
public static void log(String message, Throwable e) {
- getDefault().log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, "Caught exception", e)); //$NON-NLS-1$
+ getDefault().log(
+ new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK,
+ "Caught exception", e)); //$NON-NLS-1$
}
protected LogService getLogService() {
@@ -65,7 +62,8 @@ public class Activator implements BundleActivator {
public void log(IStatus status) {
LogService logService = getLogService();
if (logService != null) {
- logService.log(LogHelper.getLogCode(status), LogHelper.getLogMessage(status), status.getException());
+ logService.log(LogHelper.getLogCode(status),
+ LogHelper.getLogMessage(status), status.getException());
}
}
@@ -95,20 +93,6 @@ public class Activator implements BundleActivator {
plugin = null;
}
- public PackageAdmin getPackageAdmin() {
- if (packageServiceTracker == null) {
- packageServiceTracker = new ServiceTracker(bundleContext,
- PackageAdmin.class.getName(), null);
- packageServiceTracker.open();
- }
-
- if (packageService == null) {
- packageService = (PackageAdmin) packageServiceTracker.getService();
- }
-
- return packageService;
- }
-
/**
* Returns the shared instance.
*/
@@ -119,4 +103,15 @@ public class Activator implements BundleActivator {
return plugin;
}
+ public boolean hasDatashare() {
+ if (bundleContext == null)
+ return false;
+ Bundle[] bundles = bundleContext.getBundles();
+ for (int i = 0; i < bundles.length; i++)
+ if (bundles[i].getSymbolicName().equals(
+ "org.eclipse.ecf.provider.datashare.nio"))
+ return true;
+ return false;
+ }
+
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/container/IRCRootContainer.java b/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/container/IRCRootContainer.java
index 2201c9abc..6b741e86d 100644
--- a/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/container/IRCRootContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/container/IRCRootContainer.java
@@ -31,8 +31,6 @@ import org.eclipse.ecf.presence.im.IChatMessage.Type;
import org.eclipse.ecf.presence.im.IChatMessageSender;
import org.eclipse.equinox.concurrent.future.TimeoutException;
import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.Bundle;
-import org.osgi.service.packageadmin.PackageAdmin;
import org.schwering.irc.lib.*;
import org.schwering.irc.lib.ssl.SSLIRCConnection;
@@ -108,10 +106,7 @@ public class IRCRootContainer extends IRCAbstractContainer implements
* <code>false</code> otherwise
*/
private boolean hasDatashare() {
- PackageAdmin admin = Activator.getDefault().getPackageAdmin();
- Bundle[] bundles = admin.getBundles(
- "org.eclipse.ecf.provider.datashare.nio", null); //$NON-NLS-1$
- return bundles != null && bundles.length != 0;
+ return Activator.getDefault().hasDatashare();
}
/**
@@ -1083,12 +1078,10 @@ public class IRCRootContainer extends IRCAbstractContainer implements
}
public void setActive(boolean active) {
- // TODO Auto-generated method stub
}
public Object getAdapter(Class adapter) {
- // TODO Auto-generated method stub
return null;
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java
index f022a0485..3d8de7dc5 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java
@@ -85,8 +85,6 @@ final class MSNContainer implements IContainer, IChatManager,
IChatMessageSender, IPresenceService, IPresenceSender, IRoster,
IRosterManager, IRosterSubscriptionSender, ITypingMessageSender {
- private static final long serialVersionUID = 1676711994010767942L;
-
private final Map chatSessions;
private final List containerListeners;
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/ChatMembershipEvent.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/ChatMembershipEvent.java
index 76f4b2b8f..252ae08d9 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/ChatMembershipEvent.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/ChatMembershipEvent.java
@@ -10,30 +10,27 @@ package org.eclipse.ecf.internal.provider.xmpp.events;
import org.eclipse.ecf.core.util.Event;
-/**
- * @author slewis
- *
- */
public class ChatMembershipEvent implements Event {
-
- private static final long serialVersionUID = 8293255412415864623L;
+
String id;
boolean add;
-
- public ChatMembershipEvent(String id, boolean add) {
- this.id = id;
- this.add = add;
- }
-
- public String getFrom() {
- return id;
- }
- public boolean isAdd() {
- return add;
- }
- public String toString() {
- StringBuffer buf = new StringBuffer("ChatMembershipEvent[");
- buf.append(id).append(";").append(add).append("]");
- return buf.toString();
- }
+
+ public ChatMembershipEvent(String id, boolean add) {
+ this.id = id;
+ this.add = add;
+ }
+
+ public String getFrom() {
+ return id;
+ }
+
+ public boolean isAdd() {
+ return add;
+ }
+
+ public String toString() {
+ StringBuffer buf = new StringBuffer("ChatMembershipEvent[");
+ buf.append(id).append(";").append(add).append("]");
+ return buf.toString();
+ }
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/IQEvent.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/IQEvent.java
index a62e9c7d6..12aeebd8e 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/IQEvent.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/IQEvent.java
@@ -11,24 +11,20 @@ package org.eclipse.ecf.internal.provider.xmpp.events;
import org.eclipse.ecf.core.util.Event;
import org.jivesoftware.smack.packet.IQ;
-/**
- * @author slewis
- *
- */
public class IQEvent implements Event {
-
- private static final long serialVersionUID = 8136148813492923513L;
+
protected IQ iq = null;
-
- public IQEvent(IQ iq) {
- this.iq = iq;
- }
-
- public IQ getIQ() {
- return iq;
- }
- public String toString() {
- StringBuffer buf = new StringBuffer("IQEvent[]");
- return buf.toString();
- }
+
+ public IQEvent(IQ iq) {
+ this.iq = iq;
+ }
+
+ public IQ getIQ() {
+ return iq;
+ }
+
+ public String toString() {
+ StringBuffer buf = new StringBuffer("IQEvent[]");
+ return buf.toString();
+ }
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/InvitationReceivedEvent.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/InvitationReceivedEvent.java
index 1d0407e8c..c7e5386f9 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/InvitationReceivedEvent.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/InvitationReceivedEvent.java
@@ -15,16 +15,15 @@ import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.packet.Message;
public class InvitationReceivedEvent implements Event {
- private static final long serialVersionUID = 916275866023754310L;
-
XMPPConnection connection;
String room;
String inviter;
String reason;
String password;
Message message;
-
- public InvitationReceivedEvent(XMPPConnection conn, String room, String inviter, String reason, String password, Message message) {
+
+ public InvitationReceivedEvent(XMPPConnection conn, String room,
+ String inviter, String reason, String password, Message message) {
super();
this.connection = conn;
this.room = room;
@@ -57,12 +56,13 @@ public class InvitationReceivedEvent implements Event {
public String getRoom() {
return room;
}
-
+
public String toString() {
StringBuffer buf = new StringBuffer("InvitationReceivedEvent[");
- buf.append("conn="+getConnection()).append(";room="+getRoom());
- buf.append(";inviter="+getInviter()).append(";reason="+reason);
- buf.append(";pw="+password).append(";msg="+getMessage()).append("]");
+ buf.append("conn=" + getConnection()).append(";room=" + getRoom());
+ buf.append(";inviter=" + getInviter()).append(";reason=" + reason);
+ buf.append(";pw=" + password).append(";msg=" + getMessage())
+ .append("]");
return buf.toString();
}
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/MessageEvent.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/MessageEvent.java
index 8e1182d31..1a13b1b3e 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/MessageEvent.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/MessageEvent.java
@@ -9,37 +9,36 @@
package org.eclipse.ecf.internal.provider.xmpp.events;
import java.util.Iterator;
-
import org.eclipse.ecf.core.util.Event;
import org.jivesoftware.smack.packet.Message;
public class MessageEvent implements Event {
-
- private static final long serialVersionUID = 6940577888021931351L;
+
protected Message message = null;
-
+
protected Iterator xhtmlbodies = null;
-
+
public MessageEvent(Message message) {
this(message, null);
}
-
- public MessageEvent(Message message, Iterator xhtmlbodies) {
- this.message = message;
- this.xhtmlbodies = xhtmlbodies;
- }
-
- public Message getMessage() {
- return message;
- }
-
- public Iterator getXHTMLBodies() {
- return xhtmlbodies;
- }
-
- public String toString() {
- StringBuffer buf = new StringBuffer("MessageEvent[");
- buf.append(message).append(";").append((message==null)?"":message.toXML()).append("]");
- return buf.toString();
- }
+
+ public MessageEvent(Message message, Iterator xhtmlbodies) {
+ this.message = message;
+ this.xhtmlbodies = xhtmlbodies;
+ }
+
+ public Message getMessage() {
+ return message;
+ }
+
+ public Iterator getXHTMLBodies() {
+ return xhtmlbodies;
+ }
+
+ public String toString() {
+ StringBuffer buf = new StringBuffer("MessageEvent[");
+ buf.append(message).append(";")
+ .append((message == null) ? "" : message.toXML()).append("]");
+ return buf.toString();
+ }
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/PresenceEvent.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/PresenceEvent.java
index 67b214add..5fa574385 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/PresenceEvent.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/events/PresenceEvent.java
@@ -15,21 +15,21 @@ import org.jivesoftware.smack.packet.Presence;
*
*/
public class PresenceEvent implements Event {
-
- private static final long serialVersionUID = -8207158000504357229L;
+
protected Presence presence = null;
-
- public PresenceEvent(Presence presence) {
- this.presence = presence;
- }
-
- public Presence getPresence() {
- return presence;
- }
-
- public String toString() {
- StringBuffer buf = new StringBuffer("PresenceEvent[");
- buf.append(presence).append(";").append((presence==null)?"":presence.toXML()).append("]");
- return buf.toString();
- }
+
+ public PresenceEvent(Presence presence) {
+ this.presence = presence;
+ }
+
+ public Presence getPresence() {
+ return presence;
+ }
+
+ public String toString() {
+ StringBuffer buf = new StringBuffer("PresenceEvent[");
+ buf.append(presence).append(";")
+ .append((presence == null) ? "" : presence.toXML()).append("]");
+ return buf.toString();
+ }
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPFileTransferRequestListener.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPFileTransferRequestListener.java
index 8d172183d..de90b635f 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPFileTransferRequestListener.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPFileTransferRequestListener.java
@@ -18,7 +18,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
-
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.ecf.core.IContainer;
import org.eclipse.ecf.core.identity.ID;
@@ -47,7 +46,8 @@ public class XMPPFileTransferRequestListener implements FileTransferListener {
protected IContainer container = null;
- public XMPPFileTransferRequestListener(IContainer container, IIncomingFileTransferRequestListener listener) {
+ public XMPPFileTransferRequestListener(IContainer container,
+ IIncomingFileTransferRequestListener listener) {
this.container = container;
this.requestListener = listener;
}
@@ -55,117 +55,141 @@ public class XMPPFileTransferRequestListener implements FileTransferListener {
/*
* (non-Javadoc)
*
- * @see org.jivesoftware.smackx.filetransfer.FileTransferListener#fileTransferRequest(org.jivesoftware.smackx.filetransfer.FileTransferRequest)
+ * @see
+ * org.jivesoftware.smackx.filetransfer.FileTransferListener#fileTransferRequest
+ * (org.jivesoftware.smackx.filetransfer.FileTransferRequest)
*/
public void fileTransferRequest(final FileTransferRequest request) {
- requestListener.handleFileTransferRequest(new IFileTransferRequestEvent() {
-
- private static final long serialVersionUID = -6173401619917403353L;
-
- boolean requestAccepted = false;
+ requestListener
+ .handleFileTransferRequest(new IFileTransferRequestEvent() {
- IFileTransferInfo fileTransferInfo = new IFileTransferInfo() {
+ boolean requestAccepted = false;
- Map props = new HashMap();
+ IFileTransferInfo fileTransferInfo = new IFileTransferInfo() {
- File f = new File(request.getFileName());
+ Map props = new HashMap();
- public String getDescription() {
- return request.getDescription();
- }
+ File f = new File(request.getFileName());
- public File getFile() {
- return f;
- }
-
- public Map getProperties() {
- return props;
- }
+ public String getDescription() {
+ return request.getDescription();
+ }
- public Object getAdapter(Class adapter) {
- if (adapter == null)
- return null;
- if (adapter.isInstance(this))
- return this;
- final IAdapterManager adapterManager = XmppPlugin.getDefault().getAdapterManager();
- return (adapterManager == null) ? null : adapterManager.loadAdapter(this, adapter.getName());
- }
+ public File getFile() {
+ return f;
+ }
- public long getFileSize() {
- return request.getFileSize();
- }
+ public Map getProperties() {
+ return props;
+ }
- public String getMimeType() {
- return request.getMimeType();
- }
+ public Object getAdapter(Class adapter) {
+ if (adapter == null)
+ return null;
+ if (adapter.isInstance(this))
+ return this;
+ final IAdapterManager adapterManager = XmppPlugin
+ .getDefault().getAdapterManager();
+ return (adapterManager == null) ? null
+ : adapterManager.loadAdapter(this,
+ adapter.getName());
+ }
- public String toString() {
- final StringBuffer buf = new StringBuffer("FileTransferInfo[");
- buf.append("file=").append(f);
- buf.append(";size=").append(getFileSize());
- buf.append(";description=" + getDescription());
- buf.append(";mimeType=").append(getMimeType()).append("]");
- return buf.toString();
- }
+ public long getFileSize() {
+ return request.getFileSize();
+ }
- };
+ public String getMimeType() {
+ return request.getMimeType();
+ }
- public IIncomingFileTransfer accept(File localFileToSave) throws IncomingFileTransferException {
+ public String toString() {
+ final StringBuffer buf = new StringBuffer(
+ "FileTransferInfo[");
+ buf.append("file=").append(f);
+ buf.append(";size=").append(getFileSize());
+ buf.append(";description=" + getDescription());
+ buf.append(";mimeType=").append(getMimeType())
+ .append("]");
+ return buf.toString();
+ }
- try {
- final OutputStream outs = new FileOutputStream(localFileToSave);
- return accept(outs, new IFileTransferListener() {
- public void handleTransferEvent(IFileTransferEvent event) {
- if (event instanceof IIncomingFileTransferReceiveDoneEvent) {
- try {
- outs.close();
- } catch (final IOException e) {
+ };
+
+ public IIncomingFileTransfer accept(File localFileToSave)
+ throws IncomingFileTransferException {
+
+ try {
+ final OutputStream outs = new FileOutputStream(
+ localFileToSave);
+ return accept(outs, new IFileTransferListener() {
+ public void handleTransferEvent(
+ IFileTransferEvent event) {
+ if (event instanceof IIncomingFileTransferReceiveDoneEvent) {
+ try {
+ outs.close();
+ } catch (final IOException e) {
+ }
+ }
}
- }
+ });
+ } catch (final FileNotFoundException e) {
+ throw new IncomingFileTransferException(
+ "Exception opening file for writing", e);
+ }
+ }
+
+ public IFileTransferInfo getFileTransferInfo() {
+ return fileTransferInfo;
+ }
+
+ public ID getRequesterID() {
+ return createIDFromName(request.getRequestor());
+ }
+
+ public void reject() {
+ request.reject();
+ }
+
+ public boolean requestAccepted() {
+ return requestAccepted;
+ }
+
+ public String toString() {
+ final StringBuffer buf = new StringBuffer(
+ "FileTransferRequestEvent[");
+ buf.append("requester=").append(getRequesterID());
+ buf.append(";requestAccepted=").append(
+ requestAccepted());
+ buf.append(";transferInfo=")
+ .append(getFileTransferInfo()).append("]");
+ return buf.toString();
+ }
+
+ public IIncomingFileTransfer accept(
+ OutputStream outputStream,
+ IFileTransferListener listener)
+ throws IncomingFileTransferException {
+ if (requestAccepted)
+ throw new IncomingFileTransferException(
+ "Incoming request previously accepted");
+ if (outputStream == null)
+ throw new IncomingFileTransferException(
+ "outputStream cannot be null");
+ incoming = request.accept();
+ try {
+ return new XMPPIncomingFileTransfer(IDFactory
+ .getDefault().createStringID(
+ request.getStreamID()), request
+ .getFileName(), incoming.recieveFile(),
+ outputStream, request.getFileSize(),
+ listener);
+ } catch (final Exception e) {
+ throw new IncomingFileTransferException(
+ "Exception receiving file", e);
}
- });
- } catch (final FileNotFoundException e) {
- throw new IncomingFileTransferException("Exception opening file for writing", e);
- }
- }
-
- public IFileTransferInfo getFileTransferInfo() {
- return fileTransferInfo;
- }
-
- public ID getRequesterID() {
- return createIDFromName(request.getRequestor());
- }
-
- public void reject() {
- request.reject();
- }
-
- public boolean requestAccepted() {
- return requestAccepted;
- }
-
- public String toString() {
- final StringBuffer buf = new StringBuffer("FileTransferRequestEvent[");
- buf.append("requester=").append(getRequesterID());
- buf.append(";requestAccepted=").append(requestAccepted());
- buf.append(";transferInfo=").append(getFileTransferInfo()).append("]");
- return buf.toString();
- }
-
- public IIncomingFileTransfer accept(OutputStream outputStream, IFileTransferListener listener) throws IncomingFileTransferException {
- if (requestAccepted)
- throw new IncomingFileTransferException("Incoming request previously accepted");
- if (outputStream == null)
- throw new IncomingFileTransferException("outputStream cannot be null");
- incoming = request.accept();
- try {
- return new XMPPIncomingFileTransfer(IDFactory.getDefault().createStringID(request.getStreamID()), request.getFileName(), incoming.recieveFile(), outputStream, request.getFileSize(), listener);
- } catch (final Exception e) {
- throw new IncomingFileTransferException("Exception receiving file", e);
- }
- }
- });
+ }
+ });
}
private XMPPID createIDFromName(String uname) {
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPIncomingFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPIncomingFileTransfer.java
index 13a635aec..2286ff564 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPIncomingFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPIncomingFileTransfer.java
@@ -116,51 +116,45 @@ public class XMPPIncomingFileTransfer implements IIncomingFileTransfer {
protected void fireTransferReceiveDoneEvent() {
if (listener != null)
- listener
- .handleTransferEvent(new IIncomingFileTransferReceiveDoneEvent() {
-
- private static final long serialVersionUID = 6925524078226825710L;
-
- public IIncomingFileTransfer getSource() {
- return XMPPIncomingFileTransfer.this;
- }
-
- public Exception getException() {
- return XMPPIncomingFileTransfer.this.getException();
- }
-
- public String toString() {
- final StringBuffer sb = new StringBuffer(
- "IIncomingFileTransferReceiveDoneEvent["); //$NON-NLS-1$
- sb.append("isDone=").append(done).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
- sb.append("bytesReceived=").append(bytesReceived) //$NON-NLS-1$
- .append("]"); //$NON-NLS-1$
- return sb.toString();
- }
- });
+ listener.handleTransferEvent(new IIncomingFileTransferReceiveDoneEvent() {
+
+ public IIncomingFileTransfer getSource() {
+ return XMPPIncomingFileTransfer.this;
+ }
+
+ public Exception getException() {
+ return XMPPIncomingFileTransfer.this.getException();
+ }
+
+ public String toString() {
+ final StringBuffer sb = new StringBuffer(
+ "IIncomingFileTransferReceiveDoneEvent["); //$NON-NLS-1$
+ sb.append("isDone=").append(done).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append("bytesReceived=").append(bytesReceived) //$NON-NLS-1$
+ .append("]"); //$NON-NLS-1$
+ return sb.toString();
+ }
+ });
}
protected void fireTransferReceiveDataEvent() {
if (listener != null)
- listener
- .handleTransferEvent(new IIncomingFileTransferReceiveDataEvent() {
- private static final long serialVersionUID = -5656328374614130161L;
-
- public IIncomingFileTransfer getSource() {
- return XMPPIncomingFileTransfer.this;
- }
-
- public String toString() {
- final StringBuffer sb = new StringBuffer(
- "IIncomingFileTransferReceiveDataEvent["); //$NON-NLS-1$
- sb.append("isDone=").append(done).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
- sb.append("bytesReceived=").append(bytesReceived) //$NON-NLS-1$
- .append(";"); //$NON-NLS-1$
- sb.append("percentComplete=").append( //$NON-NLS-1$
- getPercentComplete() * 100).append("]"); //$NON-NLS-1$
- return sb.toString();
- }
- });
+ listener.handleTransferEvent(new IIncomingFileTransferReceiveDataEvent() {
+ public IIncomingFileTransfer getSource() {
+ return XMPPIncomingFileTransfer.this;
+ }
+
+ public String toString() {
+ final StringBuffer sb = new StringBuffer(
+ "IIncomingFileTransferReceiveDataEvent["); //$NON-NLS-1$
+ sb.append("isDone=").append(done).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append("bytesReceived=").append(bytesReceived) //$NON-NLS-1$
+ .append(";"); //$NON-NLS-1$
+ sb.append("percentComplete=").append( //$NON-NLS-1$
+ getPercentComplete() * 100).append("]"); //$NON-NLS-1$
+ return sb.toString();
+ }
+ });
}
/**
@@ -187,7 +181,8 @@ public class XMPPIncomingFileTransfer implements IIncomingFileTransfer {
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.filetransfer.IIncomingFileTransfer#getBytesReceived()
+ * @see
+ * org.eclipse.ecf.filetransfer.IIncomingFileTransfer#getBytesReceived()
*/
public long getBytesReceived() {
return bytesReceived;
@@ -264,8 +259,12 @@ public class XMPPIncomingFileTransfer implements IIncomingFileTransfer {
return threadID;
}
- /* (non-Javadoc)
- * @see org.eclipse.ecf.filetransfer.IIncomingFileTransfer#getFileRangeSpecification()
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.ecf.filetransfer.IIncomingFileTransfer#getFileRangeSpecification
+ * ()
*/
public IFileRangeSpecification getFileRangeSpecification() {
return null;
@@ -275,15 +274,22 @@ public class XMPPIncomingFileTransfer implements IIncomingFileTransfer {
return fileLength;
}
- /* (non-Javadoc)
- * @see org.eclipse.ecf.filetransfer.IIncomingFileTransfer#getRemoteFileName()
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.ecf.filetransfer.IIncomingFileTransfer#getRemoteFileName()
*/
public String getRemoteFileName() {
return fileName;
}
- /* (non-Javadoc)
- * @see org.eclipse.ecf.filetransfer.IIncomingFileTransfer#getRemoteLastModified()
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.ecf.filetransfer.IIncomingFileTransfer#getRemoteLastModified
+ * ()
*/
public Date getRemoteLastModified() {
// Not supported
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPOutgoingFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPOutgoingFileTransfer.java
index a310023d5..86284ccf4 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPOutgoingFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPOutgoingFileTransfer.java
@@ -29,9 +29,9 @@ import org.eclipse.ecf.provider.xmpp.identity.XMPPID;
import org.eclipse.osgi.util.NLS;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.filetransfer.FileTransfer;
+import org.jivesoftware.smackx.filetransfer.FileTransfer.Status;
import org.jivesoftware.smackx.filetransfer.FileTransferManager;
import org.jivesoftware.smackx.filetransfer.OutgoingFileTransfer;
-import org.jivesoftware.smackx.filetransfer.FileTransfer.Status;
public class XMPPOutgoingFileTransfer implements IOutgoingFileTransfer {
@@ -139,8 +139,6 @@ public class XMPPOutgoingFileTransfer implements IOutgoingFileTransfer {
|| s.equals(Status.error)
|| s.equals(Status.refused)) {
fireTransferListenerEvent(new IOutgoingFileTransferResponseEvent() {
- private static final long serialVersionUID = -5940612388464073240L;
-
public boolean requestAccepted() {
return negotiated;
}
@@ -152,8 +150,7 @@ public class XMPPOutgoingFileTransfer implements IOutgoingFileTransfer {
public String toString() {
final StringBuffer buf = new StringBuffer(
"OutgoingFileTransferResponseEvent["); //$NON-NLS-1$
- buf
- .append("requestAccepted=").append(requestAccepted()).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
+ buf.append("requestAccepted=").append(requestAccepted()).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
return buf.toString();
}
@@ -189,8 +186,6 @@ public class XMPPOutgoingFileTransfer implements IOutgoingFileTransfer {
}
// Then notify that the sending is done
fireTransferListenerEvent(new IOutgoingFileTransferSendDoneEvent() {
- private static final long serialVersionUID = -6315336868737148845L;
-
public IOutgoingFileTransfer getSource() {
return XMPPOutgoingFileTransfer.this;
}
@@ -199,10 +194,8 @@ public class XMPPOutgoingFileTransfer implements IOutgoingFileTransfer {
final StringBuffer buf = new StringBuffer(
"IOutgoingFileTransferSendDoneEvent["); //$NON-NLS-1$
buf.append("isDone=" + getSource().isDone()); //$NON-NLS-1$
- buf
- .append(";bytesSent=").append(getSource().getBytesSent()); //$NON-NLS-1$
- buf
- .append(";exception=").append(getException()).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
+ buf.append(";bytesSent=").append(getSource().getBytesSent()); //$NON-NLS-1$
+ buf.append(";exception=").append(getException()).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
return buf.toString();
}
});
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/smack/ECFConnectionObjectPacketEvent.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/smack/ECFConnectionObjectPacketEvent.java
index 589d67f9d..f72f9f78d 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/smack/ECFConnectionObjectPacketEvent.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/smack/ECFConnectionObjectPacketEvent.java
@@ -14,21 +14,23 @@ import org.jivesoftware.smack.packet.Packet;
public class ECFConnectionObjectPacketEvent extends AsynchEvent {
- private static final long serialVersionUID = -1618091206033717358L;
Object value;
- public ECFConnectionObjectPacketEvent(IAsynchConnection source, Packet p, Object obj) {
- super(source,p);
+
+ public ECFConnectionObjectPacketEvent(IAsynchConnection source, Packet p,
+ Object obj) {
+ super(source, p);
this.value = obj;
}
-
+
public Object getObjectValue() {
- return value;
+ return value;
}
+
public String toString() {
- StringBuffer sb = new StringBuffer("ECFConnectionPacketEvent[");
- sb.append(getData()).append(";");
- sb.append(getConnection()).append(";");
- sb.append(getObjectValue()).append("]");
- return sb.toString();
+ StringBuffer sb = new StringBuffer("ECFConnectionPacketEvent[");
+ sb.append(getData()).append(";");
+ sb.append(getConnection()).append(";");
+ sb.append(getObjectValue()).append("]");
+ return sb.toString();
}
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/smack/ECFConnectionPacketEvent.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/smack/ECFConnectionPacketEvent.java
index d16192f04..12a8055dd 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/smack/ECFConnectionPacketEvent.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/smack/ECFConnectionPacketEvent.java
@@ -14,16 +14,14 @@ import org.jivesoftware.smack.packet.Packet;
public class ECFConnectionPacketEvent extends AsynchEvent {
- private static final long serialVersionUID = 7000820721266245824L;
-
public ECFConnectionPacketEvent(IAsynchConnection source, Packet p) {
- super(source,p);
+ super(source, p);
}
-
+
public String toString() {
- StringBuffer sb = new StringBuffer("ECFConnectionPacketEvent[");
- sb.append(getData()).append(";");
- sb.append(getConnection()).append("]");
- return sb.toString();
+ StringBuffer sb = new StringBuffer("ECFConnectionPacketEvent[");
+ sb.append(getData()).append(";");
+ sb.append(getConnection()).append("]");
+ return sb.toString();
}
}
diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/.api_filters b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/.api_filters
new file mode 100644
index 000000000..cc1f966bf
--- /dev/null
+++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/.api_filters
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.ecf.remoteservice.eventadmin" version="2">
+ <resource path="src/org/eclipse/ecf/internal/remoteservice/eventadmin/LogTracker.java" type="org.eclipse.ecf.internal.remoteservice.eventadmin.LogTracker">
+ <filter id="574619656">
+ <message_arguments>
+ <message_argument value="LogService"/>
+ <message_argument value="LogTracker"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/org.eclipse.ecf.tests.filetransfer.launch b/tests/bundles/org.eclipse.ecf.tests.filetransfer/org.eclipse.ecf.tests.filetransfer.launch
index c40a7f55d..60223f20c 100644
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/org.eclipse.ecf.tests.filetransfer.launch
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/org.eclipse.ecf.tests.filetransfer.launch
@@ -7,7 +7,7 @@
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bad_container_name" value="\org.eclipse.ecf.tests.filetransfer\A"/>
<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
+<stringAttribute key="checked" value="org.eclipse.ecf.provider.filetransfer.httpclient4"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
@@ -40,6 +40,7 @@
<booleanAttribute key="tracing" value="true"/>
<mapAttribute key="tracingOptions">
<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
+<mapEntry key="org.eclipse.core.expressions/debug/TypeExtensionManager" value="false"/>
<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
@@ -93,11 +94,14 @@
<mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/breadcrumb" value="false"/>
<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/breakpointDeltas" value="false"/>
<mapEntry key="org.eclipse.debug.ui/debug/viewers/contentProvider" value="false"/>
<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/presentationId" value=""/>
<mapEntry key="org.eclipse.debug.ui/debug/viewers/stateSaveRestore" value="false"/>
<mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
@@ -129,11 +133,6 @@
<mapEntry key="org.eclipse.ecf.filetransfer/debug/flag" value="true"/>
<mapEntry key="org.eclipse.ecf.filetransfer/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.ecf.filetransfer/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.ecf.identity/debug" value="true"/>
-<mapEntry key="org.eclipse.ecf.identity/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ecf.identity/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ecf.identity/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ecf.identity/debug/methods/exiting" value="false"/>
<mapEntry key="org.eclipse.ecf.internal.provisional.docshare/debug" value="true"/>
<mapEntry key="org.eclipse.ecf.internal.provisional.docshare/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.ecf.internal.provisional.docshare/debug/exceptions/throwing" value="false"/>
@@ -141,6 +140,29 @@
<mapEntry key="org.eclipse.ecf.internal.provisional.docshare/debug/flag" value="true"/>
<mapEntry key="org.eclipse.ecf.internal.provisional.docshare/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.ecf.internal.provisional.docshare/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.distribution/debug" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.distribution/debug/containerfinder" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.distribution/debug/discoveredservicetracker" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.distribution/debug/eventhook" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.distribution/debug/exceptions/catching" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.distribution/debug/exceptions/throwing" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.distribution/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.distribution/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.distribution/debug/methods/entering" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.distribution/debug/methods/exiting" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.remoteserviceadmin/debug" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.remoteserviceadmin/debug/containerselector" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.remoteserviceadmin/debug/endpointdescriptionadvertiser" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.remoteserviceadmin/debug/endpointdescriptionlocator" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.remoteserviceadmin/debug/endpointdescriptionreader" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.remoteserviceadmin/debug/exceptions/catching" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.remoteserviceadmin/debug/exceptions/throwing" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.remoteserviceadmin/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.remoteserviceadmin/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.remoteserviceadmin/debug/metadatafactory" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.remoteserviceadmin/debug/packageversioncomparator" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.remoteserviceadmin/debug/remoteserviceadmin" value="true"/>
+<mapEntry key="org.eclipse.ecf.osgi.services.remoteserviceadmin/debug/topologymanager" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.datashare/debug" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.datashare/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.datashare/debug/exceptions/throwing" value="false"/>
@@ -157,6 +179,15 @@
<mapEntry key="org.eclipse.ecf.provider.discovery/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.discovery/debug/methods/exiting" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.discovery/debug/methods/tracing" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.dnssd/debug" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.dnssd/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.dnssd/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.dnssd/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ecf.provider.dnssd/debug/flag" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.dnssd/debug/methods/changing" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.dnssd/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.dnssd/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.dnssd/debug/methods/tracing" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.filetransfer.httpclient/debug" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.filetransfer.httpclient/debug/exceptions/catching" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.filetransfer.httpclient/debug/exceptions/throwing" value="true"/>
@@ -164,6 +195,18 @@
<mapEntry key="org.eclipse.ecf.provider.filetransfer.httpclient/debug/flag" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.filetransfer.httpclient/debug/methods/entering" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.filetransfer.httpclient/debug/methods/exiting" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.filetransfer.httpclient4/debug" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.filetransfer.httpclient4/debug/exceptions/catching" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.filetransfer.httpclient4/debug/exceptions/throwing" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.filetransfer.httpclient4/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ecf.provider.filetransfer.httpclient4/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.filetransfer.httpclient4/debug/methods/entering" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.filetransfer.httpclient4/debug/methods/exiting" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.filetransfer/debug" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.filetransfer/debug/exceptions/catching" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.filetransfer/debug/exceptions/throwing" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.filetransfer/debug/methods/entering" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.filetransfer/debug/methods/exiting" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.irc/debug" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.irc/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.irc/debug/exceptions/throwing" value="false"/>
@@ -171,18 +214,15 @@
<mapEntry key="org.eclipse.ecf.provider.irc/debug/flag" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.irc/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.irc/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jgroups/debug" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider.jgroups/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jgroups/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jgroups/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.ecf.provider.jgroups/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider.jgroups/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jgroups/debug/methods/exiting" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.jmdns/debug" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/container" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/exceptions/throwing" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/filter" value="*"/>
<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/flag" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/jmdns" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/methods/changing" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/methods/tracing" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.jms.activemq/debug" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.jms.activemq/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.jms.activemq/debug/exceptions/throwing" value="false"/>
@@ -190,13 +230,6 @@
<mapEntry key="org.eclipse.ecf.provider.jms.activemq/debug/flag" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.jms.activemq/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.jms.activemq/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jms.weblogic/debug" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider.jms.weblogic/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jms.weblogic/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jms.weblogic/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.ecf.provider.jms.weblogic/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider.jms.weblogic/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jms.weblogic/debug/methods/exiting" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.jms/debug" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.jms/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.jms/debug/exceptions/throwing" value="false"/>
@@ -227,13 +260,16 @@
<mapEntry key="org.eclipse.ecf.provider.rss/debug/flag" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.rss/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.rss/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.skype/debug" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider.skype/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.skype/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.skype/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.ecf.provider.skype/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider.skype/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.skype/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.wave.google/debug" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.wave.google/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.wave.google/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.wave.google/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ecf.provider.wave.google/debug/flag" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.wave.google/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.wave.google/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.wave.google/trace" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.wave.google/trace/filter" value="*"/>
+<mapEntry key="org.eclipse.ecf.provider.wave.google/trace/flag" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.xmpp/debug" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/exceptions/throwing" value="false"/>
@@ -241,9 +277,7 @@
<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/flag" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.yahoo/debug" value="true"/>
<mapEntry key="org.eclipse.ecf.provider/debug" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/basesharedobject" value="true"/>
<mapEntry key="org.eclipse.ecf.provider/debug/connection" value="true"/>
<mapEntry key="org.eclipse.ecf.provider/debug/container" value="true"/>
<mapEntry key="org.eclipse.ecf.provider/debug/containerfactory" value="true"/>
@@ -257,7 +291,6 @@
<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectcontext" value="true"/>
<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectmanager" value="true"/>
<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectwrapper" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/transactioneventprocessor" value="true"/>
<mapEntry key="org.eclipse.ecf.server/debug" value="true"/>
<mapEntry key="org.eclipse.ecf.server/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.ecf.server/debug/exceptions/throwing" value="false"/>
@@ -277,6 +310,13 @@
<mapEntry key="org.eclipse.ecf.sync/debug/flag" value="true"/>
<mapEntry key="org.eclipse.ecf.sync/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.ecf.sync/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.ecf.tests.osgi.services.distribution/debug" value="true"/>
+<mapEntry key="org.eclipse.ecf.tests.osgi.services.distribution/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.ecf.tests.osgi.services.distribution/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.ecf.tests.osgi.services.distribution/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ecf.tests.osgi.services.distribution/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.ecf.tests.osgi.services.distribution/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.ecf.tests.osgi.services.distribution/debug/methods/exiting" value="false"/>
<mapEntry key="org.eclipse.ecf.ui/debug" value="true"/>
<mapEntry key="org.eclipse.ecf.ui/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.ecf.ui/debug/exceptions/throwing" value="false"/>
@@ -291,22 +331,25 @@
<mapEntry key="org.eclipse.ecf/debug/flag" value="true"/>
<mapEntry key="org.eclipse.ecf/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.ecf/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.equinox.common/debug" value="false"/>
+<mapEntry key="org.eclipse.egit.core/debug" value="false"/>
+<mapEntry key="org.eclipse.egit.core/debug/core" value="false"/>
+<mapEntry key="org.eclipse.egit.core/debug/core/indexdiffcache" value="false"/>
+<mapEntry key="org.eclipse.egit.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.egit.ui/debug/quickdiff" value="false"/>
+<mapEntry key="org.eclipse.egit.ui/debug/repochangescanner" value="false"/>
+<mapEntry key="org.eclipse.egit.ui/debug/ui" value="false"/>
+<mapEntry key="org.eclipse.egit.ui/debug/ui/decoration" value="false"/>
+<mapEntry key="org.eclipse.egit.ui/debug/ui/historyview" value="false"/>
+<mapEntry key="org.eclipse.egit.ui/debug/ui/repositoriesview" value="false"/>
<mapEntry key="org.eclipse.equinox.ds/debug" value="false"/>
+<mapEntry key="org.eclipse.equinox.ds/instantiate_all" value="false"/>
<mapEntry key="org.eclipse.equinox.ds/performance" value="false"/>
<mapEntry key="org.eclipse.equinox.ds/print_on_console" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.core/artifacts/mirrors" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.core/core/parseproblems" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.core/core/removeRepo" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.core/debug" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.core/engine/installregistry" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.core/generator/parsing" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.core/metadata/parsing" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.core/planner/operands" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.core/planner/projector" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.core/reconciler" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.core/updatechecker" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.garbagecollector/debug" value="false"/>
+<mapEntry key="org.eclipse.equinox.p2.engine/certificatechecker/unsigned" value="false"/>
+<mapEntry key="org.eclipse.equinox.p2.engine/certificatechecker/untrusted" value="false"/>
+<mapEntry key="org.eclipse.equinox.p2.engine/engine/debug" value="false"/>
+<mapEntry key="org.eclipse.equinox.p2.engine/enginesession/debug" value="false"/>
+<mapEntry key="org.eclipse.equinox.p2.engine/profileregistry/debug" value="false"/>
<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
@@ -361,6 +404,13 @@
<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
+<mapEntry key="org.eclipse.jdt.debug/debug" value="false"/>
+<mapEntry key="org.eclipse.jdt.debug/debug/astEvaluations" value="false"/>
+<mapEntry key="org.eclipse.jdt.debug/debug/astEvaluations/callingThreads" value="false"/>
+<mapEntry key="org.eclipse.jdt.debug/debug/jdiEvents" value="false"/>
+<mapEntry key="org.eclipse.jdt.debug/debug/jdiRequestTimes" value="false"/>
+<mapEntry key="org.eclipse.jdt.launching/debug" value="false"/>
+<mapEntry key="org.eclipse.jdt.launching/debug/classpath/jreContainer" value="false"/>
<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
<mapEntry key="org.eclipse.jdt.ui/debug/BreadcrumbItemDropDown" value="false"/>
@@ -387,6 +437,8 @@
<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/objectPool/adds" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/objectPool/dups" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
@@ -396,6 +448,7 @@
<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/cachedmanifest" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
@@ -417,10 +470,26 @@
<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/apianalyzer" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/apidescription" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/apifilterstore" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/apiprofile" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/builder" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/classfilevisitor" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/delta" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/descriptor/framework" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/pluginworkspacecomponent" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/profilemanager" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/search" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/tagscanner" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/usereportconverter" value="false"/>
+<mapEntry key="org.eclipse.pde.api.tools/debug/workspacedeltaprocessor" value="false"/>
<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
+<mapEntry key="org.eclipse.pde.core/target/profile" value="false"/>
<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
<mapEntry key="org.eclipse.team.core/debug" value="false"/>
@@ -433,8 +502,6 @@
<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
@@ -450,6 +517,13 @@
<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
+<mapEntry key="org.eclipse.ui.navigator/debug" value="false"/>
+<mapEntry key="org.eclipse.ui.navigator/debug/dnd" value="false"/>
+<mapEntry key="org.eclipse.ui.navigator/debug/resolution" value="false"/>
+<mapEntry key="org.eclipse.ui.navigator/debug/setup" value="false"/>
+<mapEntry key="org.eclipse.ui.navigator/debug/sort" value="false"/>
+<mapEntry key="org.eclipse.ui.navigator/debug/viewermap" value="false"/>
+<mapEntry key="org.eclipse.ui.navigator/perf/explorer/createPartControl" value="1300"/>
<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
<mapEntry key="org.eclipse.ui/debug" value="false"/>
<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
@@ -497,6 +571,7 @@
<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/perspectives" value="false"/>
<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
<mapEntry key="org.eclipse.update.core/debug" value="true"/>
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/internal/tests/remoteservice/rpc/HttpServiceConnector.java b/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/internal/tests/remoteservice/rpc/HttpServiceConnector.java
index 0a4cc0e5e..03d2a6553 100644
--- a/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/internal/tests/remoteservice/rpc/HttpServiceConnector.java
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/internal/tests/remoteservice/rpc/HttpServiceConnector.java
@@ -16,13 +16,15 @@ import org.osgi.service.http.HttpService;
import org.osgi.util.tracker.ServiceTracker;
import org.osgi.util.tracker.ServiceTrackerCustomizer;
+@SuppressWarnings("rawtypes")
public class HttpServiceConnector extends ServiceTracker implements ServiceTrackerCustomizer {
private String path;
private HttpServlet servlet;
- public HttpServiceConnector(BundleContext context, String path, HttpServlet servlet) {
+ @SuppressWarnings("unchecked")
+ public HttpServiceConnector(BundleContext context, String path, HttpServlet servlet) {
super(context, HttpService.class.getName(), null);
this.path = path;
this.servlet = servlet;
@@ -31,7 +33,8 @@ public class HttpServiceConnector extends ServiceTracker implements ServiceTrack
}
public Object addingService(ServiceReference reference) {
- HttpService httpService = (HttpService) super.addingService(reference);
+ @SuppressWarnings("unchecked")
+ HttpService httpService = (HttpService) super.addingService(reference);
if (httpService == null)
return null;
@@ -45,7 +48,8 @@ public class HttpServiceConnector extends ServiceTracker implements ServiceTrack
return httpService;
}
- public void removedService(ServiceReference reference, Object service) {
+ @SuppressWarnings("unchecked")
+ public void removedService(ServiceReference reference, Object service) {
HttpService httpService = (HttpService) service;
httpService.unregister(path);
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/tests/remoteservice/rpc/RpcRemoteServiceTest.java b/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/tests/remoteservice/rpc/RpcRemoteServiceTest.java
index f7f2811c7..37589d850 100644
--- a/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/tests/remoteservice/rpc/RpcRemoteServiceTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/tests/remoteservice/rpc/RpcRemoteServiceTest.java
@@ -27,6 +27,7 @@ import org.eclipse.ecf.remoteservice.events.IRemoteCallEvent;
import org.eclipse.ecf.tests.remoteservice.rpc.common.IEcho;
import org.eclipse.equinox.concurrent.future.IFuture;
+@SuppressWarnings("restriction")
public class RpcRemoteServiceTest extends AbstractRpcTestCase {
private static final String ECHO_TEST_DATA = "Hello, world";

Back to the top