diff --git a/discovery/org.eclipse.rse.discovery/.classpath b/discovery/org.eclipse.rse.discovery/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/discovery/org.eclipse.rse.discovery/.classpath +++ b/discovery/org.eclipse.rse.discovery/.classpath @@ -1,11 +1,7 @@ - - - - - + diff --git a/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF b/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF index cc5fb5a3b7f..f6e10bbc84a 100644 --- a/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.discovery;singleton:=true Bundle-Version: 1.0.2.qualifier -Bundle-Activator: org.eclipse.rse.discovery.Activator +Bundle-Activator: org.eclipse.rse.internal.discovery.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -15,3 +15,4 @@ Require-Bundle: org.eclipse.ui, Eclipse-LazyStart: true Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Export-Package: org.eclipse.rse.internal.discovery;x-internal:=true diff --git a/discovery/org.eclipse.rse.discovery/plugin.xml b/discovery/org.eclipse.rse.discovery/plugin.xml index f19854ee0b9..7bae160553d 100644 --- a/discovery/org.eclipse.rse.discovery/plugin.xml +++ b/discovery/org.eclipse.rse.discovery/plugin.xml @@ -2,13 +2,13 @@ @@ -18,7 +18,7 @@ Contributors: - - + diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/Activator.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Activator.java similarity index 92% rename from discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/Activator.java rename to discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Activator.java index 1ca27175ad1..b923cef08aa 100644 --- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/Activator.java +++ b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 @@ -8,7 +8,7 @@ * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.rse.discovery; +package org.eclipse.rse.internal.discovery; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/Messages.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java similarity index 75% rename from discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/Messages.java rename to discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java index ab5bdb34978..503381a252e 100644 --- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/Messages.java +++ b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java @@ -1,19 +1,19 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.rse.discovery; +package org.eclipse.rse.internal.discovery; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.rse.discovery.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.rse.internal.discovery.messages"; //$NON-NLS-1$ public static String ServiceDiscoveryWizard_DiscoveryPropertySet; diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoverySubSystemConfiguration.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoverySubSystemConfiguration.java similarity index 91% rename from discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoverySubSystemConfiguration.java rename to discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoverySubSystemConfiguration.java index 28714d8565a..ae86d1af0cc 100644 --- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoverySubSystemConfiguration.java +++ b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoverySubSystemConfiguration.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.rse.discovery; +package org.eclipse.rse.internal.discovery; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizard.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java similarity index 94% rename from discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizard.java rename to discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java index 7b44a5abcdc..4b6fea2338b 100644 --- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizard.java +++ b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 @@ -8,7 +8,7 @@ * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.rse.discovery; +package org.eclipse.rse.internal.discovery; import java.util.Enumeration; import java.util.Iterator; @@ -24,8 +24,8 @@ import org.eclipse.rse.ui.actions.SystemRefreshAllAction; import org.eclipse.tm.discovery.model.Pair; import org.eclipse.tm.discovery.model.Service; import org.eclipse.tm.discovery.model.ServiceType; -import org.eclipse.tm.discovery.wizard.ServiceDiscoveryWizardDisplayPage; -import org.eclipse.tm.discovery.wizard.ServiceDiscoveryWizardMainPage; +import org.eclipse.tm.internal.discovery.wizard.ServiceDiscoveryWizardDisplayPage; +import org.eclipse.tm.internal.discovery.wizard.ServiceDiscoveryWizardMainPage; /** * Service Discovery Wizard diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/messages.properties b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties similarity index 74% rename from discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/messages.properties rename to discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties index 8f14ae4242e..12852ba8466 100644 --- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/messages.properties +++ b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties @@ -1,15 +1,15 @@ ################################################################################## -# Copyright (c) 2006 Symbian Software Ltd. All rights reserved. +# Copyright (c) 2006, 2007 Symbian Software Ltd. 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: -# Javier Montalvo Orús (Symbian) - initial API and implementation +# Javier Montalvo Orus (Symbian) - initial API and implementation ################################################################################## ServiceDiscoveryWizard_DiscoveryPropertySet=Discovery ServiceDiscoveryWizard_Port=port ServiceDiscoveryWizard_SavingMessage=Saving RSE model -ServiceDiscoveryWizard_StatusId=org.eclipse.tm.discovery.wizard +ServiceDiscoveryWizard_StatusId=org.eclipse.tm.internal.discovery.wizard ServiceDiscoveryWizard_StatusMessage=RSE model saved diff --git a/discovery/org.eclipse.tm.discovery.engine/.classpath b/discovery/org.eclipse.tm.discovery.engine/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/discovery/org.eclipse.tm.discovery.engine/.classpath +++ b/discovery/org.eclipse.tm.discovery.engine/.classpath @@ -1,11 +1,7 @@ - - - - - + diff --git a/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF index 509b4df411f..340c0ba70eb 100644 --- a/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF @@ -3,17 +3,17 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.discovery.engine;singleton:=true Bundle-Version: 1.0.1.qualifier -Bundle-Activator: org.eclipse.tm.discovery.engine.Activator +Bundle-Activator: org.eclipse.tm.internal.discovery.engine.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.emf.ecore.xmi, org.eclipse.tm.discovery.model Eclipse-LazyStart: true -Export-Package: org.eclipse.tm.discovery.engine, - org.eclipse.tm.discovery.protocol, - org.eclipse.tm.discovery.transport +Export-Package: org.eclipse.tm.discovery.protocol, + org.eclipse.tm.discovery.transport, + org.eclipse.tm.internal.discovery.engine;x-friends:="org.eclipse.tm.internal.discovery.wizard" Import-Package: org.eclipse.tm.discovery.model, - org.eclipse.tm.discovery.model.util + org.eclipse.tm.internal.discovery.model.util Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/discovery/org.eclipse.tm.discovery.engine/plugin.xml b/discovery/org.eclipse.tm.discovery.engine/plugin.xml index c8e743e725a..b5f161deb9c 100644 --- a/discovery/org.eclipse.tm.discovery.engine/plugin.xml +++ b/discovery/org.eclipse.tm.discovery.engine/plugin.xml @@ -1,5 +1,16 @@ + + + diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/IProtocol.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/IProtocol.java index f88422b0d75..22956cb1f94 100644 --- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/IProtocol.java +++ b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/IProtocol.java @@ -1,11 +1,11 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.protocol; diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/ProtocolFactory.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/ProtocolFactory.java index 87c103a6556..10f93fd2d0e 100644 --- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/ProtocolFactory.java +++ b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/ProtocolFactory.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/ITransport.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/ITransport.java index 52dd1e6237a..7f1c4866274 100644 --- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/ITransport.java +++ b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/ITransport.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/TransportFactory.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/TransportFactory.java index 79ec7f2a49e..87cab8fc076 100644 --- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/TransportFactory.java +++ b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/TransportFactory.java @@ -1,11 +1,11 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.transport; diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/Activator.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Activator.java similarity index 92% rename from discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/Activator.java rename to discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Activator.java index c58c92f5950..1338457fde5 100644 --- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/Activator.java +++ b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 @@ -8,7 +8,7 @@ * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.engine; +package org.eclipse.tm.internal.discovery.engine; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/Messages.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Messages.java similarity index 72% rename from discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/Messages.java rename to discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Messages.java index 47f30b9f92c..3e28677637c 100644 --- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/Messages.java +++ b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Messages.java @@ -1,20 +1,20 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.wizard; +package org.eclipse.tm.internal.discovery.engine; import java.util.MissingResourceException; import java.util.ResourceBundle; public class Messages { - private static final String BUNDLE_NAME = "org.eclipse.tm.discovery.wizard.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tm.internal.discovery.engine.messages"; //$NON-NLS-1$ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle .getBundle(BUNDLE_NAME); diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/ServiceDiscoveryEngine.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/ServiceDiscoveryEngine.java similarity index 91% rename from discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/ServiceDiscoveryEngine.java rename to discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/ServiceDiscoveryEngine.java index 05d6be00327..5cab69811b3 100644 --- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/ServiceDiscoveryEngine.java +++ b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/ServiceDiscoveryEngine.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.engine; +package org.eclipse.tm.internal.discovery.engine; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.common.util.WrappedException; @@ -16,9 +16,9 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.tm.discovery.model.ModelPackage; -import org.eclipse.tm.discovery.model.util.ModelResourceFactoryImpl; import org.eclipse.tm.discovery.protocol.IProtocol; import org.eclipse.tm.discovery.transport.ITransport; +import org.eclipse.tm.internal.discovery.model.util.ModelResourceFactoryImpl; /** * Engine for service discovery. diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/messages.properties b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/messages.properties similarity index 77% rename from discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/messages.properties rename to discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/messages.properties index 380ab6187ab..454c8ffb01a 100644 --- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/messages.properties +++ b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/messages.properties @@ -1,11 +1,11 @@ ################################################################################## -# Copyright (c) 2006 Symbian Software Ltd. All rights reserved. +# Copyright (c) 2006, 2007 Symbian Software Ltd. 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: -# Javier Montalvo Orús (Symbian) - initial API and implementation +# Javier Montalvo Orus (Symbian) - initial API and implementation ################################################################################## ServiceDiscoveryEngine.DiscoveryModelFileURI=discoveryModel.xml diff --git a/discovery/org.eclipse.tm.discovery.model.edit/.classpath b/discovery/org.eclipse.tm.discovery.model.edit/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/discovery/org.eclipse.tm.discovery.model.edit/.classpath +++ b/discovery/org.eclipse.tm.discovery.model.edit/.classpath @@ -1,11 +1,7 @@ - - - - - + diff --git a/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF index 4b6f10f17c2..3a871cc780c 100644 --- a/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.discovery.model.edit;singleton:=true Bundle-Version: 1.0.1.qualifier Bundle-ClassPath: . -Bundle-Activator: org.eclipse.tm.discovery.model.provider.DiscoveryModelEditPlugin$Implementation +Bundle-Activator: org.eclipse.tm.internal.discovery.model.provider.DiscoveryModelEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Export-Package: org.eclipse.tm.discovery.model.provider +Export-Package: org.eclipse.tm.internal.discovery.model.provider;x-friends:="org.eclipse.tm.internal.discovery.wizard" Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.edit;visibility:=reexport, org.eclipse.tm.discovery.model diff --git a/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties b/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties index 9085b1bf8bd..f6c95b27359 100644 --- a/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties +++ b/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties @@ -24,37 +24,8 @@ pluginName = TM Service Discovery Edit Support providerName = Eclipse.org -_UI_CreateChild_text = {0} -_UI_CreateChild_text2 = {1} {0} -_UI_CreateChild_text3 = {1} -_UI_CreateChild_tooltip = Create New {0} Under {1} Feature -_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}. -_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent. -_UI_PropertyDescriptor_description = The {0} of the {1} -_UI_Unknown_type = Object -_UI_Unknown_datatype= Value -_UI_SDDevice_sDServiceType_feature = SD Service Type -_UI_SDNetwork_sDDevice_feature = SD Device -_UI_SDService_sDPair_feature = SD Pair -_UI_SDServiceType_sDService_feature = SD Service -_UI_Device_type = Device -_UI_Network_type = Network -_UI_Pair_type = Pair -_UI_Service_type = Service -_UI_ServiceType_type = Service Type -_UI_Device_serviceType_feature = Service Type -_UI_Device_address_feature = Address -_UI_Device_name_feature = Name -_UI_Network_device_feature = Device -_UI_Pair_key_feature = Key -_UI_Pair_value_feature = Value -_UI_Service_pair_feature = Pair -_UI_Service_name_feature = Name -_UI_ServiceType_service_feature = Service -_UI_ServiceType_name_feature = Name -_UI_Unknown_feature = Unspecified \ No newline at end of file diff --git a/discovery/org.eclipse.tm.discovery.model.edit/plugin.xml b/discovery/org.eclipse.tm.discovery.model.edit/plugin.xml index d1bab02dd09..0c1041049bf 100644 --- a/discovery/org.eclipse.tm.discovery.model.edit/plugin.xml +++ b/discovery/org.eclipse.tm.discovery.model.edit/plugin.xml @@ -2,7 +2,7 @@ @@ -21,7 +21,7 @@ Contributors: + class="org.eclipse.tm.internal.discovery.model.util.ModelResourceFactoryImpl" /> diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java index 48182efd041..c8ad9accd88 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java @@ -1,11 +1,11 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.model; diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Device.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Device.java index 2244480cda5..691f67f9b7c 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Device.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Device.java @@ -1,11 +1,11 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.model; diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelFactory.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelFactory.java index 477658c0ed7..820c190e83e 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelFactory.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelFactory.java @@ -1,11 +1,11 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.model; @@ -26,7 +26,7 @@ public interface ModelFactory extends EFactory { * * @generated */ - ModelFactory eINSTANCE = org.eclipse.tm.discovery.model.impl.ModelFactoryImpl.init(); + ModelFactory eINSTANCE = org.eclipse.tm.internal.discovery.model.impl.ModelFactoryImpl.init(); /** * Returns a new object of class 'Device'. diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java index 91d2f36be5f..087602be9e8 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java @@ -1,11 +1,11 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.model; @@ -56,13 +56,13 @@ public interface ModelPackage extends EPackage { * * @generated */ - ModelPackage eINSTANCE = org.eclipse.tm.discovery.model.impl.ModelPackageImpl.init(); + ModelPackage eINSTANCE = org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl.init(); /** - * The meta object id for the '{@link org.eclipse.tm.discovery.model.impl.DeviceImpl Device}' class. + * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl Device}' class. * - * @see org.eclipse.tm.discovery.model.impl.DeviceImpl - * @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getDevice() + * @see org.eclipse.tm.internal.discovery.model.impl.DeviceImpl + * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getDevice() * @generated */ int DEVICE = 0; @@ -100,10 +100,10 @@ public interface ModelPackage extends EPackage { int DEVICE_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.tm.discovery.model.impl.NetworkImpl Network}' class. + * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.NetworkImpl Network}' class. * - * @see org.eclipse.tm.discovery.model.impl.NetworkImpl - * @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getNetwork() + * @see org.eclipse.tm.internal.discovery.model.impl.NetworkImpl + * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getNetwork() * @generated */ int NETWORK = 1; @@ -125,10 +125,10 @@ public interface ModelPackage extends EPackage { int NETWORK_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.tm.discovery.model.impl.PairImpl Pair}' class. + * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.PairImpl Pair}' class. * - * @see org.eclipse.tm.discovery.model.impl.PairImpl - * @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getPair() + * @see org.eclipse.tm.internal.discovery.model.impl.PairImpl + * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getPair() * @generated */ int PAIR = 2; @@ -158,10 +158,10 @@ public interface ModelPackage extends EPackage { int PAIR_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.tm.discovery.model.impl.ServiceImpl Service}' class. + * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl Service}' class. * - * @see org.eclipse.tm.discovery.model.impl.ServiceImpl - * @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getService() + * @see org.eclipse.tm.internal.discovery.model.impl.ServiceImpl + * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getService() * @generated */ int SERVICE = 3; @@ -191,10 +191,10 @@ public interface ModelPackage extends EPackage { int SERVICE_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.tm.discovery.model.impl.ServiceTypeImpl Service Type}' class. + * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl Service Type}' class. * - * @see org.eclipse.tm.discovery.model.impl.ServiceTypeImpl - * @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getServiceType() + * @see org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl + * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getServiceType() * @generated */ int SERVICE_TYPE = 4; @@ -395,10 +395,10 @@ public interface ModelPackage extends EPackage { interface Literals { /** - * The meta object literal for the '{@link org.eclipse.tm.discovery.model.impl.DeviceImpl Device}' class. + * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl Device}' class. * - * @see org.eclipse.tm.discovery.model.impl.DeviceImpl - * @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getDevice() + * @see org.eclipse.tm.internal.discovery.model.impl.DeviceImpl + * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getDevice() * @generated */ @@ -426,10 +426,10 @@ public interface ModelPackage extends EPackage { EAttribute DEVICE__NAME = eINSTANCE.getDevice_Name(); /** - * The meta object literal for the '{@link org.eclipse.tm.discovery.model.impl.NetworkImpl Network}' class. + * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.NetworkImpl Network}' class. * - * @see org.eclipse.tm.discovery.model.impl.NetworkImpl - * @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getNetwork() + * @see org.eclipse.tm.internal.discovery.model.impl.NetworkImpl + * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getNetwork() * @generated */ EClass NETWORK = eINSTANCE.getNetwork(); @@ -442,10 +442,10 @@ public interface ModelPackage extends EPackage { EReference NETWORK__DEVICE = eINSTANCE.getNetwork_Device(); /** - * The meta object literal for the '{@link org.eclipse.tm.discovery.model.impl.PairImpl Pair}' class. + * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.PairImpl Pair}' class. * - * @see org.eclipse.tm.discovery.model.impl.PairImpl - * @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getPair() + * @see org.eclipse.tm.internal.discovery.model.impl.PairImpl + * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getPair() * @generated */ EClass PAIR = eINSTANCE.getPair(); @@ -465,10 +465,10 @@ public interface ModelPackage extends EPackage { EAttribute PAIR__VALUE = eINSTANCE.getPair_Value(); /** - * The meta object literal for the '{@link org.eclipse.tm.discovery.model.impl.ServiceImpl Service}' class. + * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl Service}' class. * - * @see org.eclipse.tm.discovery.model.impl.ServiceImpl - * @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getService() + * @see org.eclipse.tm.internal.discovery.model.impl.ServiceImpl + * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getService() * @generated */ EClass SERVICE = eINSTANCE.getService(); @@ -488,10 +488,10 @@ public interface ModelPackage extends EPackage { EAttribute SERVICE__NAME = eINSTANCE.getService_Name(); /** - * The meta object literal for the '{@link org.eclipse.tm.discovery.model.impl.ServiceTypeImpl Service Type}' class. + * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl Service Type}' class. * - * @see org.eclipse.tm.discovery.model.impl.ServiceTypeImpl - * @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getServiceType() + * @see org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl + * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getServiceType() * @generated */ EClass SERVICE_TYPE = eINSTANCE.getServiceType(); diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Network.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Network.java index 4123559dea0..2fc8cd1a47b 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Network.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Network.java @@ -1,11 +1,11 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.model; diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Pair.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Pair.java index 5739ed7695c..b085eec750e 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Pair.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Pair.java @@ -1,11 +1,11 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.model; diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Service.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Service.java index d9bd5076250..108dbe214ea 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Service.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Service.java @@ -1,11 +1,11 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.model; diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ServiceType.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ServiceType.java index 1bf4a6b52d0..3ec0b8c6994 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ServiceType.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ServiceType.java @@ -1,11 +1,11 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.model; diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/DeviceImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/DeviceImpl.java similarity index 91% rename from discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/DeviceImpl.java rename to discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/DeviceImpl.java index 6b505077501..39a159659c0 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/DeviceImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/DeviceImpl.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.model.impl; +package org.eclipse.tm.internal.discovery.model.impl; import java.util.Collection; @@ -37,9 +37,9 @@ import org.eclipse.tm.discovery.model.ServiceType; *

