From b56a248a0e0106ee06b04d7bceab84a3cb6cb64c Mon Sep 17 00:00:00 2001
From: Pascal Rapicault
Date: Fri, 25 Feb 2011 16:59:43 -0500
Subject: Edit bundle vendor and bundle names

---
 .../org.eclipse.m2e.discovery.oss/build.properties          |  4 ++--
 .../org.eclipse.m2e.discovery.oss/plugin.properties         | 10 ++++++----
 org.eclipse.m2e.editor.xml/OSGI-INF/l10n/bundle.properties  |  2 +-
 org.eclipse.m2e.feature/feature.properties                  |  2 +-
 .../META-INF/MANIFEST.MF                                    |  1 +
 org.eclipse.m2e.lifecyclemapping.defaults/build.properties  |  3 ++-
 org.eclipse.m2e.lifecyclemapping.defaults/plugin.properties |  2 +-
 org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF       |  3 ++-
 org.eclipse.m2e.logback.appender/build.properties           | 13 ++++++++++++-
 org.eclipse.m2e.logback.appender/plugin.properties          | 10 ++++++++++
 .../OSGI-INF/l10n/bundle.properties                         |  2 +-
 org.eclipse.m2e.logback.feature/feature.properties          |  2 +-
 .../OSGI-INF/l10n/bundle.properties                         |  4 ++--
 org.eclipse.m2e.model.edit/OSGI-INF/l10n/bundle.properties  |  2 +-
 org.eclipse.m2e.model.edit/plugin.properties                |  4 ++--
 org.eclipse.m2e.refactoring/OSGI-INF/l10n/bundle.properties |  2 +-
 org.eclipse.m2e.scm/plugin.properties                       |  2 +-
 org.eclipse.m2e.sdk.feature/feature.properties              |  2 +-
 .../OSGI-INF/l10n/bundle.properties                         |  2 +-
 .../OSGI-INF/l10n/bundle.properties                         |  2 +-
 org.eclipse.m2e.usagedata/META-INF/MANIFEST.MF              |  1 +
 org.eclipse.m2e.usagedata/plugin.properties                 | 10 ++++++++++
 22 files changed, 61 insertions(+), 24 deletions(-)
 create mode 100644 org.eclipse.m2e.logback.appender/plugin.properties
 create mode 100644 org.eclipse.m2e.usagedata/plugin.properties

diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/build.properties b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/build.properties
index 1096b8b7..2618d0ea 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/build.properties
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/build.properties
@@ -1,12 +1,12 @@
 ###############################################################################
-# Copyright (c) 2009 Tasktop Technologies and others.
+# Copyright (c) 2011 Sonatype, 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
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#      Tasktop Technologies - initial API and implementation
+#      Sonatype, Inc. - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
                .,\
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.properties b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.properties
index 874e5f79..f046d182 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.properties
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.properties
@@ -1,12 +1,14 @@
-#
-# Copyright (c) 2011 Sonatype, Inc.
+###############################################################################
+# Copyright (c) 2011 Sonatype, 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
 # http://www.eclipse.org/legal/epl-v10.html
 #
-
-Bundle-Vendor = Eclipse.org
+# Contributors:
+#      Sonatype, Inc. - initial API and implementation
+###############################################################################
+Bundle-Vendor = Eclipse.org - m2e
 category.name.lifecycles = Lifecycle Mappings
 category.description.lifecycles = Lifecycle Mappings 
 
diff --git a/org.eclipse.m2e.editor.xml/OSGI-INF/l10n/bundle.properties b/org.eclipse.m2e.editor.xml/OSGI-INF/l10n/bundle.properties
index 0d4a288d..842d65a7 100644
--- a/org.eclipse.m2e.editor.xml/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.m2e.editor.xml/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,5 @@
 #Properties file for org.eclipse.m2e.editor.xml
-Bundle-Vendor = Eclipse m2e
+Bundle-Vendor = Eclipse.org - m2e
 Bundle-Name = Maven POM XML Editor
 contextType.document = Document
 contextType.project = Project
diff --git a/org.eclipse.m2e.feature/feature.properties b/org.eclipse.m2e.feature/feature.properties
index 3ed56657..c230f53f 100644
--- a/org.eclipse.m2e.feature/feature.properties
+++ b/org.eclipse.m2e.feature/feature.properties
@@ -18,7 +18,7 @@
 featureName=m2e - Maven Integration for Eclipse (Incubation)
 
 # "providerName" property - name of the company that provides the feature
-providerName=Eclipse m2e
+providerName=Eclipse.org - m2e
 
 # "updateSiteName" property - label for the update site
 #updateSiteName=The Eclipse Project Updates
