4 files changed, 90 insertions, 36 deletions
diff --git a/org.eclipse.debug.core/schema/launchConfigurationTypes.exsd b/org.eclipse.debug.core/schema/launchConfigurationTypes.exsd
index 150cc2253..d63f389a2 100644
--- a/org.eclipse.debug.core/schema/launchConfigurationTypes.exsd
+++ b/org.eclipse.debug.core/schema/launchConfigurationTypes.exsd
@@ -60,21 +60,21 @@ As of 3.2 the types can also define a migration delegate that can be used to set
                </documentation>
             </annotation>
          </attribute>
-         <attribute name="delegate" type="string" use="required">
+         <attribute name="delegate" type="string">
             <annotation>
                <documentation>
                   specifies the fully qualified name of the Java class that implements &lt;code&gt;ILaunchConfigurationDelegate&lt;/code&gt;.
-Launch configuration instances of this type will delegate to instances of this class to perform launching.
+Launch configuration instances of this type will delegate to instances of this class to perform launching. Launch delegates can also be contributed for a launch configuration type via the &lt;code&gt;launchDelegates&lt;/code&gt; extension.
                </documentation>
                <appInfo>
                   <meta.attribute kind="java" basedOn="org.eclipse.debug.core.model.ILaunchConfigurationDelegate"/>
                </appInfo>
             </annotation>
          </attribute>
-         <attribute name="modes" type="string" use="required">
+         <attribute name="modes" type="string">
             <annotation>
                <documentation>
-                  specifies a comma-separated list of the modes this type of lauch configuration supports - &quot;run&quot; and/or &quot;debug&quot;.
+                  specifies a comma-separated list of the modes this type of lauch configuration supports - &quot;run&quot; and/or &quot;debug&quot;. Launch modes can also be contributed for a launch configuration type via the &lt;code&gt;launchDelegates&lt;/code&gt; extension.
                </documentation>
             </annotation>
          </attribute>
@@ -106,6 +106,8 @@ Launch configuration instances of this type will delegate to instances of this c
             <annotation>
                <documentation>
                   The unique identifier of a sourcePathComputer extension that is used to compute a default source lookup path for launch configurations of this type. This atttribute was added in the 3.0 release.
+
+With new API changes for 3.3M3 the sourcePathComputer id should be contributed via the &lt;code&gt;launchDelegates&lt;/code&gt; extension point
                </documentation>
             </annotation>
          </attribute>
@@ -113,6 +115,8 @@ Launch configuration instances of this type will delegate to instances of this c
             <annotation>
                <documentation>
                   The unique identifier of a sourceLocator extension that is used to create the source locator for sessions launched using launch configurations of this type. This atttribute was added in the 3.0 release.
+
+With new API changes for 3.3M3 the sourceLocatorId id should be contributed via the &lt;code&gt;launchDelegates&lt;/code&gt; extension point
                </documentation>
             </annotation>
          </attribute>
@@ -126,6 +130,25 @@ Launch configuration instances of this type will delegate to instances of this c
                </appInfo>
             </annotation>
          </attribute>
+         <attribute name="icon" type="string">
+            <annotation>
+               <documentation>
+                  The id of the icon for this launch configuraiton type.
+
+since 3.3
+
+&lt;p&gt;
+&lt;strong&gt;EXPERIMENTAL&lt;/strong&gt;. This element has been added as
+part of a work in progress. There is no guarantee that this API will
+remain unchanged during the 3.3 release cycle. Please do not use this API
+without consulting with the Platform/Debug team.
+&lt;/p&gt;
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="resource"/>
+               </appInfo>
+            </annotation>
+         </attribute>
       </complexType>
    </element>
 
diff --git a/org.eclipse.debug.core/schema/launchDelegates.exsd b/org.eclipse.debug.core/schema/launchDelegates.exsd
index f2771cf3a..45a428e4a 100644
--- a/org.eclipse.debug.core/schema/launchDelegates.exsd
+++ b/org.eclipse.debug.core/schema/launchDelegates.exsd
@@ -46,7 +46,7 @@
          </appInfo>
       </annotation>
       <complexType>
-         <sequence>
+         <sequence minOccurs="0" maxOccurs="unbounded">
          </sequence>
          <attribute name="id" type="string" use="required">
             <annotation>
@@ -55,6 +55,23 @@
                </documentation>
             </annotation>
          </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  A human readable name for this delegate. This attribute was added in the 3.3. release.
+
+&lt;p&gt;
+&lt;strong&gt;EXPERIMENTAL&lt;/strong&gt;. This attribute has been added as
+part of a work in progress. There is no guarantee that this API will
+remain unchanged during the 3.3 release cycle. Please do not use this API
+without consulting with the Platform/Debug team.
+&lt;/p&gt;
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
          <attribute name="delegate" type="string" use="required">
             <annotation>
                <documentation>
@@ -66,14 +83,14 @@ Launch configuration instances of this delegate&apos;s type will delegate to ins
                </appInfo>
             </annotation>
          </attribute>
-         <attribute name="modes" type="string" use="required">
+         <attribute name="modes" type="string">
             <annotation>
                <documentation>
-                  specifies a comma-separated list of the modes this lauch delegate supports.
+                  A comma-separated list of the launch modes this lauch delegate supports.
                </documentation>
             </annotation>
          </attribute>
-         <attribute name="type" type="string" use="required">
+         <attribute name="type" type="string">
             <annotation>
                <documentation>
                   identifier of an existing launch configuration type that this launch delegate is capable of launching.