* The following features are implemented: *

    - *
  • {@link org.eclipse.tm.discovery.model.impl.DeviceImpl#getServiceType Service Type}
  • - *
  • {@link org.eclipse.tm.discovery.model.impl.DeviceImpl#getAddress Address}
  • - *
  • {@link org.eclipse.tm.discovery.model.impl.DeviceImpl#getName Name}
  • + *
  • {@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl#getServiceType Service Type}
  • + *
  • {@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl#getAddress Address}
  • + *
  • {@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl#getName Name}
  • *
*

* diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelFactoryImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelFactoryImpl.java similarity index 93% rename from discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelFactoryImpl.java rename to discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelFactoryImpl.java index ce3ab62161d..791eabafb8d 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelFactoryImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelFactoryImpl.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.model.impl; +package org.eclipse.tm.internal.discovery.model.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelPackageImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelPackageImpl.java similarity index 99% rename from discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelPackageImpl.java rename to discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelPackageImpl.java index 0e75e8b3078..4e4a542a3ab 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelPackageImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelPackageImpl.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 @@ -8,7 +8,7 @@ * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.model.impl; +package org.eclipse.tm.internal.discovery.model.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/NetworkImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/NetworkImpl.java similarity index 91% rename from discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/NetworkImpl.java rename to discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/NetworkImpl.java index 0ecf541dd94..8b06e0a8f9c 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/NetworkImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/NetworkImpl.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.model.impl; +package org.eclipse.tm.internal.discovery.model.impl; import java.util.Collection; @@ -35,7 +35,7 @@ import org.eclipse.tm.discovery.model.Network; *

* The following features are implemented: *

    - *
  • {@link org.eclipse.tm.discovery.model.impl.NetworkImpl#getDevice Device}
  • + *
  • {@link org.eclipse.tm.internal.discovery.model.impl.NetworkImpl#getDevice Device}
  • *
*

* diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/PairImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/PairImpl.java similarity index 91% rename from discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/PairImpl.java rename to discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/PairImpl.java index 25aa9ad75c9..17810b4c4f1 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/PairImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/PairImpl.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.model.impl; +package org.eclipse.tm.internal.discovery.model.impl; import org.eclipse.emf.common.notify.Notification; @@ -27,8 +27,8 @@ import org.eclipse.tm.discovery.model.Pair; *

* The following features are implemented: *

    - *
  • {@link org.eclipse.tm.discovery.model.impl.PairImpl#getKey Key}
  • - *
  • {@link org.eclipse.tm.discovery.model.impl.PairImpl#getValue Value}
  • + *
  • {@link org.eclipse.tm.internal.discovery.model.impl.PairImpl#getKey Key}
  • + *
  • {@link org.eclipse.tm.internal.discovery.model.impl.PairImpl#getValue Value}
  • *
*

* diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceImpl.java similarity index 91% rename from discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceImpl.java rename to discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceImpl.java index 1f57639ab04..90c8cc24ca1 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceImpl.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.model.impl; +package org.eclipse.tm.internal.discovery.model.impl; import java.util.Collection; @@ -37,8 +37,8 @@ import org.eclipse.tm.discovery.model.Service; *

* The following features are implemented: *

    - *
  • {@link org.eclipse.tm.discovery.model.impl.ServiceImpl#getPair Pair}
  • - *
  • {@link org.eclipse.tm.discovery.model.impl.ServiceImpl#getName Name}
  • + *
  • {@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl#getPair Pair}
  • + *
  • {@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl#getName Name}
  • *
*

* diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceTypeImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceTypeImpl.java similarity index 91% rename from discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceTypeImpl.java rename to discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceTypeImpl.java index 2c7e737014b..5b27ddfe066 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceTypeImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceTypeImpl.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.model.impl; +package org.eclipse.tm.internal.discovery.model.impl; import java.util.Collection; @@ -37,8 +37,8 @@ import org.eclipse.tm.discovery.model.ServiceType; *

* The following features are implemented: *

    - *
  • {@link org.eclipse.tm.discovery.model.impl.ServiceTypeImpl#getService Service}
  • - *
  • {@link org.eclipse.tm.discovery.model.impl.ServiceTypeImpl#getName Name}
  • + *
  • {@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl#getService Service}
  • + *
  • {@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl#getName Name}
  • *
*

* diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelAdapterFactory.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelAdapterFactory.java similarity index 96% rename from discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelAdapterFactory.java rename to discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelAdapterFactory.java index a03dff3fd7f..7b654473690 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelAdapterFactory.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelAdapterFactory.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.model.util; +package org.eclipse.tm.internal.discovery.model.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelResourceFactoryImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java similarity index 86% rename from discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelResourceFactoryImpl.java rename to discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java index a26e503d2bb..1e32b69b1f5 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelResourceFactoryImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.model.util; +package org.eclipse.tm.internal.discovery.model.util; import org.eclipse.emf.common.util.URI; @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource; * * The Resource Factory associated with the package. * - * @see org.eclipse.tm.discovery.model.util.ModelResourceImpl + * @see org.eclipse.tm.internal.discovery.model.util.ModelResourceImpl * @generated */ public class ModelResourceFactoryImpl extends ResourceFactoryImpl { diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelResourceImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java similarity index 75% rename from discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelResourceImpl.java rename to discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java index 5b80920fe72..3275b0e998d 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelResourceImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.model.util; +package org.eclipse.tm.internal.discovery.model.util; import org.eclipse.emf.common.util.URI; @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl; * * The Resource associated with the package. * - * @see org.eclipse.tm.discovery.model.util.ModelResourceFactoryImpl + * @see org.eclipse.tm.internal.discovery.model.util.ModelResourceFactoryImpl * @generated */ public class ModelResourceImpl extends XMLResourceImpl { diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelSwitch.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java similarity index 98% rename from discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelSwitch.java rename to discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java index d94aff2091c..9da418db2ad 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelSwitch.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 @@ -8,7 +8,7 @@ * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.model.util; +package org.eclipse.tm.internal.discovery.model.util; import java.util.List; diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelXMLProcessor.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java similarity index 87% rename from discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelXMLProcessor.java rename to discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java index eb9648acc05..38f0bfeab6d 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelXMLProcessor.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.model.util; +package org.eclipse.tm.internal.discovery.model.util; import java.util.Map; diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.classpath b/discovery/org.eclipse.tm.discovery.protocol.dnssd/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.classpath +++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/.classpath @@ -1,11 +1,7 @@ - - - - - + diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF index 7e6107e9b29..09453e6233f 100644 --- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.discovery.protocol.dnssd;singleton:=true Bundle-Version: 1.0.1.qualifier -Bundle-Activator: org.eclipse.tm.discovery.protocol.dnssd.Activator +Bundle-Activator: org.eclipse.tm.internal.discovery.protocol.dnssd.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml b/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml index c612ca67a60..a02e3966657 100644 --- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml +++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml @@ -1,9 +1,20 @@ + + + diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/Activator.java b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Activator.java similarity index 92% rename from discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/Activator.java rename to discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Activator.java index c4aff3dbc54..c695ffeec41 100644 --- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/Activator.java +++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 @@ -8,7 +8,7 @@ * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.protocol.dnssd; +package org.eclipse.tm.internal.discovery.protocol.dnssd; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/DNSSDProtocol.java b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/DNSSDProtocol.java similarity index 99% rename from discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/DNSSDProtocol.java rename to discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/DNSSDProtocol.java index 13bab04ba48..4de1b56dbc5 100644 --- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/DNSSDProtocol.java +++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/DNSSDProtocol.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 @@ -8,7 +8,7 @@ * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.protocol.dnssd; +package org.eclipse.tm.internal.discovery.protocol.dnssd; import java.io.ByteArrayInputStream; import java.util.Iterator; diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/Messages.java b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Messages.java similarity index 71% rename from discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/Messages.java rename to discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Messages.java index f38d3abd4cb..5fbd9f98a10 100644 --- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/Messages.java +++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Messages.java @@ -1,20 +1,20 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.protocol.dnssd; +package org.eclipse.tm.internal.discovery.protocol.dnssd; import java.util.MissingResourceException; import java.util.ResourceBundle; public class Messages { - private static final String BUNDLE_NAME = "org.eclipse.tm.discovery.protocol.dnssd.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tm.internal.discovery.protocol.dnssd.messages"; //$NON-NLS-1$ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle .getBundle(BUNDLE_NAME); diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/messages.properties b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/messages.properties similarity index 83% rename from discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/messages.properties rename to discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/messages.properties index 78138f7704b..05ed2428d94 100644 --- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/messages.properties +++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/messages.properties @@ -1,11 +1,11 @@ ################################################################################## -# Copyright (c) 2006 Symbian Software Ltd. All rights reserved. +# Copyright (c) 2006, 2007 Symbian Software Ltd. 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: -# Javier Montalvo Orús (Symbian) - initial API and implementation +# Javier Montalvo Orus (Symbian) - initial API and implementation ################################################################################## DNSSDProtocol.ServiceDiscoveryCommand=_services._dns-sd._udp.local. diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/.classpath b/discovery/org.eclipse.tm.discovery.transport.udp/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/discovery/org.eclipse.tm.discovery.transport.udp/.classpath +++ b/discovery/org.eclipse.tm.discovery.transport.udp/.classpath @@ -1,11 +1,7 @@ - - - - - + diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF index ff55aa6f05f..06d4dbcdb57 100644 --- a/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.discovery.transport.udp;singleton:=true Bundle-Version: 1.0.1.qualifier -Bundle-Activator: org.eclipse.tm.discovery.transport.udp.Activator +Bundle-Activator: org.eclipse.tm.internal.discovery.transport.udp.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, @@ -11,3 +11,4 @@ Require-Bundle: org.eclipse.ui, org.eclipse.tm.discovery.engine Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Export-Package: org.eclipse.tm.internal.discovery.transport.udp;x-internal:=true diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.xml b/discovery/org.eclipse.tm.discovery.transport.udp/plugin.xml index 5951d38e4f0..b97d9d216b0 100644 --- a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.xml +++ b/discovery/org.eclipse.tm.discovery.transport.udp/plugin.xml @@ -1,10 +1,21 @@ + + + diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/discovery/transport/udp/Activator.java b/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/Activator.java similarity index 92% rename from discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/discovery/transport/udp/Activator.java rename to discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/Activator.java index d0bb577cf37..f7255a7b939 100644 --- a/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/discovery/transport/udp/Activator.java +++ b/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 @@ -8,7 +8,7 @@ * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.transport.udp; +package org.eclipse.tm.internal.discovery.transport.udp; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/discovery/transport/udp/UDPTransport.java b/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/UDPTransport.java similarity index 95% rename from discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/discovery/transport/udp/UDPTransport.java rename to discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/UDPTransport.java index 2fc5b2bb556..efbf7837595 100644 --- a/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/discovery/transport/udp/UDPTransport.java +++ b/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/UDPTransport.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 @@ -8,7 +8,7 @@ * Javier Montalvo Orús (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.transport.udp; +package org.eclipse.tm.internal.discovery.transport.udp; import java.io.IOException; import java.net.DatagramPacket; diff --git a/discovery/org.eclipse.tm.discovery.view/.classpath b/discovery/org.eclipse.tm.discovery.view/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/discovery/org.eclipse.tm.discovery.view/.classpath +++ b/discovery/org.eclipse.tm.discovery.view/.classpath @@ -1,11 +1,7 @@ - - - - - + diff --git a/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF index 1086adc8227..32991a32b92 100644 --- a/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.discovery.view;singleton:=true Bundle-Version: 1.0.1.qualifier -Bundle-Activator: org.eclipse.tm.discovery.view.Activator +Bundle-Activator: org.eclipse.tm.internal.discovery.view.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui.forms, @@ -17,9 +17,9 @@ Require-Bundle: org.eclipse.core.runtime, Eclipse-LazyStart: false Import-Package: org.eclipse.emf.common.ui, org.eclipse.emf.common.util, - org.eclipse.tm.discovery.engine, - org.eclipse.tm.discovery.model.provider, - org.eclipse.tm.discovery.model.util -Export-Package: org.eclipse.tm.discovery.view + org.eclipse.tm.internal.discovery.engine, + org.eclipse.tm.internal.discovery.model.provider, + org.eclipse.tm.internal.discovery.model.util +Export-Package: org.eclipse.tm.internal.discovery.view Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/discovery/org.eclipse.tm.discovery.view/plugin.xml b/discovery/org.eclipse.tm.discovery.view/plugin.xml index edeb4f0bf72..cacf9dcc698 100644 --- a/discovery/org.eclipse.tm.discovery.view/plugin.xml +++ b/discovery/org.eclipse.tm.discovery.view/plugin.xml @@ -2,13 +2,13 @@ @@ -21,7 +21,7 @@ Contributors: diff --git a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/Activator.java b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Activator.java similarity index 93% rename from discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/Activator.java rename to discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Activator.java index f5311b74036..7c1fed5daa0 100644 --- a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/Activator.java +++ b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 @@ -8,7 +8,7 @@ * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.view; +package org.eclipse.tm.internal.discovery.view; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; diff --git a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/Messages.java b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Messages.java similarity index 85% rename from discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/Messages.java rename to discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Messages.java index 916ad2e1346..a5564273c6a 100644 --- a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/Messages.java +++ b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Messages.java @@ -1,19 +1,19 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.view; +package org.eclipse.tm.internal.discovery.view; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.tm.discovery.view.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tm.internal.discovery.view.messages"; //$NON-NLS-1$ public static String ServiceDiscoveryView_ClearActionText; diff --git a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/ServiceDiscoveryView.java b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/ServiceDiscoveryView.java similarity index 96% rename from discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/ServiceDiscoveryView.java rename to discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/ServiceDiscoveryView.java index 1506bb23acc..d76483f063e 100644 --- a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/ServiceDiscoveryView.java +++ b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/ServiceDiscoveryView.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.view; +package org.eclipse.tm.internal.discovery.view; import java.net.UnknownHostException; import java.util.ArrayList; @@ -47,14 +47,14 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Tree; -import org.eclipse.tm.discovery.engine.ServiceDiscoveryEngine; import org.eclipse.tm.discovery.model.Service; -import org.eclipse.tm.discovery.model.provider.ModelItemProviderAdapterFactory; import org.eclipse.tm.discovery.protocol.IProtocol; import org.eclipse.tm.discovery.protocol.ProtocolFactory; import org.eclipse.tm.discovery.transport.ITransport; import org.eclipse.tm.discovery.transport.TransportFactory; -import org.eclipse.tm.discovery.wizard.ServiceDiscoveryWizardMainPage; +import org.eclipse.tm.internal.discovery.engine.ServiceDiscoveryEngine; +import org.eclipse.tm.internal.discovery.model.provider.ModelItemProviderAdapterFactory; +import org.eclipse.tm.internal.discovery.wizard.ServiceDiscoveryWizardMainPage; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer; diff --git a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/messages.properties b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/messages.properties similarity index 100% rename from discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/messages.properties rename to discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/messages.properties diff --git a/discovery/org.eclipse.tm.discovery.wizard/.classpath b/discovery/org.eclipse.tm.discovery.wizard/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/discovery/org.eclipse.tm.discovery.wizard/.classpath +++ b/discovery/org.eclipse.tm.discovery.wizard/.classpath @@ -1,11 +1,7 @@ - - - - - + diff --git a/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF index c092bdf3243..a6cf5032260 100644 --- a/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.discovery.wizard Bundle-Version: 1.0.1.qualifier -Bundle-Activator: org.eclipse.tm.discovery.wizard.Activator +Bundle-Activator: org.eclipse.tm.internal.discovery.wizard.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.emf.ecore.edit;bundle-version="[2.2.0,3.0.0)", @@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.tm.discovery.model, org.eclipse.tm.discovery.model.edit Eclipse-LazyStart: true -Export-Package: org.eclipse.tm.discovery.wizard +Export-Package: org.eclipse.tm.internal.discovery.wizard;x-friends:="org.eclipse.rse.internal.discovery" Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/Activator.java b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Activator.java similarity index 92% rename from discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/Activator.java rename to discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Activator.java index 1821a523c0d..340aa608b76 100644 --- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/Activator.java +++ b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 @@ -8,7 +8,7 @@ * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.wizard; +package org.eclipse.tm.internal.discovery.wizard; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/Messages.java b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Messages.java similarity index 72% rename from discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/Messages.java rename to discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Messages.java index 1057a35a8d5..a4c01b0153f 100644 --- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/Messages.java +++ b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Messages.java @@ -1,20 +1,20 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.engine; +package org.eclipse.tm.internal.discovery.wizard; import java.util.MissingResourceException; import java.util.ResourceBundle; public class Messages { - private static final String BUNDLE_NAME = "org.eclipse.tm.discovery.engine.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tm.internal.discovery.wizard.messages"; //$NON-NLS-1$ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle .getBundle(BUNDLE_NAME); diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java similarity index 98% rename from discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java rename to discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java index c41b2522fbb..5b752b612ee 100644 --- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java +++ b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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 @@ -8,7 +8,7 @@ * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.wizard; +package org.eclipse.tm.internal.discovery.wizard; import java.net.UnknownHostException; import java.util.ArrayList; @@ -62,16 +62,16 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; import org.eclipse.swt.widgets.Tree; -import org.eclipse.tm.discovery.engine.ServiceDiscoveryEngine; import org.eclipse.tm.discovery.model.Device; import org.eclipse.tm.discovery.model.Pair; import org.eclipse.tm.discovery.model.Service; import org.eclipse.tm.discovery.model.ServiceType; -import org.eclipse.tm.discovery.model.provider.ModelItemProviderAdapterFactory; import org.eclipse.tm.discovery.protocol.IProtocol; import org.eclipse.tm.discovery.protocol.ProtocolFactory; import org.eclipse.tm.discovery.transport.ITransport; import org.eclipse.tm.discovery.transport.TransportFactory; +import org.eclipse.tm.internal.discovery.engine.ServiceDiscoveryEngine; +import org.eclipse.tm.internal.discovery.model.provider.ModelItemProviderAdapterFactory; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer; diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardMainPage.java b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardMainPage.java similarity index 96% rename from discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardMainPage.java rename to discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardMainPage.java index 138c5683f47..546699a4483 100644 --- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardMainPage.java +++ b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardMainPage.java @@ -1,14 +1,14 @@ /******************************************************************************** - * Copyright (c) 2006 Symbian Software Ltd. All rights reserved. + * Copyright (c) 2006, 2007 Symbian Software Ltd. 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: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ -package org.eclipse.tm.discovery.wizard; +package org.eclipse.tm.internal.discovery.wizard; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.wizard.WizardPage; diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/messages.properties b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties similarity index 93% rename from discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/messages.properties rename to discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties index dbd13c37ea4..62313ffcb99 100644 --- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/messages.properties +++ b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties @@ -1,11 +1,11 @@ ################################################################################## -# Copyright (c) 2006 Symbian Software Ltd. All rights reserved. +# Copyright (c) 2006, 2007 Symbian Software Ltd. 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: -# Javier Montalvo Orús (Symbian) - initial API and implementation +# Javier Montalvo Orus (Symbian) - initial API and implementation ################################################################################## ServiceDiscoveryWizardDisplayPage.WizardPageTitle=Service Discovery