fixed up license files for features
diff --git a/features/org.eclipse.jst.doc.user.feature/feature.properties b/features/org.eclipse.jst.doc.user.feature/feature.properties index f831e73..9ad20c3 100644 --- a/features/org.eclipse.jst.doc.user.feature/feature.properties +++ b/features/org.eclipse.jst.doc.user.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.doc.user.feature/license.html b/features/org.eclipse.jst.doc.user.feature/license.html index 99a8d0e..5644598 100644 --- a/features/org.eclipse.jst.doc.user.feature/license.html +++ b/features/org.eclipse.jst.doc.user.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
diff --git a/features/org.eclipse.jst.enterprise_core.feature/feature.properties b/features/org.eclipse.jst.enterprise_core.feature/feature.properties index 3841e62..cf186db 100644 --- a/features/org.eclipse.jst.enterprise_core.feature/feature.properties +++ b/features/org.eclipse.jst.enterprise_core.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.enterprise_core.feature/license.html b/features/org.eclipse.jst.enterprise_core.feature/license.html index 99a8d0e..5644598 100644 --- a/features/org.eclipse.jst.enterprise_core.feature/license.html +++ b/features/org.eclipse.jst.enterprise_core.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
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties index 111ad15..1e9f89e 100644 --- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties +++ b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/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.enterprise_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html index a200b71..fec4a48 100644 --- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html +++ b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html
@@ -63,7 +63,10 @@ <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> <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>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 conditions govern that particular Content.</p>
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties b/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties index 01f44c7..9ce770a 100644 --- a/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties +++ b/features/org.eclipse.jst.enterprise_sdk.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.enterprise_sdk.feature/license.html b/features/org.eclipse.jst.enterprise_sdk.feature/license.html index 99a8d0e..5644598 100644 --- a/features/org.eclipse.jst.enterprise_sdk.feature/license.html +++ b/features/org.eclipse.jst.enterprise_sdk.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
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature/feature.properties index fa7d5b2..c89eac6 100644 --- a/features/org.eclipse.jst.enterprise_ui.feature/feature.properties +++ b/features/org.eclipse.jst.enterprise_ui.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.enterprise_ui.feature/license.html b/features/org.eclipse.jst.enterprise_ui.feature/license.html index 99a8d0e..76abfb4 100644 --- a/features/org.eclipse.jst.enterprise_ui.feature/license.html +++ b/features/org.eclipse.jst.enterprise_ui.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
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties index 5628c5c..34dd00b 100644 --- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties +++ b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/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.enterprise_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html index a200b71..fec4a48 100644 --- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html +++ b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html
@@ -63,7 +63,10 @@ <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> <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>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 conditions govern that particular Content.</p>
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties b/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties index 6d2f0a8..18dcbf5 100644 --- a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties +++ b/features/org.eclipse.jst.enterprise_userdoc.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.enterprise_userdoc.feature/license.html b/features/org.eclipse.jst.enterprise_userdoc.feature/license.html index 99a8d0e..5644598 100644 --- a/features/org.eclipse.jst.enterprise_userdoc.feature/license.html +++ b/features/org.eclipse.jst.enterprise_userdoc.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
diff --git a/features/org.eclipse.jst.web_core.feature/feature.properties b/features/org.eclipse.jst.web_core.feature/feature.properties index cad8ae4..bf394c7 100644 --- a/features/org.eclipse.jst.web_core.feature/feature.properties +++ b/features/org.eclipse.jst.web_core.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.web_core.feature/license.html b/features/org.eclipse.jst.web_core.feature/license.html index 99a8d0e..76abfb4 100644 --- a/features/org.eclipse.jst.web_core.feature/license.html +++ b/features/org.eclipse.jst.web_core.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
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties index 5a6e376..f12c794 100644 --- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties +++ b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties
@@ -45,7 +45,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\ @@ -124,6 +124,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.web_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html index a200b71..fec4a48 100644 --- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html +++ b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html
@@ -63,7 +63,10 @@ <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> <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>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 conditions govern that particular Content.</p>
diff --git a/features/org.eclipse.jst.web_sdk.feature/feature.properties b/features/org.eclipse.jst.web_sdk.feature/feature.properties index a10d1e3..99618d6 100644 --- a/features/org.eclipse.jst.web_sdk.feature/feature.properties +++ b/features/org.eclipse.jst.web_sdk.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.web_sdk.feature/license.html b/features/org.eclipse.jst.web_sdk.feature/license.html index 99a8d0e..5644598 100644 --- a/features/org.eclipse.jst.web_sdk.feature/license.html +++ b/features/org.eclipse.jst.web_sdk.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
diff --git a/features/org.eclipse.jst.web_ui.feature/feature.properties b/features/org.eclipse.jst.web_ui.feature/feature.properties index 5d7c4c1..47e40ee 100644 --- a/features/org.eclipse.jst.web_ui.feature/feature.properties +++ b/features/org.eclipse.jst.web_ui.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.web_ui.feature/license.html b/features/org.eclipse.jst.web_ui.feature/license.html index 99a8d0e..5644598 100644 --- a/features/org.eclipse.jst.web_ui.feature/license.html +++ b/features/org.eclipse.jst.web_ui.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
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties index 6c55a0a..6b719e2 100644 --- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties +++ b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/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.web_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html index a200b71..fec4a48 100644 --- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html +++ b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html
@@ -63,7 +63,10 @@ <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> <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>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 conditions govern that particular Content.</p>