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
---
.../sourceTemplateFeature/license.html | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
(limited to 'jpa/features/org.eclipse.jpt.eclipselink.feature/sourceTemplateFeature/license.html')
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 @@
Eclipse Foundation Software User Agreement
-June 06, 2007
+March 17, 2005
Usage Of Content
@@ -29,10 +29,12 @@
- Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+
- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
- 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 "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.
- Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
@@ -41,12 +43,14 @@ including, but not limited to the following locations:
- The top-level (root) directory
+
- Plug-in and Fragment directories
- Inside Plug-ins and Fragments packaged as JARs
- Sub-directories of the directory named "src" of certain Plug-ins
- Feature directories
+
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") 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 "license" property of files named "feature.properties" found within a Feature.
@@ -58,15 +62,14 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
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.
@@ -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.
Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+