diff --git a/org.eclipse.m2e.lifecyclemapping.defaults/META-INF/MANIFEST.MF b/org.eclipse.m2e.lifecyclemapping.defaults/META-INF/MANIFEST.MF
index 39794c09..1f7d984c 100644
--- a/org.eclipse.m2e.lifecyclemapping.defaults/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.lifecyclemapping.defaults/META-INF/MANIFEST.MF
@@ -6,3 +6,4 @@ Bundle-Version: 0.13.0.qualifier
 Require-Bundle: org.eclipse.m2e.core;bundle-version="0.13.0",
  org.eclipse.m2e.jdt;bundle-version="0.13.0"
 Bundle-Vendor: %Bundle-Vendor
+Bundle-Localization: plugin
diff --git a/org.eclipse.m2e.lifecyclemapping.defaults/build.properties b/org.eclipse.m2e.lifecyclemapping.defaults/build.properties
index 80f53365..daaf415b 100644
--- a/org.eclipse.m2e.lifecyclemapping.defaults/build.properties
+++ b/org.eclipse.m2e.lifecyclemapping.defaults/build.properties
@@ -1,2 +1,3 @@
 bin.includes = META-INF/,\
-               lifecycle-mapping-metadata.xml
+               lifecycle-mapping-metadata.xml,\
+               plugin.properties
diff --git a/org.eclipse.m2e.lifecyclemapping.defaults/plugin.properties b/org.eclipse.m2e.lifecyclemapping.defaults/plugin.properties
index 89312854..cf4e0351 100644
--- a/org.eclipse.m2e.lifecyclemapping.defaults/plugin.properties
+++ b/org.eclipse.m2e.lifecyclemapping.defaults/plugin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2008 Sonatype, Inc.
+# Copyright (c) 2011 Sonatype, Inc.
 # 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
diff --git a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF
index 47f2a950..06cac304 100644
--- a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.m2e.logback.appender
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.m2e.logback.appender;singleton:=true
 Bundle-Version: 0.13.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
@@ -11,3 +11,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface,
  org.eclipse.ui.console,
  org.eclipse.m2e.core.ui;bundle-version="0.13.0"
+Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.m2e.logback.appender/build.properties b/org.eclipse.m2e.logback.appender/build.properties
index 5fc538bc..3d5146f8 100644
--- a/org.eclipse.m2e.logback.appender/build.properties
+++ b/org.eclipse.m2e.logback.appender/build.properties
@@ -1,4 +1,15 @@
+###############################################################################
+# Copyright (c) 2011 Sonatype, 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#      Sonatype, Inc. - initial API and implementation
+###############################################################################
 source.. = src/main/java/
 output.. = target/classes/
 bin.includes = META-INF/,\
-               .
+               .,\
+               plugin.properties
diff --git a/org.eclipse.m2e.logback.appender/plugin.properties b/org.eclipse.m2e.logback.appender/plugin.properties
new file mode 100644
index 00000000..7ce696ff
--- /dev/null
+++ b/org.eclipse.m2e.logback.appender/plugin.properties
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2011 Sonatype, Inc.
+# 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
+#
+
+Bundle-Vendor = Eclipse.org - m2e
+Bundle-Name = Logback appender for m2e
diff --git a/org.eclipse.m2e.logback.configuration/OSGI-INF/l10n/bundle.properties b/org.eclipse.m2e.logback.configuration/OSGI-INF/l10n/bundle.properties
index 8e5195c5..d10e1864 100644
--- a/org.eclipse.m2e.logback.configuration/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.m2e.logback.configuration/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.m2e.logback.configuration
 Bundle-Name = m2e logback configuration
-Bundle-Vendor = Eclipse.org
\ No newline at end of file
+Bundle-Vendor = Eclipse.org - m2e
\ No newline at end of file
diff --git a/org.eclipse.m2e.logback.feature/feature.properties b/org.eclipse.m2e.logback.feature/feature.properties
index 09872827..05c9d4d8 100644
--- a/org.eclipse.m2e.logback.feature/feature.properties
+++ b/org.eclipse.m2e.logback.feature/feature.properties
@@ -18,7 +18,7 @@
 featureName=Maven Integration for Eclipse - slf4j over logback logging (Optional)
 
 # "providerName" property - name of the company that provides the feature
-providerName=Eclipse m2e
+providerName=Eclipse.org - m2e
 
 # "updateSiteName" property - label for the update site
 #updateSiteName=The Eclipse Project Updates
diff --git a/org.eclipse.m2e.maven.indexer/OSGI-INF/l10n/bundle.properties b/org.eclipse.m2e.maven.indexer/OSGI-INF/l10n/bundle.properties
index 3e3d39a6..0c9ce220 100644
--- a/org.eclipse.m2e.maven.indexer/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.m2e.maven.indexer/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.m2e.maven.indexer
-Bundle-Vendor = Eclipse m2e
-Bundle-Name = Nexus Indexer Bundle
\ No newline at end of file
+Bundle-Vendor = Eclipse.org - m2e
+Bundle-Name = Maven / Nexus Indexer Bundle
\ No newline at end of file
diff --git a/org.eclipse.m2e.model.edit/OSGI-INF/l10n/bundle.properties b/org.eclipse.m2e.model.edit/OSGI-INF/l10n/bundle.properties
index 36d31208..a3639a77 100644
--- a/org.eclipse.m2e.model.edit/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.m2e.model.edit/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.m2e.model.edit
-Bundle-Vendor = Eclipse m2e
+Bundle-Vendor = Eclipse.org - m2e
 Bundle-Name = Maven Project Model Edit Bundle
