Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2022-02-02 16:15:42 +0000
committerEike Stepper2022-02-02 16:15:42 +0000
commitef9e26b07a7fe75d2e9c9044304f1053ba926ead (patch)
treeb62538eecb40d6cab469d1d0471fcd92fc3cdf18
parentdf38638f8c1b2d85a96a212cd5a6f6facb9186ae (diff)
downloadcdo-ef9e26b07a7fe75d2e9c9044304f1053ba926ead.tar.gz
cdo-ef9e26b07a7fe75d2e9c9044304f1053ba926ead.tar.xz
cdo-ef9e26b07a7fe75d2e9c9044304f1053ba926ead.zip
[578539] Provide an extension point for container product groups
https://bugs.eclipse.org/bugs/show_bug.cgi?id=578539
-rw-r--r--plugins/org.eclipse.emf.cdo.common/plugin.xml8
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/plugin.xml19
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/plugin.xml10
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/plugin.xml16
-rw-r--r--plugins/org.eclipse.emf.cdo.server.lissome/plugin.xml13
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/plugin.xml32
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/plugin.xml3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/plugin.xml6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/plugin.xml9
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/plugin.xml7
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/plugin.xml8
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/plugin.xml7
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo/plugin.xml13
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/plugin.xml15
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/build.properties3
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/plugin.xml21
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/plugin.xml15
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/build.properties3
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/plugin.xml21
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.trace/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.net4j.trace/plugin.xml7
-rw-r--r--plugins/org.eclipse.net4j.trace/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/plugin.xml43
-rw-r--r--plugins/org.eclipse.net4j.util/plugin.properties5
-rw-r--r--plugins/org.eclipse.net4j.util/plugin.xml26
-rw-r--r--plugins/org.eclipse.net4j.util/schema/factories.exsd6
-rw-r--r--plugins/org.eclipse.net4j.util/schema/productGroups.exsd126
-rw-r--r--plugins/org.eclipse.net4j/plugin.xml10
45 files changed, 403 insertions, 167 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/plugin.xml b/plugins/org.eclipse.emf.cdo.common/plugin.xml
index 5eb70e7e4d..f41e67bd68 100644
--- a/plugins/org.eclipse.emf.cdo.common/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.common/plugin.xml
@@ -13,7 +13,11 @@
<plugin>
- <extension point="org.eclipse.core.expressions.propertyTesters">
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.common.util.uriHandlers" name="URI Handlers"/>
+ </extension>
+
+ <extension point="org.eclipse.core.expressions.propertyTesters">
<propertyTester
id="org.eclipse.emf.cdo.repository.properties"
type="org.eclipse.emf.cdo.common.CDOCommonRepository"
@@ -26,6 +30,6 @@
namespace="org.eclipse.emf.cdo.branch"
properties="id,name,pathName,baseBranchID,baseBranchID,baseTimeStamp,deleted,local,main,proxy"
class="org.eclipse.emf.cdo.internal.common.branch.BranchProperties$Tester"/>
- </extension>
+ </extension>
</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml
index aae8cdc619..2934e55743 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml
@@ -28,6 +28,10 @@
</product>
</extension>
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.explorer.ui.checkouts.contentModifiers" name="CDO Checkout Content Modifiers"/>
+ </extension>
+
<extension point="org.eclipse.net4j.util.factories">
<factory
class="org.eclipse.emf.cdo.explorer.ui.checkouts.PapyrusDIFactory"
diff --git a/plugins/org.eclipse.emf.cdo.net4j/plugin.xml b/plugins/org.eclipse.emf.cdo.net4j/plugin.xml
index cf170566d1..c31094ee39 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.net4j/plugin.xml
@@ -13,8 +13,11 @@
<plugin>
- <extension
- point="org.eclipse.net4j.util.factories">
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.sessions" name="Net4j Sessions"/>
+ </extension>
+
+ <extension point="org.eclipse.net4j.util.factories">
<factory
class="org.eclipse.emf.cdo.internal.net4j.protocol.CDOClientProtocolFactory"
productGroup="org.eclipse.net4j.clientProtocols"
@@ -25,14 +28,11 @@
type="cdo"/>
</extension>
- <extension
- point="org.eclipse.net4j.util.elementProcessors">
- <elementProcessor
- class="org.eclipse.emf.cdo.internal.net4j.Net4jConnectorInjector"/>
+ <extension point="org.eclipse.net4j.util.elementProcessors">
+ <elementProcessor class="org.eclipse.emf.cdo.internal.net4j.Net4jConnectorInjector"/>
</extension>
- <extension
- point="org.eclipse.emf.ecore.protocol_parser">
+ <extension point="org.eclipse.emf.ecore.protocol_parser">
<parser
class="org.eclipse.emf.cdo.eresource.impl.CDOResourceFactoryImpl"
protocolName="cdo.net4j.jvm"/>
@@ -47,8 +47,7 @@
protocolName="cdo.net4j.ws"/>
</extension>
- <extension
- point="org.eclipse.emf.cdo.viewProviders">
+ <extension point="org.eclipse.emf.cdo.viewProviders">
<viewProvider
class="org.eclipse.emf.cdo.net4j.CDONet4jViewProvider$JVM"
priority="500"
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.admin/META-INF/MANIFEST.MF
index 0576a38e8f..565fdcbed5 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.admin/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.server.admin;singleton:=true
-Bundle-Version: 4.3.5.qualifier
+Bundle-Version: 4.3.6.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -17,12 +17,12 @@ Require-Bundle: org.eclipse.core.runtime;resolution:=optional;bundle-version="[3
org.eclipse.emf.cdo.server.security;bundle-version="[4.3.0,5.0.0)",
org.eclipse.emf.cdo.security;bundle-version="[4.3.0,5.0.0)",
org.eclipse.net4j.jvm;bundle-version="[4.1.100,5.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.server.admin;version="4.3.5",
- org.eclipse.emf.cdo.server.internal.admin;x-internal:=true;version="4.3.5",
- org.eclipse.emf.cdo.server.internal.admin.bundle;x-internal:=true;version="4.3.5",
- org.eclipse.emf.cdo.server.internal.admin.protocol;x-internal:=true;version="4.3.5",
- org.eclipse.emf.cdo.server.spi.admin;version="4.3.5",
- org.eclipse.emf.cdo.server.internal.admin.catalog;x-internal:=true;version="4.3.5",
- org.eclipse.emf.cdo.server.internal.admin.catalog.impl;x-internal:=true;version="4.3.5",
- org.eclipse.emf.cdo.server.internal.admin.catalog.util;x-internal:=true;version="4.3.5"
+Export-Package: org.eclipse.emf.cdo.server.admin;version="4.3.6",
+ org.eclipse.emf.cdo.server.internal.admin;x-internal:=true;version="4.3.6",
+ org.eclipse.emf.cdo.server.internal.admin.bundle;x-internal:=true;version="4.3.6",
+ org.eclipse.emf.cdo.server.internal.admin.protocol;x-internal:=true;version="4.3.6",
+ org.eclipse.emf.cdo.server.spi.admin;version="4.3.6",
+ org.eclipse.emf.cdo.server.internal.admin.catalog;x-internal:=true;version="4.3.6",
+ org.eclipse.emf.cdo.server.internal.admin.catalog.impl;x-internal:=true;version="4.3.6",
+ org.eclipse.emf.cdo.server.internal.admin.catalog.util;x-internal:=true;version="4.3.6"
Automatic-Module-Name: org.eclipse.emf.cdo.server.admin
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/plugin.xml b/plugins/org.eclipse.emf.cdo.server.admin/plugin.xml
index d5998ce8f1..4d536cc10a 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server.admin/plugin.xml
@@ -14,7 +14,13 @@
<plugin>
- <extension point="org.eclipse.net4j.util.factories">
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.server.admin.adminServers" name="CDO Administration Servers"/>
+ <productGroup id="org.eclipse.emf.cdo.server.admin.adminHandlers" name="CDO Administration Handlers"/>
+ <productGroup id="org.eclipse.emf.cdo.server.admin.repositoryConfigurationManagers" name="CDO Repository Configuration Managers"/>
+ </extension>
+
+ <extension point="org.eclipse.net4j.util.factories">
<factory
productGroup="org.eclipse.net4j.serverProtocols"
type="cdo-admin"
@@ -31,7 +37,7 @@
productGroup="org.eclipse.emf.cdo.server.admin.adminHandlers"
type="default"
class="org.eclipse.emf.cdo.server.internal.admin.DefaultCDOAdminHandler$Factory"/>
- </extension>
+ </extension>
<extension point="org.eclipse.emf.cdo.server.appExtensions">
<appExtension class="org.eclipse.emf.cdo.server.internal.admin.RepositoryConfigurationManagerExtension"/>
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/pom.xml b/plugins/org.eclipse.emf.cdo.server.admin/pom.xml
index e9c1972d36..6f2645e4d5 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.server.admin/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.server.admin</artifactId>
- <version>4.3.5-SNAPSHOT</version>
+ <version>4.3.6-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.server.db/plugin.xml b/plugins/org.eclipse.emf.cdo.server.db/plugin.xml
index 97e941b766..158f6d51bb 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server.db/plugin.xml
@@ -15,8 +15,11 @@
<extension-point id="mappingStrategies" name="%extension-point.name" schema="schema/mappingStrategies.exsd"/>
- <extension
- point="org.eclipse.net4j.util.factories">
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.server.db.typeMappingProviders" name="CDO Type Mapping Providers"/>
+ </extension>
+
+ <extension point="org.eclipse.net4j.util.factories">
<factory
productGroup="org.eclipse.emf.cdo.server.browserPages"
type="db-tables"
@@ -31,16 +34,13 @@
class="org.eclipse.emf.cdo.server.internal.db.mapping.TypeMappingRegistry$Factory"/>
</extension>
- <extension
- point="org.eclipse.emf.cdo.server.storeFactories">
+ <extension point="org.eclipse.emf.cdo.server.storeFactories">
<storeFactory
class="org.eclipse.emf.cdo.server.internal.db.DBStoreFactory"
- storeType="db">
- </storeFactory>
+ storeType="db"/>
</extension>
- <extension
- point="org.eclipse.emf.cdo.server.db.mappingStrategies">
+ <extension point="org.eclipse.emf.cdo.server.db.mappingStrategies">
<mappingStrategy
class="org.eclipse.emf.cdo.server.internal.db.mapping.horizontal.HorizontalMappingStrategy"
type="horizontal"/>
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/plugin.xml b/plugins/org.eclipse.emf.cdo.server.lissome/plugin.xml
index 8edb0ff3b1..aabd9ef7af 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/plugin.xml
@@ -13,22 +13,17 @@
<plugin>
- <extension
- point="org.eclipse.net4j.util.factories">
+ <extension point="org.eclipse.net4j.util.factories">
<factory
class="org.eclipse.emf.cdo.server.internal.lissome.LissomeBrowserPage$Factory"
productGroup="org.eclipse.emf.cdo.server.browserPages"
- type="lissome">
- </factory>
+ type="lissome"/>
</extension>
- <extension
- point="org.eclipse.emf.cdo.server.storeFactories">
+ <extension point="org.eclipse.emf.cdo.server.storeFactories">
<storeFactory
class="org.eclipse.emf.cdo.server.internal.lissome.LissomeStoreFactory"
- storeType="lissome">
- </storeFactory>
+ storeType="lissome"/>
</extension>
-
</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/plugin.xml b/plugins/org.eclipse.emf.cdo.server.net4j/plugin.xml
index e4a82e50c6..d604731987 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/plugin.xml
@@ -13,31 +13,31 @@
<plugin>
- <extension
- point="org.eclipse.net4j.util.factories">
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.server.net4j.failoverMonitors" name="Net4j Failover Monitors"/>
+ </extension>
+
+ <extension point="org.eclipse.net4j.util.factories">
<factory
productGroup="org.eclipse.net4j.serverProtocols"
- type="cdo"
- class="org.eclipse.emf.cdo.server.internal.net4j.protocol.CDOPluginProtocolFactory"/>
+ type="cdo"
+ class="org.eclipse.emf.cdo.server.internal.net4j.protocol.CDOPluginProtocolFactory"/>
<factory
productGroup="org.eclipse.net4j.serverProtocols"
- type="failover"
- class="org.eclipse.emf.cdo.server.net4j.FailoverMonitor$AgentProtocol$Factory"/>
+ type="failover"
+ class="org.eclipse.emf.cdo.server.net4j.FailoverMonitor$AgentProtocol$Factory"/>
<factory
productGroup="org.eclipse.net4j.serverProtocols"
- type="failover-client"
- class="org.eclipse.emf.cdo.server.net4j.FailoverMonitor$ClientProtocol$Factory"/>
+ type="failover-client"
+ class="org.eclipse.emf.cdo.server.net4j.FailoverMonitor$ClientProtocol$Factory"/>
<factory
productGroup="org.eclipse.emf.cdo.server.net4j.failoverMonitors"
- type="net4j"
- class="org.eclipse.emf.cdo.server.net4j.FailoverMonitor$Factory"/>
- </extension>
+ type="net4j"
+ class="org.eclipse.emf.cdo.server.net4j.FailoverMonitor$Factory"/>
+ </extension>
- <extension
- point="org.eclipse.emf.cdo.server.appExtensions">
- <appExtension
- class="org.eclipse.emf.cdo.server.internal.net4j.bundle.Net4jAppExtension">
- </appExtension>
+ <extension point="org.eclipse.emf.cdo.server.appExtensions">
+ <appExtension class="org.eclipse.emf.cdo.server.internal.net4j.bundle.Net4jAppExtension"/>
</extension>
</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF
index 4505aee757..df3aae27f4 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.server.ocl;singleton:=true
Bundle-Name: %pluginName
-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 4.4.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -10,5 +10,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)",
org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.server.ocl;version="4.4.0"
+Export-Package: org.eclipse.emf.cdo.server.ocl;version="4.4.1"
Automatic-Module-Name: org.eclipse.emf.cdo.server.ocl
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/plugin.xml b/plugins/org.eclipse.emf.cdo.server.ocl/plugin.xml
index 1484e10b1c..728e208567 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/plugin.xml
@@ -13,8 +13,7 @@
<plugin>
- <extension
- point="org.eclipse.net4j.util.factories">
+ <extension point="org.eclipse.net4j.util.factories">
<factory
class="org.eclipse.emf.cdo.server.ocl.OCLQueryHandler$Factory"
productGroup="org.eclipse.emf.cdo.server.queryHandlerFactories"
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/pom.xml b/plugins/org.eclipse.emf.cdo.server.ocl/pom.xml
index d0c2cb3b22..9b00c50257 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.server.ocl</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.4.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.server.security/plugin.xml b/plugins/org.eclipse.emf.cdo.server.security/plugin.xml
index 35cdb0f86a..28c9f8ed7a 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server.security/plugin.xml
@@ -17,6 +17,12 @@
<appExtension class="org.eclipse.emf.cdo.server.internal.security.SecurityExtension"/>
</extension>
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.server.security.managers" name="CDO Security Managers"/>
+ <productGroup id="org.eclipse.emf.cdo.server.security.commitHandlers" name="CDO Commit Handlers"/>
+ <productGroup id="org.eclipse.net4j.util.security.operationAuthorizers" name="CDO Operation Authorizers"/>
+ </extension>
+
<extension point="org.eclipse.net4j.util.factories">
<factory
productGroup="org.eclipse.emf.cdo.server.security.managers"
diff --git a/plugins/org.eclipse.emf.cdo.server/plugin.xml b/plugins/org.eclipse.emf.cdo.server/plugin.xml
index 061a7ba089..e8cbcea2b5 100644
--- a/plugins/org.eclipse.emf.cdo.server/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server/plugin.xml
@@ -16,6 +16,15 @@
<extension-point id="storeFactories" name="%extension-point.name" schema="schema/storeFactories.exsd"/>
<extension-point id="repositoryFactories" name="%extension-point.name.0" schema="schema/repositoryFactories.exsd"/>
<extension-point id="appExtensions" name="%extension-point.name.1" schema="schema/appExtensions.exsd"/>
+
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.server.repositoryConfigurators" name="CDO Repository Configurators"/>
+ <productGroup id="org.eclipse.emf.cdo.server.repositoryActivityLogs" name="CDO Repository Activity Logs"/>
+ <productGroup id="org.eclipse.emf.cdo.server.queryHandlerFactories" name="CDO Query Handler Factories"/>
+ <productGroup id="org.eclipse.emf.cdo.server.commands" name="CDO Commands"/>
+ <productGroup id="org.eclipse.emf.cdo.server.browsers" name="CDO Browsers"/>
+ <productGroup id="org.eclipse.emf.cdo.server.browserPages" name="CDO Browser Pages"/>
+ </extension>
<extension point="org.eclipse.net4j.util.factories">
<factory
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF
index e5c0ced26d..1178ac7153 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.transfer.ui;singleton:=true
-Bundle-Version: 4.4.1.qualifier
+Bundle-Version: 4.4.2.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,11 +15,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo.ui.shared;bundle-version="[4.1.0,5.0.0)",
org.eclipse.emf.cdo.transfer;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.transfer.workspace;bundle-version="[4.2.0,5.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.transfer.internal.ui;version="4.4.1";x-internal:=true,
- org.eclipse.emf.cdo.transfer.internal.ui.bundle;version="4.4.1";x-internal:=true,
- org.eclipse.emf.cdo.transfer.spi.ui;version="4.4.1",
- org.eclipse.emf.cdo.transfer.ui;version="4.4.1",
- org.eclipse.emf.cdo.transfer.ui.swt;version="4.4.1",
+Export-Package: org.eclipse.emf.cdo.transfer.internal.ui;version="4.4.2";x-internal:=true,
+ org.eclipse.emf.cdo.transfer.internal.ui.bundle;version="4.4.2";x-internal:=true,
+ org.eclipse.emf.cdo.transfer.spi.ui;version="4.4.2",
+ org.eclipse.emf.cdo.transfer.ui;version="4.4.2",
+ org.eclipse.emf.cdo.transfer.ui.swt;version="4.4.2",
org.eclipse.wb.swt;version="4.2.100";x-internal:=true
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.cdo.transfer.internal.ui.bundle.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.transfer.ui/plugin.xml
index e5e79dc203..a9207a479d 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/plugin.xml
@@ -13,8 +13,11 @@
<plugin>
- <extension
- point="org.eclipse.net4j.util.factories">
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.transfer.ui.providers" name="CDO Transfer UI Providers"/>
+ </extension>
+
+ <extension point="org.eclipse.net4j.util.factories">
<factory
class="org.eclipse.emf.cdo.transfer.internal.ui.FileSystemUIProvider$Factory"
productGroup="org.eclipse.emf.cdo.transfer.ui.providers"
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/pom.xml b/plugins/org.eclipse.emf.cdo.transfer.ui/pom.xml
index 5acc42502d..527d3f96b1 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.transfer.ui</artifactId>
- <version>4.4.1-SNAPSHOT</version>
+ <version>4.4.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.ui/plugin.xml
index 560668d1b2..3fde41070e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.ui/plugin.xml
@@ -16,8 +16,8 @@
<extension-point id="editorOpeners" name="Editor Openers" schema="schema/editorOpeners.exsd"/>
- <extension point="org.eclipse.net4j.util.elementProcessors">
- <elementProcessor class="org.eclipse.emf.cdo.ui.CDOInteractiveExceptionHandler"/>
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.ui.userInfoStorages" name="CDO User Info Storages"/>
</extension>
<extension point="org.eclipse.net4j.util.factories">
@@ -42,6 +42,10 @@
</factories>
</extension>
+ <extension point="org.eclipse.net4j.util.elementProcessors">
+ <elementProcessor class="org.eclipse.emf.cdo.ui.CDOInteractiveExceptionHandler"/>
+ </extension>
+
<extension point="org.eclipse.core.expressions.propertyTesters">
<propertyTester
id="org.eclipse.emf.cdo.ui.properties"
diff --git a/plugins/org.eclipse.emf.cdo.workspace/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.workspace/META-INF/MANIFEST.MF
index f232a60dc2..98bb1c408e 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.workspace/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.workspace;singleton:=true
-Bundle-Version: 4.4.2.qualifier
+Bundle-Version: 4.4.3.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resoluti
org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)",
org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.internal.workspace;version="4.4.2";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db,org.eclipse.emf.cdo.ui.workspace",
- org.eclipse.emf.cdo.internal.workspace.bundle;version="4.4.2";x-internal:=true,
- org.eclipse.emf.cdo.spi.workspace;version="4.4.2",
- org.eclipse.emf.cdo.workspace;version="4.4.2"
+Export-Package: org.eclipse.emf.cdo.internal.workspace;version="4.4.3";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db,org.eclipse.emf.cdo.ui.workspace",
+ org.eclipse.emf.cdo.internal.workspace.bundle;version="4.4.3";x-internal:=true,
+ org.eclipse.emf.cdo.spi.workspace;version="4.4.3",
+ org.eclipse.emf.cdo.workspace;version="4.4.3"
Automatic-Module-Name: org.eclipse.emf.cdo.workspace
diff --git a/plugins/org.eclipse.emf.cdo.workspace/plugin.xml b/plugins/org.eclipse.emf.cdo.workspace/plugin.xml
index 47e0b0730f..92d4c7dc40 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.workspace/plugin.xml
@@ -13,8 +13,11 @@
<plugin>
- <extension
- point="org.eclipse.net4j.util.factories">
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.workspace.bases" name="CDO Workspace Bases"/>
+ </extension>
+
+ <extension point="org.eclipse.net4j.util.factories">
<factory
class="org.eclipse.emf.cdo.internal.workspace.FolderCDOWorkspaceBase$Factory"
productGroup="org.eclipse.emf.cdo.workspace.bases"
diff --git a/plugins/org.eclipse.emf.cdo.workspace/pom.xml b/plugins/org.eclipse.emf.cdo.workspace/pom.xml
index 268e96b91a..df02cf918a 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.workspace/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.workspace</artifactId>
- <version>4.4.2-SNAPSHOT</version>
+ <version>4.4.3-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo/plugin.xml b/plugins/org.eclipse.emf.cdo/plugin.xml
index 42f8fd1737..4c4fd3c5b6 100644
--- a/plugins/org.eclipse.emf.cdo/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo/plugin.xml
@@ -16,8 +16,11 @@
<extension-point id="viewProviders" name="%extension-point.name.0" schema="schema/viewProviders.exsd"/>
- <extension
- point="org.eclipse.net4j.util.factories">
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.conflictHandlers" name="CDO Conflict Handlers"/>
+ </extension>
+
+ <extension point="org.eclipse.net4j.util.factories">
<factory
class="org.eclipse.emf.internal.cdo.transaction.RollbackConflictHandler$Factory"
productGroup="org.eclipse.emf.cdo.conflictHandlers"
@@ -40,12 +43,10 @@
genModel="model/eresource.genmodel"/>
</extension>
- <extension
- point="org.eclipse.emf.ecore.protocol_parser">
+ <extension point="org.eclipse.emf.ecore.protocol_parser">
<parser
class="org.eclipse.emf.cdo.eresource.impl.CDOResourceFactoryImpl"
- protocolName="cdo">
- </parser>
+ protocolName="cdo"/>
</extension>
<extension point="org.eclipse.core.expressions.propertyTesters">
diff --git a/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
index 3adc1d51cb..f67b2ecd05 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.net4j.buddies.chat;singleton:=true
-Bundle-Version: 4.1.1.qualifier
+Bundle-Version: 4.1.2.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -10,8 +10,8 @@ Bundle-Activator: org.eclipse.net4j.buddies.internal.chat.bundle.OM$Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.buddies.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies.chat;version="4.1.1",
- org.eclipse.net4j.buddies.internal.chat;version="4.1.1",
- org.eclipse.net4j.buddies.internal.chat.bundle;version="4.1.1";x-internal:=true
+Export-Package: org.eclipse.net4j.buddies.chat;version="4.1.2",
+ org.eclipse.net4j.buddies.internal.chat;version="4.1.2",
+ org.eclipse.net4j.buddies.internal.chat.bundle;version="4.1.2";x-internal:=true
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.net4j.buddies.chat
diff --git a/plugins/org.eclipse.net4j.buddies.chat/plugin.xml b/plugins/org.eclipse.net4j.buddies.chat/plugin.xml
index d7c7e33713..cb795bf014 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/plugin.xml
+++ b/plugins/org.eclipse.net4j.buddies.chat/plugin.xml
@@ -13,16 +13,15 @@
<plugin>
- <extension
- point="org.eclipse.net4j.util.factories">
- <factory
+ <extension point="org.eclipse.net4j.util.factories">
+ <factory
class="org.eclipse.net4j.buddies.internal.chat.ChatFactory"
- productGroup="org.eclipse.net4j.buddies.clientFacilities"
- type="chat"/>
- <factory
+ productGroup="org.eclipse.net4j.buddies.clientFacilities"
+ type="chat"/>
+ <factory
class="org.eclipse.net4j.buddies.internal.chat.ChatRoomFactory"
- productGroup="org.eclipse.net4j.buddies.serverFacilities"
- type="chat"/>
+ productGroup="org.eclipse.net4j.buddies.serverFacilities"
+ type="chat"/>
</extension>
</plugin>
diff --git a/plugins/org.eclipse.net4j.buddies.chat/pom.xml b/plugins/org.eclipse.net4j.buddies.chat/pom.xml
index 57ff0eef58..0b12e42643 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/pom.xml
+++ b/plugins/org.eclipse.net4j.buddies.chat/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.net4j.buddies.chat</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
index b3f655d235..814b5ea5ff 100644
--- a/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.buddies.common
-Bundle-Version: 4.1.1.qualifier
+Bundle-SymbolicName: org.eclipse.net4j.buddies.common;singleton:=true
+Bundle-Version: 4.1.2.qualifier
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.net4j.buddies.internal.common.bundle.OM$Activator
Bundle-ClassPath: .
@@ -11,10 +11,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
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.buddies.common;version="4.1.1",
- org.eclipse.net4j.buddies.internal.common;version="4.1.1";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server,org.eclipse.net4j.buddies.ui",
- org.eclipse.net4j.buddies.internal.common.bundle;version="4.1.1";x-internal:=true,
- org.eclipse.net4j.buddies.internal.common.protocol;version="4.1.1";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server",
- org.eclipse.net4j.buddies.spi.common;version="4.1.1"
+Export-Package: org.eclipse.net4j.buddies.common;version="4.1.2",
+ org.eclipse.net4j.buddies.internal.common;version="4.1.2";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server,org.eclipse.net4j.buddies.ui",
+ org.eclipse.net4j.buddies.internal.common.bundle;version="4.1.2";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.common.protocol;version="4.1.2";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server",
+ org.eclipse.net4j.buddies.spi.common;version="4.1.2"
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.net4j.buddies.common
diff --git a/plugins/org.eclipse.net4j.buddies.common/build.properties b/plugins/org.eclipse.net4j.buddies.common/build.properties
index 0be1e73ea1..e5a57fe428 100644
--- a/plugins/org.eclipse.net4j.buddies.common/build.properties
+++ b/plugins/org.eclipse.net4j.buddies.common/build.properties
@@ -15,7 +15,8 @@ bin.includes = META-INF/,\
.,\
about.html,\
plugin.properties,\
- .options
+ .options,\
+ plugin.xml
src.includes = about.html,\
pom.xml
diff --git a/plugins/org.eclipse.net4j.buddies.common/plugin.xml b/plugins/org.eclipse.net4j.buddies.common/plugin.xml
new file mode 100644
index 0000000000..a6ecb63167
--- /dev/null
+++ b/plugins/org.eclipse.net4j.buddies.common/plugin.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<!--
+ Copyright (c) 2008, 2012 Eike Stepper (Loehne, 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
+-->
+
+<plugin>
+
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.net4j.buddies.serverFacilities" name="Net4j Buddies Server Facilities"/>
+ <productGroup id="org.eclipse.net4j.buddies.clientFacilities" name="Net4j Buddies Client Facilities"/>
+ </extension>
+
+</plugin>
diff --git a/plugins/org.eclipse.net4j.buddies.common/pom.xml b/plugins/org.eclipse.net4j.buddies.common/pom.xml
index d95a2c7ffd..a61428c58b 100644
--- a/plugins/org.eclipse.net4j.buddies.common/pom.xml
+++ b/plugins/org.eclipse.net4j.buddies.common/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.net4j.buddies.common</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
index 3adc1d51cb..f67b2ecd05 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.net4j.buddies.chat;singleton:=true
-Bundle-Version: 4.1.1.qualifier
+Bundle-Version: 4.1.2.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -10,8 +10,8 @@ Bundle-Activator: org.eclipse.net4j.buddies.internal.chat.bundle.OM$Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.buddies.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies.chat;version="4.1.1",
- org.eclipse.net4j.buddies.internal.chat;version="4.1.1",
- org.eclipse.net4j.buddies.internal.chat.bundle;version="4.1.1";x-internal:=true
+Export-Package: org.eclipse.net4j.buddies.chat;version="4.1.2",
+ org.eclipse.net4j.buddies.internal.chat;version="4.1.2",
+ org.eclipse.net4j.buddies.internal.chat.bundle;version="4.1.2";x-internal:=true
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.net4j.buddies.chat
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/plugin.xml b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/plugin.xml
index d7c7e33713..cb795bf014 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/plugin.xml
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/plugin.xml
@@ -13,16 +13,15 @@
<plugin>
- <extension
- point="org.eclipse.net4j.util.factories">
- <factory
+ <extension point="org.eclipse.net4j.util.factories">
+ <factory
class="org.eclipse.net4j.buddies.internal.chat.ChatFactory"
- productGroup="org.eclipse.net4j.buddies.clientFacilities"
- type="chat"/>
- <factory
+ productGroup="org.eclipse.net4j.buddies.clientFacilities"
+ type="chat"/>
+ <factory
class="org.eclipse.net4j.buddies.internal.chat.ChatRoomFactory"
- productGroup="org.eclipse.net4j.buddies.serverFacilities"
- type="chat"/>
+ productGroup="org.eclipse.net4j.buddies.serverFacilities"
+ type="chat"/>
</extension>
</plugin>
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/pom.xml b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/pom.xml
index 57ff0eef58..0b12e42643 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/pom.xml
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.net4j.buddies.chat</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
index b3f655d235..814b5ea5ff 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.buddies.common
-Bundle-Version: 4.1.1.qualifier
+Bundle-SymbolicName: org.eclipse.net4j.buddies.common;singleton:=true
+Bundle-Version: 4.1.2.qualifier
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.net4j.buddies.internal.common.bundle.OM$Activator
Bundle-ClassPath: .
@@ -11,10 +11,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
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.buddies.common;version="4.1.1",
- org.eclipse.net4j.buddies.internal.common;version="4.1.1";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server,org.eclipse.net4j.buddies.ui",
- org.eclipse.net4j.buddies.internal.common.bundle;version="4.1.1";x-internal:=true,
- org.eclipse.net4j.buddies.internal.common.protocol;version="4.1.1";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server",
- org.eclipse.net4j.buddies.spi.common;version="4.1.1"
+Export-Package: org.eclipse.net4j.buddies.common;version="4.1.2",
+ org.eclipse.net4j.buddies.internal.common;version="4.1.2";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server,org.eclipse.net4j.buddies.ui",
+ org.eclipse.net4j.buddies.internal.common.bundle;version="4.1.2";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.common.protocol;version="4.1.2";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server",
+ org.eclipse.net4j.buddies.spi.common;version="4.1.2"
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.net4j.buddies.common
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/build.properties b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/build.properties
index 0be1e73ea1..e5a57fe428 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/build.properties
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/build.properties
@@ -15,7 +15,8 @@ bin.includes = META-INF/,\
.,\
about.html,\
plugin.properties,\
- .options
+ .options,\
+ plugin.xml
src.includes = about.html,\
pom.xml
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/plugin.xml b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/plugin.xml
new file mode 100644
index 0000000000..a6ecb63167
--- /dev/null
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/plugin.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<!--
+ Copyright (c) 2008, 2012 Eike Stepper (Loehne, 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
+-->
+
+<plugin>
+
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.net4j.buddies.serverFacilities" name="Net4j Buddies Server Facilities"/>
+ <productGroup id="org.eclipse.net4j.buddies.clientFacilities" name="Net4j Buddies Client Facilities"/>
+ </extension>
+
+</plugin>
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/pom.xml b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/pom.xml
index d95a2c7ffd..a61428c58b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/pom.xml
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.net4j.buddies.common</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.net4j.trace/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.trace/META-INF/MANIFEST.MF
index b1569216bb..ad27d1586e 100644
--- a/plugins/org.eclipse.net4j.trace/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.trace/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.net4j.trace;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,9 +15,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resoluti
org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.net4j.util;bundle-version="[3.8.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.internal.trace;version="1.1.1";x-friends:="org.eclipse.net4j.trace.aspectj",
- org.eclipse.net4j.internal.trace.bundle;version="1.1.1";x-friends:="org.eclipse.net4j.trace.aspectj",
- org.eclipse.net4j.trace;version="1.1.1"
+Export-Package: org.eclipse.net4j.internal.trace;version="1.1.2";x-friends:="org.eclipse.net4j.trace.aspectj",
+ org.eclipse.net4j.internal.trace.bundle;version="1.1.2";x-friends:="org.eclipse.net4j.trace.aspectj",
+ org.eclipse.net4j.trace;version="1.1.2"
Automatic-Module-Name: org.eclipse.net4j.trace
Eclipse-SupplementBundle: org.eclipse.net4j,
org.eclipse.net4j.jvm,
diff --git a/plugins/org.eclipse.net4j.trace/plugin.xml b/plugins/org.eclipse.net4j.trace/plugin.xml
index 8ce08e6ef1..c796f98cc2 100644
--- a/plugins/org.eclipse.net4j.trace/plugin.xml
+++ b/plugins/org.eclipse.net4j.trace/plugin.xml
@@ -13,8 +13,11 @@
<plugin>
- <extension
- point="org.eclipse.net4j.util.factories">
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.net4j.trace.listeners" name="Net4j Trace Listeners"/>
+ </extension>
+
+ <extension point="org.eclipse.net4j.util.factories">
<factory
class="org.eclipse.net4j.internal.trace.Logger$Factory"
productGroup="org.eclipse.net4j.trace.listeners"
diff --git a/plugins/org.eclipse.net4j.trace/pom.xml b/plugins/org.eclipse.net4j.trace/pom.xml
index 541018a34f..3509dcbe60 100644
--- a/plugins/org.eclipse.net4j.trace/pom.xml
+++ b/plugins/org.eclipse.net4j.trace/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.net4j.trace</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.net4j.util.ui/plugin.xml b/plugins/org.eclipse.net4j.util.ui/plugin.xml
index cfc6101809..789fdf137e 100644
--- a/plugins/org.eclipse.net4j.util.ui/plugin.xml
+++ b/plugins/org.eclipse.net4j.util.ui/plugin.xml
@@ -14,12 +14,29 @@
<plugin>
- <extension
- point="org.eclipse.ui.views">
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.net4j.util.ui.elementWizards" name="Element Wizards"/>
+ </extension>
+
+ <extension point="org.eclipse.net4j.util.factories">
+ <factory
+ class="org.eclipse.net4j.util.internal.ui.InteractiveCredentialsProviderFactory"
+ productGroup="org.eclipse.net4j.util.security.credentialsProviders"
+ type="interactive"/>
+ <factory
+ class="org.eclipse.net4j.util.ui.confirmation.InteractiveConfirmationProvider$Factory"
+ productGroup="org.eclipse.net4j.util.confirmationProviders"
+ type="interactive"/>
+ <factory
+ class="org.eclipse.net4j.util.internal.ui.DisplayDelegateDetector$Factory"
+ productGroup="org.eclipse.net4j.util.concurrent.delegateDetectors"
+ type="display"/>
+ </extension>
+
+ <extension point="org.eclipse.ui.views">
<category
id="org.eclipse.net4j.debug"
- name="%category.name">
- </category>
+ name="%category.name"/>
<view
category="org.eclipse.net4j.debug"
id="org.eclipse.net4j.util.Net4jContainerView"
@@ -32,22 +49,6 @@
class="org.eclipse.net4j.util.internal.ui.views.Net4jIntrospectorView"
name="%view.name.0"
icon="platform:/plugin/org.eclipse.net4j.ui.shared/icons/full/view16/javabean.gif"/>
- </extension>
-
- <extension
- point="org.eclipse.net4j.util.factories">
- <factory
- class="org.eclipse.net4j.util.internal.ui.InteractiveCredentialsProviderFactory"
- productGroup="org.eclipse.net4j.util.security.credentialsProviders"
- type="interactive"/>
- <factory
- class="org.eclipse.net4j.util.ui.confirmation.InteractiveConfirmationProvider$Factory"
- productGroup="org.eclipse.net4j.util.confirmationProviders"
- type="interactive"/>
- <factory
- class="org.eclipse.net4j.util.internal.ui.DisplayDelegateDetector$Factory"
- productGroup="org.eclipse.net4j.util.concurrent.delegateDetectors"
- type="display"/>
- </extension>
+ </extension>
</plugin>
diff --git a/plugins/org.eclipse.net4j.util/plugin.properties b/plugins/org.eclipse.net4j.util/plugin.properties
index afdab85db0..9390d180b0 100644
--- a/plugins/org.eclipse.net4j.util/plugin.properties
+++ b/plugins/org.eclipse.net4j.util/plugin.properties
@@ -10,5 +10,6 @@
pluginName = Net4j Utilities
providerName = Eclipse Modeling Project
-extension-point.name = Factories
-extension-point.name.0 = Element Processors
+extpoint.name.productGroups = Product Groups
+extpoint.name.factories = Factories
+extpoint.name.elementProcessors = Element Processors
diff --git a/plugins/org.eclipse.net4j.util/plugin.xml b/plugins/org.eclipse.net4j.util/plugin.xml
index b5e42caec1..747c119ddd 100644
--- a/plugins/org.eclipse.net4j.util/plugin.xml
+++ b/plugins/org.eclipse.net4j.util/plugin.xml
@@ -14,11 +14,25 @@
<plugin>
- <extension-point id="factories" name="%extension-point.name" schema="schema/factories.exsd"/>
- <extension-point id="elementProcessors" name="%extension-point.name.0" schema="schema/elementProcessors.exsd"/>
+ <extension-point id="productGroups" name="%extpoint.name.productGroups" schema="schema/productGroups.exsd"/>
+ <extension-point id="factories" name="%extpoint.name.factories" schema="schema/factories.exsd"/>
+ <extension-point id="elementProcessors" name="%extpoint.name.elementProcessors" schema="schema/elementProcessors.exsd"/>
- <extension
- point="org.eclipse.net4j.util.factories">
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.net4j.util.timers" name="Timers"/>
+ <productGroup id="org.eclipse.net4j.executorServices" name="Executor Services"/>
+ <productGroup id="org.eclipse.net4j.randomizers" name="Randomizers"/>
+ <productGroup id="org.eclipse.net4j.streamWrappers" name="Stream Wrappers"/>
+ <productGroup id="org.eclipse.net4j.util.concurrent.delegateDetectors" name="Reentrant Lock Delegate Detectors"/>
+ <productGroup id="org.eclipse.net4j.userManagers" name="User Managers"/>
+ <productGroup id="org.eclipse.net4j.Negotiators" name="Negotiators"/>
+ <productGroup id="org.eclipse.net4j.authenticators" name="Authenticators"/>
+ <productGroup id="org.eclipse.net4j.util.security.credentialsProviders" name="Credentials Providers"/>
+ <productGroup id="org.eclipse.net4j.util.security.authorizableOperations" name="Authorizable Operations"/>
+ <productGroup id="org.eclipse.net4j.util.confirmationProviders" name="Confirmation Providers"/>
+ </extension>
+
+ <extension point="org.eclipse.net4j.util.factories">
<factory
class="org.eclipse.net4j.util.concurrent.TimerLifecycle$DaemonFactory"
productGroup="org.eclipse.net4j.util.timers"
@@ -42,7 +56,7 @@
<factory
productGroup="org.eclipse.net4j.util.confirmationProviders"
type="default"
- class="org.eclipse.net4j.util.confirmation.IConfirmationProvider.Factory.Default"/>
- </extension>
+ class="org.eclipse.net4j.util.confirmation.IConfirmationProvider$Factory$Default"/>
+ </extension>
</plugin>
diff --git a/plugins/org.eclipse.net4j.util/schema/factories.exsd b/plugins/org.eclipse.net4j.util/schema/factories.exsd
index d6e84afea4..b73ff6ffaa 100644
--- a/plugins/org.eclipse.net4j.util/schema/factories.exsd
+++ b/plugins/org.eclipse.net4j.util/schema/factories.exsd
@@ -60,6 +60,9 @@
<documentation>
</documentation>
+ <appinfo>
+ <meta.attribute kind="identifier" basedOn="org.eclipse.net4j.util.productGroups/productGroup/@id"/>
+ </appinfo>
</annotation>
</attribute>
<attribute name="type" type="string" use="required">
@@ -92,6 +95,9 @@
<documentation>
</documentation>
+ <appinfo>
+ <meta.attribute kind="identifier" basedOn="org.eclipse.net4j.util.productGroups/productGroup/@id"/>
+ </appinfo>
</annotation>
</attribute>
<attribute name="class" type="string" use="required">
diff --git a/plugins/org.eclipse.net4j.util/schema/productGroups.exsd b/plugins/org.eclipse.net4j.util/schema/productGroups.exsd
new file mode 100644
index 0000000000..e0e86879a7
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/schema/productGroups.exsd
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.net4j.util" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appinfo>
+ <meta.schema plugin="org.eclipse.net4j.util" id="productGroups" name="Product Groups"/>
+ </appinfo>
+ <documentation>
+ [Enter description of this extension point.]
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="productGroup" minOccurs="1" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="productGroup">
+ <complexType>
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ <attribute name="description" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ <attribute name="deprecated" type="boolean">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="since"/>
+ </appinfo>
+ <documentation>
+ [Enter the first release in which this extension point appears.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="examples"/>
+ </appinfo>
+ <documentation>
+ [Enter extension point usage example here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="apiinfo"/>
+ </appinfo>
+ <documentation>
+ [Enter API information here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="implementation"/>
+ </appinfo>
+ <documentation>
+ [Enter information about supplied implementation of this extension point.]
+ </documentation>
+ </annotation>
+
+
+</schema>
diff --git a/plugins/org.eclipse.net4j/plugin.xml b/plugins/org.eclipse.net4j/plugin.xml
index f489bc56fc..36eb3a4e5b 100644
--- a/plugins/org.eclipse.net4j/plugin.xml
+++ b/plugins/org.eclipse.net4j/plugin.xml
@@ -13,6 +13,16 @@
<plugin>
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.net4j.bufferProviders" name="Net4j Buffer Providers"/>
+ <productGroup id="org.eclipse.net4j.serverProtocols" name="Net4j Server Protocols"/>
+ <productGroup id="org.eclipse.net4j.clientProtocols" name="Net4j Client Protocols"/>
+ <productGroup id="org.eclipse.net4j.acceptorDescriptionParsers" name="Net4j Acceptor Description Parsers"/>
+ <productGroup id="org.eclipse.net4j.acceptors" name="Net4j Acceptors"/>
+ <productGroup id="org.eclipse.net4j.connectors" name="Net4j Connectors"/>
+ <productGroup id="org.eclipse.net4j.selectors" name="Net4j Selectors"/>
+ </extension>
+
<extension point="org.eclipse.net4j.util.factories">
<factory
class="org.eclipse.internal.net4j.buffer.BufferPoolFactory"

Back to the top