Bug 254300 Brandingpre_log_1_1

53 files changed, 81 insertions, 56 deletions

diff --git a/bundles/org.eclipse.equinox.app/plugin.properties b/bundles/org.eclipse.equinox.app/plugin.properties
index f4088f0ed..c6c336145 100755
--- a/bundles/org.eclipse.equinox.app/plugin.properties
+++ b/bundles/org.eclipse.equinox.app/plugin.properties
@@ -9,6 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 pluginName = Equinox Application Container
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
 applicationsName = Applications
 productsName = Products
diff --git a/bundles/org.eclipse.equinox.cm/plugin.properties b/bundles/org.eclipse.equinox.cm/plugin.properties
index 16a1ebcf3..5527a39df 100644
--- a/bundles/org.eclipse.equinox.cm/plugin.properties
+++ b/bundles/org.eclipse.equinox.cm/plugin.properties
@@ -9,4 +9,4 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bundleName = Configuration Admin
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
diff --git a/bundles/org.eclipse.equinox.common/plugin.properties b/bundles/org.eclipse.equinox.common/plugin.properties
index 9badd2f46..e26122d63 100644
--- a/bundles/org.eclipse.equinox.common/plugin.properties
+++ b/bundles/org.eclipse.equinox.common/plugin.properties
@@ -9,4 +9,4 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 pluginName = Common Eclipse Runtime
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
diff --git a/bundles/org.eclipse.equinox.concurrent/plugin.properties b/bundles/org.eclipse.equinox.concurrent/plugin.properties
index edebe31e4..927e0ac02 100644
--- a/bundles/org.eclipse.equinox.concurrent/plugin.properties
+++ b/bundles/org.eclipse.equinox.concurrent/plugin.properties
@@ -7,4 +7,4 @@
 #   EclipseSource - initial API and implementation
 #################################################################################
 pluginName=Equinox Concurrent API
-pluginProvider=Eclipse.org
+pluginProvider=Eclipse.org - Equinox
diff --git a/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF
index 3dffed693..57cac74f3 100644
--- a/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-Activator: org.eclipse.equinox.device.Activator
 Bundle-SymbolicName: org.eclipse.equinox.device
 Bundle-Vendor: %bundleVendor
diff --git a/bundles/org.eclipse.equinox.device/plugin.properties b/bundles/org.eclipse.equinox.device/plugin.properties
index 86742fd77..863dfe91d 100644
--- a/bundles/org.eclipse.equinox.device/plugin.properties
+++ b/bundles/org.eclipse.equinox.device/plugin.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bundleVendor = Eclipse.org
+bundleVendor = Eclipse.org - Equinox
 bundleName = Device Access Service
 bundleCopyright = Copyright (c) IBM Corp. 1999, 2005
diff --git a/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF
index 054a12046..267d89a94 100644
--- a/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Declarative Services
+Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.equinox.ds;singleton:=true
 Bundle-Version: 1.1.0.qualifier
-Bundle-Vendor: Eclipse
+Bundle-Vendor: %bundleVendor
 Bundle-Activator: org.eclipse.equinox.internal.ds.Activator
 Bundle-Description: This bundle provides support for OSGi 
  Declarative Services. This module implements a declarative service model,
@@ -40,3 +40,4 @@ Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.2,
  CDC-1.1/Foundation-1.1,
  J2SE-1.4
 Lazy-ManifestFilter: (Service-Component=*)
+Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.ds/build.properties b/bundles/org.eclipse.equinox.ds/build.properties
index f0fcab02b..a93c7ee49 100644
--- a/bundles/org.eclipse.equinox.ds/build.properties
+++ b/bundles/org.eclipse.equinox.ds/build.properties
@@ -3,5 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                about.html,\
-               .options
+               .options,\
+               plugin.properties
 src.includes = about.html
diff --git a/bundles/org.eclipse.equinox.ds/plugin.properties b/bundles/org.eclipse.equinox.ds/plugin.properties
new file mode 100644
index 000000000..5ca4e3cc7
--- /dev/null
+++ b/bundles/org.eclipse.equinox.ds/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.equinox.ds
+bundleVendor = Eclipse.org - Equinox
+bundleName = Declarative Services
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF
index 9481c3759..9653fe872 100644
--- a/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-SymbolicName: org.eclipse.equinox.event
 Bundle-Activator: org.eclipse.equinox.internal.event.Activator
 Bundle-Copyright: %bundleCopyright
