From f923879f1cde079a0c63172227c5b4995a6b7bb1 Mon Sep 17 00:00:00 2001
From: kmoore
Date: Mon, 19 Apr 2010 17:13:18 +0000
Subject: cleaned up license and .properties files

---
 .../feature.properties                                    |  4 ++--
 .../sourceTemplateBundle/about.properties                 |  4 ++--
 .../sourceTemplateBundle/license.html                     | 15 +++++++++------
 .../sourceTemplateBundle/plugin.properties                |  4 ++--
 .../sourceTemplateFeature/feature.properties              |  6 +++---
 .../sourceTemplateFeature/license.html                    | 14 +++++++++-----
 .../sourceTemplatePlugin/about.properties                 |  4 ++--
 .../sourceTemplatePlugin/license.html                     | 15 +++++++++------
 .../sourceTemplatePlugin/plugin.properties                |  2 +-
 .../feature.properties                                    |  4 ++--
 jpa/features/org.eclipse.jpt.feature/feature.properties   |  4 ++--
 .../sourceTemplateBundle/about.properties                 |  4 ++--
 .../sourceTemplateBundle/license.html                     | 15 +++++++++------
 .../sourceTemplateBundle/plugin.properties                |  2 +-
 .../sourceTemplateFeature/feature.properties              |  6 +++---
 .../sourceTemplateFeature/license.html                    | 14 +++++++++-----
 .../sourceTemplatePlugin/about.properties                 |  6 +++---
 .../sourceTemplatePlugin/license.html                     | 15 +++++++++------
 .../sourceTemplatePlugin/plugin.properties                |  4 ++--
 .../org.eclipse.jpt.tests.feature/feature.properties      |  6 +++---
 .../org.eclipse.jpt_sdk.feature/feature.properties        |  6 +++---
 21 files changed, 87 insertions(+), 67 deletions(-)

(limited to 'jpa/features')

diff --git a/jpa/features/org.eclipse.jpt.eclipselink.feature/feature.properties b/jpa/features/org.eclipse.jpt.eclipselink.feature/feature.properties
index 33bfbe4943..4bf1005e44 100644
--- a/jpa/features/org.eclipse.jpt.eclipselink.feature/feature.properties
+++ b/jpa/features/org.eclipse.jpt.eclipselink.feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006 Oracle.
+# Copyright (c) 2006, 2010 Oracle.
 # 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
@@ -23,7 +23,7 @@ description=Dali Java Persistence Tools - EclipseLink Support
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2006, 2009 Oracle Corporation.\n\
+Copyright (c) 2006, 2010 Oracle Corporation.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateBundle/about.properties b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateBundle/about.properties
index 50c0a9ef9c..cb59e5f914 100644
--- a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateBundle/about.properties
+++ b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateBundle/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008 Oracle.
+# Copyright (c) 2008, 2010 Oracle.
 # 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
@@ -16,7 +16,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Java Persistence API Tools - EclipseLink Support Source\n\
+blurb=Dali Java Persistence Tools - EclipseLink Support Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateBundle/license.html b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateBundle/license.html
index 14b1d50265..5ad00ba719 100644
--- a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateBundle/license.html
+++ b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateBundle/license.html
@@ -7,7 +7,7 @@
 
 <body lang="EN-US" link=blue vlink=purple>
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
+<p>March 17, 2005</p>
 
 <h3>Usage Of Content</h3>
 
@@ -29,10 +29,12 @@
    
 <ul>
 	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+
 	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
 	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
       and/or Fragments associated with that Feature.</li>
 	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+
 </ul>   
  
 <p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
@@ -41,12 +43,14 @@ including, but not limited to the following locations:</p>
 
 <ul>
 	<li>The top-level (root) directory</li>
+
 	<li>Plug-in and Fragment directories</li>
 	<li>Inside Plug-ins and Fragments packaged as JARs</li>
 	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
 	<li>Feature directories</li>
 </ul>
 		
