summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkraev2011-02-21 12:04:33 (EST)
committerkraev2011-02-21 12:04:33 (EST)
commit5805b352e30a98900072c4892f4e012f1f8f5c92 (patch)
treec0f908495914d077550f60a8da2019149002500b
parent0b5dc2afe155c2c41091e6125cc7db222bd29757 (diff)
downloadorg.eclipse.libra-5805b352e30a98900072c4892f4e012f1f8f5c92.zip
org.eclipse.libra-5805b352e30a98900072c4892f4e012f1f8f5c92.tar.gz
org.eclipse.libra-5805b352e30a98900072c4892f4e012f1f8f5c92.tar.bz2
[337700] Fix provider name of Libra plugins and features
-rw-r--r--development/org.eclipse.libra.releng/pom.xml1
-rw-r--r--features/org.eclipse.libra.facet.feature/feature.properties4
-rw-r--r--features/org.eclipse.libra.facet.feature/feature.xml7
-rw-r--r--features/org.eclipse.libra.facet.feature/pom.xml2
-rw-r--r--features/org.eclipse.libra.warproducts.feature/feature.properties3
-rw-r--r--features/org.eclipse.libra.warproducts.feature/feature.xml5
-rw-r--r--features/org.eclipse.libra.warproducts.feature/pom.xml2
-rw-r--r--plugins/org.eclipse.libra.facet.ui/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.libra.facet.ui/build.properties3
-rw-r--r--plugins/org.eclipse.libra.facet.ui/plugin.properties3
-rw-r--r--plugins/org.eclipse.libra.facet.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.libra.facet/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.libra.facet/build.properties4
-rw-r--r--plugins/org.eclipse.libra.facet/plugin.properties3
-rw-r--r--plugins/org.eclipse.libra.facet/pom.xml2
-rw-r--r--plugins/org.eclipse.libra.warproducts.core/plugin.properties4
-rw-r--r--plugins/org.eclipse.libra.warproducts.core/pom.xml2
-rw-r--r--plugins/org.eclipse.libra.warproducts.help/plugin.properties4
-rw-r--r--plugins/org.eclipse.libra.warproducts.help/pom.xml2
-rw-r--r--plugins/org.eclipse.libra.warproducts.ui/plugin.properties2
-rw-r--r--plugins/org.eclipse.libra.warproducts.ui/pom.xml2
-rw-r--r--tests/org.eclipse.libra.facet.test/META-INF/MANIFEST.MF5
-rw-r--r--tests/org.eclipse.libra.facet.test/build.properties4
-rw-r--r--tests/org.eclipse.libra.facet.test/plugin.properties3
-rw-r--r--tests/org.eclipse.libra.facet.test/pom.xml2
-rw-r--r--tests/org.eclipse.libra.warproducts.core.test/META-INF/MANIFEST.MF4
-rw-r--r--tests/org.eclipse.libra.warproducts.core.test/plugin.properties11
-rw-r--r--tests/org.eclipse.libra.warproducts.core.test/pom.xml2
28 files changed, 64 insertions, 34 deletions
diff --git a/development/org.eclipse.libra.releng/pom.xml b/development/org.eclipse.libra.releng/pom.xml
index 39b0621..86b883d 100644
--- a/development/org.eclipse.libra.releng/pom.xml
+++ b/development/org.eclipse.libra.releng/pom.xml
@@ -6,6 +6,7 @@
<artifactId>org.eclipse.libra_parent</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <name>Libra Parent POM</name>
<properties>
<tycho-version>0.10.0</tycho-version>
diff --git a/features/org.eclipse.libra.facet.feature/feature.properties b/features/org.eclipse.libra.facet.feature/feature.properties
index 1d76d6e..8293e95 100644
--- a/features/org.eclipse.libra.facet.feature/feature.properties
+++ b/features/org.eclipse.libra.facet.feature/feature.properties
@@ -13,8 +13,8 @@
# </copyright>
#
###############################################################################
-featureName=Libra (Incubation)
-featureProvider=Eclipse.org
+featureName=OSGi Bundle Facet (Incubation)
+providerName=Eclipse Web Tools Platform
featureDescription=Libra provides Convert to Web Application Bundle functionality
# "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.libra.facet.feature/feature.xml b/features/org.eclipse.libra.facet.feature/feature.xml
index 46cadb0..4f02932 100644
--- a/features/org.eclipse.libra.facet.feature/feature.xml
+++ b/features/org.eclipse.libra.facet.feature/feature.xml
@@ -16,11 +16,12 @@
-->
<feature
id="org.eclipse.libra.facet.feature"
- label="OSGi Facet Feature"
- version="0.1.0.qualifier">
+ label="%featureName"
+ version="0.1.0.qualifier"
+ provider-name="%providerName">
<description url="http://www.example.com/description">
- Libra provides Convert to Web Application Bundle functionality
+ Provides OSGi Bundle facet for projects.
</description>
<plugin
diff --git a/features/org.eclipse.libra.facet.feature/pom.xml b/features/org.eclipse.libra.facet.feature/pom.xml
index 9afd34d..efd9842 100644
--- a/features/org.eclipse.libra.facet.feature/pom.xml
+++ b/features/org.eclipse.libra.facet.feature/pom.xml
@@ -11,6 +11,6 @@
<artifactId>org.eclipse.libra.facet.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <name>Libra Facet Feature</name>
+ <name>OSGi Bundle Facet Feature</name>
</project> \ No newline at end of file
diff --git a/features/org.eclipse.libra.warproducts.feature/feature.properties b/features/org.eclipse.libra.warproducts.feature/feature.properties
index c4086b9..54cc1d0 100644
--- a/features/org.eclipse.libra.warproducts.feature/feature.properties
+++ b/features/org.eclipse.libra.warproducts.feature/feature.properties
@@ -14,6 +14,9 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file should be translated.
+featureName=WAR Products (Incubation)
+providerName=Eclipse Web Tools Platform
+
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
Copyright (c) 2010 EclipeSource and others.\n\
diff --git a/features/org.eclipse.libra.warproducts.feature/feature.xml b/features/org.eclipse.libra.warproducts.feature/feature.xml
index 8251544..068b640 100644
--- a/features/org.eclipse.libra.warproducts.feature/feature.xml
+++ b/features/org.eclipse.libra.warproducts.feature/feature.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.libra.warproducts.feature"
- label="WAR Products Core Feature (Incubation)"
- version="0.1.0.qualifier">
+ label="%featureName"
+ version="0.1.0.qualifier"
+ provider-name="%providerName">
<description url="http://eclipsesource.com">
The Feature contains all bundles for the WAR product tooling.
diff --git a/features/org.eclipse.libra.warproducts.feature/pom.xml b/features/org.eclipse.libra.warproducts.feature/pom.xml
index 9240849..e88492d 100644
--- a/features/org.eclipse.libra.warproducts.feature/pom.xml
+++ b/features/org.eclipse.libra.warproducts.feature/pom.xml
@@ -11,6 +11,6 @@
<artifactId>org.eclipse.libra.warproducts.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <name>WAR Products Core Feature (Incubation)</name>
+ <name>WAR Products Feature</name>
</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.libra.facet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.libra.facet.ui/META-INF/MANIFEST.MF
index 796cb35..4481a5a 100644
--- a/plugins/org.eclipse.libra.facet.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.libra.facet.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Ui
+Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.libra.facet.ui;singleton:=true
Bundle-Version: 0.1.0.qualifier
Require-Bundle: org.eclipse.core.resources,
@@ -19,6 +19,7 @@ Require-Bundle: org.eclipse.core.resources,
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.libra.facet.ui.operations
-Bundle-Vendor: %provider.name
+Bundle-Localization: plugin
+Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/org.eclipse.libra.facet.ui/build.properties b/plugins/org.eclipse.libra.facet.ui/build.properties
index 4b8162a..5185705 100644
--- a/plugins/org.eclipse.libra.facet.ui/build.properties
+++ b/plugins/org.eclipse.libra.facet.ui/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.,\
- icons/
+ icons/,\
+ plugin.properties
diff --git a/plugins/org.eclipse.libra.facet.ui/plugin.properties b/plugins/org.eclipse.libra.facet.ui/plugin.properties
index f817bcc..1cbd174 100644
--- a/plugins/org.eclipse.libra.facet.ui/plugin.properties
+++ b/plugins/org.eclipse.libra.facet.ui/plugin.properties
@@ -13,4 +13,5 @@
# </copyright>
#
###############################################################################
-provider.name = TBD
+Bundle-Name = OSGi Bundle Facet UI (Incubation)
+Bundle-Vendor = Eclipse Web Tools Platform
diff --git a/plugins/org.eclipse.libra.facet.ui/pom.xml b/plugins/org.eclipse.libra.facet.ui/pom.xml
index bfe1ace..94d3934 100644
--- a/plugins/org.eclipse.libra.facet.ui/pom.xml
+++ b/plugins/org.eclipse.libra.facet.ui/pom.xml
@@ -11,7 +11,7 @@
<artifactId>org.eclipse.libra.facet.ui</artifactId>
<packaging>eclipse-plugin</packaging>
- <name>Libra Facet Plug-in UI</name>
+ <name>OSGi Bundle Facet UI Plug-in</name>
<build>
<plugins>
diff --git a/plugins/org.eclipse.libra.facet/META-INF/MANIFEST.MF b/plugins/org.eclipse.libra.facet/META-INF/MANIFEST.MF
index 909a215..3993b11 100644
--- a/plugins/org.eclipse.libra.facet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.libra.facet/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
Manifest-Version: 1.0
Eclipse-ExtensibleAPI: true
Bundle-ManifestVersion: 2
-Bundle-Name: OSGi Enterprise Tools Plug-in
+Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.libra.facet;singleton:=true
Bundle-Version: 0.1.0.qualifier
Bundle-Activator: org.eclipse.libra.facet.Activator
-Bundle-Vendor: %provider.name
+Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.jdt.core,
@@ -14,5 +14,6 @@ Require-Bundle: org.eclipse.core.resources,
org.eclipse.wst.common.project.facet.core,
org.eclipse.core.databinding
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.libra.facet
diff --git a/plugins/org.eclipse.libra.facet/build.properties b/plugins/org.eclipse.libra.facet/build.properties
index d9421de..4c0ea05 100644
--- a/plugins/org.eclipse.libra.facet/build.properties
+++ b/plugins/org.eclipse.libra.facet/build.properties
@@ -2,4 +2,6 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml\
+ plugin.xml,\
+ plugin.properties
+
diff --git a/plugins/org.eclipse.libra.facet/plugin.properties b/plugins/org.eclipse.libra.facet/plugin.properties
index 7e88c11..c672cc6 100644
--- a/plugins/org.eclipse.libra.facet/plugin.properties
+++ b/plugins/org.eclipse.libra.facet/plugin.properties
@@ -13,4 +13,5 @@
# </copyright>
#
###############################################################################
-provider.name = Eclipse.org
+Bundle-Name = OSGi Bundle Facet Core (Incubation)
+Bundle-Vendor = Eclipse Web Tools Platform
diff --git a/plugins/org.eclipse.libra.facet/pom.xml b/plugins/org.eclipse.libra.facet/pom.xml
index c56f60e..0f0bcb7 100644
--- a/plugins/org.eclipse.libra.facet/pom.xml
+++ b/plugins/org.eclipse.libra.facet/pom.xml
@@ -11,7 +11,7 @@
<artifactId>org.eclipse.libra.facet</artifactId>
<packaging>eclipse-plugin</packaging>
- <name>Libra Facet Plug-in</name>
+ <name>OSGi Bundle Facet Core Plug-in</name>
<build>
<plugins>
diff --git a/plugins/org.eclipse.libra.warproducts.core/plugin.properties b/plugins/org.eclipse.libra.warproducts.core/plugin.properties
index 9fc41ed..5763959 100644
--- a/plugins/org.eclipse.libra.warproducts.core/plugin.properties
+++ b/plugins/org.eclipse.libra.warproducts.core/plugin.properties
@@ -7,5 +7,5 @@
# Contributors:
# Holger Staduacher - initial API and implementation
################################################################################
-Bundle-Name = WAR products core (Incubation)
-Bundle-Vendor = Eclipse.org - Libra \ No newline at end of file
+Bundle-Name = WAR Products Core (Incubation)
+Bundle-Vendor = Eclipse Web Tools Platform \ No newline at end of file
diff --git a/plugins/org.eclipse.libra.warproducts.core/pom.xml b/plugins/org.eclipse.libra.warproducts.core/pom.xml
index e0de120..16030ab 100644
--- a/plugins/org.eclipse.libra.warproducts.core/pom.xml
+++ b/plugins/org.eclipse.libra.warproducts.core/pom.xml
@@ -11,7 +11,7 @@
<artifactId>org.eclipse.libra.warproducts.core</artifactId>
<packaging>eclipse-plugin</packaging>
- <name>WAR products core (Incubation)</name>
+ <name>WAR Products Core Plug-in</name>
<build>
<plugins>
diff --git a/plugins/org.eclipse.libra.warproducts.help/plugin.properties b/plugins/org.eclipse.libra.warproducts.help/plugin.properties
index 1842b20..8a3c405 100644
--- a/plugins/org.eclipse.libra.warproducts.help/plugin.properties
+++ b/plugins/org.eclipse.libra.warproducts.help/plugin.properties
@@ -7,5 +7,5 @@
# Contributors:
# Holger Staduacher - initial API and implementation
################################################################################
-Bundle-Name = Documentation and HelpContexts for WAR products (Incubation)
-Bundle-Vendor = Eclipse.org - Libra \ No newline at end of file
+Bundle-Name = Documentation and HelpContexts for WAR Products (Incubation)
+Bundle-Vendor = Eclipse Web Tools Platform \ No newline at end of file
diff --git a/plugins/org.eclipse.libra.warproducts.help/pom.xml b/plugins/org.eclipse.libra.warproducts.help/pom.xml
index e3d86fb..daec1ed 100644
--- a/plugins/org.eclipse.libra.warproducts.help/pom.xml
+++ b/plugins/org.eclipse.libra.warproducts.help/pom.xml
@@ -11,6 +11,6 @@
<artifactId>org.eclipse.libra.warproducts.help</artifactId>
<packaging>eclipse-plugin</packaging>
- <name>Documentation and HelpContexts for WAR products (Incubation)</name>
+ <name>Documentation and HelpContexts for WAR Products Plug-in</name>
</project>
diff --git a/plugins/org.eclipse.libra.warproducts.ui/plugin.properties b/plugins/org.eclipse.libra.warproducts.ui/plugin.properties
index 3eda9f8..ba3e025 100644
--- a/plugins/org.eclipse.libra.warproducts.ui/plugin.properties
+++ b/plugins/org.eclipse.libra.warproducts.ui/plugin.properties
@@ -8,7 +8,7 @@
# Holger Staudacher - initial API and implementation
################################################################################
Bundle-Name = WAR Products UI (Incubation)
-Bundle-Vendor = Eclipse.org - Libra
+Bundle-Vendor = Eclipse Web Tools Platform
new.warproduct.config = WAR Product Configuration
new.warproduct.desc = Create a new Eclipse WAR product configuration
diff --git a/plugins/org.eclipse.libra.warproducts.ui/pom.xml b/plugins/org.eclipse.libra.warproducts.ui/pom.xml
index 9573a8b..a4f2cbd 100644
--- a/plugins/org.eclipse.libra.warproducts.ui/pom.xml
+++ b/plugins/org.eclipse.libra.warproducts.ui/pom.xml
@@ -11,7 +11,7 @@
<artifactId>org.eclipse.libra.warproducts.ui</artifactId>
<packaging>eclipse-plugin</packaging>
- <name>WAR Products UI (Incubation)</name>
+ <name>WAR Products UI Plug-in</name>
<build>
<plugins>
diff --git a/tests/org.eclipse.libra.facet.test/META-INF/MANIFEST.MF b/tests/org.eclipse.libra.facet.test/META-INF/MANIFEST.MF
index 690470a..27d8cce 100644
--- a/tests/org.eclipse.libra.facet.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.libra.facet.test/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: WAB Conversion Tests
+Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.libra.facet.test
Bundle-Version: 0.1.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
@@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.wst.common.project.facet.core;bundle-version="1.4.102",
org.eclipse.core.databinding.observable;bundle-version="1.3.0",
org.eclipse.ui.ide;bundle-version="3.6.0"
-Bundle-Vendor: %provider.name
+Bundle-Vendor: %Bundle-Vendor
Import-Package: org.junit;version="4.5.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Localization: plugin
diff --git a/tests/org.eclipse.libra.facet.test/build.properties b/tests/org.eclipse.libra.facet.test/build.properties
index e943fd8..2af7c87 100644
--- a/tests/org.eclipse.libra.facet.test/build.properties
+++ b/tests/org.eclipse.libra.facet.test/build.properties
@@ -1,4 +1,6 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- . \ No newline at end of file
+ .,\
+ plugin.properties
+
diff --git a/tests/org.eclipse.libra.facet.test/plugin.properties b/tests/org.eclipse.libra.facet.test/plugin.properties
index f7282e9..20f1de6 100644
--- a/tests/org.eclipse.libra.facet.test/plugin.properties
+++ b/tests/org.eclipse.libra.facet.test/plugin.properties
@@ -13,4 +13,5 @@
# </copyright>
#
###############################################################################
-provider.name = Eclipse.org
+Bundle-Name = OSGi Bundle Facet Tests (Incubation)
+Bundle-Vendor = Eclipse Web Tools Platform
diff --git a/tests/org.eclipse.libra.facet.test/pom.xml b/tests/org.eclipse.libra.facet.test/pom.xml
index a502be0..1bcfe71 100644
--- a/tests/org.eclipse.libra.facet.test/pom.xml
+++ b/tests/org.eclipse.libra.facet.test/pom.xml
@@ -11,7 +11,7 @@
<artifactId>org.eclipse.libra.facet.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
- <name>Libra Facet Test Plug-in</name>
+ <name>OSGi Bundle Facet Tests Plug-in</name>
<build>
<plugins>
diff --git a/tests/org.eclipse.libra.warproducts.core.test/META-INF/MANIFEST.MF b/tests/org.eclipse.libra.warproducts.core.test/META-INF/MANIFEST.MF
index 91a256b..08eb303 100644
--- a/tests/org.eclipse.libra.warproducts.core.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.libra.warproducts.core.test/META-INF/MANIFEST.MF
@@ -1,9 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: WAR Products core tests (Incubation)
+Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.libra.warproducts.core.test
Bundle-Version: 0.1.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-Localization: plugin
Require-Bundle: org.junit;bundle-version="3.8.2",
org.eclipse.libra.warproducts.core;bundle-version="0.1.0",
org.eclipse.core.runtime;bundle-version="3.6.0",
@@ -11,3 +12,4 @@ Require-Bundle: org.junit;bundle-version="3.8.2",
org.eclipse.pde.core;bundle-version="3.6.0"
Export-Package: org.eclipse.libra.warproducts.core.test,
org.eclipse.libra.warproducts.core.test.tests
+Bundle-Vendor: %Bundle-Vendor
diff --git a/tests/org.eclipse.libra.warproducts.core.test/plugin.properties b/tests/org.eclipse.libra.warproducts.core.test/plugin.properties
new file mode 100644
index 0000000..d793358
--- /dev/null
+++ b/tests/org.eclipse.libra.warproducts.core.test/plugin.properties
@@ -0,0 +1,11 @@
+################################################################################
+# Copyright (c) 2010, 2011 EclipseSource 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:
+# Holger Staudacher - initial API and implementation
+################################################################################
+Bundle-Name = WAR Products Core Tests (Incubation)
+Bundle-Vendor = Eclipse Web Tools Platform \ No newline at end of file
diff --git a/tests/org.eclipse.libra.warproducts.core.test/pom.xml b/tests/org.eclipse.libra.warproducts.core.test/pom.xml
index 91c4e49..5e8ca0c 100644
--- a/tests/org.eclipse.libra.warproducts.core.test/pom.xml
+++ b/tests/org.eclipse.libra.warproducts.core.test/pom.xml
@@ -11,7 +11,7 @@
<artifactId>org.eclipse.libra.warproducts.core.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
- <name>WAR Products core tests (Incubation)</name>
+ <name>WAR Products Core Tests Plug-in</name>
<build>
<plugins>