updated category+ product
diff --git a/org.eclipse.emf.emfstore.products/org.eclipse.emf.ecp.product b/org.eclipse.emf.emfstore.products/org.eclipse.emf.ecp.product
deleted file mode 100644
index 167dc80..0000000
--- a/org.eclipse.emf.emfstore.products/org.eclipse.emf.ecp.product
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="EMFStore Client" uid="org.eclipse.emf.ecp.product" application="org.eclipse.ui.ide.workbench" version="0.9.0.qualifier" useFeatures="false" includeLaunchers="true">
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-consoleLog -clearConfig=C:\Users\User\workspaces\EMFECPTest\.metadata\.plugins\org.eclipse.pde.core\ecp</programArgs>
- <vmArgs>-Xmx1024m</vmArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
- </launcherArgs>
-
- <launcher>
- <solaris/>
- <win useIco="false">
- <bmp/>
- </win>
- </launcher>
-
- <vm>
- </vm>
-
- <plugins>
- <plugin id="com.ibm.icu"/>
- <plugin id="com.jcraft.jsch"/>
- <plugin id="javax.servlet"/>
- <plugin id="org.apache.commons.codec"/>
- <plugin id="org.apache.commons.logging"/>
- <plugin id="org.eclipse.ant.core"/>
- <plugin id="org.eclipse.compare"/>
- <plugin id="org.eclipse.compare.core"/>
- <plugin id="org.eclipse.core.commands"/>
- <plugin id="org.eclipse.core.contenttype"/>
- <plugin id="org.eclipse.core.databinding"/>
- <plugin id="org.eclipse.core.databinding.observable"/>
- <plugin id="org.eclipse.core.databinding.property"/>
- <plugin id="org.eclipse.core.expressions"/>
- <plugin id="org.eclipse.core.filebuffers"/>
- <plugin id="org.eclipse.core.filesystem"/>
- <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true" os="win32" ws="win32" arch="x86"/>
- <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true" os="win32" ws="win32" arch="x86_64"/>
- <plugin id="org.eclipse.core.filesystem.linux.x86" fragment="true" os="linux" ws="gtk" arch="x86"/>
- <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true" os="linux" ws="gtk" arch="x86_64"/>
- <plugin id="org.eclipse.core.filesystem.macosx" fragment="true" os="macosx" ws="cocoa" arch="x86_64"/>
- <plugin id="org.eclipse.core.jobs"/>
- <plugin id="org.eclipse.core.net"/>
- <plugin id="org.eclipse.core.net.win32.x86" fragment="true" os="win32" ws="win32" arch="x86"/>
- <plugin id="org.eclipse.core.net.win32.x86_64" fragment="true" os="win32" ws="win32" arch="x86_64"/>
- <plugin id="org.eclipse.core.net.linux.x86" fragment="true" os="linux" ws="gtk" arch="x86"/>
- <plugin id="org.eclipse.core.net.linux.x86_64" fragment="true" os="linux" ws="gtk" arch="x86_64"/>
- <plugin id="org.eclipse.core.resources"/>
- <plugin id="org.eclipse.core.resources.win32.x86" fragment="true" os="win32" ws="win32" arch="x86"/>
- <plugin id="org.eclipse.core.runtime"/>
- <plugin id="org.eclipse.core.runtime.compatibility.auth"/>
- <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
- <plugin id="org.eclipse.core.variables"/>
- <plugin id="org.eclipse.egit"/>
- <plugin id="org.eclipse.egit.core"/>
- <plugin id="org.eclipse.emf.cdo"/>
- <plugin id="org.eclipse.emf.cdo.common"/>
- <plugin id="org.eclipse.emf.cdo.edit"/>
- <plugin id="org.eclipse.emf.common"/>
- <plugin id="org.eclipse.emf.common.ui"/>
- <plugin id="org.eclipse.emf.databinding"/>
- <plugin id="org.eclipse.emf.databinding.edit"/>
- <plugin id="org.eclipse.emf.ecore"/>
- <plugin id="org.eclipse.emf.ecore.change"/>
- <plugin id="org.eclipse.emf.ecore.edit"/>
- <plugin id="org.eclipse.emf.ecore.xmi"/>
- <plugin id="org.eclipse.emf.ecp.common"/>
- <plugin id="org.eclipse.emf.ecp.common.model"/>
- <plugin id="org.eclipse.emf.ecp.common.rcp" fragment="true"/>
- <plugin id="org.eclipse.emf.ecp.common.util"/>
- <plugin id="org.eclipse.emf.ecp.editor"/>
- <plugin id="org.eclipse.emf.ecp.emfstorebridge"/>
- <plugin id="org.eclipse.emf.ecp.navigator"/>
- <plugin id="org.eclipse.emf.ecp.navigatoreditorbridge"/>
- <plugin id="org.eclipse.emf.ecp.validation"/>
- <plugin id="org.eclipse.emf.edit"/>
- <plugin id="org.eclipse.emf.edit.ui"/>
- <plugin id="org.eclipse.emf.emfstore.client"/>
- <plugin id="org.eclipse.emf.emfstore.client.model.edit"/>
- <plugin id="org.eclipse.emf.emfstore.client.ui"/>
- <plugin id="org.eclipse.emf.emfstore.common"/>
- <plugin id="org.eclipse.emf.emfstore.common.model"/>
- <plugin id="org.eclipse.emf.emfstore.common.model.edit"/>
- <plugin id="org.eclipse.emf.emfstore.examplemodel"/>
- <plugin id="org.eclipse.emf.emfstore.examplemodel.edit"/>
- <plugin id="org.eclipse.emf.emfstore.migration"/>
- <plugin id="org.eclipse.emf.emfstore.perspective"/>
- <plugin id="org.eclipse.emf.emfstore.server"/>
- <plugin id="org.eclipse.emf.emfstore.server.model"/>
- <plugin id="org.eclipse.emf.emfstore.server.model.edit"/>
- <plugin id="org.eclipse.emf.transaction"/>
- <plugin id="org.eclipse.emf.validation"/>
- <plugin id="org.eclipse.emf.workspace"/>
- <plugin id="org.eclipse.equinox.app"/>
- <plugin id="org.eclipse.equinox.common"/>
- <plugin id="org.eclipse.equinox.p2.core"/>
- <plugin id="org.eclipse.equinox.p2.engine"/>
- <plugin id="org.eclipse.equinox.p2.metadata"/>
- <plugin id="org.eclipse.equinox.p2.metadata.repository"/>
- <plugin id="org.eclipse.equinox.p2.repository"/>
- <plugin id="org.eclipse.equinox.preferences"/>
- <plugin id="org.eclipse.equinox.registry"/>
- <plugin id="org.eclipse.equinox.security"/>
- <plugin id="org.eclipse.equinox.security.win32.x86" fragment="true" os="win32" ws="win32" arch="x86"/>
- <plugin id="org.eclipse.equinox.security.win32.x86_64" fragment="true" os="win32" ws="win32" arch="x86_64"/>
- <plugin id="org.eclipse.equinox.security.macosx" fragment="true" os="macosx" ws="cocoa" arch="x86_64"/>
- <plugin id="org.eclipse.help"/>
- <plugin id="org.eclipse.jface"/>
- <plugin id="org.eclipse.jface.databinding"/>
- <plugin id="org.eclipse.jface.text"/>
- <plugin id="org.eclipse.jgit"/>
- <plugin id="org.eclipse.ltk.core.refactoring"/>
- <plugin id="org.eclipse.ltk.ui.refactoring"/>
- <plugin id="org.eclipse.net4j.db"/>
- <plugin id="org.eclipse.net4j.db.h2"/>
- <plugin id="org.eclipse.net4j.ui.shared"/>
- <plugin id="org.eclipse.net4j.util"/>
- <plugin id="org.eclipse.net4j.util.ui"/>
- <plugin id="org.eclipse.osgi"/>
- <plugin id="org.eclipse.osgi.services"/>
- <plugin id="org.eclipse.swt"/>
- <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true" os="win32" ws="win32" arch="x86"/>
- <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true" os="win32" ws="win32" arch="x86_64"/>
- <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true" os="linux" ws="gtk" arch="x86"/>
- <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true" os="linux" ws="gtk" arch="x86_64"/>
- <plugin id="org.eclipse.team.core"/>
- <plugin id="org.eclipse.team.ui"/>
- <plugin id="org.eclipse.text"/>
- <plugin id="org.eclipse.ui"/>
- <plugin id="org.eclipse.ui.editors"/>
- <plugin id="org.eclipse.ui.forms"/>
- <plugin id="org.eclipse.ui.ide"/>
- <plugin id="org.eclipse.ui.ide.application"/>
- <plugin id="org.eclipse.ui.navigator"/>
- <plugin id="org.eclipse.ui.navigator.resources"/>
- <plugin id="org.eclipse.ui.views"/>
- <plugin id="org.eclipse.ui.views.properties.tabbed"/>
- <plugin id="org.eclipse.ui.win32" fragment="true" ws="win32"/>
- <plugin id="org.eclipse.ui.cocoa" fragment="true" ws="cocoa"/>
- <plugin id="org.eclipse.ui.workbench"/>
- <plugin id="org.eclipse.ui.workbench.texteditor"/>
- <plugin id="org.h2"/>
- <plugin id="org.hamcrest.core"/>
- <plugin id="org.junit"/>
- <plugin id="org.junit4"/>
- </plugins>
-
- <configurations>
- <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
- </configurations>
-
-</product>
diff --git a/org.eclipse.emf.emfstore.repository/category.xml b/org.eclipse.emf.emfstore.repository/category.xml
index 4256a8c..c3dafdf 100644
--- a/org.eclipse.emf.emfstore.repository/category.xml
+++ b/org.eclipse.emf.emfstore.repository/category.xml
@@ -3,21 +3,6 @@
<description name="EMFStore (Incubation)" url="http://download.eclipse.org/emf-store/latest">
Update Site for the EMFStore
</description>
- <feature id="org.eclipse.emf.ecp.common.feature" version="0.0.0">
- <category name="org.eclipse.emf.ecp"/>
- </feature>
- <feature id="org.eclipse.emf.ecp.editor.feature" version="0.0.0">
- <category name="org.eclipse.emf.ecp"/>
- </feature>
- <feature id="org.eclipse.emf.ecp.navigator.feature" version="0.0.0">
- <category name="org.eclipse.emf.ecp"/>
- </feature>
- <feature id="org.eclipse.emf.ecp.navigatoreditorbridge.feature" version="0.0.0">
- <category name="org.eclipse.emf.ecp"/>
- </feature>
- <feature id="org.eclipse.emf.ecp.validation.feature" version="0.0.0">
- <category name="org.eclipse.emf.ecp"/>
- </feature>
<feature id="org.eclipse.emf.emfstore.client.feature" version="0.0.0">
<category name="org.eclipse.emf.emfstore.core"/>
</feature>
@@ -27,91 +12,15 @@
<feature id="org.eclipse.emf.emfstore.common.feature" version="0.0.0">
<category name="org.eclipse.emf.emfstore.core"/>
</feature>
- <feature id="org.eclipse.emf.emfstore.ecore.feature" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.core"/>
- </feature>
- <feature id="org.eclipse.emf.emfstore.ecp.feature" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.core"/>
- </feature>
- <feature id="org.eclipse.emf.emfstore.perspective.feature" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.core"/>
- </feature>
<feature id="org.eclipse.emf.emfstore.server.feature" version="0.0.0">
<category name="org.eclipse.emf.emfstore.core"/>
</feature>
- <feature id="org.eclipse.emf.emfstore.client.transaction.feature" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.other"/>
- </feature>
<feature id="org.eclipse.emf.emfstore.example.feature" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.examples"/>
- </feature>
- <feature id="org.eclipse.emf.ecp.common.feature.source" version="0.0.0">
- <category name="org.eclipse.emf.ecp.sources"/>
- </feature>
- <feature id="org.eclipse.emf.ecp.editor.feature.source" version="0.0.0">
- <category name="org.eclipse.emf.ecp.sources"/>
- </feature>
- <feature id="org.eclipse.emf.ecp.navigator.feature.source" version="0.0.0">
- <category name="org.eclipse.emf.ecp.sources"/>
- </feature>
- <feature id="org.eclipse.emf.ecp.navigatoreditorbridge.feature.source" version="0.0.0">
- <category name="org.eclipse.emf.ecp.sources"/>
- </feature>
- <feature id="org.eclipse.emf.ecp.validation.feature.source" version="0.0.0">
- <category name="org.eclipse.emf.ecp.sources"/>
- </feature>
- <feature id="org.eclipse.emf.emfstore.client.feature.source" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.sources"/>
- </feature>
- <feature id="org.eclipse.emf.emfstore.client.ui.feature.source" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.sources"/>
- </feature>
- <feature id="org.eclipse.emf.emfstore.common.feature.source" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.sources"/>
- </feature>
- <feature id="org.eclipse.emf.emfstore.ecore.feature.source" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.sources"/>
- </feature>
- <feature id="org.eclipse.emf.emfstore.ecp.feature.source" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.sources"/>
- </feature>
- <feature id="org.eclipse.emf.emfstore.perspective.feature.source" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.sources"/>
- </feature>
- <feature id="org.eclipse.emf.emfstore.server.feature.source" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.sources"/>
- </feature>
- <feature id="org.eclipse.emf.emfstore.client.transaction.feature.source" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.sources"/>
+ <category name="org.eclipse.emf.emfstore.core"/>
</feature>
<category-def name="org.eclipse.emf.emfstore.core" label="EMFStore Core Features (Install all to get started)">
<description>
Core Features of EMFStore, a model repository for EMF.
</description>
</category-def>
- <category-def name="org.eclipse.emf.ecp" label="EMFClient Platform (Install all to get started)">
- <description>
- Core Features of EMF Client Platform, a reflective UI for EMF.
- </description>
- </category-def>
- <category-def name="org.eclipse.emf.emfstore.other" label="EMFStore Additional Features">
- <description>
- Addtional Features of EMFStore, a model repository for EMF.
- </description>
- </category-def>
- <category-def name="org.eclipse.emf.emfstore.sources" label="EMFStore Sources">
- <description>
- EMFStore Source Features.
- </description>
- </category-def>
- <category-def name="org.eclipse.emf.ecp.sources" label="EMFClient Sources">
- <description>
- EMFClient Source Features.
- </description>
- </category-def>
- <category-def name="org.eclipse.emf.emfstore.examples" label="EMFStore Code Examples">
- <description>
- EMFStore Code Examples.
- </description>
- </category-def>
</site>