+
 <p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
 installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
 inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
@@ -58,16 +62,14 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
 
 <ul>
 	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+
 	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
 	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
 	<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>
-  
-  <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>
+</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>
@@ -79,5 +81,6 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha
    possession, or use, and re-export of encryption software, to see if this is permitted.</p>
    
 <small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
+
 </body>
 </html>
diff --git a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateBundle/plugin.properties b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateBundle/plugin.properties
index 0944451417..262082f5ee 100644
--- a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateBundle/plugin.properties
+++ b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateBundle/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008 Oracle.
+# Copyright (c) 2008, 2010 Oracle.
 # 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
@@ -9,5 +9,5 @@
 #     Oracle. - initial API and implementation
 ###############################################################################
 
-pluginName = Java Persistence API Tools - EclipseLink Support
+pluginName = Dali Java Persistence Tools - EclipseLink Support
 providerName = Eclipse Web Tools Platform
diff --git a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateFeature/feature.properties b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateFeature/feature.properties
index 3eab125085..cd933cc089 100644
--- a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateFeature/feature.properties
+++ b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008 Oracle.
+# Copyright (c) 2008, 2010 Oracle.
 # 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
@@ -24,11 +24,11 @@ providerName=Eclipse Web Tools Platform
 updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
 
 # "description" property - description of the feature
-description=Source code zips for JPA EclipseLink Support
+description=Source code zips for Dali Java Persistence Tools EclipseLink Support
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2006, 2008 Oracle Corporation.\n\
+Copyright (c) 2006, 2010 Oracle Corporation.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateFeature/license.html b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateFeature/license.html
index fec4a489ad..5ad00ba719 100644
--- a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateFeature/license.html
+++ b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateFeature/license.html
@@ -7,7 +7,7 @@
 
 <body lang="EN-US" link=blue vlink=purple>
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
+<p>March 17, 2005</p>
 
 <h3>Usage Of Content</h3>
 
@@ -29,10 +29,12 @@
    
 <ul>
 	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+
 	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
 	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
       and/or Fragments associated with that Feature.</li>
 	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+
 </ul>   
  
 <p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
@@ -41,12 +43,14 @@ including, but not limited to the following locations:</p>
 
 <ul>
 	<li>The top-level (root) directory</li>
+
 	<li>Plug-in and Fragment directories</li>
 	<li>Inside Plug-ins and Fragments packaged as JARs</li>
 	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
 	<li>Feature directories</li>
 </ul>
 		
+
 <p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
 installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
 inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
@@ -58,15 +62,14 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
 
 <ul>
 	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+
 	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
 	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
 	<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>
-  <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>
+</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>
@@ -78,5 +81,6 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha
    possession, or use, and re-export of encryption software, to see if this is permitted.</p>
    
 <small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
+
 </body>
 </html>
diff --git a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplatePlugin/about.properties b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplatePlugin/about.properties
index 50c0a9ef9c..cb59e5f914 100644
--- a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplatePlugin/about.properties
+++ b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008 Oracle.
+# Copyright (c) 2008, 2010 Oracle.
 # 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
@@ -16,7 +16,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Java Persistence API Tools - EclipseLink Support Source\n\
+blurb=Dali Java Persistence Tools - EclipseLink Support Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplatePlugin/license.html b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplatePlugin/license.html
index 14b1d50265..5ad00ba719 100644
--- a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplatePlugin/license.html
+++ b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplatePlugin/license.html
@@ -7,7 +7,7 @@
 
 <body lang="EN-US" link=blue vlink=purple>
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
+<p>March 17, 2005</p>
 
 <h3>Usage Of Content</h3>
 
@@ -29,10 +29,12 @@
    
 <ul>
 	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+
 	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
 	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
       and/or Fragments associated with that Feature.</li>
 	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+
 </ul>   
  
 <p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
@@ -41,12 +43,14 @@ including, but not limited to the following locations:</p>
 
 <ul>
 	<li>The top-level (root) directory</li>