\ No newline at end of file
diff --git a/org.eclipse.m2e.model.edit/plugin.properties b/org.eclipse.m2e.model.edit/plugin.properties
index bf6d0f47..68497cdd 100644
--- a/org.eclipse.m2e.model.edit/plugin.properties
+++ b/org.eclipse.m2e.model.edit/plugin.properties
@@ -18,8 +18,8 @@
 # %%% END OF TRANSLATED PROPERTIES %%%
 # ====================================================================
 
-pluginName = Pom Model
-providerName = www.example.org
+pluginName = m2eclipse pom model
+providerName = Eclipse.org - m2e
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
 _UI_CreateChild_text3 = {1}
diff --git a/org.eclipse.m2e.refactoring/OSGI-INF/l10n/bundle.properties b/org.eclipse.m2e.refactoring/OSGI-INF/l10n/bundle.properties
index 7ef07972..6f565cae 100644
--- a/org.eclipse.m2e.refactoring/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.m2e.refactoring/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,5 @@
 #Properties file for org.eclipse.m2e.refactoring
-Bundle-Vendor = Eclipse m2e
+Bundle-Vendor = Eclipse.org - m2e
 Bundle-Name = Maven Integration for Eclipse Refactoring
 action.rename1.label = Rename Maven Artifact...
 action.rename2.label = Rename Maven Artifact...
diff --git a/org.eclipse.m2e.scm/plugin.properties b/org.eclipse.m2e.scm/plugin.properties
index cf5a76b8..23f0cecd 100644
--- a/org.eclipse.m2e.scm/plugin.properties
+++ b/org.eclipse.m2e.scm/plugin.properties
@@ -7,7 +7,7 @@
 #
 
 Bundle-Vendor = Eclipse.org - m2e
-Bundle-Name = Maven Integration for Eclipse
+Bundle-Name = SCM Maven Integration for Eclipse
 
 extension-point.scmhandlers.name = SCM Handlers
 extension-point.scmhandlersui.name = SCM Handlers UI
diff --git a/org.eclipse.m2e.sdk.feature/feature.properties b/org.eclipse.m2e.sdk.feature/feature.properties
index babd9bbc..bb33e126 100644
--- a/org.eclipse.m2e.sdk.feature/feature.properties
+++ b/org.eclipse.m2e.sdk.feature/feature.properties
@@ -18,7 +18,7 @@
 featureName=M2Eclipse Extensions Development Support (Optional)
 
 # "providerName" property - name of the company that provides the feature
-providerName=Eclipse m2e
+providerName=Eclipse.org - m2e
 
 # "updateSiteName" property - label for the update site
 #updateSiteName=The Eclipse Project Updates
diff --git a/org.eclipse.m2e.slf4j.bridge/OSGI-INF/l10n/bundle.properties b/org.eclipse.m2e.slf4j.bridge/OSGI-INF/l10n/bundle.properties
index 45234de5..cdb32004 100644
--- a/org.eclipse.m2e.slf4j.bridge/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.m2e.slf4j.bridge/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.m2e.slf4j.bridge
-Bundle-Vendor = Eclipse.org
+Bundle-Vendor = Eclipse.org - m2e
 Bundle-Name = Eclipse log / slf4j bridge
\ No newline at end of file
diff --git a/org.eclipse.m2e.tests.common/OSGI-INF/l10n/bundle.properties b/org.eclipse.m2e.tests.common/OSGI-INF/l10n/bundle.properties
index a9eef3ec..4e8cdf6d 100644
--- a/org.eclipse.m2e.tests.common/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.m2e.tests.common/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.m2e.tests.common
-Bundle-Vendor = Eclipse m2e
+Bundle-Vendor = Eclipse.org - m2e
 Bundle-Name = M2E Testing Helpers
\ No newline at end of file
diff --git a/org.eclipse.m2e.usagedata/META-INF/MANIFEST.MF b/org.eclipse.m2e.usagedata/META-INF/MANIFEST.MF
index fd00b6ba..318ff862 100644
--- a/org.eclipse.m2e.usagedata/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.usagedata/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5,
 Export-Package: org.eclipse.m2e.internal.udc;x-internal:=true
 Bundle-Activator: org.eclipse.m2e.internal.udc.Activator
 Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.m2e.usagedata/plugin.properties b/org.eclipse.m2e.usagedata/plugin.properties
new file mode 100644
index 00000000..acab9892
--- /dev/null
+++ b/org.eclipse.m2e.usagedata/plugin.properties
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2011 Sonatype, Inc.
+# 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
+#
+
+Bundle-Vendor = Eclipse.org - m2e
+Bundle-Name = m2e / UDC integration Marketplace
-- 
cgit v1.2.3