diff options
author | Thomas Watson | 2005-05-16 20:37:14 +0000 |
---|---|---|
committer | Thomas Watson | 2005-05-16 20:37:14 +0000 |
commit | 4b5a60ff2a7d77f55cfac43f57efc9ecd5e6eba2 (patch) | |
tree | 94addc425763245c1291b1b869e44eb30bd07550 /bundles/org.eclipse.osgi/osgi/src/org/osgi/util | |
parent | 8b796d5cf3a095e5c226d449d109e2543e4ae1da (diff) | |
download | rt.equinox.framework-4b5a60ff2a7d77f55cfac43f57efc9ecd5e6eba2.tar.gz rt.equinox.framework-4b5a60ff2a7d77f55cfac43f57efc9ecd5e6eba2.tar.xz rt.equinox.framework-4b5a60ff2a7d77f55cfac43f57efc9ecd5e6eba2.zip |
Bug 90052 OSGI License Needs Clarification
- updated osgi packages with the EPL header.
Diffstat (limited to 'bundles/org.eclipse.osgi/osgi/src/org/osgi/util')
-rw-r--r-- | bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTracker.java | 29 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTrackerCustomizer.java | 29 |
2 files changed, 12 insertions, 46 deletions
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTracker.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTracker.java index e13fe112a..19ffb4496 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTracker.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTracker.java @@ -1,28 +1,11 @@ /* - * $Header: /cvshome/build/org.osgi.util.tracker/src/org/osgi/util/tracker/ServiceTracker.java,v 1.12 2005/01/25 15:36:40 hargrave Exp $ + * $Header: /cvshome/build/org.osgi.util.tracker/src/org/osgi/util/tracker/ServiceTracker.java,v 1.13 2005/05/13 20:33:35 hargrave Exp $ * - * Copyright (c) OSGi Alliance (2000, 2004). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved. * - * Implementation of certain elements of the OSGi Specification 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. - * - * This document and the information contained herein are provided on an "AS IS" - * basis and THE OSGI ALLIANCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION - * HEREIN WILL NOT INFRINGE ANY RIGHTS AND ANY IMPLIED WARRANTIES OF - * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL THE - * OSGI ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF BUSINESS, LOSS OF - * USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR DIRECT, INDIRECT, SPECIAL OR - * EXEMPLARY, INCIDENTIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES OF ANY KIND IN - * CONNECTION WITH THIS DOCUMENT OR THE INFORMATION CONTAINED HEREIN, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH LOSS OR DAMAGE. - * - * All Company, brand and product names may be trademarks that are the sole - * property of their respective owners. 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. */ package org.osgi.util.tracker; @@ -50,7 +33,7 @@ import org.osgi.framework.*; * <code>getServices</code> methods can be called to get the service objects * for the tracked service. * - * @version $Revision: 1.12 $ + * @version $Revision: 1.13 $ */ public class ServiceTracker implements ServiceTrackerCustomizer { /* set this to true to compile in debug messages */ diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTrackerCustomizer.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTrackerCustomizer.java index 57a0e3aa6..be4459ed1 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTrackerCustomizer.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTrackerCustomizer.java @@ -1,28 +1,11 @@ /* - * $Header: /cvshome/build/org.osgi.util.tracker/src/org/osgi/util/tracker/ServiceTrackerCustomizer.java,v 1.6 2005/01/19 20:35:19 hargrave Exp $ + * $Header: /cvshome/build/org.osgi.util.tracker/src/org/osgi/util/tracker/ServiceTrackerCustomizer.java,v 1.7 2005/05/13 20:33:35 hargrave Exp $ * - * Copyright (c) OSGi Alliance (2000, 2004). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved. * - * Implementation of certain elements of the OSGi Specification 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. - * - * This document and the information contained herein are provided on an "AS IS" - * basis and THE OSGI ALLIANCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION - * HEREIN WILL NOT INFRINGE ANY RIGHTS AND ANY IMPLIED WARRANTIES OF - * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL THE - * OSGI ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF BUSINESS, LOSS OF - * USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR DIRECT, INDIRECT, SPECIAL OR - * EXEMPLARY, INCIDENTIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES OF ANY KIND IN - * CONNECTION WITH THIS DOCUMENT OR THE INFORMATION CONTAINED HEREIN, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH LOSS OR DAMAGE. - * - * All Company, brand and product names may be trademarks that are the sole - * property of their respective owners. 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. */ package org.osgi.util.tracker; @@ -49,7 +32,7 @@ import org.osgi.framework.ServiceReference; * <code>ServiceRegistration.unregister</code>) a service while being * synchronized on any object. * - * @version $Revision: 1.6 $ + * @version $Revision: 1.7 $ */ public interface ServiceTrackerCustomizer { /** |