diff --git a/bundles/org.eclipse.equinox.event/plugin.properties b/bundles/org.eclipse.equinox.event/plugin.properties
index 2c33066a5..06b9feabb 100644
--- a/bundles/org.eclipse.equinox.event/plugin.properties
+++ b/bundles/org.eclipse.equinox.event/plugin.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bundleVendor = Eclipse.org
+bundleVendor = Eclipse.org - Equinox
 bundleName = Event Admin
 bundleCopyright = Copyright (c) IBM Corp. 2005
diff --git a/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF
index 4d83edbd0..e3b49a6d4 100644
--- a/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.equinox.http.jetty
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-Activator: org.eclipse.equinox.http.jetty.internal.Activator
 Import-Package: javax.servlet;version="[2.4.0,2.6.0)",
  javax.servlet.http;version="[2.4.0,2.6.0)",
diff --git a/bundles/org.eclipse.equinox.http.jetty5/plugin.properties b/bundles/org.eclipse.equinox.http.jetty5/plugin.properties
index e2ce6f0c0..75c5b995f 100644
--- a/bundles/org.eclipse.equinox.http.jetty5/plugin.properties
+++ b/bundles/org.eclipse.equinox.http.jetty5/plugin.properties
@@ -9,6 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bundleName = Jetty Http Service
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
 configurationName = Http Server Configuration
 configurationDescription = Provides Http Server Configuration Parameters
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.http.jetty6/plugin.properties b/bundles/org.eclipse.equinox.http.jetty6/plugin.properties
index e2ce6f0c0..75c5b995f 100644
--- a/bundles/org.eclipse.equinox.http.jetty6/plugin.properties
+++ b/bundles/org.eclipse.equinox.http.jetty6/plugin.properties
@@ -9,6 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bundleName = Jetty Http Service
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
 configurationName = Http Server Configuration
 configurationDescription = Provides Http Server Configuration Parameters
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF
index cb91c2866..3ba8b0eac 100644
--- a/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.equinox.http.registry;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
 Bundle-Activator: org.eclipse.equinox.http.registry.internal.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.equinox.common,
diff --git a/bundles/org.eclipse.equinox.http.registry/plugin.properties b/bundles/org.eclipse.equinox.http.registry/plugin.properties
index cad230cac..29e6c7efe 100644
--- a/bundles/org.eclipse.equinox.http.registry/plugin.properties
+++ b/bundles/org.eclipse.equinox.http.registry/plugin.properties
@@ -9,7 +9,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bundleName = Http Service Registry Extensions
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
 servletsName = HttpService servlets
 resourcesName = HttpService resources
 httpcontextsName = HttpService httpcontexts
diff --git a/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
index 74d3a92e1..dabe0f1e3 100644
--- a/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.equinox.http.servlet
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
 Bundle-Activator: org.eclipse.equinox.http.servlet.internal.Activator
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
diff --git a/bundles/org.eclipse.equinox.http.servlet/plugin.properties b/bundles/org.eclipse.equinox.http.servlet/plugin.properties
index 345ccf6c2..bc1823a29 100644
--- a/bundles/org.eclipse.equinox.http.servlet/plugin.properties
+++ b/bundles/org.eclipse.equinox.http.servlet/plugin.properties
@@ -9,4 +9,4 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bundleName = Http Services Servlet
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
diff --git a/bundles/org.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
index d33e2e9ee..ec9ab73d2 100644
--- a/bundles/org.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-Vendor: %bundleProvider
 Bundle-SymbolicName: org.eclipse.equinox.http.servletbridge
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-Activator: org.eclipse.equinox.http.servletbridge.internal.Activator
 Bundle-Localization: plugin
 Import-Package: javax.servlet;version="2.3",