+
 	<li>Plug-in and Fragment directories</li>
 	<li>Inside Plug-ins and Fragments packaged as JARs</li>
 	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
 	<li>Feature directories</li>
 </ul>
 		
+
 <p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
 installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
 inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
@@ -58,16 +62,14 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
 
 <ul>
 	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+
 	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
 	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
 	<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>
-  
-  <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>
+</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>
@@ -79,5 +81,6 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha
    possession, or use, and re-export of encryption software, to see if this is permitted.</p>
    
 <small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
+
 </body>
 </html>
diff --git a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplatePlugin/plugin.properties b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplatePlugin/plugin.properties
index 7d85f17b97..262082f5ee 100644
--- a/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplatePlugin/plugin.properties
+++ b/jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplatePlugin/plugin.properties
@@ -9,5 +9,5 @@
 #     Oracle. - initial API and implementation
 ###############################################################################
 
-pluginName = Java Persistence API Tools - EclipseLink Support
+pluginName = Dali Java Persistence Tools - EclipseLink Support
 providerName = Eclipse Web Tools Platform
diff --git a/jpa/features/org.eclipse.jpt.eclipselink_sdk.feature/feature.properties b/jpa/features/org.eclipse.jpt.eclipselink_sdk.feature/feature.properties
index 2e4d3b9de1..d46d2b0533 100644
--- a/jpa/features/org.eclipse.jpt.eclipselink_sdk.feature/feature.properties
+++ b/jpa/features/org.eclipse.jpt.eclipselink_sdk.feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Oracle.
+# Copyright (c) 2006, 2010 Oracle.
 # 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
@@ -23,7 +23,7 @@ description=Source code archives for Dali Java Persistence - EclipseLink Support
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2006-09 Oracle Corporation.\n\
+Copyright (c) 2006, 2010 Oracle Corporation.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/jpa/features/org.eclipse.jpt.feature/feature.properties b/jpa/features/org.eclipse.jpt.feature/feature.properties
index 725fb6d19d..5e4db2622a 100644
--- a/jpa/features/org.eclipse.jpt.feature/feature.properties
+++ b/jpa/features/org.eclipse.jpt.feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2009 Oracle.
+# Copyright (c) 2006, 2010 Oracle.
 # 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
@@ -23,7 +23,7 @@ description=Dali Java Persistence Tools
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2006, 2009 Oracle Corporation.\n\
+Copyright (c) 2006, 2010 Oracle Corporation.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/about.properties b/jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/about.properties
index 15417ff15a..20288ae9d9 100644
--- a/jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/about.properties
+++ b/jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Oracle.
+# Copyright (c) 2006, 2010 Oracle.
 # 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
@@ -16,7 +16,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Dali Java Persistence API (JPA) Tools Source\n\
+blurb=Dali Java Persistence Tools Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/license.html b/jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/license.html
index 14b1d50265..5ad00ba719 100644
--- a/jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/license.html
+++ b/jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/license.html
@@ -7,7 +7,7 @@
 
 <body lang="EN-US" link=blue vlink=purple>
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
+<p>March 17, 2005</p>
 
 <h3>Usage Of Content</h3>
 
@@ -29,10 +29,12 @@
    
 <ul>
 	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+
 	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
 	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
       and/or Fragments associated with that Feature.</li>
 	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+
 </ul>   
  
 <p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
@@ -41,12 +43,14 @@ including, but not limited to the following locations:</p>
 
 <ul>
 	<li>The top-level (root) directory</li>
+
 	<li>Plug-in and Fragment directories</li>
 	<li>Inside Plug-ins and Fragments packaged as JARs</li>
 	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
 	<li>Feature directories</li>
 </ul>
 		
+
 <p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
 installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
 inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
@@ -58,16 +62,14 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
 
 <ul>
 	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+
 	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
 	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
 	<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>
