diff options
author | Thomas Watson | 2005-05-16 23:08:00 +0000 |
---|---|---|
committer | Thomas Watson | 2005-05-16 23:08:00 +0000 |
commit | d102efddf17c58b7ed584fda2e17f451ca8cd095 (patch) | |
tree | 6c30814d3dc1860cdd6c5dc4da4bf54c9c8cb197 /bundles/org.eclipse.osgi.util | |
parent | 7d4f1a53a711f337c79d988fa027f9b6eea620e5 (diff) | |
download | rt.equinox.framework-d102efddf17c58b7ed584fda2e17f451ca8cd095.tar.gz rt.equinox.framework-d102efddf17c58b7ed584fda2e17f451ca8cd095.tar.xz rt.equinox.framework-d102efddf17c58b7ed584fda2e17f451ca8cd095.zip |
Bug 90052 OSGI License Needs Clarification
- updated osgi packages with the EPL header.
- new about.html
Diffstat (limited to 'bundles/org.eclipse.osgi.util')
13 files changed, 46 insertions, 8 deletions
diff --git a/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF index 0e84708cc..8a2d0da55 100644 --- a/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF @@ -1,15 +1,18 @@ Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 Bundle-Name: %osgiUtil Bundle-SymbolicName: org.eclipse.osgi.util -Bundle-Version: 3.0.0 +Bundle-Version: 3.1.0 Bundle-Description: %osgiUtilDes Bundle-Vendor: %eclipse.org Bundle-Localization: plugin Bundle-DocUrl: http://www.eclipse.org Bundle-ContactAddress: www.eclipse.org Bundle-Copyright: %copyright -Bundle-ManifestVersion: 2 -Export-Package: org.osgi.util.measurement; specification-version=1.0, - org.osgi.util.position; specification-version=1.0, - org.osgi.util.xml; specification-version=1.0 -Import-Package: org.osgi.framework; specification-version=1.1 +Export-Package: org.osgi.util.gsm; version="1.0", + org.osgi.util.measurement; version="1.1", + org.osgi.util.mobile; version="1.0", + org.osgi.util.position; version="1.0", + org.osgi.util.xml; version="1.0" +Import-Package: org.osgi.framework; version=1.1, + org.osgi.service.condpermadmin diff --git a/bundles/org.eclipse.osgi.util/about.html b/bundles/org.eclipse.osgi.util/about.html index 6f6b96c4c..63e100397 100644 --- a/bundles/org.eclipse.osgi.util/about.html +++ b/bundles/org.eclipse.osgi.util/about.html @@ -6,8 +6,8 @@ </head> <body lang="EN-US"> <h2>About This Content</h2> - -<p>February 24, 2005</p> + +<p>May 16, 2005</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the @@ -18,5 +18,40 @@ For purposes of the EPL, "Program" will mean the Content.</p> apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p> +<h3>Third Party Content</h3> + +<p>The Content includes items that have been sourced from third parties as follows:</p> + +<p><b>OSGi Materials</b></p> + +<p>All files in the following sub-directories (and their sub-directories):</p> + +<ul> + <li>org/osgi</li> +</ul> + +<p>shall be defined as the "OSGi Materials." The OSGi Materials are:</p> + +<blockquote> +Copyright (c) 2000, 2005 +<br /><br /> +OSGi Alliance +Bishop Ranch 6<br/> +2400 Camino Ramon, Suite 375<br/> +San Ramon, CA 94583 USA +<br /><br /> +All Rights Reserved. +</blockquote> + +<p>The OSGi Materials are provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). For purposes of the EPL, "Program" will mean the OSGi Materials.</p> + +<p>Implementation of certain elements of the OSGi Materials may be subject to third party intellectual property rights, including without limitation, patent rights (such a third party may +or may not be a member of the OSGi Alliance). The OSGi Alliance is not responsible and shall not be held responsible in any manner for identifying or failing to identify any or all such third party +intellectual property rights.</p> + +<small>OSGi™ is a trademark, registered trademark, or service mark of The OSGi Alliance in the US and other countries. Java is a trademark, +registered trademark, or service mark of Sun Microsystems, Inc. in the US and other countries. All other trademarks, registered trademarks, or +service marks used in the Content are the property of their respective owners and are hereby recognized.</small> </body> </html>
\ No newline at end of file diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMEICondition.class b/bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMEICondition.class Binary files differnew file mode 100644 index 000000000..d1830d6a8 --- /dev/null +++ b/bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMEICondition.class diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMSICondition.class b/bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMSICondition.class Binary files differnew file mode 100644 index 000000000..6956fdaf8 --- /dev/null +++ b/bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMSICondition.class diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Measurement.class b/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Measurement.class Binary files differindex 9e0626564..9149e0639 100644 --- a/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Measurement.class +++ b/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Measurement.class diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/State.class b/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/State.class Binary files differindex 822b26aea..a64e31170 100644 --- a/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/State.class +++ b/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/State.class diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Unit.class b/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Unit.class Binary files differindex a464197c1..ddbc81ea6 100644 --- a/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Unit.class +++ b/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Unit.class diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/TransferCostCondition.class b/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/TransferCostCondition.class Binary files differnew file mode 100644 index 000000000..25f50d4ae --- /dev/null +++ b/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/TransferCostCondition.class diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition$UserPromptConditionFactory.class b/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition$UserPromptConditionFactory.class Binary files differnew file mode 100644 index 000000000..6799b017b --- /dev/null +++ b/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition$UserPromptConditionFactory.class diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition.class b/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition.class Binary files differnew file mode 100644 index 000000000..e552b3be3 --- /dev/null +++ b/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition.class diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/position/Position.class b/bundles/org.eclipse.osgi.util/org/osgi/util/position/Position.class Binary files differindex 1909757c8..4a1cdf1a9 100644 --- a/bundles/org.eclipse.osgi.util/org/osgi/util/position/Position.class +++ b/bundles/org.eclipse.osgi.util/org/osgi/util/position/Position.class diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/xml/XMLParserActivator.class b/bundles/org.eclipse.osgi.util/org/osgi/util/xml/XMLParserActivator.class Binary files differindex 5a18b4fde..86fe05480 100644 --- a/bundles/org.eclipse.osgi.util/org/osgi/util/xml/XMLParserActivator.class +++ b/bundles/org.eclipse.osgi.util/org/osgi/util/xml/XMLParserActivator.class diff --git a/bundles/org.eclipse.osgi.util/src.zip b/bundles/org.eclipse.osgi.util/src.zip Binary files differindex 109863747..7823ab260 100644 --- a/bundles/org.eclipse.osgi.util/src.zip +++ b/bundles/org.eclipse.osgi.util/src.zip |