Adding JAX-WS Tools Developer Documentation
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tocreference.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/tocreference.xml
index 84fd4c4..aca2472 100755
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tocreference.xml
+++ b/docs/org.eclipse.jst.ws.cxf.doc.user/tocreference.xml
@@ -7,9 +7,8 @@
         <topic label="WSDL2Java" href="reference/wsdl2java_tab.html"/>
         <topic label="JAX-WS" href="reference/jaxws_tab.html"/>
         <topic label="Endpoint Config" href="reference/endpoint_config_tab.html"/>
-        <topic href="reference/server_runtime.html" label="Server and runtime">
-        </topic>
+        <topic label="Server and runtime" href="reference/server_runtime.html"/>
     </topic>
- <topic href="reference/cxf_facet.html" label="CXF Project Facet">
+    <topic href="reference/cxf_facet.html" label="CXF Project Facet">
  </topic>
 </toc>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.user/tocreference.xml b/docs/org.eclipse.jst.ws.jaxws.doc.user/tocreference.xml
index fd0a1c9..12a7594 100755
--- a/docs/org.eclipse.jst.ws.jaxws.doc.user/tocreference.xml
+++ b/docs/org.eclipse.jst.ws.jaxws.doc.user/tocreference.xml
@@ -3,8 +3,14 @@
 
 <toc label="Reference" link_to="toc.xml#reference">
    <link toc="../org.eclipse.jst.ws.cxf.doc.user/tocreference.xml"/>
-   <topic href="reference/annotation_processors.html" label="Annotation Validation">
+   <topic href="reference/annotation_processors.html" label="Annotation Validation"/>
+   <topic href="reference/annotation_view.html" label="Annotation Properties View"/>
+   <topic label="Developer Documentation">
+      <topic label="API Reference">
+         <anchor id="api_reference"/>
+      </topic>
+      <topic label="Extension Points Reference">
+         <anchor id="extension_points_reference"/>
+      </topic>
    </topic>
-   <topic href="reference/annotation_view.html" label="Annotation Properties View">
-   </topic> 
 </toc>
diff --git a/features/org.eclipse.jst.ws.cxf.feature/feature.properties b/features/org.eclipse.jst.ws.cxf.feature/feature.properties
index 9725b1e..650bcca 100644
--- a/features/org.eclipse.jst.ws.cxf.feature/feature.properties
+++ b/features/org.eclipse.jst.ws.cxf.feature/feature.properties
@@ -40,7 +40,7 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties
index 8b2d0a2..8f5f2d7 100644
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties
@@ -40,12 +40,12 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+Eclipse Foundation Software User Agreement\n\
 March 17, 2005\n\
 \n\
 Usage Of Content\n\
@@ -54,20 +54,20 @@
 OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
 USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
 AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
 AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
 AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
 TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
 OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
 BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
@@ -75,21 +75,17 @@
 repository ("Repository") in CVS modules ("Modules") and made available\n\
 as downloadable archives ("Downloads").\n\
 \n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+	- Content may be structured and packaged into modules to facilitate delivering,\n\
+	  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+	  plug-in fragments ("Fragments"), and features ("Features").\n\
+	- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+	  in a directory named "plugins".\n\
+	- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+	  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+	  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+	  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+	- Features may also include other Features ("Included Features"). Within a Feature, files\n\
+	  named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
 \n\
 The terms and conditions governing Plug-ins and Fragments should be\n\
 contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -98,11 +94,11 @@
 Licenses may be located in any directory of a Download or Module\n\
 including, but not limited to the following locations:\n\
 \n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