diff --git a/bundles/org.eclipse.equinox.http.servletbridge/plugin.properties b/bundles/org.eclipse.equinox.http.servletbridge/plugin.properties
index f87cf095d..954a93af3 100644
--- a/bundles/org.eclipse.equinox.http.servletbridge/plugin.properties
+++ b/bundles/org.eclipse.equinox.http.servletbridge/plugin.properties
@@ -9,4 +9,4 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bundleName = Servletbridge Http Service
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
diff --git a/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF
index 9b932dd6b..32cece2a3 100644
--- a/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Vendor: %bundleVendor
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Bundle-Activator: org.eclipse.equinox.http.Activator
 Bundle-Copyright: %bundleCopyright
 Bundle-SymbolicName: org.eclipse.equinox.http
diff --git a/bundles/org.eclipse.equinox.http/plugin.properties b/bundles/org.eclipse.equinox.http/plugin.properties
index ad0e815c1..ce8f779a1 100644
--- a/bundles/org.eclipse.equinox.http/plugin.properties
+++ b/bundles/org.eclipse.equinox.http/plugin.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bundleVendor = Eclipse.org
+bundleVendor = Eclipse.org - Equinox
 bundleName = HTTP Service
 bundleCopyright = Copyright (c) IBM Corp. 1999, 2005
diff --git a/bundles/org.eclipse.equinox.io/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.io/META-INF/MANIFEST.MF
index 5877c4e6b..3e8fa0679 100644
--- a/bundles/org.eclipse.equinox.io/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.io/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: IO Connector Service
+Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.equinox.io
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Eclipse
+Bundle-Version: 1.0.100.qualifier
+Bundle-Vendor: %bundleVendor
 Bundle-Activator: org.eclipse.equinox.internal.io.impl.Activator
 Bundle-Description: This bundle contains service for creating connections. 
 Import-Package: 
@@ -22,3 +22,4 @@ Export-Package:
  org.eclipse.equinox.internal.io.util; x-internal:=true
 Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.0
 Provided-Services: class=org.osgi.service.io.ConnectorService
+Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.io/build.properties b/bundles/org.eclipse.equinox.io/build.properties
index 9cbab3c13..cdd2db7f1 100644
--- a/bundles/org.eclipse.equinox.io/build.properties
+++ b/bundles/org.eclipse.equinox.io/build.properties
@@ -2,5 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               about.html
+               about.html,\
+               plugin.properties
 src.includes = about.html
diff --git a/bundles/org.eclipse.equinox.io/plugin.properties b/bundles/org.eclipse.equinox.io/plugin.properties
new file mode 100644
index 000000000..e0fb702d3
--- /dev/null
+++ b/bundles/org.eclipse.equinox.io/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.equinox.io
+bundleVendor = Eclipse.org - Equinox
+bundleName = IO Connector Service
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF
index 83242e105..d42b2cd89 100644
--- a/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Initial Provisioning
+Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.equinox.ip
 Bundle-Version: 1.1.0.qualifier
-Bundle-Vendor: Eclipse
+Bundle-Vendor: %bundleVendor
 Bundle-Description: Provides implementation of the Intial Provisioning service
  defined by OSGi specification release 4.
 Bundle-Activator: org.eclipse.equinox.internal.ip.impl.ProvisioningAgent
@@ -38,4 +38,5 @@ PrvInfo-Providers:
  org.eclipse.equinox.internal.ip.provider.file.FileProvider;100
 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
  J2SE-1.3
+Bundle-Localization: plugin
 
diff --git a/bundles/org.eclipse.equinox.ip/build.properties b/bundles/org.eclipse.equinox.ip/build.properties
index 9cbab3c13..cdd2db7f1 100644
--- a/bundles/org.eclipse.equinox.ip/build.properties
+++ b/bundles/org.eclipse.equinox.ip/build.properties
@@ -2,5 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               about.html
+               about.html,\
+               plugin.properties
 src.includes = about.html
diff --git a/bundles/org.eclipse.equinox.ip/plugin.properties b/bundles/org.eclipse.equinox.ip/plugin.properties
new file mode 100644
index 000000000..57c9664bf
--- /dev/null
+++ b/bundles/org.eclipse.equinox.ip/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.equinox.ip
+bundleVendor = Eclipse.org - Equinox
+bundleName = Initial Provisioning
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.jsp.jasper.registry/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.jsp.jasper.registry/META-INF/MANIFEST.MF
index 394cbcaad..3d2894877 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper.registry/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.jsp.jasper.registry/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.equinox.jsp.jasper.registry
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-Activator: org.eclipse.equinox.internal.jsp.jasper.registry.Activator
 Import-Package: org.eclipse.equinox.jsp.jasper,
  org.osgi.framework;version="1.3.0",
