diff options
| author | Eike Stepper | 2013-11-12 09:03:57 +0000 |
|---|---|---|
| committer | Eike Stepper | 2013-11-12 09:03:57 +0000 |
| commit | 953fed8152c7a0b5f1045f22ac7fabf7fc74d3e9 (patch) | |
| tree | d55ef2434b29aa4f9e7b39846a5af7f782ba5c5e | |
| parent | 51ec118978bd2cb292b67b36d27dfa7a4444bfed (diff) | |
| download | cdo-953fed8152c7a0b5f1045f22ac7fabf7fc74d3e9.tar.gz cdo-953fed8152c7a0b5f1045f22ac7fabf7fc74d3e9.tar.xz cdo-953fed8152c7a0b5f1045f22ac7fabf7fc74d3e9.zip | |
Consolidate feature names and categories
64 files changed, 219 insertions, 371 deletions
diff --git a/features/org.eclipse.emf.cdo.examples.hibernate-feature/feature.properties b/features/org.eclipse.emf.cdo.examples.hibernate-feature/feature.properties index 32b8661633..4f3362119d 100644 --- a/features/org.eclipse.emf.cdo.examples.hibernate-feature/feature.properties +++ b/features/org.eclipse.emf.cdo.examples.hibernate-feature/feature.properties @@ -4,5 +4,5 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -featureName = CDO Model Repository Examples Hibernate +featureName = CDO Model Repository Server Hibernate Examples description = Contains the CDO Hibernate example plugin and sources. Ensure that Hibernate is already installed! Visit http://www.elver.org/eclipse/2.0.0/update for a p2 repository that contains Hibernate. diff --git a/features/org.eclipse.emf.cdo.releng.help-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.help-feature/feature.properties index 9257f04d29..93daf7e18e 100644 --- a/features/org.eclipse.emf.cdo.releng.help-feature/feature.properties +++ b/features/org.eclipse.emf.cdo.releng.help-feature/feature.properties @@ -4,5 +4,5 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -featureName = CDO Release Engineering Documentation +featureName = Release Engineering Documentation description = Contains the documentation of the CDO release engineering infrastructure. diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml index 4ac8c1d8cd..c0eaaad490 100644 --- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml @@ -88,6 +88,10 @@ version="0.0.0"/> <includes + id="org.eclipse.emf.cdo.compare" + version="0.0.0"/> + + <includes id="org.eclipse.emf.cdo.compare.source" version="0.0.0"/> diff --git a/features/org.eclipse.emf.cdo.server.db-feature/feature.properties b/features/org.eclipse.emf.cdo.server.db-feature/feature.properties index ab5e358c62..811ef90651 100644 --- a/features/org.eclipse.emf.cdo.server.db-feature/feature.properties +++ b/features/org.eclipse.emf.cdo.server.db-feature/feature.properties @@ -4,5 +4,5 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -featureName = CDO Model Repository Server DB Store +featureName = CDO Model Repository Server DB description = Contains the DBStore plugins. diff --git a/features/org.eclipse.emf.cdo.server.db4o-feature/feature.properties b/features/org.eclipse.emf.cdo.server.db4o-feature/feature.properties index 3e25b636d5..7d6336fe2d 100644 --- a/features/org.eclipse.emf.cdo.server.db4o-feature/feature.properties +++ b/features/org.eclipse.emf.cdo.server.db4o-feature/feature.properties @@ -4,5 +4,5 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -featureName = CDO Model Repository Server DB4O Store +featureName = CDO Model Repository Server DB4O description = Contains the DB4O Store bundle. Ensure that DB4O Driver is already installed! Visit http://www.elver.org/eclipse/2.0.0/update for a p2 repository that contains DB4O Driver. diff --git a/features/org.eclipse.emf.cdo.server.db4o-feature/feature.xml b/features/org.eclipse.emf.cdo.server.db4o-feature/feature.xml index d0b8f6284c..4abc23bd8f 100644 --- a/features/org.eclipse.emf.cdo.server.db4o-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server.db4o-feature/feature.xml @@ -13,7 +13,7 @@ <feature id="org.eclipse.emf.cdo.server.db4o" label="%featureName" - version="4.2.0.qualifier" + version="4.2.100.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.cdo.license" license-feature-version="0.0.0"> diff --git a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.properties b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.properties index 1a140dbf7e..51afd63c84 100644 --- a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.properties +++ b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.properties @@ -4,5 +4,5 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -featureName = CDO Model Repository Server Hibernate Store +featureName = CDO Model Repository Server Hibernate description = Contains the HibernateStore and Teneo integration plugins. Ensure that Hibernate is already installed! Visit http://www.elver.org/eclipse/2.0.0/update for a p2 repository that contains Hibernate. diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/feature.properties b/features/org.eclipse.emf.cdo.server.lissome-feature/feature.properties index fcfc0e7e74..1d641fb9a5 100644 --- a/features/org.eclipse.emf.cdo.server.lissome-feature/feature.properties +++ b/features/org.eclipse.emf.cdo.server.lissome-feature/feature.properties @@ -4,5 +4,5 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -featureName = CDO Model Repository Server Lissome Store +featureName = CDO Model Repository Server Lissome description = Contains the LissomeStore plugins. diff --git a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.properties b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.properties index 6093804b8c..e491dba05a 100644 --- a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.properties +++ b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.properties @@ -4,5 +4,5 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -featureName = CDO Model Repository Server MongoDB Store +featureName = CDO Model Repository Server MongoDB description = Contains the MongoDBStore plugins. Ensure that a MongoDB Java driver is already installed! Visit http://www.elver.org/eclipse/2.0.0/update for a p2 repository that contains a MongoDB Java driver. diff --git a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml index cf9b3234e6..56c67c9453 100644 --- a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.server.mongodb" label="%featureName" - version="4.2.0.qualifier" + version="4.2.100.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.cdo.license" license-feature-version="0.0.0"> diff --git a/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.properties b/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.properties index aebc30d2e0..6aee8fe7b2 100644 --- a/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.properties +++ b/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.properties @@ -4,5 +4,5 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -featureName = CDO Model Repository Server Objectivity Store +featureName = CDO Model Repository Server Objectivity description = Contains the Objectivity Store and stubbed jar file bundle. For runtime, ensure that you have Objectivity /DB installed! diff --git a/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml b/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml index 52f84c4ef4..f83daa145d 100644 --- a/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml @@ -13,7 +13,7 @@ <feature id="org.eclipse.emf.cdo.server.objectivity" label="%featureName" - version="4.2.0.qualifier" + version="4.2.100.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.cdo.license" license-feature-version="0.0.0"> diff --git a/features/org.eclipse.emf.cdo.site-feature/category.xml b/features/org.eclipse.emf.cdo.site-feature/category.xml index 0782e576c0..547fd23b5c 100644 --- a/features/org.eclipse.emf.cdo.site-feature/category.xml +++ b/features/org.eclipse.emf.cdo.site-feature/category.xml @@ -1,193 +1,93 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <feature id="org.eclipse.emf.cdo" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.defs" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.doc" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.examples" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.explorer.product" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.sdk" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.compare" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.server" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.server.lissome" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.server.db" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.server.db4o" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.server.objectivity" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.server.mongodb" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.server.product" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.tests" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.gastro" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.server.hibernate" version="0.0.0"> - <category name="org.eclipse.emf.cdo.hibernate.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.tests.hibernate" version="0.0.0"> - <category name="org.eclipse.emf.cdo.hibernate.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.examples.hibernate" version="0.0.0"> - <category name="org.eclipse.emf.cdo.hibernate.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.dawn" version="0.0.0"> - <category name="org.eclipse.emf.cdo.dawn.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.dawn.codegen" version="0.0.0"> - <category name="org.eclipse.emf.cdo.dawn.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.dawn.codegen.gmf" version="0.0.0"> - <category name="org.eclipse.emf.cdo.dawn.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.dawn.examples" version="0.0.0"> - <category name="org.eclipse.emf.cdo.dawn.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.dawn.tests" version="0.0.0"> - <category name="org.eclipse.emf.cdo.dawn.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.dawn.sdk" version="0.0.0"> - <category name="org.eclipse.emf.cdo.dawn.category"/> - </feature> - <feature id="org.eclipse.net4j" version="0.0.0"> - <category name="org.eclipse.net4j.category"/> - </feature> - <feature id="org.eclipse.net4j.defs" version="0.0.0"> - <category name="org.eclipse.net4j.category"/> - </feature> - <feature id="org.eclipse.net4j.doc" version="0.0.0"> - <category name="org.eclipse.net4j.category"/> - </feature> - <feature id="org.eclipse.net4j.examples" version="0.0.0"> - <category name="org.eclipse.net4j.category"/> - </feature> - <feature id="org.eclipse.net4j.sdk" version="0.0.0"> - <category name="org.eclipse.net4j.category"/> - </feature> - <feature id="org.eclipse.net4j.tests" version="0.0.0"> - <category name="org.eclipse.net4j.category"/> - </feature> - <feature id="org.eclipse.net4j.ui" version="0.0.0"> - <category name="org.eclipse.net4j.category"/> - </feature> - <feature id="org.eclipse.net4j.db" version="0.0.0"> - <category name="org.eclipse.net4j.db.category"/> - </feature> - <feature id="org.eclipse.net4j.db.derby" version="0.0.0"> - <category name="org.eclipse.net4j.db.category"/> - </feature> - <feature id="org.eclipse.net4j.db.h2" version="0.0.0"> - <category name="org.eclipse.net4j.db.category"/> - </feature> - <feature id="org.eclipse.net4j.db.hsqldb" version="0.0.0"> - <category name="org.eclipse.net4j.db.category"/> - </feature> - <feature id="org.eclipse.net4j.db.mysql" version="0.0.0"> - <category name="org.eclipse.net4j.db.category"/> - </feature> - <feature id="org.eclipse.net4j.db.oracle" version="0.0.0"> - <category name="org.eclipse.net4j.db.category"/> - </feature> - <feature id="org.eclipse.net4j.db.postgresql" version="0.0.0"> - <category name="org.eclipse.net4j.db.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.version" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.version.headless" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.help" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.launches" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.apireports" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.setup" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.projectconfig" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.preferences" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.manifests" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.relativepaths" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.tasks" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.winexplorer" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.gitbash" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.workingsets" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.net4j.util" version="0.0.0"> - <category name="org.eclipse.net4j.category"/> - </feature> - <feature id="org.eclipse.net4j.util.ui" version="0.0.0"> - <category name="org.eclipse.net4j.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.tasks" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.migrator" version="0.0.0"> - <category name="org.eclipse.emf.cdo.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.projectcopy" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.buildstamp" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.epp" version="0.0.0"> - <category name="org.eclipse.emf.releng.hidden.category"/> - </feature> - <feature id="org.eclipse.emf.cdo.releng.setup.installer" version="0.0.0"> - <category name="org.eclipse.emf.releng.hidden.category"/> - </feature> - <category-def name="org.eclipse.emf.releng.category" label="CDO Release Engineering"/> - <category-def name="org.eclipse.emf.cdo.category" label="CDO Model Repository"/> - <category-def name="org.eclipse.emf.cdo.hibernate.category" label="CDO Model Repository Hibernate (optional)"/> - <category-def name="org.eclipse.emf.cdo.dawn.category" label="CDO Dawn"/> - <category-def name="org.eclipse.net4j.category" label="Net4j Signalling Platform"/> - <category-def name="org.eclipse.net4j.db.category" label="Net4j DB Framework"/> - <category-def name="org.eclipse.emf.releng.hidden.category" label="Others"/> + + <!-- CDO Model Repository --> + <feature id="org.eclipse.emf.cdo" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature> + <feature id="org.eclipse.emf.cdo.doc" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature> + <feature id="org.eclipse.emf.cdo.examples" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature> + <feature id="org.eclipse.emf.cdo.sdk" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature> + <feature id="org.eclipse.emf.cdo.compare" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature> + <feature id="org.eclipse.emf.cdo.tests" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature> + <feature id="org.eclipse.emf.cdo.migrator" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature> + <feature id="org.gastro" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature> + + <!-- CDO Model Repository Server --> + <feature id="org.eclipse.emf.cdo.server" version="0.0.0"><category name="org.eclipse.emf.cdo.server.category"/></feature> + <feature id="org.eclipse.emf.cdo.server.lissome" version="0.0.0"><category name="org.eclipse.emf.cdo.server.category"/></feature> + <feature id="org.eclipse.emf.cdo.server.db" version="0.0.0"><category name="org.eclipse.emf.cdo.server.category"/></feature> + <feature id="org.eclipse.emf.cdo.server.db4o" version="0.0.0"><category name="org.eclipse.emf.cdo.server.category"/></feature> + <feature id="org.eclipse.emf.cdo.server.objectivity" version="0.0.0"><category name="org.eclipse.emf.cdo.server.category"/></feature> + <feature id="org.eclipse.emf.cdo.server.mongodb" version="0.0.0"><category name="org.eclipse.emf.cdo.server.category"/></feature> + + <!-- CDO Model Repository Server Hibernate --> + <feature id="org.eclipse.emf.cdo.server.hibernate" version="0.0.0"><category name="org.eclipse.emf.cdo.server.hibernate.category"/></feature> + <feature id="org.eclipse.emf.cdo.examples.hibernate" version="0.0.0"><category name="org.eclipse.emf.cdo.server.hibernate.category"/></feature> + <feature id="org.eclipse.emf.cdo.tests.hibernate" version="0.0.0"><category name="org.eclipse.emf.cdo.server.hibernate.category"/></feature> + + <!-- CDO Dawn --> + <feature id="org.eclipse.emf.cdo.dawn" version="0.0.0"><category name="org.eclipse.emf.cdo.dawn.category"/></feature> + <feature id="org.eclipse.emf.cdo.dawn.codegen" version="0.0.0"><category name="org.eclipse.emf.cdo.dawn.category"/></feature> + <feature id="org.eclipse.emf.cdo.dawn.codegen.gmf" version="0.0.0"><category name="org.eclipse.emf.cdo.dawn.category"/></feature> + <feature id="org.eclipse.emf.cdo.dawn.examples" version="0.0.0"><category name="org.eclipse.emf.cdo.dawn.category"/></feature> + <feature id="org.eclipse.emf.cdo.dawn.tests" version="0.0.0"><category name="org.eclipse.emf.cdo.dawn.category"/></feature> + <feature id="org.eclipse.emf.cdo.dawn.sdk" version="0.0.0"><category name="org.eclipse.emf.cdo.dawn.category"/></feature> + + <!-- Net4j Signalling Platform --> + <feature id="org.eclipse.net4j" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature> + <feature id="org.eclipse.net4j.doc" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature> + <feature id="org.eclipse.net4j.examples" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature> + <feature id="org.eclipse.net4j.sdk" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature> + <feature id="org.eclipse.net4j.tests" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature> + <feature id="org.eclipse.net4j.ui" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature> + + <!-- Net4j DB Framework --> + <feature id="org.eclipse.net4j.db" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature> + <feature id="org.eclipse.net4j.db.derby" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature> + <feature id="org.eclipse.net4j.db.h2" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature> + <feature id="org.eclipse.net4j.db.hsqldb" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature> + <feature id="org.eclipse.net4j.db.mysql" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature> + <feature id="org.eclipse.net4j.db.oracle" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature> + <feature id="org.eclipse.net4j.db.postgresql" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature> + + <!-- Net4j Utilities --> + <feature id="org.eclipse.net4j.util" version="0.0.0"><category name="org.eclipse.net4j.util.category"/></feature> + <feature id="org.eclipse.net4j.util.ui" version="0.0.0"><category name="org.eclipse.net4j.util.category"/></feature> + + <!-- Release Engineering --> + <feature id="org.eclipse.emf.cdo.releng.version" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.version.headless" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.help" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.launches" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.projectcopy" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.buildstamp" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.apireports" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.projectconfig" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.preferences" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.manifests" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.relativepaths" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.winexplorer" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.gitbash" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.workingsets" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.tasks" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature> + + <!-- Others --> + <feature id="org.eclipse.emf.cdo.explorer.product" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature> + <feature id="org.eclipse.emf.cdo.server.product" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.setup" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature> + <feature id="org.eclipse.emf.cdo.releng.setup.installer" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature> + <feature id="org.eclipse.net4j.defs" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature> + <feature id="org.eclipse.emf.cdo.defs" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature> + <feature id="org.eclipse.emf.cdo.epp" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature> + + <!-- Categories --> + <category-def name="org.eclipse.emf.cdo.category" label="CDO Model Repository"/> + <category-def name="org.eclipse.emf.cdo.server.category" label="CDO Model Repository Server"/> + <category-def name="org.eclipse.emf.cdo.server.hibernate.category" label="CDO Model Repository Server Hibernate (optional)"/> + <category-def name="org.eclipse.emf.cdo.dawn.category" label="CDO Dawn"/> + <category-def name="org.eclipse.net4j.category" label="Net4j Signalling Platform"/> + <category-def name="org.eclipse.net4j.db.category" label="Net4j DB Framework"/> + <category-def name="org.eclipse.net4j.util.category" label="Net4j Utilities"/> + <category-def name="org.eclipse.emf.cdo.releng.category" label="Release Engineering"/> + <category-def name="org.eclipse.emf.cdo.releng.hidden.category" label="Others"/> + </site> diff --git a/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.properties b/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.properties index 3b98b591ad..4ed3cfb118 100644 --- a/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.properties +++ b/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.properties @@ -4,5 +4,5 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -featureName = CDO Model Repository Tests Hibernate +featureName = CDO Model Repository Server Hibernate Tests description = Contains the CDO Hibernate test plugins and sources. Ensure that Hibernate is already installed! Visit http://www.elver.org/eclipse/2.0.0/update for a p2 repository that contains Hibernate. diff --git a/features/org.eclipse.net4j-feature/feature.properties b/features/org.eclipse.net4j-feature/feature.properties index f974558231..1435121a7f 100644 --- a/features/org.eclipse.net4j-feature/feature.properties +++ b/features/org.eclipse.net4j-feature/feature.properties @@ -4,5 +4,5 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -featureName = Net4j Signalling Platform Runtime +featureName = Net4j Signalling Platform description = Contains the Net4j core and transport provider plugins (tcp, jvm and http). diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/plugin.properties b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/plugin.properties index e09d0659f9..804f347493 100644 --- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/plugin.properties @@ -16,7 +16,7 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -pluginName = CDO Model Repository Examples Hibernate Client +pluginName = CDO Model Repository Server Hibernate Examples (Client) providerName = Eclipse Modeling Project # ============================================================================== diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/META-INF/MANIFEST.MF index 1d66ce7f4a..cf81e761be 100644 --- a/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.examples.hibernate.log4j -Bundle-Version: 4.0.100.qualifier +Bundle-Version: 4.0.200.qualifier Fragment-Host: org.apache.log4j;bundle-version="1.2.12" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/about.ini b/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/about.ini deleted file mode 100644 index b7e87ca285..0000000000 --- a/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/about.ini +++ /dev/null @@ -1,15 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%featureText - -# Property "featureImage" contains path to feature image (32x32) -featureImage=modeling32.png - -# Property "appName" contains name of the application (translated) -appName=%featureName - diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/about.mappings b/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/about.mappings deleted file mode 100644 index bddaab4310..0000000000 --- a/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/about.mappings +++ /dev/null @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/about.properties b/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/about.properties deleted file mode 100644 index dd269186a2..0000000000 --- a/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/about.properties +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) 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: -# Eike Stepper - initial API and implementation - -# NLS_MESSAGEFORMAT_VAR - -# ============================================================================== -# Do not change the properties between this line and the last line containing: -# %%% END OF TRANSLATED PROPERTIES %%% -# Instead, either redefine an existing property, or create a new property, -# append it to the end of the file, and change the code to use the new name. -# ============================================================================== - -featureName = CDO Model Repository Server Hibernate -featureText = CDO Model Repository Server Hibernate\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\ -\n\ -Visit http://wiki.eclipse.org/CDO - -# ============================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# The above properties have been shipped for translation. -# ============================================================================== diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/build.properties b/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/build.properties index 69800437c7..4cb69632ef 100644 --- a/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/build.properties +++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/build.properties @@ -14,12 +14,8 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ about.html,\ - about.ini,\ - about.mappings,\ - about.properties,\ plugin.properties,\ copyright.txt,\ - modeling32.png,\ src/log4j.properties generateSourceReferences = true diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/modeling32.png b/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/modeling32.png Binary files differdeleted file mode 100644 index 6b08de2ada..0000000000 --- a/plugins/org.eclipse.emf.cdo.examples.hibernate.log4j/modeling32.png +++ /dev/null diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/plugin.properties b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/plugin.properties index 6eaebb5069..000f99fb19 100644 --- a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/plugin.properties @@ -16,7 +16,7 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -pluginName = CDO Model Repository Examples Hibernate Server +pluginName = CDO Model Repository Server Hibernate Examples providerName = Eclipse Modeling Project # ============================================================================== diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.doc/META-INF/MANIFEST.MF index 95b32dd578..1051ad64ad 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.releng.doc/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: CDO Release Engineering Documentation +Bundle-Name: Documentation Generator Bundle-SymbolicName: org.eclipse.emf.cdo.releng.doc;singleton:=true Bundle-Version: 4.1.200.qualifier Bundle-Vendor: Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/debug/frame.html b/plugins/org.eclipse.emf.cdo.releng.doc/debug/frame.html index 23770ab0b9..131d3dbdd5 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/debug/frame.html +++ b/plugins/org.eclipse.emf.cdo.releng.doc/debug/frame.html @@ -182,7 +182,7 @@ <ul> <li><a href="../../org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transfer/spi/workspace/package-summary.html" target="debugDetails">org.eclipse.emf.cdo.transfer.spi.workspace</a> </ul> -<b><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/package-summary.html" target="debugDetails">Net4j Signalling Platform Transport</a></b> +<b><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/package-summary.html" target="debugDetails">Net4j Signalling Platform</a></b> <ul> <li><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/package-summary.html" target="debugDetails">org.eclipse.net4j</a> <li><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/acceptor/package-summary.html" target="debugDetails">org.eclipse.net4j.acceptor</a> @@ -196,23 +196,23 @@ <li><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/wrapping/package-summary.html" target="debugDetails">org.eclipse.net4j.signal.wrapping</a> <li><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/spi/net4j/package-summary.html" target="debugDetails">org.eclipse.spi.net4j</a> </ul> -<b><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/package-summary.html" target="debugDetails">Net4j Signalling Platform Transport HTTP</a></b> +<b><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/package-summary.html" target="debugDetails">Net4j Signalling Platform HTTP</a></b> <ul> <li><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/package-summary.html" target="debugDetails">org.eclipse.net4j.http</a> </ul> -<b><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/common/package-summary.html" target="debugDetails">Net4j Signalling Platform Transport HTTP Common</a></b> +<b><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/common/package-summary.html" target="debugDetails">Net4j Signalling Platform HTTP Common</a></b> <ul> <li><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/common/package-summary.html" target="debugDetails">org.eclipse.net4j.http.common</a> </ul> -<b><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/package-summary.html" target="debugDetails">Net4j Signalling Platform Transport HTTP Server</a></b> +<b><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/package-summary.html" target="debugDetails">Net4j Signalling Platform HTTP Server</a></b> <ul> <li><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/package-summary.html" target="debugDetails">org.eclipse.net4j.http.server</a> </ul> -<b><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/package-summary.html" target="debugDetails">Net4j Signalling Platform Transport JVM</a></b> +<b><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/package-summary.html" target="debugDetails">Net4j Signalling Platform JVM</a></b> <ul> <li><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/package-summary.html" target="debugDetails">org.eclipse.net4j.jvm</a> </ul> -<b><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/package-summary.html" target="debugDetails">Net4j Signalling Platform Transport TCP</a></b> +<b><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/package-summary.html" target="debugDetails">Net4j Signalling Platform TCP</a></b> <ul> <li><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/package-summary.html" target="debugDetails">org.eclipse.net4j.tcp</a> <li><a href="../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/ssl/package-summary.html" target="debugDetails">org.eclipse.net4j.tcp.ssl</a> diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.doc/plugin.properties index 0f965d9d6d..255a0020b4 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.releng.doc/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = Documentation Tool +pluginName = Documentation Generator providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.releng.help/about.properties b/plugins/org.eclipse.emf.cdo.releng.help/about.properties index 8e6e774c46..893f6fe43f 100644 --- a/plugins/org.eclipse.emf.cdo.releng.help/about.properties +++ b/plugins/org.eclipse.emf.cdo.releng.help/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = CDO Release Engineering Documentation -featureText = CDO Release Engineering Documentation\n\ +featureName = Release Engineering Documentation +featureText = Release Engineering Documentation\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.emf.cdo.releng.help/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.help/plugin.properties index f9728389bd..ff66419c52 100644 --- a/plugins/org.eclipse.emf.cdo.releng.help/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.releng.help/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Release Engineering Documentation +pluginName = Release Engineering Documentation providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.server.db/about.properties b/plugins/org.eclipse.emf.cdo.server.db/about.properties index 61aac94316..76de40561d 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/about.properties +++ b/plugins/org.eclipse.emf.cdo.server.db/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = CDO Model Repository Server DB Store -featureText = CDO Model Repository Server DB Store\n\ +featureName = CDO Model Repository Server DB +featureText = CDO Model Repository Server DB\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.emf.cdo.server.db/plugin.properties b/plugins/org.eclipse.emf.cdo.server.db/plugin.properties index fe7441b29d..509299f711 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.db/plugin.properties @@ -7,7 +7,7 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Model Repository Server DB Store +pluginName = CDO Model Repository Server DB providerName = Eclipse Modeling Project extension-point.name = CDO Mapping Strategies diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.db4o/META-INF/MANIFEST.MF index 2096a76baa..0bb87d0e24 100644 --- a/plugins/org.eclipse.emf.cdo.server.db4o/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.server.db4o/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.server.db4o;singleton:=true -Bundle-Version: 4.0.100.qualifier +Bundle-Version: 4.0.200.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.server.db4o;version="4.0.100", - org.eclipse.emf.cdo.server.internal.db4o;version="4.0.100";x-friends:="org.eclipse.emf.cdo.tests.db4o", - org.eclipse.emf.cdo.server.internal.db4o.bundle;version="4.0.100";x-internal:=true +Export-Package: org.eclipse.emf.cdo.server.db4o;version="4.0.200", + org.eclipse.emf.cdo.server.internal.db4o;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.db4o", + org.eclipse.emf.cdo.server.internal.db4o.bundle;version="4.0.200";x-internal:=true Import-Package: com.db4o;version="[7.4.0,8.0.0)", com.db4o.config;version="[7.4.0,8.0.0)", com.db4o.constraints;version="[7.4.0,8.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/about.properties b/plugins/org.eclipse.emf.cdo.server.db4o/about.properties index 01d3a4d61e..9b73c2780b 100644 --- a/plugins/org.eclipse.emf.cdo.server.db4o/about.properties +++ b/plugins/org.eclipse.emf.cdo.server.db4o/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = CDO Model Repository Server DB4O Store -featureText = CDO Model Repository Server DB4O Store\n\ +featureName = CDO Model Repository Server DB4O +featureText = CDO Model Repository Server DB4O\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/plugin.properties b/plugins/org.eclipse.emf.cdo.server.db4o/plugin.properties index ff1c4fa748..a67bd741aa 100644 --- a/plugins/org.eclipse.emf.cdo.server.db4o/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.db4o/plugin.properties @@ -8,5 +8,5 @@ # Victor Roldan Betancort - initial API and implementation # Eike Stepper - maintenance -pluginName = CDO Model Repository Server DB4O Store +pluginName = CDO Model Repository Server DB4O providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/plugin.properties b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/plugin.properties index dfa5948d89..08ef44fc00 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Model Repository Server Hibernate Store (Teneo Integration) +pluginName = CDO Model Repository Server Hibernate (Teneo Integration) providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/about.properties b/plugins/org.eclipse.emf.cdo.server.hibernate/about.properties index 6b9dd9dcb1..9c14528e42 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/about.properties +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = CDO Model Repository Server Hibernate Store -featureText = CDO Model Repository Server Hibernate Store\n\ +featureName = CDO Model Repository Server Hibernate +featureText = CDO Model Repository Server Hibernate\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.properties b/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.properties index 0bd5fe0c42..6685c3750d 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.properties @@ -7,7 +7,7 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Model Repository Server Hibernate Store +pluginName = CDO Model Repository Server Hibernate providerName = Eclipse Modeling Project extension-point.name = Hibernate Mapping Provider Factories diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/about.properties b/plugins/org.eclipse.emf.cdo.server.lissome/about.properties index c91a47fc8e..c15692be6b 100644 --- a/plugins/org.eclipse.emf.cdo.server.lissome/about.properties +++ b/plugins/org.eclipse.emf.cdo.server.lissome/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = CDO Model Repository Server Lissome Store -featureText = CDO Model Repository Server Lissome Store\n\ +featureName = CDO Model Repository Server Lissome +featureText = CDO Model Repository Server Lissome\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/plugin.properties b/plugins/org.eclipse.emf.cdo.server.lissome/plugin.properties index f55063e865..1f3f6b167f 100644 --- a/plugins/org.eclipse.emf.cdo.server.lissome/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.lissome/plugin.properties @@ -7,6 +7,6 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Model Repository Server Lissome Store +pluginName = CDO Model Repository Server Lissome providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF index fbb0ede3db..508075e1bf 100644 --- a/plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.server.mongodb;singleton:=true -Bundle-Version: 4.0.200.qualifier +Bundle-Version: 4.0.300.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,9 +11,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.server.internal.mongodb;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.mongodb", - org.eclipse.emf.cdo.server.internal.mongodb.bundle;version="4.0.200";x-internal:=true, - org.eclipse.emf.cdo.server.mongodb;version="4.0.200" +Export-Package: org.eclipse.emf.cdo.server.internal.mongodb;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.mongodb", + org.eclipse.emf.cdo.server.internal.mongodb.bundle;version="4.0.300";x-internal:=true, + org.eclipse.emf.cdo.server.mongodb;version="4.0.300" Import-Package: com.mongodb;version="[2.0.0,3.0.0)", com.mongodb.gridfs;version="[2.0.0,3.0.0)", com.mongodb.io;version="[2.0.0,3.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/about.properties b/plugins/org.eclipse.emf.cdo.server.mongodb/about.properties index 6e764d3806..b03794d212 100644 --- a/plugins/org.eclipse.emf.cdo.server.mongodb/about.properties +++ b/plugins/org.eclipse.emf.cdo.server.mongodb/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = CDO Model Repository Server MongoDB Store -featureText = CDO Model Repository Server MongoDB Store\n\ +featureName = CDO Model Repository Server MongoDB +featureText = CDO Model Repository Server MongoDB\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/plugin.properties b/plugins/org.eclipse.emf.cdo.server.mongodb/plugin.properties index 675ac42525..c56c403489 100644 --- a/plugins/org.eclipse.emf.cdo.server.mongodb/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.mongodb/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Model Repository Server MongoDB Store +pluginName = CDO Model Repository Server MongoDB providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity.stub/plugin.properties b/plugins/org.eclipse.emf.cdo.server.objectivity.stub/plugin.properties index 813165e303..9972377e1e 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity.stub/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.objectivity.stub/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Ibrahim Sallam - initial API and implementation -pluginName = CDO Model Repository Server Objectivity Store (Driver Stub) +pluginName = CDO Model Repository Server Objectivity (Driver Stub) providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.objectivity/META-INF/MANIFEST.MF index 115d8e2343..4b9c91c346 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.server.objectivity;singleton:=true -Bundle-Version: 4.0.200.qualifier +Bundle-Version: 4.0.300.qualifier Bundle-Activator: org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM$Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport @@ -11,14 +11,14 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ClassPath: . -Export-Package: org.eclipse.emf.cdo.server.internal.objectivity;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.objectivity", - org.eclipse.emf.cdo.server.internal.objectivity.bundle;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.objectivity", - org.eclipse.emf.cdo.server.internal.objectivity.clustering;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.objectivity", - org.eclipse.emf.cdo.server.internal.objectivity.db;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.objectivity", - org.eclipse.emf.cdo.server.internal.objectivity.mapper;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.objectivity", - org.eclipse.emf.cdo.server.internal.objectivity.schema;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.objectivity", - org.eclipse.emf.cdo.server.internal.objectivity.utils;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.objectivity", - org.eclipse.emf.cdo.server.objectivity;version="4.0.200" +Export-Package: org.eclipse.emf.cdo.server.internal.objectivity;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity", + org.eclipse.emf.cdo.server.internal.objectivity.bundle;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity", + org.eclipse.emf.cdo.server.internal.objectivity.clustering;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity", + org.eclipse.emf.cdo.server.internal.objectivity.db;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity", + org.eclipse.emf.cdo.server.internal.objectivity.mapper;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity", + org.eclipse.emf.cdo.server.internal.objectivity.schema;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity", + org.eclipse.emf.cdo.server.internal.objectivity.utils;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity", + org.eclipse.emf.cdo.server.objectivity;version="4.0.300" Import-Package: com.objy.as;version="[4.0.0,5.0.0)", com.objy.as.app;version="[4.0.0,5.0.0)", com.objy.db;version="[4.0.0,5.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/about.properties b/plugins/org.eclipse.emf.cdo.server.objectivity/about.properties index a7c886d7e7..02b6cd8e96 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/about.properties +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = CDO Model Repository Server Objectivity Store -featureText = CDO Model Repository Server Objectivity Store\n\ +featureName = CDO Model Repository Server Objectivity +featureText = CDO Model Repository Server Objectivity\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/plugin.properties b/plugins/org.eclipse.emf.cdo.server.objectivity/plugin.properties index 8ee55fcdee..87bab445d3 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Model Repository Server Objectivity Store +pluginName = CDO Model Repository Server Objectivity providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/plugin.properties b/plugins/org.eclipse.emf.cdo.tests.hibernate/plugin.properties index b32c606222..5544642905 100644 --- a/plugins/org.eclipse.emf.cdo.tests.hibernate/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Model Repository Tests Hibernate +pluginName = CDO Model Repository Server Hibernate Tests providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF index 288c8397a9..b73a9b4ace 100644 --- a/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.net4j.defs;singleton:=true -Bundle-Version: 4.0.200.qualifier +Bundle-Version: 4.0.300.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.net4j.util.defs;bundle-version="[4.0.0,5.0.0)";visib org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.http;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.net4j.defs;version="4.0.200", - org.eclipse.net4j.defs.impl;version="4.0.200", - org.eclipse.net4j.defs.util;version="4.0.200" +Export-Package: org.eclipse.net4j.defs;version="4.0.300", + org.eclipse.net4j.defs.impl;version="4.0.300", + org.eclipse.net4j.defs.util;version="4.0.300" diff --git a/plugins/org.eclipse.net4j.defs/about.properties b/plugins/org.eclipse.net4j.defs/about.properties index dac4200e31..dbb60c4857 100644 --- a/plugins/org.eclipse.net4j.defs/about.properties +++ b/plugins/org.eclipse.net4j.defs/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = Net4j Signalling Platform Transport Definitions -featureText = Net4j Signalling Platform Transport Definitions\n\ +featureName = Net4j Signalling Platform Definitions +featureText = Net4j Signalling Platform Definitions\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.net4j.defs/plugin.properties b/plugins/org.eclipse.net4j.defs/plugin.properties index a66d3a73e4..2fa4f0c24e 100644 --- a/plugins/org.eclipse.net4j.defs/plugin.properties +++ b/plugins/org.eclipse.net4j.defs/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Andre Dietisheim - initial API and implementation -pluginName = Net4j Signalling Platform Transport Definitions +pluginName = Net4j Signalling Platform Definitions providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.net4j.doc/build.xml b/plugins/org.eclipse.net4j.doc/build.xml index 6ed5cef1f0..471ea893bb 100644 --- a/plugins/org.eclipse.net4j.doc/build.xml +++ b/plugins/org.eclipse.net4j.doc/build.xml @@ -121,7 +121,7 @@ <include name="org.eclipse.net4j/src/org/eclipse/spi/net4j/*.java" /> </fileset> - <group title="Net4j Signalling Platform Transport"> + <group title="Net4j Signalling Platform"> <package name="org.eclipse.net4j" /> <package name="org.eclipse.net4j.acceptor" /> <package name="org.eclipse.net4j.buffer" /> @@ -134,19 +134,19 @@ <package name="org.eclipse.net4j.signal.wrapping" /> <package name="org.eclipse.spi.net4j" /> </group> - <group title="Net4j Signalling Platform Transport HTTP"> + <group title="Net4j Signalling Platform HTTP"> <package name="org.eclipse.net4j.http" /> </group> - <group title="Net4j Signalling Platform Transport HTTP Common"> + <group title="Net4j Signalling Platform HTTP Common"> <package name="org.eclipse.net4j.http.common" /> </group> - <group title="Net4j Signalling Platform Transport HTTP Server"> + <group title="Net4j Signalling Platform HTTP Server"> <package name="org.eclipse.net4j.http.server" /> </group> - <group title="Net4j Signalling Platform Transport JVM"> + <group title="Net4j Signalling Platform JVM"> <package name="org.eclipse.net4j.jvm" /> </group> - <group title="Net4j Signalling Platform Transport TCP"> + <group title="Net4j Signalling Platform TCP"> <package name="org.eclipse.net4j.tcp" /> <package name="org.eclipse.net4j.tcp.ssl" /> </group> diff --git a/plugins/org.eclipse.net4j.doc/javadoc/overview-summary.html b/plugins/org.eclipse.net4j.doc/javadoc/overview-summary.html index 308fc40c0f..8de3fcf2a1 100644 --- a/plugins/org.eclipse.net4j.doc/javadoc/overview-summary.html +++ b/plugins/org.eclipse.net4j.doc/javadoc/overview-summary.html @@ -72,8 +72,8 @@ The Net4j Signalling platform is an extensible client/server communications fram <p>See: <a href="#overview_description">Description</a></p> </div> <div class="contentContainer"> -<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Net4j Signalling Platform Transport table, listing packages, and an explanation"> -<caption><span>Net4j Signalling Platform Transport</span><span class="tabEnd"> </span></caption> +<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Net4j Signalling Platform table, listing packages, and an explanation"> +<caption><span>Net4j Signalling Platform</span><span class="tabEnd"> </span></caption> <tr> <th class="colFirst" scope="col">Package</th> <th class="colLast" scope="col">Description</th> @@ -149,8 +149,8 @@ The Net4j Signalling platform is an extensible client/server communications fram </table> </div> <div class="contentContainer"> -<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Net4j Signalling Platform Transport HTTP table, listing packages, and an explanation"> -<caption><span>Net4j Signalling Platform Transport HTTP</span><span class="tabEnd"> </span></caption> +<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Net4j Signalling Platform HTTP table, listing packages, and an explanation"> +<caption><span>Net4j Signalling Platform HTTP</span><span class="tabEnd"> </span></caption> <tr> <th class="colFirst" scope="col">Package</th> <th class="colLast" scope="col">Description</th> @@ -166,8 +166,8 @@ The Net4j Signalling platform is an extensible client/server communications fram </table> </div> <div class="contentContainer"> -<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Net4j Signalling Platform Transport HTTP Common table, listing packages, and an explanation"> -<caption><span>Net4j Signalling Platform Transport HTTP Common</span><span class="tabEnd"> </span></caption> +<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Net4j Signalling Platform HTTP Common table, listing packages, and an explanation"> +<caption><span>Net4j Signalling Platform HTTP Common</span><span class="tabEnd"> </span></caption> <tr> <th class="colFirst" scope="col">Package</th> <th class="colLast" scope="col">Description</th> @@ -183,8 +183,8 @@ The Net4j Signalling platform is an extensible client/server communications fram </table> </div> <div class="contentContainer"> -<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Net4j Signalling Platform Transport HTTP Server table, listing packages, and an explanation"> -<caption><span>Net4j Signalling Platform Transport HTTP Server</span><span class="tabEnd"> </span></caption> +<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Net4j Signalling Platform HTTP Server table, listing packages, and an explanation"> +<caption><span>Net4j Signalling Platform HTTP Server</span><span class="tabEnd"> </span></caption> <tr> <th class="colFirst" scope="col">Package</th> <th class="colLast" scope="col">Description</th> @@ -200,8 +200,8 @@ The Net4j Signalling platform is an extensible client/server communications fram </table> </div> <div class="contentContainer"> -<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Net4j Signalling Platform Transport JVM table, listing packages, and an explanation"> -<caption><span>Net4j Signalling Platform Transport JVM</span><span class="tabEnd"> </span></caption> +<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Net4j Signalling Platform JVM table, listing packages, and an explanation"> +<caption><span>Net4j Signalling Platform JVM</span><span class="tabEnd"> </span></caption> <tr> <th class="colFirst" scope="col">Package</th> <th class="colLast" scope="col">Description</th> @@ -217,8 +217,8 @@ The Net4j Signalling platform is an extensible client/server communications fram </table> </div> <div class="contentContainer"> -<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Net4j Signalling Platform Transport TCP table, listing packages, and an explanation"> -<caption><span>Net4j Signalling Platform Transport TCP</span><span class="tabEnd"> </span></caption> +<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Net4j Signalling Platform TCP table, listing packages, and an explanation"> +<caption><span>Net4j Signalling Platform TCP</span><span class="tabEnd"> </span></caption> <tr> <th class="colFirst" scope="col">Package</th> <th class="colLast" scope="col">Description</th> diff --git a/plugins/org.eclipse.net4j.doc/toc.xmi b/plugins/org.eclipse.net4j.doc/toc.xmi index b0f941189a..071c422485 100644 --- a/plugins/org.eclipse.net4j.doc/toc.xmi +++ b/plugins/org.eclipse.net4j.doc/toc.xmi @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:article="http://www.eclipse.org/ARTICLE/1.0"> - <article:Plugin name="org.eclipse.net4j" label="Net4j Signalling Platform Transport"> + <article:Plugin name="org.eclipse.net4j" label="Net4j Signalling Platform"> <packages name="org.eclipse.net4j"/> <packages name="org.eclipse.net4j.acceptor"/> <packages name="org.eclipse.net4j.buffer"/> @@ -13,19 +13,19 @@ <packages name="org.eclipse.net4j.signal.wrapping"/> <packages name="org.eclipse.spi.net4j"/> </article:Plugin> - <article:Plugin name="org.eclipse.net4j.http" label="Net4j Signalling Platform Transport HTTP"> + <article:Plugin name="org.eclipse.net4j.http" label="Net4j Signalling Platform HTTP"> <packages name="org.eclipse.net4j.http"/> </article:Plugin> - <article:Plugin name="org.eclipse.net4j.http.common" label="Net4j Signalling Platform Transport HTTP Common"> + <article:Plugin name="org.eclipse.net4j.http.common" label="Net4j Signalling Platform HTTP Common"> <packages name="org.eclipse.net4j.http.common"/> </article:Plugin> - <article:Plugin name="org.eclipse.net4j.http.server" label="Net4j Signalling Platform Transport HTTP Server"> + <article:Plugin name="org.eclipse.net4j.http.server" label="Net4j Signalling Platform HTTP Server"> <packages name="org.eclipse.net4j.http.server"/> </article:Plugin> - <article:Plugin name="org.eclipse.net4j.jvm" label="Net4j Signalling Platform Transport JVM"> + <article:Plugin name="org.eclipse.net4j.jvm" label="Net4j Signalling Platform JVM"> <packages name="org.eclipse.net4j.jvm"/> </article:Plugin> - <article:Plugin name="org.eclipse.net4j.tcp" label="Net4j Signalling Platform Transport TCP"> + <article:Plugin name="org.eclipse.net4j.tcp" label="Net4j Signalling Platform TCP"> <packages name="org.eclipse.net4j.tcp"/> <packages name="org.eclipse.net4j.tcp.ssl"/> </article:Plugin> diff --git a/plugins/org.eclipse.net4j.doc/toc.xml b/plugins/org.eclipse.net4j.doc/toc.xml index fcd154cfca..8cf3ed62a7 100644 --- a/plugins/org.eclipse.net4j.doc/toc.xml +++ b/plugins/org.eclipse.net4j.doc/toc.xml @@ -5,7 +5,7 @@ <topic label="Overview" href="html/Overview.html" /> <topic label="Reference" href="html/reference/index.html"> <topic label="API Reference" href="javadoc/overview-summary.html"> - <topic label="Net4j Signalling Platform Transport" href="javadoc/org/eclipse/net4j/package-summary.html" icon="plugin"> + <topic label="Net4j Signalling Platform" href="javadoc/org/eclipse/net4j/package-summary.html" icon="plugin"> <topic label="org.eclipse.net4j" href="javadoc/org/eclipse/net4j/package-summary.html" icon="package" /> <topic label="org.eclipse.net4j.acceptor" href="javadoc/org/eclipse/net4j/acceptor/package-summary.html" icon="package" /> <topic label="org.eclipse.net4j.buffer" href="javadoc/org/eclipse/net4j/buffer/package-summary.html" icon="package" /> @@ -18,19 +18,19 @@ <topic label="org.eclipse.net4j.signal.wrapping" href="javadoc/org/eclipse/net4j/signal/wrapping/package-summary.html" icon="package" /> <topic label="org.eclipse.spi.net4j" href="javadoc/org/eclipse/spi/net4j/package-summary.html" icon="package" /> </topic> - <topic label="Net4j Signalling Platform Transport HTTP" href="javadoc/org/eclipse/net4j/http/package-summary.html" icon="plugin"> + <topic label="Net4j Signalling Platform HTTP" href="javadoc/org/eclipse/net4j/http/package-summary.html" icon="plugin"> <topic label="org.eclipse.net4j.http" href="javadoc/org/eclipse/net4j/http/package-summary.html" icon="package" /> </topic> - <topic label="Net4j Signalling Platform Transport HTTP Common" href="javadoc/org/eclipse/net4j/http/common/package-summary.html" icon="plugin"> + <topic label="Net4j Signalling Platform HTTP Common" href="javadoc/org/eclipse/net4j/http/common/package-summary.html" icon="plugin"> <topic label="org.eclipse.net4j.http.common" href="javadoc/org/eclipse/net4j/http/common/package-summary.html" icon="package" /> </topic> - <topic label="Net4j Signalling Platform Transport HTTP Server" href="javadoc/org/eclipse/net4j/http/server/package-summary.html" icon="plugin"> + <topic label="Net4j Signalling Platform HTTP Server" href="javadoc/org/eclipse/net4j/http/server/package-summary.html" icon="plugin"> <topic label="org.eclipse.net4j.http.server" href="javadoc/org/eclipse/net4j/http/server/package-summary.html" icon="package" /> </topic> - <topic label="Net4j Signalling Platform Transport JVM" href="javadoc/org/eclipse/net4j/jvm/package-summary.html" icon="plugin"> + <topic label="Net4j Signalling Platform JVM" href="javadoc/org/eclipse/net4j/jvm/package-summary.html" icon="plugin"> <topic label="org.eclipse.net4j.jvm" href="javadoc/org/eclipse/net4j/jvm/package-summary.html" icon="package" /> </topic> - <topic label="Net4j Signalling Platform Transport TCP" href="javadoc/org/eclipse/net4j/tcp/package-summary.html" icon="plugin"> + <topic label="Net4j Signalling Platform TCP" href="javadoc/org/eclipse/net4j/tcp/package-summary.html" icon="plugin"> <topic label="org.eclipse.net4j.tcp" href="javadoc/org/eclipse/net4j/tcp/package-summary.html" icon="package" /> <topic label="org.eclipse.net4j.tcp.ssl" href="javadoc/org/eclipse/net4j/tcp/ssl/package-summary.html" icon="package" /> </topic> diff --git a/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF index fd41a99ab0..87d415d7f9 100644 --- a/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.http.common -Bundle-Version: 4.0.200.qualifier +Bundle-Version: 4.0.300.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,11 +11,11 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional, org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport -Export-Package: org.eclipse.net4j.http.common;version="4.0.200";uses:="org.eclipse.net4j.connector", - org.eclipse.net4j.http.internal.common;version="4.0.200"; +Export-Package: org.eclipse.net4j.http.common;version="4.0.300";uses:="org.eclipse.net4j.connector", + org.eclipse.net4j.http.internal.common;version="4.0.300"; x-friends:="org.eclipse.net4j.http, org.eclipse.net4j.http.server, org.eclipse.net4j.http.tests, org.eclipse.net4j.defs", - org.eclipse.net4j.http.internal.common.bundle;version="4.0.200";x-friends:="org.eclipse.net4j.http,org.eclipse.net4j.http.server,org.eclipse.net4j.http.tests", - org.eclipse.net4j.http.internal.common.messages;version="4.0.200";x-internal:=true + org.eclipse.net4j.http.internal.common.bundle;version="4.0.300";x-friends:="org.eclipse.net4j.http,org.eclipse.net4j.http.server,org.eclipse.net4j.http.tests", + org.eclipse.net4j.http.internal.common.messages;version="4.0.300";x-internal:=true diff --git a/plugins/org.eclipse.net4j.http.common/plugin.properties b/plugins/org.eclipse.net4j.http.common/plugin.properties index b804acf50b..f3b2ab9c2a 100644 --- a/plugins/org.eclipse.net4j.http.common/plugin.properties +++ b/plugins/org.eclipse.net4j.http.common/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = Net4j Signalling Platform Transport HTTP Common +pluginName = Net4j Signalling Platform HTTP Common providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.net4j.http.server/plugin.properties b/plugins/org.eclipse.net4j.http.server/plugin.properties index 2e22c1f79a..54ac53082c 100644 --- a/plugins/org.eclipse.net4j.http.server/plugin.properties +++ b/plugins/org.eclipse.net4j.http.server/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = Net4j Signalling Platform Transport HTTP Server +pluginName = Net4j Signalling Platform HTTP Server providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.net4j.http.tests/plugin.properties b/plugins/org.eclipse.net4j.http.tests/plugin.properties index 741dc85a3b..4d6e10b255 100644 --- a/plugins/org.eclipse.net4j.http.tests/plugin.properties +++ b/plugins/org.eclipse.net4j.http.tests/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = Net4j Signalling Platform Transport HTTP Tests +pluginName = Net4j Signalling Platform HTTP Tests providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF index b30aabac30..ebed8981f6 100644 --- a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.http;singleton:=true -Bundle-Version: 4.0.200.qualifier +Bundle-Version: 4.0.300.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -15,6 +15,6 @@ Import-Package: org.apache.commons.codec;version="[1.3.0,2.0.0)", org.apache.commons.httpclient;version="[3.0.0,4.0.0)", org.apache.commons.httpclient.methods;version="[3.0.0,4.0.0)", org.apache.commons.logging;version="[1.1.0,2.0.0)" -Export-Package: org.eclipse.net4j.http;version="4.0.200", - org.eclipse.net4j.internal.http;version="4.0.200";x-friends:="org.eclipse.net4j.http.tests,org.eclipse.net4j.defs", - org.eclipse.net4j.internal.http.bundle;version="4.0.200";x-internal:=true +Export-Package: org.eclipse.net4j.http;version="4.0.300", + org.eclipse.net4j.internal.http;version="4.0.300";x-friends:="org.eclipse.net4j.http.tests,org.eclipse.net4j.defs", + org.eclipse.net4j.internal.http.bundle;version="4.0.300";x-internal:=true diff --git a/plugins/org.eclipse.net4j.http/plugin.properties b/plugins/org.eclipse.net4j.http/plugin.properties index 8aa7778de7..3b6b7e3f14 100644 --- a/plugins/org.eclipse.net4j.http/plugin.properties +++ b/plugins/org.eclipse.net4j.http/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = Net4j Signalling Platform Transport HTTP +pluginName = Net4j Signalling Platform HTTP providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF index 86c1e2228d..8589a8ab98 100644 --- a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.jvm;singleton:=true -Bundle-Version: 4.1.100.qualifier +Bundle-Version: 4.1.200.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -12,7 +12,7 @@ Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional, org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional -Export-Package: org.eclipse.net4j.internal.jvm;version="4.1.100";x-friends:="org.eclipse.net4j.defs,org.eclipse.net4j.tests,org.eclipse.net4j.ui", - org.eclipse.net4j.internal.jvm.bundle;version="4.1.100";x-internal:=true, - org.eclipse.net4j.internal.jvm.messages;version="4.1.100";x-internal:=true, - org.eclipse.net4j.jvm;version="4.1.100" +Export-Package: org.eclipse.net4j.internal.jvm;version="4.1.200";x-friends:="org.eclipse.net4j.defs,org.eclipse.net4j.tests,org.eclipse.net4j.ui", + org.eclipse.net4j.internal.jvm.bundle;version="4.1.200";x-internal:=true, + org.eclipse.net4j.internal.jvm.messages;version="4.1.200";x-internal:=true, + org.eclipse.net4j.jvm;version="4.1.200" diff --git a/plugins/org.eclipse.net4j.jvm/plugin.properties b/plugins/org.eclipse.net4j.jvm/plugin.properties index 1ee2aa1a11..afce58f792 100644 --- a/plugins/org.eclipse.net4j.jvm/plugin.properties +++ b/plugins/org.eclipse.net4j.jvm/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = Net4j Signalling Platform Transport JVM +pluginName = Net4j Signalling Platform JVM providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.net4j.tcp/plugin.properties b/plugins/org.eclipse.net4j.tcp/plugin.properties index b2c2adc0bc..86b215a1c8 100644 --- a/plugins/org.eclipse.net4j.tcp/plugin.properties +++ b/plugins/org.eclipse.net4j.tcp/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = Net4j Signalling Platform Transport TCP +pluginName = Net4j Signalling Platform TCP providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.net4j/about.properties b/plugins/org.eclipse.net4j/about.properties index 19d7851a65..c238fd2b73 100644 --- a/plugins/org.eclipse.net4j/about.properties +++ b/plugins/org.eclipse.net4j/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = Net4j Signalling Platform Transport -featureText = Net4j Signalling Platform Transport\n\ +featureName = Net4j Signalling Platform +featureText = Net4j Signalling Platform\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.net4j/plugin.properties b/plugins/org.eclipse.net4j/plugin.properties index f0906816c6..4f0f80908d 100644 --- a/plugins/org.eclipse.net4j/plugin.properties +++ b/plugins/org.eclipse.net4j/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = Net4j Signalling Platform Transport +pluginName = Net4j Signalling Platform providerName = Eclipse Modeling Project |
