From b86aeaa689128b880f1e9f26e6e9f4bb97f1f171 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Wed, 10 May 2006 16:18:27 +0000 Subject: update copyrights. --- .../eclipse/core/internal/runtime/DataArea.java | 4 +- .../core/internal/runtime/DevClassPathHelper.java | 4 +- .../eclipse/core/internal/runtime/FindSupport.java | 4 +- .../core/internal/runtime/MetaDataKeeper.java | 4 +- .../core/internal/runtime/ReferenceHashSet.java | 4 +- .../core/internal/runtime/ResourceTranslator.java | 4 +- .../internal/runtime/commonMessages.properties | 4 +- .../src/org/eclipse/equinox/device/Activator.java | 2 +- .../org/eclipse/equinox/device/DeviceTracker.java | 2 +- .../equinox/device/DriverLocatorTracker.java | 2 +- .../equinox/device/DriverSelectorTracker.java | 2 +- .../org/eclipse/equinox/device/DriverTracker.java | 2 +- .../equinox/device/ExternalMessages.properties | 4 +- .../eclipse/equinox/device/LogMessages.properties | 4 +- .../src/org/eclipse/equinox/device/LogTracker.java | 2 +- .../org/eclipse/equinox/device/LogTrackerMsg.java | 4 +- .../src/org/eclipse/equinox/ds/Activator.java | 4 +- .../equinox/ds/instance/InstanceProcess.java | 2 +- .../equinox/ds/model/ComponentDescription.java | 4 +- .../ds/model/ComponentDescriptionCache.java | 4 +- .../equinox/ds/parser/ComponentElement.java | 4 +- .../equinox/ds/parser/ImplementationElement.java | 4 +- .../src/org/eclipse/equinox/ds/parser/Parser.java | 4 +- .../eclipse/equinox/ds/parser/ParserHandler.java | 4 +- .../equinox/ds/parser/PropertiesElement.java | 4 +- .../eclipse/equinox/ds/parser/PropertyElement.java | 2 +- .../eclipse/equinox/ds/parser/ProvideElement.java | 4 +- .../equinox/ds/parser/ReferenceElement.java | 4 +- .../eclipse/equinox/ds/parser/ServiceElement.java | 4 +- .../ds/parser/XMLParserNotAvailableException.java | 2 +- .../org/eclipse/equinox/ds/resolver/Resolver.java | 6 +- .../equinox/ds/service/ComponentFactoryImpl.java | 4 +- .../src/org/eclipse/equinox/event/Activator.java | 10 + .../OSGI-INF/l10n/bundle_en.properties | 2 +- .../src/org/eclipse/equinox/http/Activator.java | 2 +- .../equinox/http/ExternalMessages.properties | 4 +- .../src/org/eclipse/equinox/http/Http.java | 2 +- .../eclipse/equinox/http/HttpConfiguration.java | 2 +- .../src/org/eclipse/equinox/http/HttpDate.java | 2 +- .../src/org/eclipse/equinox/http/HttpListener.java | 474 ++++++++++++++++++++- .../src/org/eclipse/equinox/http/HttpMsg.java | 4 +- .../eclipse/equinox/http/HttpSecurityTracker.java | 2 +- .../src/org/eclipse/equinox/http/HttpService.java | 2 +- .../src/org/eclipse/equinox/http/HttpThread.java | 2 +- .../org/eclipse/equinox/http/HttpThreadPool.java | 4 +- .../eclipse/equinox/http/LogMessages.properties | 4 +- .../src/org/eclipse/equinox/http/LogTracker.java | 2 +- .../org/eclipse/equinox/http/LogTrackerMsg.java | 4 +- .../eclipse/equinox/http/ResourceRegistration.java | 2 +- .../equinox/http/ResourceUnavailableException.java | 4 +- .../src/org/eclipse/equinox/http/SecureAction.java | 4 +- .../org/eclipse/equinox/http/StaticDataReader.java | 2 +- .../src/org/eclipse/equinox/http/URI.java | 2 +- .../http/servlet/HttpServletRequestImpl.java | 2 +- .../http/servlet/HttpServletResponseImpl.java | 2 +- .../http/servlet/HttpSessionContextImpl.java | 2 +- .../equinox/http/servlet/HttpSessionImpl.java | 2 +- .../http/servlet/RequestDispatcherImpl.java | 2 +- .../equinox/http/servlet/ServletContextImpl.java | 2 +- .../equinox/socket/https/HttpsServerSocket.java | 2 +- .../OSGI-INF/l10n/bundle_en.properties | 2 +- .../src/org/eclipse/equinox/log/Activator.java | 2 +- .../org/eclipse/equinox/log/LogReaderService.java | 2 +- .../org/eclipse/equinox/log/LogServiceFactory.java | 2 +- .../org/eclipse/equinox/log/LogServiceImpl.java | 2 +- .../org/eclipse/equinox/log/LoggedException.java | 4 +- .../org/eclipse/equinox/metatype/Activator.java | 2 +- .../equinox/metatype/AttributeDefinitionImpl.java | 2 +- .../org/eclipse/equinox/metatype/DataParser.java | 2 +- .../equinox/metatype/LocalizationElement.java | 2 +- .../src/org/eclipse/equinox/metatype/Logging.java | 2 +- .../equinox/metatype/MetaTypeInformationImpl.java | 2 +- .../equinox/metatype/MetaTypeProviderImpl.java | 2 +- .../equinox/metatype/MetaTypeProviderTracker.java | 2 +- .../equinox/metatype/MetaTypeServiceImpl.java | 2 +- .../metatype/ObjectClassDefinitionImpl.java | 2 +- .../eclipse/equinox/metatype/ValueTokenizer.java | 2 +- .../core/internal/preferences/AbstractScope.java | 4 +- .../eclipse/core/internal/preferences/Base64.java | 4 +- .../preferences/ConfigurationPreferences.java | 4 +- .../core/internal/preferences/LookupOrder.java | 4 +- .../core/internal/preferences/PrefsMessages.java | 19 +- .../core/internal/preferences/RootPreferences.java | 4 +- .../core/internal/preferences/messages.properties | 4 +- .../core/runtime/preferences/DefaultScope.java | 4 +- .../runtime/preferences/IEclipsePreferences.java | 4 +- .../runtime/preferences/IExportedPreferences.java | 4 +- .../preferences/IPreferenceNodeVisitor.java | 4 +- .../eclipse/core/runtime/preferences/IScope.java | 4 +- .../core/runtime/preferences/IScopeContext.java | 4 +- .../org.eclipse.equinox.registry/build.properties | 4 +- .../core/internal/registry/ExtensionDelta.java | 4 +- .../core/internal/registry/ExtensionsParser.java | 4 +- .../core/internal/registry/HashtableOfInt.java | 4 +- .../internal/registry/HashtableOfStringAndInt.java | 4 +- .../core/internal/registry/IObjectManager.java | 4 +- .../core/internal/registry/IRegistryConstants.java | 4 +- .../core/internal/registry/KeyedElement.java | 4 +- .../core/internal/registry/ReadWriteMonitor.java | 4 +- .../internal/registry/RegistryChangeEvent.java | 4 +- .../core/internal/registry/RegistryDelta.java | 4 +- .../core/internal/registry/RegistryMessages.java | 19 +- .../core/internal/registry/RegistryObject.java | 4 +- .../internal/registry/RegistryObjectFactory.java | 4 +- .../ThirdLevelConfigurationElementHandle.java | 4 +- .../core/internal/registry/messages.properties | 4 +- .../core/internal/registry/osgi/Activator.java | 4 +- .../core/internal/registry/osgi/OSGIUtils.java | 4 +- .../core/runtime/IRegistryChangeListener.java | 4 +- .../org/eclipse/equinox/useradmin/Activator.java | 2 +- .../eclipse/equinox/useradmin/Authorization.java | 2 +- .../equinox/useradmin/ExternalMessages.properties | 4 +- .../src/org/eclipse/equinox/useradmin/Group.java | 2 +- .../equinox/useradmin/LogMessages.properties | 4 +- .../org/eclipse/equinox/useradmin/LogTracker.java | 2 +- .../eclipse/equinox/useradmin/LogTrackerMsg.java | 4 +- .../src/org/eclipse/equinox/useradmin/Role.java | 2 +- .../src/org/eclipse/equinox/useradmin/User.java | 2 +- .../org/eclipse/equinox/useradmin/UserAdmin.java | 2 +- .../equinox/useradmin/UserAdminEventProducer.java | 4 +- .../equinox/useradmin/UserAdminHashtable.java | 4 +- .../eclipse/equinox/useradmin/UserAdminStore.java | 2 +- .../org/eclipse/equinox/wireadmin/Activator.java | 2 +- .../equinox/wireadmin/ConsumersCustomizer.java | 2 +- .../equinox/wireadmin/ExternalMessages.properties | 4 +- .../equinox/wireadmin/LogMessages.properties | 4 +- .../org/eclipse/equinox/wireadmin/LogTracker.java | 2 +- .../eclipse/equinox/wireadmin/LogTrackerMsg.java | 4 +- .../equinox/wireadmin/ProducersCustomizer.java | 2 +- .../equinox/wireadmin/ReadOnlyDictionary.java | 2 +- .../src/org/eclipse/equinox/wireadmin/Wire.java | 2 +- .../org/eclipse/equinox/wireadmin/WireAdmin.java | 2 +- .../equinox/wireadmin/WireAdminEventProducer.java | 4 +- .../eclipse/equinox/wireadmin/WireAdminStore.java | 2 +- 134 files changed, 699 insertions(+), 225 deletions(-) diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DataArea.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DataArea.java index 792256abf..1872c5c13 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DataArea.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DataArea.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. + * Copyright (c) 2004, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DevClassPathHelper.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DevClassPathHelper.java index de1e0222b..43955a7df 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DevClassPathHelper.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DevClassPathHelper.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/FindSupport.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/FindSupport.java index 1413738c6..b7dc948d9 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/FindSupport.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/FindSupport.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2003, 2004 IBM Corporation and others. + * Copyright (c) 2003, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/MetaDataKeeper.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/MetaDataKeeper.java index 6dc26767d..dac414a4c 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/MetaDataKeeper.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/MetaDataKeeper.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/ReferenceHashSet.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/ReferenceHashSet.java index f86d20f60..05887f8f8 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/ReferenceHashSet.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/ReferenceHashSet.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. + * Copyright (c) 2004, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/ResourceTranslator.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/ResourceTranslator.java index 91a707065..38002a658 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/ResourceTranslator.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/ResourceTranslator.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2003, 2004 IBM Corporation and others. + * Copyright (c) 2003, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/commonMessages.properties b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/commonMessages.properties index f493f4ff5..75587709a 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/commonMessages.properties +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/commonMessages.properties @@ -1,10 +1,10 @@ ############################################################################### -# Copyright (c) 2000, 2005 IBM Corporation and others. +# Copyright (c) 2000, 2006 IBM Corporation 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 -# +# # Contributors: # IBM Corporation - initial API and implementation ############################################################################### diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/Activator.java b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/Activator.java index ae139605b..ae1b4113c 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/Activator.java +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation. + * Copyright (c) 2000, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DeviceTracker.java b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DeviceTracker.java index c1e507f01..ad788abef 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DeviceTracker.java +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DeviceTracker.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation. + * Copyright (c) 2000, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverLocatorTracker.java b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverLocatorTracker.java index f2ab27651..bf4e40c5f 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverLocatorTracker.java +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverLocatorTracker.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation. + * Copyright (c) 2000, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverSelectorTracker.java b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverSelectorTracker.java index 157243859..ba5782a6e 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverSelectorTracker.java +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverSelectorTracker.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation. + * Copyright (c) 2000, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverTracker.java b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverTracker.java index f46a60a82..2b7a7f8a4 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverTracker.java +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverTracker.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation. + * Copyright (c) 2000, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/ExternalMessages.properties b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/ExternalMessages.properties index 4bdd34be3..93ef23342 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/ExternalMessages.properties +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/ExternalMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2005 IBM Corporation. +# Copyright (c) 2000, 2006 IBM Corporation 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 @@ -28,4 +28,4 @@ Unable_to_uninstall_driver_bundle_number=Unable to uninstall driver bundle: {0} DriverSelector_error_during_match=DriverSelector error during match Driver_service_has_no_DRIVER_ID=Driver service has no DRIVER_ID property. Using bundle location as DRIVER_ID. Driver_error_during_match=Driver error during match -Driver_error_during_attach=Driver error during attach \ No newline at end of file +Driver_error_during_attach=Driver error during attach diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/LogMessages.properties b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/LogMessages.properties index 20ad44185..e0d8f711c 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/LogMessages.properties +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/LogMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2005 IBM Corporation. +# Copyright (c) 2000, 2006 IBM Corporation 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 @@ -12,4 +12,4 @@ Unknown_Log_level=Unknown Log Level Info=Log Info Warning=Log Warning -Error=Log Error \ No newline at end of file +Error=Log Error diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/LogTracker.java b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/LogTracker.java index 49f55c753..44b58ba12 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/LogTracker.java +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/LogTracker.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1998, 2005 IBM Corporation. + * Copyright (c) 1998, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/LogTrackerMsg.java b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/LogTrackerMsg.java index ad023bff4..630173260 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/LogTrackerMsg.java +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/LogTrackerMsg.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -24,4 +24,4 @@ public class LogTrackerMsg extends NLS { // initialize resource bundles NLS.initializeMessages(BUNDLE_NAME, LogTrackerMsg.class); } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/Activator.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/Activator.java index 2df8ca68d..83526a7c7 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/Activator.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -37,7 +37,7 @@ import org.osgi.util.tracker.ServiceTracker; * Main class for the SCR. This class will start the SCR bundle and begin * processing other bundles. * - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public class Activator implements BundleActivator, BundleTrackerCustomizer, WorkDispatcher, SynchronousBundleListener { diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/instance/InstanceProcess.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/instance/InstanceProcess.java index 21459cfdd..928b9e755 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/instance/InstanceProcess.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/instance/InstanceProcess.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/model/ComponentDescription.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/model/ComponentDescription.java index 71d4b29fc..b15459918 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/model/ComponentDescription.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/model/ComponentDescription.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -24,7 +24,7 @@ import org.osgi.service.log.LogService; * * Memory model of the Service Component xml * - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public class ComponentDescription implements Serializable { /** diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/model/ComponentDescriptionCache.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/model/ComponentDescriptionCache.java index 0e0f8645e..bcd6b984f 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/model/ComponentDescriptionCache.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/model/ComponentDescriptionCache.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -24,7 +24,7 @@ import org.osgi.service.log.LogService; * * Cache of component descriptions. * - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class ComponentDescriptionCache { diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ComponentElement.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ComponentElement.java index 839407197..b656151cf 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ComponentElement.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ComponentElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -122,4 +122,4 @@ class ComponentElement extends ElementHandler { protected String getElementName() { return "component"; } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ImplementationElement.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ImplementationElement.java index 973d1d0fe..e2aeb3c12 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ImplementationElement.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ImplementationElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -51,4 +51,4 @@ class ImplementationElement extends ElementHandler { protected String getElementName() { return "implementation"; } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/Parser.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/Parser.java index ff0b530cb..e79cc1857 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/Parser.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/Parser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -41,7 +41,7 @@ import org.xml.sax.SAXException; * * Parse the component description xml * - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public class Parser implements ServiceTrackerCustomizer { diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ParserHandler.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ParserHandler.java index 09b205e30..0a371fccb 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ParserHandler.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ParserHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -22,7 +22,7 @@ import org.xml.sax.helpers.DefaultHandler; * parser. Each Service Component bundle contains a set of xml files which are * parsed. * - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ class ParserHandler extends DefaultHandler { diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/PropertiesElement.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/PropertiesElement.java index 2ad426a99..d14dfe884 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/PropertiesElement.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/PropertiesElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -47,4 +47,4 @@ class PropertiesElement extends ElementHandler { protected String getElementName() { return "properties"; } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/PropertyElement.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/PropertyElement.java index 63c259361..2351d7f15 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/PropertyElement.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/PropertyElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ProvideElement.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ProvideElement.java index b2f0d7378..763a57398 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ProvideElement.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ProvideElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -48,4 +48,4 @@ class ProvideElement extends ElementHandler { protected String getElementName() { return "provide"; } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ReferenceElement.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ReferenceElement.java index 313cc0321..e2b339acc 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ReferenceElement.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ReferenceElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -80,4 +80,4 @@ class ReferenceElement extends ElementHandler { protected String getElementName() { return "reference"; } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ServiceElement.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ServiceElement.java index 18cf79dbc..d6d2e39d8 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ServiceElement.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/ServiceElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -71,4 +71,4 @@ class ServiceElement extends ElementHandler { protected String getElementName() { return "service"; } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/XMLParserNotAvailableException.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/XMLParserNotAvailableException.java index b68b50392..a4b013bc3 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/XMLParserNotAvailableException.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/parser/XMLParserNotAvailableException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/resolver/Resolver.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/resolver/Resolver.java index 5f6eab086..a4b7bdc7c 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/resolver/Resolver.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/resolver/Resolver.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -34,7 +34,7 @@ import org.osgi.util.tracker.ServiceTracker; * The Resolver implements AllServiceListener so it can be informed about service * changes in the framework. * - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public class Resolver implements AllServiceListener, WorkDispatcher { @@ -778,7 +778,7 @@ public class Resolver implements AllServiceListener, WorkDispatcher { * Doubly-linked node used to traverse the dependency tree in order to * find cycles. * - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ static private class ReferenceCDP { public Reference ref; diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/service/ComponentFactoryImpl.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/service/ComponentFactoryImpl.java index 6580f738b..afb42cd4e 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/service/ComponentFactoryImpl.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/ds/service/ComponentFactoryImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -21,7 +21,7 @@ import org.osgi.service.component.*; * register a ComponentFactory service to allow new component configurations * to be created and activated. * - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class ComponentFactoryImpl implements ComponentFactory { diff --git a/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/event/Activator.java b/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/event/Activator.java index cb1e6ee20..e137a5520 100644 --- a/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/event/Activator.java +++ b/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/event/Activator.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2005, 2006 IBM Corporation 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 + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ package org.eclipse.equinox.event; diff --git a/bundles/org.eclipse.equinox.http/OSGI-INF/l10n/bundle_en.properties b/bundles/org.eclipse.equinox.http/OSGI-INF/l10n/bundle_en.properties index c363862d4..28c2b2358 100644 --- a/bundles/org.eclipse.equinox.http/OSGI-INF/l10n/bundle_en.properties +++ b/bundles/org.eclipse.equinox.http/OSGI-INF/l10n/bundle_en.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 1999, 2005 IBM Corporation. +# Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/Activator.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/Activator.java index 013288d5e..7cc753132 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/Activator.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/ExternalMessages.properties b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/ExternalMessages.properties index 1d1c9b3c7..aab018df9 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/ExternalMessages.properties +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/ExternalMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005 IBM Corporation. +# Copyright (c) 2005, 2006 IBM Corporation 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 @@ -56,4 +56,4 @@ Thu_17=Thu Fri_18=Fri Sat_19=Sat HTTP_DEFAULT_PORT_FORMAT_EXCEPTION={0} value is not an integer -HTTP_THREAD_POOL_CREATE_NUMBER_ERROR=Failed to create thread number {0} \ No newline at end of file +HTTP_THREAD_POOL_CREATE_NUMBER_ERROR=Failed to create thread number {0} diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/Http.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/Http.java index 0d74aa0e9..f52ac519f 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/Http.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/Http.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpConfiguration.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpConfiguration.java index 3e1179cab..d95160040 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpConfiguration.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpConfiguration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpDate.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpDate.java index dc9693f6a..17fc8d0c4 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpDate.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpDate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpListener.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpListener.java index c96f672bf..dea17ef06 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpListener.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 @@ -8,9 +8,471 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.http; import java.io.IOException; import java.net.InetAddress; import java.net.Socket; import java.util.*; import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; +package org.eclipse.equinox.http; -import org.eclipse.equinox.http.servlet.*; import org.eclipse.equinox.socket.ServerSocketInterface; import org.eclipse.equinox.socket.SocketInterface; import org.eclipse.osgi.util.NLS; import org.osgi.framework.*; import org.osgi.service.http.HttpContext; import org.osgi.service.http.NamespaceException; public class HttpListener extends Thread implements ServiceFactory { protected Http http; /** ServerSocket upon which this listener operates */ protected volatile ServerSocketInterface serverSocket; /** Controlling HttpConfiguration object */ protected HttpConfiguration configuration; /** if true this thread must terminate */ protected volatile boolean running; protected ServiceRegistration service; private String httpsvcClass = "org.osgi.service.http.HttpService"; //$NON-NLS-1$ protected Hashtable registrations; /** Mapping of HttpContext => ServletContextImpl */ protected Hashtable servletContexts; protected int socketTimeout; protected Object lock = new Object(); /** * Constructor. * */ protected HttpListener(Http http, HttpConfiguration configuration, Dictionary properties) throws IOException { this.http = http; this.configuration = configuration; registrations = new Hashtable(51); //initialize servletContext Hashtable servletContexts = new Hashtable(15); setProperties(properties); start(); } /** * Returns true if this thread has been closed. * @return boolean */ public boolean isClosed() { return (!running); } /** * Close this thread. */ public void close() { running = false; try { setProperties(null); } catch (IOException e) { /* this will not occur when calling with null */ } servletContexts = null; } /* * ---------------------------------------------------------------------- * ServiceFactory Interface implementation * ---------------------------------------------------------------------- */ public Object getService(Bundle bundle, ServiceRegistration reg) { return (new HttpService(this, bundle)); } public void ungetService(Bundle bundle, ServiceRegistration reg, Object httpService) { ((HttpService) httpService).destroy(); } public synchronized void setProperties(Dictionary properties) throws IOException { ServerSocketInterface oldServerSocket = serverSocket; if (properties != null) { String address = (String) properties.get(HttpConfiguration.keyHttpAddress); int port = ((Integer) (properties.get(HttpConfiguration.keyHttpPort))).intValue(); String scheme = (String) properties.get(HttpConfiguration.keyHttpScheme); socketTimeout = ((Integer) (properties.get(HttpConfiguration.keyHttpTimeout))).intValue() * 1000; if ("ALL".equalsIgnoreCase(address)) { //$NON-NLS-1$ address = null; } if ((serverSocket == null) || (port != serverSocket.getLocalPort()) || !scheme.equals(serverSocket.getScheme())) { serverSocket = configuration.createServerSocket(address, port, scheme); closeServerSocket(oldServerSocket); } else if ((serverSocket.getAddress() != null && !serverSocket.getAddress().equals(address)) || (serverSocket.getAddress() == null && address != null)) { serverSocket = null; closeServerSocket(oldServerSocket); serverSocket = configuration.createServerSocket(address, port, scheme); synchronized (lock) { lock.notify(); } } if (service == null) { service = http.context.registerService(httpsvcClass, this, properties); } else { service.setProperties(properties); } } else { serverSocket = null; closeServerSocket(oldServerSocket); service.unregister(); service = null; } } protected Object getProperty(String key) { return service.getReference().getProperty(key); } private void closeServerSocket(ServerSocketInterface oldServerSocket) { if (oldServerSocket != null) { try { try { Socket phonyClient = new Socket(InetAddress.getByName(oldServerSocket.getAddress()), oldServerSocket.getLocalPort()); phonyClient.close(); } catch (IOException e) { http.logWarning(HttpMsg.HTTP_UNEXPECTED_IOEXCEPTION, e); } } finally { try { oldServerSocket.close(); } catch (IOException e) { http.logWarning(HttpMsg.HTTP_UNEXPECTED_IOEXCEPTION, e); } } configuration.pool.recallThreads(); } } public void run() { running = true; while (running) { SocketInterface socket = null; try { if (serverSocket == null) { if (running) { try { synchronized (lock) { lock.wait(5000); } } catch (InterruptedException e) { - // ignore and check exit condition } if (serverSocket == null) { running = false; continue; } } else { continue; } } ServerSocketInterface tempServerSocket = this.serverSocket; socket = tempServerSocket.acceptSock(); if (tempServerSocket != this.serverSocket) /* socket changed while we were waiting */ { try { socket.close(); } catch (IOException e) { - // TODO: consider logging } socket = null; } } catch (IOException e) { if (serverSocket != null) { http.logError(NLS.bind(HttpMsg.HTTP_ACCEPT_SOCKET_EXCEPTION, new Integer(serverSocket.getLocalPort())), e); } } if (socket != null) { HttpThread thread = configuration.pool.getThread(); if (thread != null) { thread.handleConnection(this, socket, socketTimeout); } else { try { socket.close(); } catch (Exception e) { - // TODO: consider logging } } } } } protected void handleConnection(SocketInterface socket) throws IOException, ServletException { /* Create the servlet request and response objects */ HttpServletResponseImpl response = new HttpServletResponseImpl(socket, http); HttpServletRequestImpl request = new HttpServletRequestImpl(socket, http, response); /* After the request and response objects are successfully created, * we enter a try/finally block to ensure that the response is * always closed. */ try { //Get the URI from socket String uri = request.getRequestURI(); //Get Registration object associated with the request Registration registration = getRegistration(uri); while (registration != null) { try { if (registration.getHttpContext().handleSecurity(request, response)) { //Service Request registration.service(request, response); } return; } catch (ResourceUnavailableException e) { uri = reduceURI(uri); if (uri == null) { registration = null; } else { registration = getRegistration(uri); } } } if (registration == null) { if (Http.DEBUG) { http.logDebug("File " + request.getRequestURI() + //$NON-NLS-1$ " not found -- No Registration object"); //$NON-NLS-1$ } response.sendError(HttpServletResponse.SC_NOT_FOUND); } } finally { response.close(); /* close (and flush) the response output */ } } protected ResourceRegistration registerResources(Bundle bundle, String alias, String name, HttpContext httpContext) throws NamespaceException { synchronized (registrations) { if (Http.DEBUG) { http.logDebug("HttpService -- Registering Resource -- Alias = " + //$NON-NLS-1$ alias + " Name = " + name); //$NON-NLS-1$ } checkAlias(alias); //check to see if name is valid int length = name.length(); if (length > 1) { //we need to allow "/" and "" if (name.endsWith("/")) //$NON-NLS-1$ { throw new IllegalArgumentException(NLS.bind(HttpMsg.HTTP_RESOURCE_NAME_INVALID_EXCEPTION, name)); } } checkNamespace(alias); ResourceRegistration registration = new ResourceRegistration(bundle, alias, name, httpContext, http); registrations.put(alias, registration); return (registration); } } private void checkAlias(String alias) { //check to see if the alias is valid if (!alias.equals("/")) //$NON-NLS-1$ { //so one can register at "/" if (!alias.startsWith("/") || alias.endsWith("/")) //$NON-NLS-1$ //$NON-NLS-2$ { throw new IllegalArgumentException(NLS.bind(HttpMsg.HTTP_ALIAS_INVALID_EXCEPTION, alias)); } } } protected ServletRegistration registerServlet(Bundle bundle, String alias, Servlet servlet, Dictionary initparams, HttpContext httpContext) throws ServletException, NamespaceException { synchronized (registrations) { if (Http.DEBUG) { http.logDebug("HttpService -- Registering Servlet -- Alias = " + alias); //$NON-NLS-1$ } checkAlias(alias); checkNamespace(alias); if (servlet == null) { throw new NullPointerException(HttpMsg.HTTP_SERVLET_NULL_EXCEPTION); } if (http.servlets.contains(servlet)) { throw new ServletException(HttpMsg.HTTP_SERVLET_ALREADY_REGISTERED_EXCEPTION); } /* Determine the ServletContext */ ServletContextImpl servletContext = getServletContext(httpContext); //Create registration object ServletRegistration registration = new ServletRegistration(bundle, alias, servlet, httpContext, servletContext); //call servlet's init() method try { servlet.init(new ServletConfigImpl(servletContext, initparams)); } catch (ServletException e) { ungetServletContext(httpContext); throw e; } catch (Throwable t) { ungetServletContext(httpContext); throw new ServletException(HttpMsg.HTTP_SERVET_INIT_EXCEPTION, t); } http.servlets.addElement(servlet); registrations.put(alias, registration); return (registration); } } protected void unregister(Bundle bundle, String alias) throws IllegalArgumentException { synchronized (registrations) { Registration registration = (Registration) registrations.get(alias); if (registration != null) { //this is to prevent other bundles from unregistering a bundle's resource/servlet if (registration.getBundle() != bundle) { registration = null; } } removeRegistration(registration); } } protected HttpContext createDefaultHttpContext(Bundle bundle) { return (new DefaultHttpContext(bundle, http.securityTracker)); } protected ServletContextImpl getServletContext(HttpContext httpContext) { /* Determine the ServletContext */ ServletContextImpl servletContext = (ServletContextImpl) servletContexts.get(httpContext); if (servletContext == null) { servletContext = new ServletContextImpl(http, this, httpContext); servletContexts.put(httpContext, servletContext); } servletContext.incrUseCount(); return (servletContext); } protected void ungetServletContext(HttpContext httpContext) { ServletContextImpl servletContext = (ServletContextImpl) servletContexts.get(httpContext); if (servletContext != null) { int useCount = servletContext.decrUseCount(); if (useCount <= 0) { servletContexts.remove(httpContext); } } } protected void destroyBundle(Bundle bundle) { if (registrations != null) { if (Http.DEBUG) { http.logDebug("Removing bundle " + bundle + //$NON-NLS-1$ " from HttpListener"); //$NON-NLS-1$ } synchronized (registrations) { Enumeration e = registrations.elements(); while (e.hasMoreElements()) { Registration reg = (Registration) e.nextElement(); if (bundle == reg.getBundle()) { removeRegistration(reg); } } } } } private void checkNamespace(String uri) throws NamespaceException { // If alias already exists in master resource table, // throw NamespaceException if (registrations.get(uri) != null) { throw new NamespaceException(NLS.bind(HttpMsg.HTTP_ALIAS_ALREADY_REGISTERED_EXCEPTION, uri)); } } public Registration getRegistration(String uri) { synchronized (registrations) { while (uri != null) { Registration reg = (Registration) registrations.get(uri); if (reg != null) { return (reg); } uri = reduceURI(uri); } return (null); } } /** * Reduce the input URI per the HttpService spec. * * @param uri input URI to be reduced. * @return Reduced URI or null if no further reduction possible. */ private String reduceURI(String uri) { if (uri.equals("/")) //$NON-NLS-1$ { return (null); } int index = uri.lastIndexOf('/'); if (index < 0) { return (null); } if (index == 0) { return ("/"); //$NON-NLS-1$ } return (uri.substring(0, index)); } /** * Must be called while holding the registrations lock * */ private void removeRegistration(Registration registration) { if (registration == null) { throw new IllegalArgumentException(HttpMsg.HTTP_ALIAS_UNREGISTER_EXCEPTION); } registrations.remove(registration.getAlias()); if (registration instanceof ServletRegistration) { Servlet servlet = ((ServletRegistration) registration).getServlet(); http.servlets.removeElement(servlet); } // BUGBUG Must not call servlet.destroy while it is processing requests! // Servlet 2.2 Section 3.3.4 registration.destroy(); if (registration instanceof ServletRegistration) { ungetServletContext(registration.getHttpContext()); } } } +import java.io.IOException; +import java.net.InetAddress; +import java.net.Socket; +import java.util.*; +import javax.servlet.Servlet; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.equinox.http.servlet.*; +import org.eclipse.equinox.socket.ServerSocketInterface; +import org.eclipse.equinox.socket.SocketInterface; +import org.eclipse.osgi.util.NLS; +import org.osgi.framework.*; +import org.osgi.service.http.HttpContext; +import org.osgi.service.http.NamespaceException; + +public class HttpListener extends Thread implements ServiceFactory { + protected Http http; + /** ServerSocket upon which this listener operates */ + protected volatile ServerSocketInterface serverSocket; + /** Controlling HttpConfiguration object */ + protected HttpConfiguration configuration; + /** if true this thread must terminate */ + protected volatile boolean running; + protected ServiceRegistration service; + private String httpsvcClass = "org.osgi.service.http.HttpService"; //$NON-NLS-1$ + protected Hashtable registrations; + /** Mapping of HttpContext => ServletContextImpl */ + protected Hashtable servletContexts; + protected int socketTimeout; + protected Object lock = new Object(); + + /** + * Constructor. + * + */ + protected HttpListener(Http http, HttpConfiguration configuration, Dictionary properties) throws IOException { + this.http = http; + this.configuration = configuration; + registrations = new Hashtable(51); + //initialize servletContext Hashtable + servletContexts = new Hashtable(15); + setProperties(properties); + start(); + } + + /** + * Returns true if this thread has been closed. + * @return boolean + */ + public boolean isClosed() { + return (!running); + } + + /** + * Close this thread. + */ + public void close() { + running = false; + try { + setProperties(null); + } catch (IOException e) { + /* this will not occur when calling with null */ + } + + servletContexts = null; + } + + /* + * ---------------------------------------------------------------------- + * ServiceFactory Interface implementation + * ---------------------------------------------------------------------- + */ + public Object getService(Bundle bundle, ServiceRegistration reg) { + return (new HttpService(this, bundle)); + } + + public void ungetService(Bundle bundle, ServiceRegistration reg, Object httpService) { + ((HttpService) httpService).destroy(); + } + + public synchronized void setProperties(Dictionary properties) throws IOException { + ServerSocketInterface oldServerSocket = serverSocket; + + if (properties != null) { + String address = (String) properties.get(HttpConfiguration.keyHttpAddress); + int port = ((Integer) (properties.get(HttpConfiguration.keyHttpPort))).intValue(); + String scheme = (String) properties.get(HttpConfiguration.keyHttpScheme); + socketTimeout = ((Integer) (properties.get(HttpConfiguration.keyHttpTimeout))).intValue() * 1000; + + if ("ALL".equalsIgnoreCase(address)) { //$NON-NLS-1$ + address = null; + } + + if ((serverSocket == null) || (port != serverSocket.getLocalPort()) || !scheme.equals(serverSocket.getScheme())) { + serverSocket = configuration.createServerSocket(address, port, scheme); + closeServerSocket(oldServerSocket); + } else if ((serverSocket.getAddress() != null && !serverSocket.getAddress().equals(address)) || (serverSocket.getAddress() == null && address != null)) { + serverSocket = null; + closeServerSocket(oldServerSocket); + serverSocket = configuration.createServerSocket(address, port, scheme); + synchronized (lock) { + lock.notify(); + } + } + + if (service == null) { + service = http.context.registerService(httpsvcClass, this, properties); + } else { + service.setProperties(properties); + } + } else { + serverSocket = null; + closeServerSocket(oldServerSocket); + service.unregister(); + service = null; + } + } + + protected Object getProperty(String key) { + return service.getReference().getProperty(key); + } + + private void closeServerSocket(ServerSocketInterface oldServerSocket) { + if (oldServerSocket != null) { + try { + try { + Socket phonyClient = new Socket(InetAddress.getByName(oldServerSocket.getAddress()), oldServerSocket.getLocalPort()); + phonyClient.close(); + } catch (IOException e) { + http.logWarning(HttpMsg.HTTP_UNEXPECTED_IOEXCEPTION, e); + } + } finally { + try { + oldServerSocket.close(); + } catch (IOException e) { + http.logWarning(HttpMsg.HTTP_UNEXPECTED_IOEXCEPTION, e); + } + } + + configuration.pool.recallThreads(); + } + } + + public void run() { + running = true; + + while (running) { + SocketInterface socket = null; + + try { + if (serverSocket == null) { + if (running) { + try { + synchronized (lock) { + lock.wait(5000); + } + } catch (InterruptedException e) { + // ignore and check exit condition + } + if (serverSocket == null) { + running = false; + continue; + } + } else { + continue; + } + } + ServerSocketInterface tempServerSocket = this.serverSocket; + socket = tempServerSocket.acceptSock(); + + if (tempServerSocket != this.serverSocket) /* socket changed while we were waiting */ + { + try { + socket.close(); + } catch (IOException e) { + // TODO: consider logging + } + + socket = null; + } + } catch (IOException e) { + if (serverSocket != null) { + http.logError(NLS.bind(HttpMsg.HTTP_ACCEPT_SOCKET_EXCEPTION, new Integer(serverSocket.getLocalPort())), e); + } + } + + if (socket != null) { + HttpThread thread = configuration.pool.getThread(); + + if (thread != null) { + thread.handleConnection(this, socket, socketTimeout); + } else { + try { + socket.close(); + } catch (Exception e) { + // TODO: consider logging + } + } + } + } + } + + protected void handleConnection(SocketInterface socket) throws IOException, ServletException { + /* Create the servlet request and response objects */ + HttpServletResponseImpl response = new HttpServletResponseImpl(socket, http); + + HttpServletRequestImpl request = new HttpServletRequestImpl(socket, http, response); + + /* After the request and response objects are successfully created, + * we enter a try/finally block to ensure that the response is + * always closed. + */ + try { + //Get the URI from socket + String uri = request.getRequestURI(); + //Get Registration object associated with the request + Registration registration = getRegistration(uri); + + while (registration != null) { + try { + if (registration.getHttpContext().handleSecurity(request, response)) { + //Service Request + registration.service(request, response); + } + + return; + } catch (ResourceUnavailableException e) { + uri = reduceURI(uri); + + if (uri == null) { + registration = null; + } else { + registration = getRegistration(uri); + } + } + } + + if (registration == null) { + if (Http.DEBUG) { + http.logDebug("File " + request.getRequestURI() + //$NON-NLS-1$ + " not found -- No Registration object"); //$NON-NLS-1$ + } + + response.sendError(HttpServletResponse.SC_NOT_FOUND); + } + } finally { + response.close(); /* close (and flush) the response output */ + } + } + + protected ResourceRegistration registerResources(Bundle bundle, String alias, String name, HttpContext httpContext) throws NamespaceException { + synchronized (registrations) { + if (Http.DEBUG) { + http.logDebug("HttpService -- Registering Resource -- Alias = " + //$NON-NLS-1$ + alias + " Name = " + name); //$NON-NLS-1$ + } + + checkAlias(alias); + + //check to see if name is valid + int length = name.length(); + if (length > 1) { //we need to allow "/" and "" + if (name.endsWith("/")) //$NON-NLS-1$ + { + throw new IllegalArgumentException(NLS.bind(HttpMsg.HTTP_RESOURCE_NAME_INVALID_EXCEPTION, name)); + } + } + + checkNamespace(alias); + + ResourceRegistration registration = new ResourceRegistration(bundle, alias, name, httpContext, http); + + registrations.put(alias, registration); + + return (registration); + } + } + + private void checkAlias(String alias) { + //check to see if the alias is valid + if (!alias.equals("/")) //$NON-NLS-1$ + { //so one can register at "/" + if (!alias.startsWith("/") || alias.endsWith("/")) //$NON-NLS-1$ //$NON-NLS-2$ + { + throw new IllegalArgumentException(NLS.bind(HttpMsg.HTTP_ALIAS_INVALID_EXCEPTION, alias)); + } + } + } + + protected ServletRegistration registerServlet(Bundle bundle, String alias, Servlet servlet, Dictionary initparams, HttpContext httpContext) throws ServletException, NamespaceException { + synchronized (registrations) { + if (Http.DEBUG) { + http.logDebug("HttpService -- Registering Servlet -- Alias = " + alias); //$NON-NLS-1$ + } + + checkAlias(alias); + + checkNamespace(alias); + + if (servlet == null) { + throw new NullPointerException(HttpMsg.HTTP_SERVLET_NULL_EXCEPTION); + } + + if (http.servlets.contains(servlet)) { + throw new ServletException(HttpMsg.HTTP_SERVLET_ALREADY_REGISTERED_EXCEPTION); + } + /* Determine the ServletContext */ + ServletContextImpl servletContext = getServletContext(httpContext); + //Create registration object + ServletRegistration registration = new ServletRegistration(bundle, alias, servlet, httpContext, servletContext); + + //call servlet's init() method + try { + servlet.init(new ServletConfigImpl(servletContext, initparams)); + } catch (ServletException e) { + ungetServletContext(httpContext); + + throw e; + } catch (Throwable t) { + ungetServletContext(httpContext); + + throw new ServletException(HttpMsg.HTTP_SERVET_INIT_EXCEPTION, t); + } + + http.servlets.addElement(servlet); + registrations.put(alias, registration); + return (registration); + } + } + + protected void unregister(Bundle bundle, String alias) throws IllegalArgumentException { + synchronized (registrations) { + Registration registration = (Registration) registrations.get(alias); + if (registration != null) { + //this is to prevent other bundles from unregistering a bundle's resource/servlet + if (registration.getBundle() != bundle) { + registration = null; + } + } + + removeRegistration(registration); + } + } + + protected HttpContext createDefaultHttpContext(Bundle bundle) { + return (new DefaultHttpContext(bundle, http.securityTracker)); + } + + protected ServletContextImpl getServletContext(HttpContext httpContext) { + /* Determine the ServletContext */ + ServletContextImpl servletContext = (ServletContextImpl) servletContexts.get(httpContext); + + if (servletContext == null) { + servletContext = new ServletContextImpl(http, this, httpContext); + servletContexts.put(httpContext, servletContext); + } + + servletContext.incrUseCount(); + + return (servletContext); + } + + protected void ungetServletContext(HttpContext httpContext) { + ServletContextImpl servletContext = (ServletContextImpl) servletContexts.get(httpContext); + + if (servletContext != null) { + int useCount = servletContext.decrUseCount(); + + if (useCount <= 0) { + servletContexts.remove(httpContext); + } + } + } + + protected void destroyBundle(Bundle bundle) { + if (registrations != null) { + if (Http.DEBUG) { + http.logDebug("Removing bundle " + bundle + //$NON-NLS-1$ + " from HttpListener"); //$NON-NLS-1$ + } + + synchronized (registrations) { + Enumeration e = registrations.elements(); + + while (e.hasMoreElements()) { + Registration reg = (Registration) e.nextElement(); + + if (bundle == reg.getBundle()) { + removeRegistration(reg); + } + } + } + } + } + + private void checkNamespace(String uri) throws NamespaceException { + // If alias already exists in master resource table, + // throw NamespaceException + if (registrations.get(uri) != null) { + throw new NamespaceException(NLS.bind(HttpMsg.HTTP_ALIAS_ALREADY_REGISTERED_EXCEPTION, uri)); + } + } + + public Registration getRegistration(String uri) { + synchronized (registrations) { + while (uri != null) { + Registration reg = (Registration) registrations.get(uri); + + if (reg != null) { + return (reg); + } + uri = reduceURI(uri); + } + return (null); + } + } + + /** + * Reduce the input URI per the HttpService spec. + * + * @param uri input URI to be reduced. + * @return Reduced URI or null if no further reduction possible. + */ + private String reduceURI(String uri) { + if (uri.equals("/")) //$NON-NLS-1$ + { + return (null); + } + + int index = uri.lastIndexOf('/'); + + if (index < 0) { + return (null); + } + + if (index == 0) { + return ("/"); //$NON-NLS-1$ + } + + return (uri.substring(0, index)); + } + + /** + * Must be called while holding the registrations lock + * + */ + private void removeRegistration(Registration registration) { + if (registration == null) { + throw new IllegalArgumentException(HttpMsg.HTTP_ALIAS_UNREGISTER_EXCEPTION); + } + registrations.remove(registration.getAlias()); + if (registration instanceof ServletRegistration) { + Servlet servlet = ((ServletRegistration) registration).getServlet(); + http.servlets.removeElement(servlet); + } + + // BUGBUG Must not call servlet.destroy while it is processing requests! + // Servlet 2.2 Section 3.3.4 + registration.destroy(); + + if (registration instanceof ServletRegistration) { + ungetServletContext(registration.getHttpContext()); + } + } +} diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpMsg.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpMsg.java index 96a571666..54bfa4aa0 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpMsg.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpMsg.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 @@ -68,4 +68,4 @@ public class HttpMsg extends NLS { // initialize resource bundles NLS.initializeMessages(BUNDLE_NAME, HttpMsg.class); } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpSecurityTracker.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpSecurityTracker.java index 5181b76c4..d37803453 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpSecurityTracker.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpSecurityTracker.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpService.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpService.java index 2bc7c3339..6b41e4d3d 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpService.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpThread.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpThread.java index 4df2e92be..7b0e1c1d9 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpThread.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpThread.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpThreadPool.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpThreadPool.java index bcf730ddd..1cdd6247f 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpThreadPool.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/HttpThreadPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 @@ -284,4 +284,4 @@ public class HttpThreadPool extends ThreadGroup { thread.recall(); } } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/LogMessages.properties b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/LogMessages.properties index cf6028be3..6d12a8dd8 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/LogMessages.properties +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/LogMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005 IBM Corporation. +# Copyright (c) 2005, 2006 IBM Corporation 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 @@ -13,4 +13,4 @@ Unknown_Log_level=Unknown Log Level Info=Log Info Warning=Log Warning -Error=Log Error \ No newline at end of file +Error=Log Error diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/LogTracker.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/LogTracker.java index 112d05605..a088fa17c 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/LogTracker.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/LogTracker.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1998, 2005 IBM Corporation. + * Copyright (c) 1998, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/LogTrackerMsg.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/LogTrackerMsg.java index 35311045b..ad805bb68 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/LogTrackerMsg.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/LogTrackerMsg.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -24,4 +24,4 @@ public class LogTrackerMsg extends NLS { // initialize resource bundles NLS.initializeMessages(BUNDLE_NAME, LogTrackerMsg.class); } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/ResourceRegistration.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/ResourceRegistration.java index 73830499d..36e22e522 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/ResourceRegistration.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/ResourceRegistration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/ResourceUnavailableException.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/ResourceUnavailableException.java index f747b3aa2..a3333401c 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/ResourceUnavailableException.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/ResourceUnavailableException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 @@ -12,4 +12,4 @@ package org.eclipse.equinox.http; public class ResourceUnavailableException extends RuntimeException { private static final long serialVersionUID = 4662869318092654517L; -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/SecureAction.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/SecureAction.java index 2b884f4f8..a97dfc5a7 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/SecureAction.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/SecureAction.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2003, 2005 IBM Corporation. + * Copyright (c) 2003, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/StaticDataReader.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/StaticDataReader.java index 5a75a76b6..be77cf6e0 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/StaticDataReader.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/StaticDataReader.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/URI.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/URI.java index 20e519b94..8eec1e9b1 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/URI.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/URI.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java index 991c774d8..a7fd6a5c2 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java index 1f88be48d..463c7350f 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpSessionContextImpl.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpSessionContextImpl.java index 6f7712c74..10c519d4c 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpSessionContextImpl.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpSessionContextImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpSessionImpl.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpSessionImpl.java index 32486a68f..11704fdba 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpSessionImpl.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpSessionImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java index a89a6ed03..05d97f885 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java index c26830b06..4cf2c16c9 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/socket/https/HttpsServerSocket.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/socket/https/HttpsServerSocket.java index 3cc7e0c6d..f90a917e6 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/socket/https/HttpsServerSocket.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/socket/https/HttpsServerSocket.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.log/OSGI-INF/l10n/bundle_en.properties b/bundles/org.eclipse.equinox.log/OSGI-INF/l10n/bundle_en.properties index 3691b8f2b..8bf86e2e0 100644 --- a/bundles/org.eclipse.equinox.log/OSGI-INF/l10n/bundle_en.properties +++ b/bundles/org.eclipse.equinox.log/OSGI-INF/l10n/bundle_en.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 1999, 2005 IBM Corporation. +# Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/Activator.java b/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/Activator.java index 6af7eedbb..b3aa520e0 100644 --- a/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/Activator.java +++ b/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogReaderService.java b/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogReaderService.java index b6f92e3d2..bda13d6b8 100644 --- a/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogReaderService.java +++ b/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogReaderService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogServiceFactory.java b/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogServiceFactory.java index c038d61f8..fa6a4e9c0 100644 --- a/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogServiceFactory.java +++ b/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogServiceFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogServiceImpl.java b/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogServiceImpl.java index 2a7e1a8ed..69aaed1be 100644 --- a/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogServiceImpl.java +++ b/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogServiceImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LoggedException.java b/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LoggedException.java index 6417ceed7..22789d5cc 100644 --- a/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LoggedException.java +++ b/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LoggedException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2005 IBM Corporation. + * Copyright (c) 1999, 2006 IBM Corporation 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 @@ -201,4 +201,4 @@ public class LoggedException extends Throwable implements Cloneable { int length = exceptionClassName.length() + message.length() + 2; return new StringBuffer(length).append(exceptionClassName).append(": ").append(message).toString(); //$NON-NLS-1$ } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/Activator.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/Activator.java index ebba91abc..05c654b65 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/Activator.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/AttributeDefinitionImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/AttributeDefinitionImpl.java index 93ee05504..5174fdde9 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/AttributeDefinitionImpl.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/AttributeDefinitionImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/DataParser.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/DataParser.java index 40085e974..46d66a37e 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/DataParser.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/DataParser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/LocalizationElement.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/LocalizationElement.java index 8ee9ef0b7..6b3bda4ed 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/LocalizationElement.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/LocalizationElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/Logging.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/Logging.java index 48d136f4e..cf2650175 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/Logging.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/Logging.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeInformationImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeInformationImpl.java index aef834ad2..546026bae 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeInformationImpl.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeInformationImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeProviderImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeProviderImpl.java index 16141707d..61527c0df 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeProviderImpl.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeProviderImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeProviderTracker.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeProviderTracker.java index 8a05d8864..37bacc71c 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeProviderTracker.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeProviderTracker.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeServiceImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeServiceImpl.java index 619a2204b..7b4db2174 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeServiceImpl.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeServiceImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/ObjectClassDefinitionImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/ObjectClassDefinitionImpl.java index a0d6a1c6f..7d70e2a2d 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/ObjectClassDefinitionImpl.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/ObjectClassDefinitionImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/ValueTokenizer.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/ValueTokenizer.java index 4320d3ce4..51032b155 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/ValueTokenizer.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/ValueTokenizer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/AbstractScope.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/AbstractScope.java index 6ffebd06d..1b5ebd884 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/AbstractScope.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/AbstractScope.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2005 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Base64.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Base64.java index de8518445..1cf55d3bb 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Base64.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Base64.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2005 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ConfigurationPreferences.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ConfigurationPreferences.java index 72e1426cc..3d002b002 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ConfigurationPreferences.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ConfigurationPreferences.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2005 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/LookupOrder.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/LookupOrder.java index 96284d865..4d879913c 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/LookupOrder.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/LookupOrder.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2005 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PrefsMessages.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PrefsMessages.java index 12764b93c..5eb2f2496 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PrefsMessages.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PrefsMessages.java @@ -1,12 +1,13 @@ -/********************************************************************** - * Copyright (c) 2005 IBM Corporation 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 - * - * Contributors: +/******************************************************************************* + * Copyright (c) 2005, 2006 IBM Corporation 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 + * + * Contributors: * IBM - Initial API and implementation - **********************************************************************/ + *******************************************************************************/ package org.eclipse.core.internal.preferences; import java.util.Date; @@ -67,4 +68,4 @@ public class PrefsMessages extends NLS { buffer.append(message); System.out.println(buffer.toString()); } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/RootPreferences.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/RootPreferences.java index bd74082b3..26e59a1e0 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/RootPreferences.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/RootPreferences.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. + * Copyright (c) 2004, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/messages.properties b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/messages.properties index de5a2a783..a097e26ed 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/messages.properties +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/messages.properties @@ -1,10 +1,10 @@ ############################################################################### -# Copyright (c) 2000, 2005 IBM Corporation and others. +# Copyright (c) 2000, 2006 IBM Corporation 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 -# +# # Contributors: # IBM Corporation - initial API and implementation ############################################################################### diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/DefaultScope.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/DefaultScope.java index a42de40c8..6acc39314 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/DefaultScope.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/DefaultScope.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. + * Copyright (c) 2004, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IEclipsePreferences.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IEclipsePreferences.java index a5d49caa4..f6ca286e8 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IEclipsePreferences.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IEclipsePreferences.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2005 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IExportedPreferences.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IExportedPreferences.java index 70ad2de98..41f477714 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IExportedPreferences.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IExportedPreferences.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2005 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IPreferenceNodeVisitor.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IPreferenceNodeVisitor.java index 7d2a61f12..28733cc67 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IPreferenceNodeVisitor.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IPreferenceNodeVisitor.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2005 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IScope.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IScope.java index 29d3c1936..07a56d665 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IScope.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IScope.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2005 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IScopeContext.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IScopeContext.java index f1fd7607f..9e9021ba0 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IScopeContext.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IScopeContext.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2005 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/build.properties b/bundles/org.eclipse.equinox.registry/build.properties index 532e719b2..e5ecec7d1 100644 --- a/bundles/org.eclipse.equinox.registry/build.properties +++ b/bundles/org.eclipse.equinox.registry/build.properties @@ -1,10 +1,10 @@ ############################################################################### -# Copyright (c) 2005 IBM Corporation and others. +# Copyright (c) 2005, 2006 IBM Corporation 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 -# +# # Contributors: # IBM Corporation - initial API and implementation ############################################################################### diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionDelta.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionDelta.java index 83d1d7567..29d6b787b 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionDelta.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionDelta.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. + * Copyright (c) 2000, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionsParser.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionsParser.java index a0825c8db..dd8aef83e 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionsParser.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionsParser.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/HashtableOfInt.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/HashtableOfInt.java index b66810bdd..877611b35 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/HashtableOfInt.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/HashtableOfInt.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/HashtableOfStringAndInt.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/HashtableOfStringAndInt.java index 78ff58cce..d0e4f7af6 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/HashtableOfStringAndInt.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/HashtableOfStringAndInt.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. + * Copyright (c) 2000, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IObjectManager.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IObjectManager.java index c75e7aaf2..9624b25d6 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IObjectManager.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IObjectManager.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2005 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IRegistryConstants.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IRegistryConstants.java index 035837540..a8d20043b 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IRegistryConstants.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IRegistryConstants.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/KeyedElement.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/KeyedElement.java index f58774044..0cb9fab87 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/KeyedElement.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/KeyedElement.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. + * Copyright (c) 2000, 2005 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReadWriteMonitor.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReadWriteMonitor.java index 52e4e4943..6d21bee62 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReadWriteMonitor.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReadWriteMonitor.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2005 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryChangeEvent.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryChangeEvent.java index 92c2c705e..e03ca1398 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryChangeEvent.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryChangeEvent.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. + * Copyright (c) 2000, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryDelta.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryDelta.java index 12b66dbda..eb52ebe5b 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryDelta.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryDelta.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. + * Copyright (c) 2000, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryMessages.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryMessages.java index 46ec95af3..67602d2d2 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryMessages.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryMessages.java @@ -1,12 +1,13 @@ -/********************************************************************** - * Copyright (c) 2005 IBM Corporation 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 - * - * Contributors: +/******************************************************************************* + * Copyright (c) 2005, 2006 IBM Corporation 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 + * + * Contributors: * IBM - Initial API and implementation - **********************************************************************/ + *******************************************************************************/ package org.eclipse.core.internal.registry; import org.eclipse.osgi.util.NLS; @@ -79,4 +80,4 @@ public class RegistryMessages extends NLS { public static void reloadMessages() { NLS.initializeMessages(BUNDLE_NAME, RegistryMessages.class); } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObject.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObject.java index 65fac9299..c6e5157c4 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObject.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObject.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectFactory.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectFactory.java index 3b078b294..8bff1dbde 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectFactory.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectFactory.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ThirdLevelConfigurationElementHandle.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ThirdLevelConfigurationElementHandle.java index 7cf9d0d61..db255be50 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ThirdLevelConfigurationElementHandle.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ThirdLevelConfigurationElementHandle.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * Copyright (c) 2004, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/messages.properties b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/messages.properties index 326322967..acf9f166b 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/messages.properties +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/messages.properties @@ -1,10 +1,10 @@ ############################################################################### -# Copyright (c) 2005 IBM Corporation and others. +# Copyright (c) 2005, 2006 IBM Corporation 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 -# +# # Contributors: # IBM Corporation - initial API and implementation ############################################################################### diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java index 439a4a86f..d6e701d07 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/OSGIUtils.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/OSGIUtils.java index 64e9386a2..8591d6bfd 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/OSGIUtils.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/OSGIUtils.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeListener.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeListener.java index d752e4b9d..84b30f01a 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeListener.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeListener.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2003, 2004 IBM Corporation and others. + * Copyright (c) 2003, 2006 IBM Corporation 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 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Activator.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Activator.java index 487e21451..c39fdc9ca 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Activator.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation. + * Copyright (c) 2001, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Authorization.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Authorization.java index 50e3a7113..6eedbebd6 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Authorization.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Authorization.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation. + * Copyright (c) 2001, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/ExternalMessages.properties b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/ExternalMessages.properties index 4e658dfd7..d3455e842 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/ExternalMessages.properties +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/ExternalMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2001, 2005 IBM Corporation. +# Copyright (c) 2001, 2006 IBM Corporation 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 @@ -24,4 +24,4 @@ CREATE_NULL_ROLE_EXCEPTION =Role can not be null CREATE_INVALID_TYPE_ROLE_EXCEPTION=Invalid type for createRole INVALID_KEY_EXCEPTION=Key can only be of type String INVALID_VALUE_EXCEPTION=Value can only be of type String or byte[] -USERADMIN_UNREGISTERED_EXCEPTION=UserAdmin service has been unregistered \ No newline at end of file +USERADMIN_UNREGISTERED_EXCEPTION=UserAdmin service has been unregistered diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Group.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Group.java index d744c96ca..d76067be1 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Group.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Group.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation. + * Copyright (c) 2001, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogMessages.properties b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogMessages.properties index f22b676e2..e2cd481a9 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogMessages.properties +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2001, 2005 IBM Corporation. +# Copyright (c) 2001, 2006 IBM Corporation 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 @@ -12,4 +12,4 @@ Unknown_Log_level=Unknown Log Level Info=Log Info Warning=Log Warning -Error=Log Error \ No newline at end of file +Error=Log Error diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogTracker.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogTracker.java index 8a801ef65..61ec2ef70 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogTracker.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogTracker.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1998, 2005 IBM Corporation. + * Copyright (c) 1998, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogTrackerMsg.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogTrackerMsg.java index d257de27d..17626e57b 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogTrackerMsg.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogTrackerMsg.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -24,4 +24,4 @@ public class LogTrackerMsg extends NLS { // initialize resource bundles NLS.initializeMessages(BUNDLE_NAME, LogTrackerMsg.class); } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Role.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Role.java index 3c772d922..68c13e42f 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Role.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Role.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation. + * Copyright (c) 2001, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/User.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/User.java index a76e25421..50c82284b 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/User.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/User.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation. + * Copyright (c) 2001, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdmin.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdmin.java index e8493d180..798b678f2 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdmin.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdmin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation. + * Copyright (c) 2001, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdminEventProducer.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdminEventProducer.java index 545625055..c928859fc 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdminEventProducer.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdminEventProducer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation. + * Copyright (c) 2001, 2006 IBM Corporation 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 @@ -136,4 +136,4 @@ public class UserAdminEventProducer extends ServiceTracker implements EventDispa log.log(userAdmin, LogService.LOG_WARNING, UserAdminMsg.Event_Delivery_Exception, t); } } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdminHashtable.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdminHashtable.java index 9d89c4560..15c39f0e4 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdminHashtable.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdminHashtable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation. + * Copyright (c) 2001, 2006 IBM Corporation 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 @@ -174,4 +174,4 @@ public class UserAdminHashtable extends Hashtable { return super.get(name); } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdminStore.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdminStore.java index 95c7929ad..fda68fb00 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdminStore.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/UserAdminStore.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation. + * Copyright (c) 2001, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/Activator.java b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/Activator.java index 73594576b..acaad3b02 100644 --- a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/Activator.java +++ b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2005 IBM Corporation. + * Copyright (c) 2002, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ConsumersCustomizer.java b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ConsumersCustomizer.java index 8e866abdf..26a5f5871 100644 --- a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ConsumersCustomizer.java +++ b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ConsumersCustomizer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2005 IBM Corporation. + * Copyright (c) 2002, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ExternalMessages.properties b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ExternalMessages.properties index f90e6525f..0143995d3 100644 --- a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ExternalMessages.properties +++ b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ExternalMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2002, 2005 IBM Corporation. +# Copyright (c) 2002, 2006 IBM Corporation 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 @@ -11,4 +11,4 @@ BACKING_STORE_READ_EXCEPTION=WireAdmin is unable to read its data from backing store {0} WIREADMIN_UNREGISTERED_EXCEPTION=The WireAdmin Service has been unregistered {0} WIREADMIN_EVENT_DISPATCH_ERROR=Error dispatching WireAdmin Events {0} -WIREADMIN_KEYS_CASE_INSENSITIVE_MATCH=Property keys can not be case insensitive matches \ No newline at end of file +WIREADMIN_KEYS_CASE_INSENSITIVE_MATCH=Property keys can not be case insensitive matches diff --git a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/LogMessages.properties b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/LogMessages.properties index bc1bf530c..e29ba01e2 100644 --- a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/LogMessages.properties +++ b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/LogMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2002, 2005 IBM Corporation. +# Copyright (c) 2002, 2006 IBM Corporation 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 @@ -11,4 +11,4 @@ Unknown_Log_level=Unknown Log Level Info=Log Info Warning=Log Warning -Error=Log Error \ No newline at end of file +Error=Log Error diff --git a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/LogTracker.java b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/LogTracker.java index 67b8cd1ee..cd7f72524 100644 --- a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/LogTracker.java +++ b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/LogTracker.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1998, 2005 IBM Corporation. + * Copyright (c) 1998, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/LogTrackerMsg.java b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/LogTrackerMsg.java index 7a9a0d29f..56f51a175 100644 --- a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/LogTrackerMsg.java +++ b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/LogTrackerMsg.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation. + * Copyright (c) 2005, 2006 IBM Corporation 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 @@ -24,4 +24,4 @@ public class LogTrackerMsg extends NLS { // initialize resource bundles NLS.initializeMessages(BUNDLE_NAME, LogTrackerMsg.class); } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ProducersCustomizer.java b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ProducersCustomizer.java index 55ce4864f..3b8af292d 100644 --- a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ProducersCustomizer.java +++ b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ProducersCustomizer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2005 IBM Corporation. + * Copyright (c) 2002, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ReadOnlyDictionary.java b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ReadOnlyDictionary.java index bc5a49318..f5331605d 100644 --- a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ReadOnlyDictionary.java +++ b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/ReadOnlyDictionary.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2005 IBM Corporation. + * Copyright (c) 2002, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/Wire.java b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/Wire.java index 1ba108cf3..7c0f47656 100644 --- a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/Wire.java +++ b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/Wire.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2005 IBM Corporation. + * Copyright (c) 2002, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/WireAdmin.java b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/WireAdmin.java index a16488e46..b3912b623 100644 --- a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/WireAdmin.java +++ b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/WireAdmin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2005 IBM Corporation. + * Copyright (c) 2002, 2006 IBM Corporation 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 diff --git a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/WireAdminEventProducer.java b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/WireAdminEventProducer.java index a01071bc8..e1f0563d2 100644 --- a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/WireAdminEventProducer.java +++ b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/WireAdminEventProducer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2005 IBM Corporation. + * Copyright (c) 2002, 2006 IBM Corporation 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 @@ -175,4 +175,4 @@ public class WireAdminEventProducer extends ServiceTracker implements EventDispa } -} \ No newline at end of file +} diff --git a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/WireAdminStore.java b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/WireAdminStore.java index eed71a074..9491315e7 100644 --- a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/WireAdminStore.java +++ b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/wireadmin/WireAdminStore.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2005 IBM Corporation. + * Copyright (c) 2002, 2006 IBM Corporation 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 -- cgit v1.2.3