diff --git a/bundles/org.eclipse.equinox.jsp.jasper.registry/plugin.properties b/bundles/org.eclipse.equinox.jsp.jasper.registry/plugin.properties
index 680274f55..b16458f60 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper.registry/plugin.properties
+++ b/bundles/org.eclipse.equinox.jsp.jasper.registry/plugin.properties
@@ -9,4 +9,4 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bundleName = Jasper Jsp Registry Support Plug-in
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
diff --git a/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
index 77ca49e42..07a5c7e85 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.equinox.jsp.jasper
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
 Bundle-Activator: org.eclipse.equinox.internal.jsp.jasper.Activator
 Import-Package: javax.servlet;version="2.4",
  javax.servlet.http;version="2.4",
diff --git a/bundles/org.eclipse.equinox.jsp.jasper/plugin.properties b/bundles/org.eclipse.equinox.jsp.jasper/plugin.properties
index 2e7111075..79ecd0619 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper/plugin.properties
+++ b/bundles/org.eclipse.equinox.jsp.jasper/plugin.properties
@@ -9,4 +9,4 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bundleName = Jasper Jsp Support Bundle
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
diff --git a/bundles/org.eclipse.equinox.log/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.log/META-INF/MANIFEST.MF
index d0165a272..a6caf0a33 100644
--- a/bundles/org.eclipse.equinox.log/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.log/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Vendor: %bundleVendor
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-Activator: org.eclipse.equinox.log.Activator
 Bundle-Copyright: %bundleCopyright
 Bundle-SymbolicName: org.eclipse.equinox.log
diff --git a/bundles/org.eclipse.equinox.log/plugin.properties b/bundles/org.eclipse.equinox.log/plugin.properties
index 09d786974..4914e28d5 100644
--- a/bundles/org.eclipse.equinox.log/plugin.properties
+++ b/bundles/org.eclipse.equinox.log/plugin.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bundleVendor = Eclipse.org
+bundleVendor = Eclipse.org - Equinox
 bundleName = Log Service
 bundleCopyright = Copyright (c) IBM Corp. 1999, 2005
diff --git a/bundles/org.eclipse.equinox.metatype/plugin.properties b/bundles/org.eclipse.equinox.metatype/plugin.properties
index 6c8069430..53a8cf19a 100644
--- a/bundles/org.eclipse.equinox.metatype/plugin.properties
+++ b/bundles/org.eclipse.equinox.metatype/plugin.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bundleVendor = Eclipse.org
+bundleVendor = Eclipse.org - Equinox
 bundleName = Meta Type
 bundleCopyright = Copyright (c) IBM Corp. 2005
diff --git a/bundles/org.eclipse.equinox.preferences/plugin.properties b/bundles/org.eclipse.equinox.preferences/plugin.properties
index 85acdaaf3..28ea3057d 100644
--- a/bundles/org.eclipse.equinox.preferences/plugin.properties
+++ b/bundles/org.eclipse.equinox.preferences/plugin.properties
@@ -9,6 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 pluginName = Eclipse Preferences Mechanism
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
 preferencesExtPtName = Platform Preferences
 preferencesName=Preferences
diff --git a/bundles/org.eclipse.equinox.registry/plugin.properties b/bundles/org.eclipse.equinox.registry/plugin.properties
index 7237f0fc5..0700ef131 100644
--- a/bundles/org.eclipse.equinox.registry/plugin.properties
+++ b/bundles/org.eclipse.equinox.registry/plugin.properties
@@ -9,5 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 pluginName = Extension Registry Support
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
 adaptersName = Adapter factories
diff --git a/bundles/org.eclipse.equinox.security.macosx/fragment.properties b/bundles/org.eclipse.equinox.security.macosx/fragment.properties
index 06f0dd1a5..326d4ee0d 100644
--- a/bundles/org.eclipse.equinox.security.macosx/fragment.properties
+++ b/bundles/org.eclipse.equinox.security.macosx/fragment.properties
@@ -9,6 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 fragmentName = OS X Keystore service integration
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
 macModuleName = OS X Keystore Integration
 providerDescription = The provider uses the operating system\'s keyring to store a randomly generated user-specific \'master\' password. Users who can log into the operating system account can access contents of the secure storage.
