Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2010-09-09 22:14:53 +0000
committerslewis2010-09-09 22:14:53 +0000
commit697910932207151b25f7b3630119a54cb4a8cd53 (patch)
treea0c4b3e8fcb9064f3c41e918b1f99e78b8958501 /server-side
parent47f558309662202302466a914f52e07437c9b5c0 (diff)
downloadorg.eclipse.ecf-697910932207151b25f7b3630119a54cb4a8cd53.tar.gz
org.eclipse.ecf-697910932207151b25f7b3630119a54cb4a8cd53.tar.xz
org.eclipse.ecf-697910932207151b25f7b3630119a54cb4a8cd53.zip
Removed NLS references.
Diffstat (limited to 'server-side')
-rw-r--r--server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF3
-rw-r--r--server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/DistributedEventAdminMessage.java7
-rw-r--r--server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/EventHandlerWrapper.java8
-rw-r--r--server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/remoteservice/eventadmin/DistributedEventAdmin.java11
4 files changed, 6 insertions, 23 deletions
diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF
index c5f70f7e5..52ebb619b 100644
--- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF
+++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.ecf.remoteservice.eventadmin
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-Vendor: %bundleProvider
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
@@ -10,7 +10,6 @@ Bundle-Localization: bundle
Import-Package: org.eclipse.ecf.core.identity;version="3.0.0",
org.eclipse.ecf.core.sharedobject,
org.eclipse.osgi.framework.eventmgr;version="1.2.0",
- org.eclipse.osgi.util;version="1.1.0",
org.osgi.framework;version="1.3.0",
org.osgi.service.event;version="1.2.0",
org.osgi.service.log;version="1.3.0",
diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/DistributedEventAdminMessage.java b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/DistributedEventAdminMessage.java
index 41e97438e..c5a7092e0 100644
--- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/DistributedEventAdminMessage.java
+++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/DistributedEventAdminMessage.java
@@ -15,7 +15,6 @@ import java.io.Serializable;
import java.util.Hashtable;
import java.util.Map;
-import org.eclipse.osgi.util.NLS;
import org.osgi.service.event.Event;
public class DistributedEventAdminMessage implements Serializable {
@@ -40,11 +39,7 @@ public class DistributedEventAdminMessage implements Serializable {
for (int i = 0; i < propertyNames.length; i++) {
Object val = event.getProperty(propertyNames[i]);
if (!(val instanceof Serializable))
- throw new NotSerializableException(
- NLS
- .bind(
- "Cannot serialize property value of name={0} and value={1}",
- propertyNames[i], val));
+ throw new NotSerializableException("Cannot serialize property value of name="+propertyNames[i]+" and value="+val);
ht.put(propertyNames[i], val);
}
return ht;
diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/EventHandlerWrapper.java b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/EventHandlerWrapper.java
index 8e973478d..e82bc635b 100644
--- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/EventHandlerWrapper.java
+++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/EventHandlerWrapper.java
@@ -13,7 +13,6 @@ package org.eclipse.ecf.internal.remoteservice.eventadmin;
import java.security.Permission;
-import org.eclipse.osgi.util.NLS;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
@@ -82,8 +81,7 @@ public class EventHandlerWrapper {
try {
filter = context.createFilter((String) o);
} catch (InvalidSyntaxException e) {
- log.log(LogService.LOG_ERROR, NLS.bind(
- "Invalid handler filter {0}", o), e);
+ log.log(LogService.LOG_ERROR, "Invalid handler filter "+o, e);
return false;
}
}
@@ -192,9 +190,7 @@ public class EventHandlerWrapper {
handlerService.handleEvent(event);
} catch (Throwable t) {
// log/handle any Throwable thrown by the listener
- log.log(LogService.LOG_ERROR, NLS.bind(
- "Exception while dispatching event {0} to handler {1}",
- event, handlerService), t);
+ log.log(LogService.LOG_ERROR, "Exception while dispatching event "+event+" to handler "+handlerService, t);
}
}
}
diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/remoteservice/eventadmin/DistributedEventAdmin.java b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/remoteservice/eventadmin/DistributedEventAdmin.java
index cbf38daac..32e7492ea 100644
--- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/remoteservice/eventadmin/DistributedEventAdmin.java
+++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/remoteservice/eventadmin/DistributedEventAdmin.java
@@ -25,7 +25,6 @@ import org.eclipse.ecf.internal.remoteservice.eventadmin.LogTracker;
import org.eclipse.osgi.framework.eventmgr.CopyOnWriteIdentityMap;
import org.eclipse.osgi.framework.eventmgr.EventManager;
import org.eclipse.osgi.framework.eventmgr.ListenerQueue;
-import org.eclipse.osgi.util.NLS;
import org.osgi.framework.BundleContext;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
@@ -65,9 +64,7 @@ public class DistributedEventAdmin extends BaseSharedObject implements
sendSharedObjectMsgTo(null, SharedObjectMsg.createMsg(
"handlePostEvent", new DistributedEventAdminMessage(event)));
} catch (IOException e) {
- logError(NLS.bind(
- "IOException posting distributed event {0} to {1}", event,
- event.getTopic()), e);
+ logError("IOException posting distributed event "+event+" to "+event.getTopic(), e);
}
localDispatch(event, true);
}
@@ -105,11 +102,7 @@ public class DistributedEventAdmin extends BaseSharedObject implements
sm.checkPermission(new TopicPermission(eventTopic,
TopicPermission.PUBLISH));
} catch (SecurityException e) {
- String msg = NLS
- .bind(
- "Caller bundle does not have TopicPermission to publish topic {0}",
- eventTopic);
- logError(msg, e);
+ logError("Caller bundle does not have TopicPermission to publish topic "+eventTopic, e);
throw e;
}

Back to the top