Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-05-18 05:47:21 +0000
committerEike Stepper2011-05-18 05:47:21 +0000
commitc69edaf0b39e96f7d8015d5761e1cdf1e331bd9d (patch)
tree1ca7590f506f181b83d82635fe35cae2c87d2d79 /features
parentbe6391edde60a9f3450d6682d65576bf5873ff95 (diff)
downloadcdo-c69edaf0b39e96f7d8015d5761e1cdf1e331bd9d.tar.gz
cdo-c69edaf0b39e96f7d8015d5761e1cdf1e331bd9d.tar.xz
cdo-c69edaf0b39e96f7d8015d5761e1cdf1e331bd9d.zip
use shared license
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.emf.cdo.license-feature/feature.properties17
-rw-r--r--features/org.eclipse.emf.cdo.license-feature/feature.xml8
2 files changed, 12 insertions, 13 deletions
diff --git a/features/org.eclipse.emf.cdo.license-feature/feature.properties b/features/org.eclipse.emf.cdo.license-feature/feature.properties
index 6695a516cb..68116fdd4f 100644
--- a/features/org.eclipse.emf.cdo.license-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.license-feature/feature.properties
@@ -1,11 +1,15 @@
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
+providerName = Eclipse Modeling Project
+updateSiteName = Eclipse Modeling Project Updates
+
+copyrightURL = copyright.txt
+copyright = Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\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\
+http://www.eclipse.org/legal/epl-v10.html\n\
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
+licenseURL=license.html
Eclipse Foundation Software User Agreement\n\
February 1, 2011\n\
\n\
@@ -129,4 +133,3 @@ regulations and policies concerning the import, possession, or use, and\n\
re-export of encryption software, to see if this is permitted.\n\
\n\
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.emf.cdo.license-feature/feature.xml b/features/org.eclipse.emf.cdo.license-feature/feature.xml
index 04b7dafb61..9db1b7cd6b 100644
--- a/features/org.eclipse.emf.cdo.license-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.license-feature/feature.xml
@@ -10,12 +10,8 @@
Contains the shared license for all CDO and Net4j features.
</description>
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- Copyright (c) 2011 Kenn Hussey and others.
-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
-http://www.eclipse.org/legal/epl-v10.html
+ <copyright url="%copyrightURL">
+ %copyright
</copyright>
<license url="%licenseURL">

Back to the top