diff --git a/bundles/org.eclipse.equinox.security.ui/plugin.properties b/bundles/org.eclipse.equinox.security.ui/plugin.properties
index e7e7bd0ac..53a7d58d9 100644
--- a/bundles/org.eclipse.equinox.security.ui/plugin.properties
+++ b/bundles/org.eclipse.equinox.security.ui/plugin.properties
@@ -10,7 +10,7 @@
 ###############################################################################
 
 pluginName = Equinox Security Default UI
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
 security = Security
 policy = Authorization 
 certificates = Certificates
diff --git a/bundles/org.eclipse.equinox.security.win32.x86/fragment.properties b/bundles/org.eclipse.equinox.security.win32.x86/fragment.properties
index e8db1426b..e557a4242 100644
--- a/bundles/org.eclipse.equinox.security.win32.x86/fragment.properties
+++ b/bundles/org.eclipse.equinox.security.win32.x86/fragment.properties
@@ -9,6 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 fragmentName = Windows Data Protection services integration
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
 windowsModuleName = Windows Integration
 providerDescription = The provider uses Windows APIs to encrypt a randomly generated \'master\' password in a way specific to the login credentials. Users who can log into the Windows account can access contents of the secure storage.
diff --git a/bundles/org.eclipse.equinox.security/plugin.properties b/bundles/org.eclipse.equinox.security/plugin.properties
index cddbb84e1..387fbf1b4 100644
--- a/bundles/org.eclipse.equinox.security/plugin.properties
+++ b/bundles/org.eclipse.equinox.security/plugin.properties
@@ -10,7 +10,7 @@
 ###############################################################################
 
 pluginName = Equinox Java Authentication and Authorization Service (JAAS)
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
 configProviderExtName = JAAS Login Configuration Provider
 loginModuleExtName = JAAS LoginModule
 callbackHandlerExtName = JAAS CallbackHandler
diff --git a/bundles/org.eclipse.equinox.servletbridge/plugin.properties b/bundles/org.eclipse.equinox.servletbridge/plugin.properties
index 5335ec8b0..f93a256e5 100644
--- a/bundles/org.eclipse.equinox.servletbridge/plugin.properties
+++ b/bundles/org.eclipse.equinox.servletbridge/plugin.properties
@@ -9,4 +9,4 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bundleName = Servletbridge
-providerName = Eclipse.org
+providerName = Eclipse.org - Equinox
diff --git a/bundles/org.eclipse.equinox.transforms.hook/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.transforms.hook/META-INF/MANIFEST.MF
index af9de43ec..f710e62b4 100644
--- a/bundles/org.eclipse.equinox.transforms.hook/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.transforms.hook/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.equinox.transforms.hook
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Fragment-Host: org.eclipse.osgi;bundle-version="[3.2.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-Localization: transformsHook
diff --git a/bundles/org.eclipse.equinox.transforms.hook/transformsHook.properties b/bundles/org.eclipse.equinox.transforms.hook/transformsHook.properties
index bc2d7a766..4afcf132d 100644
--- a/bundles/org.eclipse.equinox.transforms.hook/transformsHook.properties
+++ b/bundles/org.eclipse.equinox.transforms.hook/transformsHook.properties
@@ -9,4 +9,4 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bundleName=Transformer Hook Framework Extension
-providerName=Eclipse.org
\ No newline at end of file
+providerName=Eclipse.org - Equinox
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.transforms.xslt/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.transforms.xslt/META-INF/MANIFEST.MF
index b08154d51..427fcf1a4 100644
--- a/bundles/org.eclipse.equinox.transforms.xslt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.transforms.xslt/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.equinox.transforms.xslt
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Import-Package: org.eclipse.osgi.framework.log;version="1.0.0",
  org.osgi.framework;version="1.3.0",