@@ -94,6 +111,20 @@ Launch configuration instances of this delegate&apos;s type will delegate to ins
                </documentation>
             </annotation>
          </attribute>
+         <attribute name="options" type="string">
+            <annotation>
+               <documentation>
+                  A comma-separated list of the launch options this launch delegate supports. This attribute was added in the 3.3 release.
+
+&lt;p&gt;
+&lt;strong&gt;EXPERIMENTAL&lt;/strong&gt;. This attribute has been added as
+part of a work in progress. There is no guarantee that this API will
+remain unchanged during the 3.3 release cycle. Please do not use this API
+without consulting with the Platform/Debug team.
+&lt;/p&gt;
+               </documentation>
+            </annotation>
+         </attribute>
       </complexType>
    </element>
 
@@ -127,6 +158,23 @@ Launch configuration instances of this delegate&apos;s type will delegate to ins
 &lt;/p&gt;
 
 In the example above, the specified launch delegate is contributed to launch Java applications in profile mode.
+
+The previous example has been deprecated as of 3.3M3, but left in for brevity. See the following example for new usage.
+
+&lt;p&gt;
+&lt;pre&gt;
+&lt;extension point=&quot;org.eclipse.debug.core.launchDelegates&quot;&gt;
+      &lt;launchDelegate
+            delegate=&quot;org.eclipse.jdt.launching.JavaLaunchDelegate&quot;
+            id=&quot;org.eclipse.jdt.launching.JavaLaunchDelegate&quot;
+            type=&quot;org.eclipse.jdt.launching.localJavaApplication&quot;
+      modes=&quot;profile&quot;&gt;
+      &lt;/launchDelegate&gt;
+   &lt;/extension&gt;   
+&lt;/pre&gt;
+&lt;/p&gt;
+
+In 3.3 mode-based launching has been deprecated, and in its place we have provided launching with options. Options are contributed via the &lt;code&gt;launchOptions&lt;/code&gt; extension point and can be referenced here to describe what options your launch delegate supports. Options are further arranged in the form of expressions that can be evaluated to determine suitablility of your delegate for a variety of combinations of options.
       </documentation>
    </annotation>
 
diff --git a/org.eclipse.debug.core/schema/launchModes.exsd b/org.eclipse.debug.core/schema/launchModes.exsd
index a14503655..f9135c652 100644
--- a/org.eclipse.debug.core/schema/launchModes.exsd
+++ b/org.eclipse.debug.core/schema/launchModes.exsd
@@ -22,20 +22,6 @@
                </documentation>
             </annotation>
          </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
       </complexType>
    </element>
 
diff --git a/org.eclipse.debug.core/schema/launchOptions.exsd b/org.eclipse.debug.core/schema/launchOptions.exsd
index f9029829a..0e829c97e 100644
--- a/org.eclipse.debug.core/schema/launchOptions.exsd
+++ b/org.eclipse.debug.core/schema/launchOptions.exsd
@@ -8,6 +8,11 @@
       <documentation>
          This extension point is used to contribute launch options to the launch manager.
 Launch options are used as modifiers when executing a launch configuration.
+
+&lt;p&gt;&lt;strong&gt;EXPERIMENTAL&lt;/strong&gt;. This method has been added as
+part of a work in progress. There is no guarantee that this API will
+remain unchanged during the 3.3 release cycle. Please do not use this API
+without consulting with the Platform/Debug team.&lt;/p&gt;
       </documentation>
    </annotation>
 
@@ -67,13 +72,6 @@ Launch options are used as modifiers when executing a launch configuration.
                </documentation>
             </annotation>
          </attribute>
-         <attribute name="option" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the option itself, described as one word all lowercase e.g. debug
-               </documentation>
-            </annotation>
-         </attribute>
       </complexType>
    </element>
 
@@ -82,7 +80,7 @@ Launch options are used as modifiers when executing a launch configuration.
          <meta.section type="since"/>
       </appInfo>
       <documentation>
-         Eclipse 3.3 M2
+         3.3
       </documentation>
    </annotation>
 
@@ -95,13 +93,12 @@ Launch options are used as modifiers when executing a launch configuration.
 &lt;pre&gt;
  &lt;extension point=&quot;org.eclipse.debug.core.launchOptions&quot;&gt;
    &lt;launchOption
-       id=&quot;org.eclipse.debug.core.debug&quot;
-       label=&quot;Debug&quot;
-       option=&quot;debug&quot;&gt;
+       id=&quot;trace&quot;
+       label=&quot;Trace&quot;&gt;
    &lt;/launchOption&gt;
   &lt;/extension&gt;
 &lt;/pre&gt;
-&lt;/p&gt;   
+&lt;/p&gt;
       </documentation>
    </annotation>
 
@@ -110,7 +107,7 @@ Launch options are used as modifiers when executing a launch configuration.
          <meta.section type="apiInfo"/>
       </appInfo>
       <documentation>
-         The name of a launch option must be a human readable form, as well the option attribute must be a single word all lowercase.
+         
       </documentation>
    </annotation>
 
@@ -128,7 +125,7 @@ Launch options are used as modifiers when executing a launch configuration.
          <meta.section type="copyright"/>
       </appInfo>
       <documentation>
-         Copyright (c) 2003, 2005 IBM Corporation and others.&lt;br&gt;
+         Copyright (c) 2006 IBM Corporation and others.&lt;br&gt;
 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