1 files changed, 8 insertions, 7 deletions
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/src/org/eclipse/ecf/remoteservice/rpc/identity/RpcNamespace.java b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/src/org/eclipse/ecf/remoteservice/rpc/identity/RpcNamespace.java
index 673217b64..01720e670 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/src/org/eclipse/ecf/remoteservice/rpc/identity/RpcNamespace.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/src/org/eclipse/ecf/remoteservice/rpc/identity/RpcNamespace.java
@@ -1,18 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2010 Naumen. All rights reserved. This
+/******************************************************************************* 
+ * Copyright (c) 2010-2011 Naumen. 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: Pavel Samolisov - initial API and implementation
- ******************************************************************************/
+ * Contributors:
+ *   Pavel Samolisov - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ecf.remoteservice.rpc.identity;
 
 import java.net.URI;
 import java.net.URL;
 import java.util.*;
 import org.eclipse.ecf.core.identity.*;
-import org.eclipse.ecf.internal.remoteservice.rpc.Messages;
+import org.eclipse.ecf.remoteservice.rpc.client.RpcClientContainer;
 
 /**
  * This class represents a {@link Namespace} for {@link RpcClientContainer}s.
@@ -78,9 +79,9 @@ public class RpcNamespace extends Namespace {
 				else if (parameters[0] instanceof RpcId)
 					return (ID) parameters[0];
 			}
-			throw new IllegalArgumentException(Messages.RPC_INVALID_PARAMETERS_TO_ID_CREATION);
+			throw new IllegalArgumentException("Invalid parameters to RPCID creation"); //$NON-NLS-1$
 		} catch (Exception e) {
-			throw new IDCreateException(Messages.RPC_COULD_NOT_CREATE_ID, e);
+			throw new IDCreateException("Could not create RPC ID", e); //$NON-NLS-1$
 		}
 	}