+	- The top-level (root) directory\n\
+	- Plug-in and Fragment directories\n\
+	- Inside Plug-ins and Fragments packaged as JARs\n\
+	- Sub-directories of the directory named "src" of certain Plug-ins\n\
+	- Feature directories\n\
 \n\
 Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
 Eclipse Update Manager, you must agree to a license ("Feature Update\n\
@@ -110,24 +106,24 @@
 Included Features, the Feature Update License should either provide you\n\
 with the terms and conditions governing the Included Features or inform\n\
 you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
 \n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
 TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+	- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+	- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+	- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+	- IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+	- Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+	- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
 \n\
 IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
 is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
 govern that particular Content.\n\
 \n\
@@ -137,8 +133,8 @@
 currently may have restrictions on the import, possession, and use,\n\
 and/or re-export to another country, of encryption software. BEFORE\n\
 using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
 \n\
 Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
 ########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.properties b/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.properties
index 3034433..4bdefc5 100644
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.properties
+++ b/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.properties
@@ -40,7 +40,7 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
diff --git a/features/org.eclipse.jst.ws.cxf_tests.feature/feature.properties b/features/org.eclipse.jst.ws.cxf_tests.feature/feature.properties
index 0698ebd..7a5502b 100644
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/feature.properties
+++ b/features/org.eclipse.jst.ws.cxf_tests.feature/feature.properties
@@ -40,7 +40,7 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.properties
index 7a77483..05dce90 100644
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.properties
+++ b/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.properties
@@ -40,7 +40,7 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/feature.properties
index d7bee3d..9add074 100644
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/feature.properties
@@ -40,12 +40,12 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+Eclipse Foundation Software User Agreement\n\
 March 17, 2005\n\
 \n\
 Usage Of Content\n\
@@ -54,20 +54,20 @@
 OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
 USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
 AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
 AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
 AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
 TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
 OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
 BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
@@ -75,21 +75,17 @@
 repository ("Repository") in CVS modules ("Modules") and made available\n\
 as downloadable archives ("Downloads").\n\
 \n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+	- Content may be structured and packaged into modules to facilitate delivering,\n\
+	  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+	  plug-in fragments ("Fragments"), and features ("Features").\n\
+	- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+	  in a directory named "plugins".\n\
+	- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+	  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+	  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+	  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+	- Features may also include other Features ("Included Features"). Within a Feature, files\n\
+	  named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
 \n\
 The terms and conditions governing Plug-ins and Fragments should be\n\
 contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -98,11 +94,11 @@
 Licenses may be located in any directory of a Download or Module\n\
 including, but not limited to the following locations:\n\
 \n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
+	- The top-level (root) directory\n\
+	- Plug-in and Fragment directories\n\
+	- Inside Plug-ins and Fragments packaged as JARs\n\
+	- Sub-directories of the directory named "src" of certain Plug-ins\n\
+	- Feature directories\n\
 \n\
 Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
 Eclipse Update Manager, you must agree to a license ("Feature Update\n\
@@ -110,24 +106,24 @@
 Included Features, the Feature Update License should either provide you\n\
 with the terms and conditions governing the Included Features or inform\n\
 you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
 \n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
 TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+	- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+	- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+	- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+	- IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+	- Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+	- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
 \n\
 IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
 is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
 govern that particular Content.\n\
 \n\
@@ -137,8 +133,8 @@
 currently may have restrictions on the import, possession, and use,\n\
 and/or re-export to another country, of encryption software. BEFORE\n\
 using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
 \n\
 Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
 ########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.properties
index 2b87b60..94b4732 100644
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.properties
+++ b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.properties
@@ -40,7 +40,7 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml
index 00ea6fd..812976f 100644
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml
+++ b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml
@@ -30,4 +30,10 @@
          id="org.eclipse.jst.ws.jaxws.dom.feature.source"
          version="0.0.0"/>
 
+   <plugin
+         id="org.eclipse.jst.ws.jaxws.dom.doc.isv"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.properties
index 0073048..64e2fde 100644
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.properties
+++ b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.properties
@@ -40,7 +40,7 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws.feature/feature.properties
index 763ba2c..fb976bc 100644
--- a/features/org.eclipse.jst.ws.jaxws.feature/feature.properties
+++ b/features/org.eclipse.jst.ws.jaxws.feature/feature.properties
@@ -40,7 +40,7 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties
index 99e830d..5b498ad 100644
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties
@@ -40,12 +40,12 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+Eclipse Foundation Software User Agreement\n\
 March 17, 2005\n\
 \n\
 Usage Of Content\n\
@@ -54,20 +54,20 @@
 OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
 USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
 AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
 AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
 AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
 TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
 OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
 BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
@@ -75,21 +75,17 @@
 repository ("Repository") in CVS modules ("Modules") and made available\n\
 as downloadable archives ("Downloads").\n\
 \n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+	- Content may be structured and packaged into modules to facilitate delivering,\n\
+	  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+	  plug-in fragments ("Fragments"), and features ("Features").\n\
+	- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+	  in a directory named "plugins".\n\
+	- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+	  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+	  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+	  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+	- Features may also include other Features ("Included Features"). Within a Feature, files\n\
+	  named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
 \n\
 The terms and conditions governing Plug-ins and Fragments should be\n\
 contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -98,11 +94,11 @@
 Licenses may be located in any directory of a Download or Module\n\
 including, but not limited to the following locations:\n\
 \n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
+	- The top-level (root) directory\n\
+	- Plug-in and Fragment directories\n\
+	- Inside Plug-ins and Fragments packaged as JARs\n\
+	- Sub-directories of the directory named "src" of certain Plug-ins\n\
+	- Feature directories\n\
 \n\
 Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
 Eclipse Update Manager, you must agree to a license ("Feature Update\n\
@@ -110,24 +106,24 @@
 Included Features, the Feature Update License should either provide you\n\
 with the terms and conditions governing the Included Features or inform\n\
 you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
 \n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
 TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+	- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+	- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+	- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+	- IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+	- Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+	- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
 \n\
 IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
 is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
 govern that particular Content.\n\
 \n\
@@ -137,8 +133,8 @@
 currently may have restrictions on the import, possession, and use,\n\
 and/or re-export to another country, of encryption software. BEFORE\n\
 using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
 \n\
 Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
 ########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.properties
index ec56143..c7582cd 100644
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.properties
+++ b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.properties
@@ -40,7 +40,7 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
index fa079ee..3bb85ae 100644
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
+++ b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
@@ -30,4 +30,10 @@
          id="org.eclipse.jst.ws.jaxws.feature.source"
          version="0.0.0"/>
 
+   <plugin
+         id="org.eclipse.jst.ws.jaxws.doc.isv"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.properties
index 4399f66..a033bc3 100644
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.properties
+++ b/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.properties
@@ -40,7 +40,7 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
diff --git a/features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.properties
index 1f9018b..c7e9765 100644
--- a/features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.properties
+++ b/features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.properties
@@ -40,7 +40,7 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"