Moving activities/primary wizards out of platform and into sdk.
diff --git a/platform/org.eclipse.platform/plugin.properties b/platform/org.eclipse.platform/plugin.properties
index ec272fe..67f4164 100644
--- a/platform/org.eclipse.platform/plugin.properties
+++ b/platform/org.eclipse.platform/plugin.properties
@@ -16,13 +16,4 @@
intro.title=Welcome to Eclipse Platform 3.0
cheatsheet.cvs.name= CVS Tasks
-cheatsheet.cvs.desc= Go through the main CVS tasks using the cheat sheet
-
-activity.debugging=Debugging Java
-activity.debugging.desc=Grants the ability to debug Java applications.
-activity.java=Java Development
-activity.java.desc=Grants the ability to develop Java applications.
-activity.plugin=Plug-in Development
-activity.plugin.desc=Grants the ability to develop plug-ins, fragments, and features.
-activity.cat.java=Java
-activity.cat.plugin=Plug-in Development
+cheatsheet.cvs.desc= Go through the main CVS tasks using the cheat sheet
\ No newline at end of file
diff --git a/platform/org.eclipse.platform/plugin.xml b/platform/org.eclipse.platform/plugin.xml
index a8f1e4f..f003540 100644
--- a/platform/org.eclipse.platform/plugin.xml
+++ b/platform/org.eclipse.platform/plugin.xml
@@ -52,97 +52,6 @@
</config>
</extension>
<extension
- point="org.eclipse.ui.activities">
- <activity
- name="%activity.debugging"
- description="%activity.debugging.desc"
- id="org.eclipse.debugging">
- </activity>
- <activity
- name="%activity.java"
- description="%activity.java.desc"
- id="org.eclipse.javaDevelopment">
- </activity>
- <activity
- name="%activity.plugin"
- description="%activity.plugin.desc"
- id="org.eclipse.plugInDevelopment">
- </activity>
- <activityPatternBinding
- activityId="org.eclipse.debugging"
- pattern="org\.eclipse\.debug\..*/.*">
- </activityPatternBinding>
- <activityPatternBinding
- activityId="org.eclipse.javaDevelopment"
- pattern="org\.eclipse\.jdt\..*/.*">
- </activityPatternBinding>
- <activityPatternBinding
- activityId="org.eclipse.javaDevelopment"
- pattern="org\.eclipse\.jdt\.core/javanature">
- </activityPatternBinding>
- <activityPatternBinding
- activityId="org.eclipse.plugInDevelopment"
- pattern="org\.eclipse\.pde\..*/.*">
- </activityPatternBinding>
- <activityPatternBinding
- activityId="org.eclipse.plugInDevelopment"
- pattern="org\.eclipse\.pde/PluginNature">
- </activityPatternBinding>
- <category
- name="%activity.cat.java"
- description=""
- id="org.eclipse.categories.javaCategory">
- </category>
- <category
- name="%activity.cat.plugin"
- description=""
- id="org.eclipse.categories.pdeCategory">
- </category>
- <categoryActivityBinding
- activityId="org.eclipse.debugging"
- categoryId="org.eclipse.categories.javaCategory">
- </categoryActivityBinding>
- <categoryActivityBinding
- activityId="org.eclipse.javaDevelopment"
- categoryId="org.eclipse.categories.javaCategory">
- </categoryActivityBinding>
- <categoryActivityBinding
- activityId="org.eclipse.plugInDevelopment"
- categoryId="org.eclipse.categories.pdeCategory">
- </categoryActivityBinding>
- <activityActivityBinding
- childActivityId="org.eclipse.javaDevelopment"
- parentActivityId="org.eclipse.plugInDevelopment">
- </activityActivityBinding>
- <defaultEnablement
- id="org.eclipse.javaDevelopment">
- </defaultEnablement>
- <defaultEnablement
- id="org.eclipse.debugging">
- </defaultEnablement>
- <defaultEnablement
- id="org.eclipse.plugInDevelopment">
- </defaultEnablement>
- </extension>
- <extension
- point="org.eclipse.ui.newWizards">
- <primaryWizard
- id="org.eclipse.jdt.ui.wizards.JavaProjectWizard">
- </primaryWizard>
- <primaryWizard
- id="org.eclipse.pde.ui.NewProjectWizard">
- </primaryWizard>
- <primaryWizard
- id="org.eclipse.jdt.ui.wizards.NewClassCreationWizard">
- </primaryWizard>
- <primaryWizard
- id="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard">
- </primaryWizard>
- <primaryWizard
- id="org.eclipse.pde.ui.NewSchemaFileWizard">
- </primaryWizard>
- </extension>
- <extension
point="org.eclipse.ui.cheatsheets.cheatSheetContent">
<cheatSheet
name="%cheatsheet.cvs.name"
diff --git a/platform/org.eclipse.sdk/plugin.properties b/platform/org.eclipse.sdk/plugin.properties
index aea7d0a..4f7ebcf 100644
--- a/platform/org.eclipse.sdk/plugin.properties
+++ b/platform/org.eclipse.sdk/plugin.properties
@@ -1,2 +1,18 @@
pluginName=Eclipse Project SDK
providerName=Eclipse.org
+
+activity.debugging=Debugging
+activity.debugging.desc=Grants the ability to debug applications.
+activity.java=Java Development
+activity.java.desc=Grants the ability to develop Java applications.
+activity.plugin=Plug-in Development
+activity.plugin.desc=Grants the ability to develop plug-ins, fragments, and features.
+activity.cat.java=Java
+activity.cat.java.desc=Activities related to Java development.
+activity.cat.debug=Debugging
+activity.cat.debug.desc=Activities related to debugging applications.
+activity.cat.plugin=Plug-in Development
+activity.cat.plugin.desc=Activities related to plug-in development.
+
+
+
diff --git a/platform/org.eclipse.sdk/plugin.xml b/platform/org.eclipse.sdk/plugin.xml
index 1c2633c..26f3941 100644
--- a/platform/org.eclipse.sdk/plugin.xml
+++ b/platform/org.eclipse.sdk/plugin.xml
@@ -1,9 +1,111 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- name="%pluginName"
- id="org.eclipse.sdk"
- version="3.0.0"
- provider-name="%providerName">
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin
+ id="org.eclipse.sdk"
+ name="%pluginName"
+ version="3.0.0"
+ provider-name="%providerName">
+
+ <requires>
+ <import plugin="org.eclipse.ui"/>
+ </requires>
+
+
+ <extension
+ point="org.eclipse.ui.activities">
+ <activity
+ name="%activity.debugging"
+ description="%activity.debugging.desc"
+ id="org.eclipse.debugging">
+ </activity>
+ <activity
+ name="%activity.java"
+ description="%activity.java.desc"
+ id="org.eclipse.javaDevelopment">
+ </activity>
+ <activity
+ name="%activity.plugin"
+ description="%activity.plugin.desc"
+ id="org.eclipse.plugInDevelopment">
+ </activity>
+ <activityPatternBinding
+ activityId="org.eclipse.debugging"
+ pattern="org\.eclipse\.debug\..*/.*">
+ </activityPatternBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.javaDevelopment"
+ pattern="org\.eclipse\.jdt\..*/.*">
+ </activityPatternBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.javaDevelopment"
+ pattern="org\.eclipse\.jdt\.core/javanature">
+ </activityPatternBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.plugInDevelopment"
+ pattern="org\.eclipse\.pde\..*/.*">
+ </activityPatternBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.plugInDevelopment"
+ pattern="org\.eclipse\.pde/PluginNature">
+ </activityPatternBinding>
+ <category
+ name="%activity.cat.debug"
+ description="%activity.cat.debug.desc"
+ id="org.eclipse.categories.debugging">
+ </category>
+ <category
+ name="%activity.cat.java"
+ description="%activity.cat.java.desc"
+ id="org.eclipse.categories.javaCategory">
+ </category>
+ <category
+ name="%activity.cat.plugin"
+ description="%activity.cat.plugin.desc"
+ id="org.eclipse.categories.pdeCategory">
+ </category>
+ <categoryActivityBinding
+ activityId="org.eclipse.debugging"
+ categoryId="org.eclipse.categories.debugging">
+ </categoryActivityBinding>
+ <categoryActivityBinding
+ activityId="org.eclipse.javaDevelopment"
+ categoryId="org.eclipse.categories.javaCategory">
+ </categoryActivityBinding>
+ <categoryActivityBinding
+ activityId="org.eclipse.plugInDevelopment"
+ categoryId="org.eclipse.categories.pdeCategory">
+ </categoryActivityBinding>
+ <activityActivityBinding
+ childActivityId="org.eclipse.javaDevelopment"
+ parentActivityId="org.eclipse.plugInDevelopment">
+ </activityActivityBinding>
+ <defaultEnablement
+ id="org.eclipse.javaDevelopment">
+ </defaultEnablement>
+ <defaultEnablement
+ id="org.eclipse.debugging">
+ </defaultEnablement>
+ <defaultEnablement
+ id="org.eclipse.plugInDevelopment">
+ </defaultEnablement>
+ </extension>
+ <extension
+ point="org.eclipse.ui.newWizards">
+ <primaryWizard
+ id="org.eclipse.jdt.ui.wizards.JavaProjectWizard">
+ </primaryWizard>
+ <primaryWizard
+ id="org.eclipse.pde.ui.NewProjectWizard">
+ </primaryWizard>
+ <primaryWizard
+ id="org.eclipse.jdt.ui.wizards.NewClassCreationWizard">
+ </primaryWizard>
+ <primaryWizard
+ id="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard">
+ </primaryWizard>
+ <primaryWizard
+ id="org.eclipse.pde.ui.NewSchemaFileWizard">
+ </primaryWizard>
+ </extension>
+
+</plugin>