-  
-  <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>
+</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>
@@ -79,5 +81,6 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha
    possession, or use, and re-export of encryption software, to see if this is permitted.</p>
    
 <small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
+
 </body>
 </html>
diff --git a/jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/plugin.properties b/jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/plugin.properties
index 2a1f5c2130..c07594d901 100644
--- a/jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/plugin.properties
+++ b/jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/plugin.properties
@@ -9,5 +9,5 @@
 #     Oracle - initial API and implementation
 ###############################################################################
 
-pluginName = Dali Java Persistence API (JPA) Tools
+pluginName = Dali Java Persistence Tools
 providerName = Eclipse Web Tools Platform
diff --git a/jpa/features/org.eclipse.jpt.feature/sourceTemplateFeature/feature.properties b/jpa/features/org.eclipse.jpt.feature/sourceTemplateFeature/feature.properties
index 215a046c43..8b03470580 100644
--- a/jpa/features/org.eclipse.jpt.feature/sourceTemplateFeature/feature.properties
+++ b/jpa/features/org.eclipse.jpt.feature/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Oracle.
+# Copyright (c) 2006, 2010 Oracle.
 # 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
@@ -24,11 +24,11 @@ providerName=Eclipse Web Tools Platform
 updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
 
 # "description" property - description of the feature
-description=Dali Java Persistence API (JPA) Tools
+description=Source code zips for Dali Java Persistence Tools
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2006 2008 Oracle Corporation.\n\
+Copyright (c) 2006, 2010 Oracle Corporation.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/jpa/features/org.eclipse.jpt.feature/sourceTemplateFeature/license.html b/jpa/features/org.eclipse.jpt.feature/sourceTemplateFeature/license.html
index fec4a489ad..5ad00ba719 100644
--- a/jpa/features/org.eclipse.jpt.feature/sourceTemplateFeature/license.html
+++ b/jpa/features/org.eclipse.jpt.feature/sourceTemplateFeature/license.html
@@ -7,7 +7,7 @@
 
 <body lang="EN-US" link=blue vlink=purple>
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
+<p>March 17, 2005</p>
 
 <h3>Usage Of Content</h3>
 
@@ -29,10 +29,12 @@
    
 <ul>
 	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+
 	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
 	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
       and/or Fragments associated with that Feature.</li>
 	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+
 </ul>   
  
 <p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
@@ -41,12 +43,14 @@ including, but not limited to the following locations:</p>
 
 <ul>
 	<li>The top-level (root) directory</li>
+
 	<li>Plug-in and Fragment directories</li>
 	<li>Inside Plug-ins and Fragments packaged as JARs</li>
 	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
 	<li>Feature directories</li>
 </ul>
 		
+
 <p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
 installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
 inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
@@ -58,15 +62,14 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
 
 <ul>
 	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+
 	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
 	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
 	<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>
-  <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>
+</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>
@@ -78,5 +81,6 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha
    possession, or use, and re-export of encryption software, to see if this is permitted.</p>
    
 <small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
+
 </body>
 </html>
diff --git a/jpa/features/org.eclipse.jpt.feature/sourceTemplatePlugin/about.properties b/jpa/features/org.eclipse.jpt.feature/sourceTemplatePlugin/about.properties
index 15417ff15a..021634dd5c 100644
--- a/jpa/features/org.eclipse.jpt.feature/sourceTemplatePlugin/about.properties
+++ b/jpa/features/org.eclipse.jpt.feature/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Oracle.
+# Copyright (c) 2006, 2010 Oracle.
 # 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
@@ -16,11 +16,11 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Dali Java Persistence API (JPA) Tools Source\n\
+blurb=Dali Java Persistence Tools Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others 2008.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2008, 2010.  All rights reserved.\n\
 Visit http://www.eclipse.org/webtools
 
