190714 - license updates
diff --git a/features/org.eclipse.jst.jsf.doc.feature/feature.properties b/features/org.eclipse.jst.jsf.doc.feature/feature.properties index 8d45305..3cf9784 100644 --- a/features/org.eclipse.jst.jsf.doc.feature/feature.properties +++ b/features/org.eclipse.jst.jsf.doc.feature/feature.properties
@@ -46,7 +46,7 @@ # should be plain text version of license agreement pointed to be "licenseURL" license=\ ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ -March 17, 2005\n\ +June 06, 2007\n\ \n\ Usage Of Content\n\ \n\ @@ -125,6 +125,7 @@ - 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 Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.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\
diff --git a/features/org.eclipse.jst.jsf.doc.feature/license.html b/features/org.eclipse.jst.jsf.doc.feature/license.html index 99a8d0e..5644598 100644 --- a/features/org.eclipse.jst.jsf.doc.feature/license.html +++ b/features/org.eclipse.jst.jsf.doc.feature/license.html
@@ -79,7 +79,12 @@ <LI>Mozilla Public License Version 1.1 (available at <A href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) - </LI></UL> + </LI> + + <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A + href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A> + </LI> +</UL> <P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and