Fixes for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=334448

1 files changed, 4 insertions, 148 deletions

diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java
index 9d8b479cc..6be0593ca 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2004, 2009 Composent, Inc. and others.
+ * Copyright (c) 2004-2011 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
@@ -11,8 +11,6 @@
 
 package org.eclipse.ecf.remoteservice;
 
-import org.eclipse.ecf.core.IContainer;
-
 /**
  * Remote service API constants.
  */
@@ -31,7 +29,7 @@ public interface Constants {
 
 	/**
 	 * Remote service property (named "ecf.rsvc.id") identifying a
-	 * service's registration number (of type <code>java.lang.Long</code>).
+	 * service's remote registration number (of type <code>java.lang.Long</code>).
 	 * 
 	 * <p>
 	 * The value of this property is assigned by the remote services API when a
@@ -75,30 +73,6 @@ public interface Constants {
 	public static final String SERVICE_RANKING = "ecf.rsvc.ranking"; //$NON-NLS-1$
 
 	/**
-	 * Service property (named &quot;remote.service.vendor&quot;) identifying a
-	 * service's vendor.
-	 * 
-	 * <p>
-	 * This property may be supplied in the properties <code>Dictionary</code>
-	 * object passed to the
-	 * <code>IRemoteServiceContainerAdapter.registerRemoteService</code>
-	 * method.
-	 */
-	public static final String SERVICE_VENDOR = "ecf.rsvc.vendor"; //$NON-NLS-1$
-
-	/**
-	 * Service property (named &quot;remoteservice.description&quot;)
-	 * identifying a service's description.
-	 * 
-	 * <p>
-	 * This property may be supplied in the properties <code>Dictionary</code>
-	 * object passed to the
-	 * <code>IRemoteServiceContainerAdapter.registerRemoteService</code>
-	 * method.
-	 */
-	public static final String SERVICE_DESCRIPTION = "ecf.rsvc.desc"; //$NON-NLS-1$
-
-	/**
 	 * Service property (named &quot;remoteservice.description&quot;)
 	 * identifying a a registration's target for receiving the service. The
 	 * value of the property MUST be either a non-<code>null</code> instance
@@ -112,37 +86,6 @@ public interface Constants {
 	public static final String SERVICE_REGISTRATION_TARGETS = "ecf.rsvc.reg.targets"; //$NON-NLS-1$
 
 	/**
-	 * Remote service property that defines the container factory name.
-	 * <p>
-	 * This property may be supplied in the properties <code>Dictionary</code>
-	 * object passed to the
-	 * <code>IRemoteServiceContainerAdapter.registerRemoteService</code>
-	 * method.
-	 * @since 3.0
-	 */
-	public static final String SERVICE_CONTAINER_FACTORY_NAME = "ecf.rsvc.cfn"; //$NON-NLS-1$
-
-	/**
-	 * Service property that defines the container target for connection.
-	 * <p>
-	 * This property may be supplied in the properties <code>Dictionary</code>
-	 * object passed to the
-	 * <code>IRemoteServiceContainerAdapter.registerRemoteService</code>
-	 * method.
-	 * @since 3.0
-	 */
-	public static final String SERVICE_CONTAINER_TARGET = "ecf.rsvc.target"; //$NON-NLS-1$
-
-	/**
-	 * Service property that defines the remote service container ID factory name.
-	 * <p>
-	 * This property may be supplied in the properties <code>Dictionary</code>
-	 * object passed to the <code>BundleContext.registerService</code> method.
-	 * @since 3.0
-	 */
-	public static final String SERVICE_CONTAINER_ID_FACTORY = "ecf.rsvc.cidf"; //$NON-NLS-1$
-
-	/**
 	 * Remote service property that defines the remote service container ID.
 	 * <p>
 	 * This property may be supplied in the properties <code>Dictionary</code>
@@ -152,98 +95,11 @@ public interface Constants {
 	public static final String SERVICE_CONTAINER_ID = "ecf.rsvc.cid"; //$NON-NLS-1$
 
 	/**
-	 * Remote service property that defines the remote service container ID.
-	 * <p>
-	 * @since 5.0
-	 */
-	public static final String SERVICE_PROXY_CONTAINER_ID = "ecf.rsvc.pcid"; //$NON-NLS-1$
-
-	/**
-	 * Service property that determines whether a remote service proxy is automatically added to the local
-	 * service registry.  This property can be used to expose remote services transparently
-	 * to client (i.e. automatically putting a proxy into the client's local service registry).
-	 * If this property is set in during service registration, then the the associated remote 
-	 * service proxy should be added to the client's service registry by the implementing provider.  The value 
-	 * of the property can be any non-<code>null</code> value.  
-	 * <p></p>
-	 * For example:
-	 * <pre>
-	 * final Dictionary props = new Hashtable();
-	 * props.put(Constants.AUTOREGISTER_REMOTE_PROXY, "true");
-	 * // Register
-	 * adapters[0].registerRemoteService(new String[] {IConcatService.class.getName()}, serviceImpl, props);
-	 * </pre>
-	 * 
-	 */
-	public static final String AUTOREGISTER_REMOTE_PROXY = "ecf.rsvc.areg"; //$NON-NLS-1$
-
-	// Constants for use with the ECF remote services API
-
-	/**
-	 * Discovery service property to specify a namespace name for creating a connect id.  Note that
-	 * this property should be equal to the name of the namespace retrieved from {@link IContainer#getConnectNamespace()}.
-	 * Note that this property is <b>optional</b>.
-	 * @since 3.0
-	 */
-	public static final String SERVICE_CONNECT_ID_NAMESPACE = "ecf.rsvc.cnct.id.ns"; //$NON-NLS-1$
-
-	/**
-	 * Discovery service property to specify value for creating a connect id.  Note that
-	 * this property should be equal to connectID retrieved from {@link IContainer#getConnectedID()}.
-	 * Note that this property is <b>optional</b>.
-	 * @since 3.0
-	 */
-	public static final String SERVICE_CONNECT_ID = "ecf.rsvc.cnct.id"; //$NON-NLS-1$
-
-	/**
-	 * Discovery service property to specify a namespace name for creating a target service ID.
-	 * Note that this property is <b>optional</b>. It is 
-	 * expected that clients will use the value of this property, along with the SERVICE_ID_PROPERTY
-	 * to create an ID instance for the 'idFilter' parameter via
-	 * remoteServicesContainerAdapter.getRemoteServiceReferences(ID [] idFilter, String clazz, String filter). 
-	 * @since 3.0
-	 */
-	public static final String SERVICE_IDFILTER_NAMESPACE = "ecf.rsvc.idfltr.ns"; //$NON-NLS-1$
-
-	/**
-	 * Discovery service property for a 'remotesvcs' discovery type.  Note that this
-	 * property is <b>optional</b>.  It is expected
-	 * that clients will use the value of this property, along with the SERVICE_IDFILTER_NAMESPACE
-	 * to create an ID instance for the 'idFilter' parameter via
-	 * remoteServicesContainerAdapter.getRemoteServiceReferences(ID [] idFilter, String clazz, String filter). 
-	 * @since 3.0
-	 */
-	public static final String SERVICE_IDFILTER_ID = "ecf.rsvc.idfltr.id"; //$NON-NLS-1$
-
-	/**
-	 * Discovery Service property specifying the clazz paramter in  
-	 * remoteServiceContainerAdapter.getRemoteServiceReferences(ID [] idFilter, String clazz, String filter);
-	 * @since 3.0
-	 */
-	public static final String SERVICE_OBJECTCLASS = "ecf.rsvc.robjectclass"; //$NON-NLS-1$
-
-	/**
-	 * Discovery service property for specifying the service lookup filter for
-	 * client service lookup via 
-	 * remoteServicesContainerAdapter.getRemoteServiceReferences(ID [] idFilter, String clazz, String filter).  
-	 * Note that this
-	 * property is <b>optional</b> if the DISCOVERY_SERVICE_TYPE is as given above.
-	 * @since 3.0
-	 */
-	public static final String SERVICE_FILTER_PROPERTY = "ecf.rsvc.fltr"; //$NON-NLS-1$
-
-	/**
-	 * Discovery service property specifying the expected namespace name for corresponding
-	 * to remoteServiceContainerAdapter.getRemoteServicesNamespace()
-	 * @since 3.0
-	 */
-	public static final String SERVICE_NAMESPACE = "ecf.rsvc.ns"; //$NON-NLS-1$
-
-	/**
-	 * Service property used on service registration to indicate that a service proxy 
+	 * Remote service property used on service registration to indicate that a service proxy 
 	 * should be created rather than using the given service object (which may be null
 	 * when this service property is set).
 	 * @since 4.0
 	 */
 	public static final String SERVICE_REGISTER_PROXY = "ecf.rsvc.proxy"; //$NON-NLS-1$
+
 }