From ef62ccfff44b353b37fdaa7d583ad4ce6f77afd4 Mon Sep 17 00:00:00 2001
From: tle
Date: Mon, 4 Jun 2007 19:22:29 +0000
Subject: 190714 CDDL should be added to feature license files and copyright to
 feature.properties

---
 assembly/features/org.eclipse.jpt.sdk/feature.properties   | 3 ++-
 assembly/features/org.eclipse.jpt.sdk/license.html         | 7 ++++++-
 assembly/features/org.eclipse.jpt.tests/feature.properties | 3 ++-
 assembly/features/org.eclipse.jpt.tests/license.html       | 7 ++++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'assembly')

diff --git a/assembly/features/org.eclipse.jpt.sdk/feature.properties b/assembly/features/org.eclipse.jpt.sdk/feature.properties
index fe3c0c8494..abb0c88d62 100644
--- a/assembly/features/org.eclipse.jpt.sdk/feature.properties
+++ b/assembly/features/org.eclipse.jpt.sdk/feature.properties
@@ -46,7 +46,7 @@ licenseURL=license.html
 # 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 @@ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\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 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/assembly/features/org.eclipse.jpt.sdk/license.html b/assembly/features/org.eclipse.jpt.sdk/license.html
index 99a8d0e362..76abfb4621 100644
--- a/assembly/features/org.eclipse.jpt.sdk/license.html
+++ b/assembly/features/org.eclipse.jpt.sdk/license.html
@@ -79,7 +79,12 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
 
   <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/assembly/features/org.eclipse.jpt.tests/feature.properties b/assembly/features/org.eclipse.jpt.tests/feature.properties
index 132bef1c24..6b58fe6a33 100644
--- a/assembly/features/org.eclipse.jpt.tests/feature.properties
+++ b/assembly/features/org.eclipse.jpt.tests/feature.properties
@@ -46,7 +46,7 @@ licenseURL=license.html
 # 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 @@ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\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 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/assembly/features/org.eclipse.jpt.tests/license.html b/assembly/features/org.eclipse.jpt.tests/license.html
index 99a8d0e362..56445985d9 100644
--- a/assembly/features/org.eclipse.jpt.tests/license.html
+++ b/assembly/features/org.eclipse.jpt.tests/license.html
@@ -79,7 +79,12 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
 
   <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 
-- 
cgit v1.2.1