diff --git a/bundles/org.eclipse.equinox.transforms.xslt/bundle.properties b/bundles/org.eclipse.equinox.transforms.xslt/bundle.properties
index ce1cdc025..8a736aa74 100644
--- a/bundles/org.eclipse.equinox.transforms.xslt/bundle.properties
+++ b/bundles/org.eclipse.equinox.transforms.xslt/bundle.properties
@@ -9,4 +9,4 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bundleName=XSLT Transform Provider
-providerName=Eclipse.org
\ No newline at end of file
+providerName=Eclipse.org - Equinox
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.useradmin/plugin.properties b/bundles/org.eclipse.equinox.useradmin/plugin.properties
index 3bf3c5cb1..2f6b9e71f 100644
--- a/bundles/org.eclipse.equinox.useradmin/plugin.properties
+++ b/bundles/org.eclipse.equinox.useradmin/plugin.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bundleVendor = Eclipse.org
+bundleVendor = Eclipse.org - Equinox
 bundleName = User Admin Service
 bundleCopyright = Copyright (c) IBM Corp. 2001, 2005
diff --git a/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF
index adee8f39f..f52d16021 100644
--- a/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.equinox.util
-Bundle-Name: Equinox Util Bundle
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: Eclipse
+Bundle-Name: %bundleName
+Bundle-Version: 1.0.100.qualifier
+Bundle-Vendor: %bundleVendor
 Bundle-Activator: org.eclipse.equinox.internal.util.UtilActivator
 Bundle-Description: The Equinox Util Bundle contains services to facilitate bundle developers in their programming, and to lighten resource usage at runtime.
 Import-Package: 
@@ -25,3 +25,4 @@ Export-Package:
  org.eclipse.equinox.internal.util.timer;version="1.0";x-friends:="org.eclipse.equinox.ds,org.eclipse.equinox.ip"
 Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.1
 Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.util/build.properties b/bundles/org.eclipse.equinox.util/build.properties
index 9cbab3c13..cdd2db7f1 100644
--- a/bundles/org.eclipse.equinox.util/build.properties
+++ b/bundles/org.eclipse.equinox.util/build.properties
@@ -2,5 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               about.html
+               about.html,\
+               plugin.properties
 src.includes = about.html
diff --git a/bundles/org.eclipse.equinox.util/plugin.properties b/bundles/org.eclipse.equinox.util/plugin.properties
new file mode 100644
index 000000000..6787f4420
--- /dev/null
+++ b/bundles/org.eclipse.equinox.util/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.equinox.util
+bundleVendor = Eclipse.org - Equinox
+bundleName = Equinox Util Bundle
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.wireadmin/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.wireadmin/META-INF/MANIFEST.MF
index 6622daeb7..e010b9a5c 100644
--- a/bundles/org.eclipse.equinox.wireadmin/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.wireadmin/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Wire Admin Service
+Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.equinox.wireadmin
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Eclipse
+Bundle-Version: 1.0.100.qualifier
+Bundle-Vendor: %bundleVendor
 Bundle-Description: This bundle provides utility classes for Producer and Consumer services.
 Bundle-Activator: org.eclipse.equinox.internal.wireadmin.Activator
 Import-Package: org.eclipse.equinox.internal.util.hash;version="1.0.0",
@@ -16,3 +16,4 @@ Import-Package: org.eclipse.equinox.internal.util.hash;version="1.0.0",
  org.osgi.util.tracker;version="1.3"
 Export-Package: org.eclipse.equinox.internal.wireadmin; x-internal:=true
 Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.0
+Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.wireadmin/build.properties b/bundles/org.eclipse.equinox.wireadmin/build.properties
index 9cbab3c13..cdd2db7f1 100644
--- a/bundles/org.eclipse.equinox.wireadmin/build.properties
+++ b/bundles/org.eclipse.equinox.wireadmin/build.properties
@@ -2,5 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               about.html
+               about.html,\
+               plugin.properties
 src.includes = about.html
diff --git a/bundles/org.eclipse.equinox.wireadmin/plugin.properties b/bundles/org.eclipse.equinox.wireadmin/plugin.properties
new file mode 100644
index 000000000..066941b3c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.wireadmin/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.equinox.wireadmin
+bundleVendor = Eclipse.org - Equinox
+bundleName = Wire Admin Service
\ No newline at end of file