Merge "Bug 463010 - Change aggregator build to unpack200 with Java 8, instead of Java 6 "
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/plugin.properties b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/plugin.properties
index 6c3f3a9..6711bb8 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/plugin.properties
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/plugin.properties
@@ -1,10 +1,10 @@
#################################################################################
-# Copyright (c) 2010 Composent, Inc. and others. All rights reserved. This
+# Copyright (c) 2010, 2015 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
#
# Contributors:
# Composent, Inc. - initial API and implementation
#################################################################################
-pluginName=ECF RemoteServiceAdmin Topology Manager
+pluginName=ECF Remote Service Admin (RSA) Basic Topology Manager
pluginProvider=Eclipse.org - ECF
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf.console/plugin.properties b/framework/bundles/org.eclipse.ecf.console/plugin.properties
index 02c8ca1..1ea7e3f 100644
--- a/framework/bundles/org.eclipse.ecf.console/plugin.properties
+++ b/framework/bundles/org.eclipse.ecf.console/plugin.properties
@@ -6,5 +6,5 @@
# http://www.eclipse.org/legal/epl-v10.html
#
############################################################################
-plugin.name=ECF Console Provider
+plugin.name=ECF OSGi Console Command Provider
plugin.provider=Eclipse.org - ECF
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/plugin.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/plugin.properties
index e13a76b..db26fe9 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/plugin.properties
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/plugin.properties
@@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*
*****************************************************************************/
-pluginName=ECF Discovery Edit
+pluginName=ECF Discovery UI Edit
providerName=Eclipse.org - ECF
_UI_PropertyDescriptor_description = The {0} of the {1}
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/plugin.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.model/plugin.properties
index 98a17d1..77ff4f4 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/plugin.properties
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/plugin.properties
@@ -6,6 +6,6 @@
* http://www.eclipse.org/legal/epl-v10.html
*
*****************************************************************************/
-pluginName=ECF Discovery Model
+pluginName=ECF Discovery UI Model
providerName=Eclipse.org - ECF
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy/META-INF/MANIFEST.MF b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy/META-INF/MANIFEST.MF
index af0491c..b0f062f 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy/META-INF/MANIFEST.MF
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: ECF RemoteServiceAdmin Proxy
+Bundle-Name: ECF Remote Service Admin (RSA) Proxy
Bundle-SymbolicName: org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/bundle.properties b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/bundle.properties
index 51410bb..11d1667 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/bundle.properties
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/bundle.properties
@@ -1,10 +1,10 @@
#################################################################################
-# Copyright (c) 2010 Composent, Inc. and others. All rights reserved. This
+# Copyright (c) 2010, 2015 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
#
# Contributors:
# Composent, Inc. - initial API and implementation
#################################################################################
-bundle.name=ECF RemoteServiceAdmin Implementation
+bundle.name=ECF Remote Service Admin (RSA) Implementation
bundle.provider=Eclipse.org - ECF
\ No newline at end of file
diff --git a/releng/features/org.eclipse.ecf.sdk/build.properties b/releng/features/org.eclipse.ecf.sdk/build.properties
index 00bcb6b..9cb4944 100644
--- a/releng/features/org.eclipse.ecf.sdk/build.properties
+++ b/releng/features/org.eclipse.ecf.sdk/build.properties
@@ -14,11 +14,11 @@
generate.feature@org.eclipse.ecf.remoteservice.sdk.examples.source.feature=org.eclipse.ecf.remoteservice.sdk.examples.feature
category.id.core=ECF SDK for Eclipse
-category.description.core=All-in-one distribution of ECF for Eclipse. Included are Eclipse-specific APIs, plugins, and Applications (e.g. docshare, collab, server apps), along with the Remote Service SDK.
+category.description.core=All-in-one distribution of ECF for Eclipse. Includes Eclipse-specific tooling like the Remote Service Perspective, Eclipse plugins, and other ECF-based applications and examples (docshare, collab, server apps). Also includes the ECF Remote Services SDK.
category.members.core=org.eclipse.ecf.core,org.eclipse.ecf.core.source
category.id.rmt=ECF Remote Services SDK
-category.description.rmt=The OSGi Remote Services/Remote Service Admin SDK. Included are ECF's implementation of the OSGi Remote Services and RSA specifications, and multiple discovery providers (e.g. zookeeper, dnssd, zeroconf, jslp), distribution providers (r-osgi and generic) and examples.
+category.description.rmt=ECF's Remote Services/Remote Service Admin SDK. Included are ECF's implementation of the OSGi Remote Services and RSA specifications, multiple discovery providers (e.g. zookeeper, dnssd, zeroconf, jslp), multiple distribution providers (r-osgi and generic), ECF's implementation of Distributed EventAdmin, and remote services examples. The RS SDK does not include any Eclipse-specific tooling, and so can/may be installed into non-Eclipse OSGi environments (e.g. Karaf, etc). If the Eclipse-specific tooling (Remote Services perspective) is desired, please install the ECF SDK for Eclipse.
category.members.rmt=org.eclipse.ecf.remoteservice.sdk.feature,org.eclipse.ecf.remoteservice.sdk.source.feature,org.eclipse.ecf.remoteservice.sdk.examples.feature,org.eclipse.ecf.remoteservice.sdk.examples.source.feature
