Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2010-04-19 13:13:18 -0400
committerkmoore2010-04-19 13:13:18 -0400
commitf923879f1cde079a0c63172227c5b4995a6b7bb1 (patch)
tree0fb99319badfeb9ed41a5617523418c92f72f3ea /jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle
parent8893618a739cc8c20e2ce44febb4a7d065f061f8 (diff)
downloadwebtools.dali-f923879f1cde079a0c63172227c5b4995a6b7bb1.tar.gz
webtools.dali-f923879f1cde079a0c63172227c5b4995a6b7bb1.tar.xz
webtools.dali-f923879f1cde079a0c63172227c5b4995a6b7bb1.zip
cleaned up license and .properties files
Diffstat (limited to 'jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle')
-rw-r--r--jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/about.properties4
-rw-r--r--jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/license.html15
-rw-r--r--jpa/features/org.eclipse.jpt.feature/sourceTemplateBundle/plugin.properties2
3 files changed, 12 insertions, 9 deletions
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

Back to the top