diff --git a/jpa/features/org.eclipse.jpt.feature/sourceTemplatePlugin/license.html b/jpa/features/org.eclipse.jpt.feature/sourceTemplatePlugin/license.html
index 14b1d50265..5ad00ba719 100644
--- a/jpa/features/org.eclipse.jpt.feature/sourceTemplatePlugin/license.html
+++ b/jpa/features/org.eclipse.jpt.feature/sourceTemplatePlugin/license.html
@@ -7,7 +7,7 @@
 
 <body lang="EN-US" link=blue vlink=purple>
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
+<p>March 17, 2005</p>
 
 <h3>Usage Of Content</h3>
 
@@ -29,10 +29,12 @@
    
 <ul>
 	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+
 	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
 	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
       and/or Fragments associated with that Feature.</li>
 	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+
 </ul>   
  
 <p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
@@ -41,12 +43,14 @@ including, but not limited to the following locations:</p>
 
 <ul>
 	<li>The top-level (root) directory</li>
+
 	<li>Plug-in and Fragment directories</li>
 	<li>Inside Plug-ins and Fragments packaged as JARs</li>
 	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
 	<li>Feature directories</li>
 </ul>
 		
+
 <p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
 installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
 inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
@@ -58,16 +62,14 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
 
 <ul>
 	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+
 	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
 	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
 	<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>
-  
-  <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>
+</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>
@@ -79,5 +81,6 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha
    possession, or use, and re-export of encryption software, to see if this is permitted.</p>
    
 <small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
+
 </body>
 </html>
diff --git a/jpa/features/org.eclipse.jpt.feature/sourceTemplatePlugin/plugin.properties b/jpa/features/org.eclipse.jpt.feature/sourceTemplatePlugin/plugin.properties
index d88e795de1..c07594d901 100644
--- a/jpa/features/org.eclipse.jpt.feature/sourceTemplatePlugin/plugin.properties
+++ b/jpa/features/org.eclipse.jpt.feature/sourceTemplatePlugin/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Oracle.
+# Copyright (c) 2006, 2010 Oracle.
 # 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
@@ -9,5 +9,5 @@
 #     Oracle - initial API and implementation
 ###############################################################################
 
-pluginName = Dali Java Persistence API (JPA) Tools
+pluginName = Dali Java Persistence Tools
 providerName = Eclipse Web Tools Platform
diff --git a/jpa/features/org.eclipse.jpt.tests.feature/feature.properties b/jpa/features/org.eclipse.jpt.tests.feature/feature.properties
index 18dc44dedf..0c64bc6957 100644
--- a/jpa/features/org.eclipse.jpt.tests.feature/feature.properties
+++ b/jpa/features/org.eclipse.jpt.tests.feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006 Oracle.
+# Copyright (c) 2006, 2010 Oracle.
 # 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
@@ -25,11 +25,11 @@ providerName=Eclipse Web Tools Platform
 updateSiteName=Web Tools Platform (WTP) Updates
 
 # "description" property - description of the feature
-description=Dali Java Persistence Tools Tools
+description=Dali Java Persistence Tools Tests
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2006 Oracle Corporation.\n\
+Copyright (c) 2006, 2010 Oracle Corporation.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/jpa/features/org.eclipse.jpt_sdk.feature/feature.properties b/jpa/features/org.eclipse.jpt_sdk.feature/feature.properties
index 66b0d56f23..bbb19fe439 100644
--- a/jpa/features/org.eclipse.jpt_sdk.feature/feature.properties
+++ b/jpa/features/org.eclipse.jpt_sdk.feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006 Oracle.
+# Copyright (c) 2006, 2010 Oracle.
 # 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
@@ -10,7 +10,7 @@
 ###############################################################################
 
 # "featureName" property - name of the feature
-featureName=Dali Java Persistence Tools Plug-in SDK
+featureName=Dali Java Persistence Tools SDK
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse Web Tools Platform
@@ -23,7 +23,7 @@ description=Source code archives for Dali Java Persistence Tools
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2006-09 Oracle Corporation.\n\
+Copyright (c) 2006, 2010 Oracle Corporation.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
-- 
cgit v1.2.3