The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-
If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.rse.discovery/build.properties b/discovery/org.eclipse.rse.discovery/build.properties
deleted file mode 100644
index ff1dddb2aad..00000000000
--- a/discovery/org.eclipse.rse.discovery/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-##################################################################################
-# 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
-##################################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- about.html,\
- plugin.properties,\
- .,\
- plugin.xml
-src.includes = about.html
diff --git a/discovery/org.eclipse.rse.discovery/plugin.properties b/discovery/org.eclipse.rse.discovery/plugin.properties
deleted file mode 100644
index 3e1443acd7c..00000000000
--- a/discovery/org.eclipse.rse.discovery/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber - initial API and implementation
-################################################################################
-
-pluginName = Target Management Service Discovery RSE Plug-in
-providerName = Eclipse.org - DSDP
-
-DiscoverySystemLabel=Discovery
-DiscoverySystemDescription=Discovery
-
-NewConnectionWizard.discovery.name=Service Discovery Wizard
diff --git a/discovery/org.eclipse.rse.discovery/plugin.xml b/discovery/org.eclipse.rse.discovery/plugin.xml
deleted file mode 100644
index e69de9180df..00000000000
--- a/discovery/org.eclipse.rse.discovery/plugin.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Activator.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Activator.java
deleted file mode 100644
index b923cef08aa..00000000000
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Activator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.rse.internal.discovery;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.rse.discovery"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java
deleted file mode 100644
index 6999c258793..00000000000
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 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 Orus (Symbian) - initial API and implementation
- * Javier Montalvo Orus (Symbian) - NLS Cleanup
- ********************************************************************************/
-
-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.internal.discovery.messages"; //$NON-NLS-1$
-
- public static String ServiceDiscoveryWizard_DiscoveryPropertySet;
-
- public static String ServiceDiscoveryWizard_Port;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
-}
diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoverySubSystemConfiguration.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoverySubSystemConfiguration.java
deleted file mode 100644
index ae86d1af0cc..00000000000
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoverySubSystemConfiguration.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.rse.internal.discovery;
-
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
-
-/**
- * Configuration for an empty Discovery SubSystemConfiguration
- * to allow listing discovery in the RSE Wizard
- *
- */
-public class ServiceDiscoverySubSystemConfiguration extends SubSystemConfiguration {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createDefaultFilterPool(org.eclipse.rse.core.filters.ISystemFilterPoolManager)
- */
- protected ISystemFilterPool createDefaultFilterPool(
- ISystemFilterPoolManager mgr) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createSubSystemInternal(org.eclipse.rse.core.model.IHost)
- */
- public ISubSystem createSubSystemInternal(IHost conn) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchProperties(org.eclipse.rse.core.model.IHost)
- */
- public boolean supportsServerLaunchProperties(IHost host) {
- return false;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.core.model.IHost)
- */
- public IConnectorService getConnectorService(IHost host) {
- return null;
- }
-
-}
diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java
deleted file mode 100644
index bd7a12c7817..00000000000
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Javier Montalvo Orus (Symbian) - initial API and implementation
- * Javier Montalvo Orus (Symbian) - [plan] Improve Discovery and Autodetect in RSE
- * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
- * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
- * Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- ********************************************************************************/
-
-package org.eclipse.rse.internal.discovery;
-
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.IPropertySet;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-import org.eclipse.rse.ui.RSEUIPlugin;
-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.internal.discovery.wizard.ServiceDiscoveryWizardDisplayPage;
-import org.eclipse.tm.internal.discovery.wizard.ServiceDiscoveryWizardMainPage;
-
-/**
- * Service Discovery Wizard
- */
-
-public class ServiceDiscoveryWizard extends Wizard {
-
- private ServiceDiscoveryWizardMainPage serviceDiscoveryMainPage;
- private ServiceDiscoveryWizardDisplayPage serviceDiscoveryPage = null;
-
- /**
- * Service Discovery Wizard constructor
- */
- public ServiceDiscoveryWizard() {
- super();
- setNeedsProgressMonitor(false);
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- public void addPages() {
-
- serviceDiscoveryMainPage = new ServiceDiscoveryWizardMainPage();
- addPage(serviceDiscoveryMainPage);
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
- */
- public IWizardPage getNextPage(IWizardPage page) {
-
- if (page instanceof ServiceDiscoveryWizardMainPage) {
- if (serviceDiscoveryPage == null) {
- serviceDiscoveryPage = new ServiceDiscoveryWizardDisplayPage(serviceDiscoveryMainPage.getQuery(), serviceDiscoveryMainPage.getAddress(), serviceDiscoveryMainPage.getTransport(), serviceDiscoveryMainPage.getProtocol(), serviceDiscoveryMainPage.getTimeOut());
- addPage(serviceDiscoveryPage);
- } else {
- serviceDiscoveryPage.update(serviceDiscoveryMainPage.getQuery(), serviceDiscoveryMainPage.getAddress(), serviceDiscoveryMainPage.getTransport(), serviceDiscoveryMainPage.getProtocol(), serviceDiscoveryMainPage.getTimeOut());
- }
- }
- return super.getNextPage(page);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
- public boolean performFinish() {
-
- IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.rse.core","subsystemConfigurations"); //$NON-NLS-1$ //$NON-NLS-2$
- IConfigurationElement[] ce = ep.getConfigurationElements();
-
- SystemRefreshAllAction systemRefreshAllAction = new SystemRefreshAllAction(null);
- ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
-
- String[] addresses = serviceDiscoveryPage.getAddresses();
- for (int i = 0; i < addresses.length; i++) {
-
- String hostName = addresses[i];
- Vector discoveredServices = serviceDiscoveryPage.getSelectedServices(addresses[i]);
- Vector subSystemConfigurationVector = new Vector();
-
- Enumeration serviceEnumeration = discoveredServices.elements();
-
- IHost conn = null;
- try {
- IRSESystemType discoveryType = RSECorePlugin.getTheCoreRegistry().getSystemTypeById(IRSESystemType.SYSTEMTYPE_DISCOVERY_ID);
- conn = registry.createHost(discoveryType, "Discovery@" + hostName, hostName, "Discovered services in "+hostName);//$NON-NLS-1$ //$NON-NLS-2$
- } catch (Exception e) {
- RSECorePlugin.getTheSystemRegistry().deleteHost(conn);
- return false;
- }
-
- while (serviceEnumeration.hasMoreElements()) {
-
- Service service = (Service) serviceEnumeration.nextElement();
-
- //discovered service name
- String serviceName = ((ServiceType) service.eContainer()).getName();
-
- //discovered transport (tcp, udp)
- String transport = null;
-
- Iterator pairIterator = service.getPair().iterator();
- while (pairIterator.hasNext()) {
-
- Pair pair = (Pair) pairIterator.next();
- if(pair.getKey().equals("transport")) //$NON-NLS-1$
- {
- transport = pair.getValue();
- }
- }
-
- //find the SubSystemConfiguration plugin that matches the name+transport
- for (int j = 0; j < ce.length; j++) {
- String typesList = ce[j].getAttribute("serviceType"); //$NON-NLS-1$
- if(typesList!=null)
- {
- String[] types = typesList.split(";"); //$NON-NLS-1$
-
- for (int k = 0; k < types.length; k++) {
- if(types[k].equals("_"+serviceName+"._"+transport)) //$NON-NLS-1$ //$NON-NLS-2$
- {
- ISubSystemConfiguration config = registry.getSubSystemConfiguration(ce[j].getAttribute("id")); //$NON-NLS-1$
- IConnectorService connector = config.getConnectorService(conn);
- IPropertySet propertySet;
- pairIterator = service.getPair().iterator();
-
- while (pairIterator.hasNext()) {
-
- Pair pair = (Pair) pairIterator.next();
-
- if((propertySet = connector.getPropertySet(Messages.ServiceDiscoveryWizard_DiscoveryPropertySet))==null)
- {
- propertySet = connector.createPropertySet(Messages.ServiceDiscoveryWizard_DiscoveryPropertySet);
- }
- propertySet.addProperty(pair.getKey(), pair.getValue());
- }
-
- subSystemConfigurationVector.add(config);
- }
- }
- }
- }
- }
-
- ISubSystemConfiguration[] subSystemConfiguration = new ISubSystemConfiguration[subSystemConfigurationVector.size()];
-
- for (int j = 0; j < subSystemConfiguration.length; j++) {
- subSystemConfiguration[j]=(ISubSystemConfiguration)subSystemConfigurationVector.elementAt(j);
- }
-
- ISubSystem[] subSystem = registry.createSubSystems(conn, subSystemConfiguration);
-
- for (int j = 0; j < subSystem.length; j++) {
-
-
- IConnectorService connector = subSystem[j].getConnectorService();
- IPropertySet propertySet = connector.getPropertySet(Messages.ServiceDiscoveryWizard_DiscoveryPropertySet);
- if(propertySet.getProperty(Messages.ServiceDiscoveryWizard_Port)!=null)
- {
- int port = Integer.parseInt(propertySet.getPropertyValue(Messages.ServiceDiscoveryWizard_Port));
- connector.setPort(port);
-
- }
- }
-
- RSEUIPlugin.getTheSystemRegistryUI().expandHost(conn);
- }
-
- systemRefreshAllAction.run();
-
- return true;
- }
-
-}
\ No newline at end of file
diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties
deleted file mode 100644
index efc5ef7f6af..00000000000
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-##################################################################################
-# Copyright (c) 2006, 2008 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 Orus (Symbian) - initial API and implementation
-# Javier Montalvo Orus (Symbian) - NLS Cleanup
-##################################################################################
-
-ServiceDiscoveryWizard_DiscoveryPropertySet=Discovery
-ServiceDiscoveryWizard_Port=port
diff --git a/discovery/org.eclipse.tm.discovery-feature/.project b/discovery/org.eclipse.tm.discovery-feature/.project
deleted file mode 100644
index da807b818f7..00000000000
--- a/discovery/org.eclipse.tm.discovery-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- org.eclipse.tm.discovery-feature
-
-
-
-
-
- org.eclipse.pde.FeatureBuilder
-
-
-
-
-
- org.eclipse.pde.FeatureNature
-
-
diff --git a/discovery/org.eclipse.tm.discovery-feature/build.properties b/discovery/org.eclipse.tm.discovery-feature/build.properties
deleted file mode 100644
index 710aaf38515..00000000000
--- a/discovery/org.eclipse.tm.discovery-feature/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber - initial API and implementation
-################################################################################
-bin.includes = feature.xml,\
- feature.properties,\
- license.html,\
- epl-v10.html,\
- eclipse_update_120.jpg
-generate.plugin@org.eclipse.rse.discovery.source=org.eclipse.rse.discovery
-generate.plugin@org.eclipse.tm.discovery.engine.source=org.eclipse.tm.discovery.engine
-generate.plugin@org.eclipse.tm.discovery.model.source=org.eclipse.tm.discovery.model
-generate.plugin@org.eclipse.tm.discovery.model.edit.source=org.eclipse.tm.discovery.model.edit
-generate.plugin@org.eclipse.tm.discovery.protocol.dnssd.source=org.eclipse.tm.discovery.protocol.dnssd
-generate.plugin@org.eclipse.tm.discovery.transport.udp.source=org.eclipse.tm.discovery.transport.udp
-generate.plugin@org.eclipse.tm.discovery.view.source=org.eclipse.tm.discovery.view
-generate.plugin@org.eclipse.tm.discovery.wizard.source=org.eclipse.tm.discovery.wizard
diff --git a/discovery/org.eclipse.tm.discovery-feature/eclipse_update_120.jpg b/discovery/org.eclipse.tm.discovery-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad61..00000000000
Binary files a/discovery/org.eclipse.tm.discovery-feature/eclipse_update_120.jpg and /dev/null differ
diff --git a/discovery/org.eclipse.tm.discovery-feature/epl-v10.html b/discovery/org.eclipse.tm.discovery-feature/epl-v10.html
deleted file mode 100644
index 9321f4082e7..00000000000
--- a/discovery/org.eclipse.tm.discovery-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-
-
-
-
-
-
-Eclipse Public License - Version 1.0
-
-
-
-
Eclipse Public License - v 1.0
-
-
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.
-
-
1. DEFINITIONS
-
-
"Contribution" means:
-
-
a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and
-
b) in the case of each subsequent Contributor:
-
i) changes to the Program, and
-
ii) additions to the Program;
-
where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.
-
-
"Contributor" means any person or entity that distributes
-the Program.
-
-
"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.
-
-
"Program" means the Contributions distributed in accordance
-with this Agreement.
-
-
"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.
-
-
2. GRANT OF RIGHTS
-
-
a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.
-
-
b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
-
c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.
-
-
d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.
-
-
3. REQUIREMENTS
-
-
A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:
-
-
a) it complies with the terms and conditions of this
-Agreement; and
-
-
b) its license agreement:
-
-
i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;
-
-
ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-
iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and
-
-
iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.
-
-
When the Program is made available in source code form:
-
-
a) it must be made available under this Agreement; and
-
-
b) a copy of this Agreement must be included with each
-copy of the Program.
-
-
Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-
Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-
4. COMMERCIAL DISTRIBUTION
-
-
Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.
-
-
For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-
5. NO WARRANTY
-
-
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.
-
-
6. DISCLAIMER OF LIABILITY
-
-
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-
7. GENERAL
-
-
If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.
-
-
If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.
-
-
All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.
-
-
Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.
-
-
This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery-feature/feature.properties b/discovery/org.eclipse.tm.discovery-feature/feature.properties
deleted file mode 100644
index 64bdcf3bffc..00000000000
--- a/discovery/org.eclipse.tm.discovery-feature/feature.properties
+++ /dev/null
@@ -1,171 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber - initial API and implementation
-################################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Target Management Service Discovery
-
-# "description" property - description of the feature
-description=A framework and Zeroconf / DNS-SD based implementation for \
-detecting remote network services. Includes Source.
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.2 Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006, 2010 Symbian Software Ltd. and others. All rights reserved.\n\
-This program and the accompanying materials are made available under the terms\n\
-of the Eclipse Public License v1.0 which accompanies this distribution, and is\n\
-available at http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-Javier Montalvo Orús (Symbian) - initial API and implementation\n\
-Martin Oberhuber (Wind River) - externalized strings, fixed build.properties, feature.xml\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/discovery/org.eclipse.tm.discovery-feature/feature.xml b/discovery/org.eclipse.tm.discovery-feature/feature.xml
deleted file mode 100644
index 369b7926fc2..00000000000
--- a/discovery/org.eclipse.tm.discovery-feature/feature.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-
-
-
-
-
- %description
-
-
-
- %copyright
-
-
-
- %license
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery-feature/license.html b/discovery/org.eclipse.tm.discovery-feature/license.html
deleted file mode 100644
index c184ca36a99..00000000000
--- a/discovery/org.eclipse.tm.discovery-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-
-
-Eclipse Foundation Software User Agreement
-
-
-
-
Eclipse Foundation Software User Agreement
-
April 14, 2010
-
-
Usage Of Content
-
-
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
-
-
Applicable Licenses
-
-
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
- For purposes of the EPL, "Program" will mean the Content.
-
-
Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
-
-
-
Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
-
Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
-
A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.
-
Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
-
-
-
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:
-
-
-
The top-level (root) directory
-
Plug-in and Fragment directories
-
Inside Plug-ins and Fragments packaged as JARs
-
Sub-directories of the directory named "src" of certain Plug-ins
-
Feature directories
-
-
-
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.
-
-
THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
-
-
-
Use of Provisioning Technology
-
-
The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
- ("Specification").
-
-
You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
-
-
-
A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.
-
During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.
-
Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
-
-
-
Cryptography
-
-
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.
-
-
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-
If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
Source Code
-
This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.ini b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fbbb9f83db9..00000000000
--- a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.mappings b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index bddaab43109..00000000000
--- a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 01618c5056d..00000000000
--- a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber - initial API and implementation
-################################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Target Management Service Discovery Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Symbian Software Ltd. and others 2006, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
diff --git a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 7ef3fa39c6e..00000000000
--- a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber - initial API and implementation
-################################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/dsdp32.png b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/dsdp32.png
deleted file mode 100644
index 3077b1220dd..00000000000
Binary files a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/dsdp32.png and /dev/null differ
diff --git a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index f4e518d62dc..00000000000
--- a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber - initial API and implementation
-################################################################################
-pluginName=Target Management Service Discovery Source
-providerName=Eclipse.org - DSDP
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/.cvsignore b/discovery/org.eclipse.tm.discovery.doc.isv/.cvsignore
deleted file mode 100644
index 0700bef2a10..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-index
-build.xml
-javadoc.link.location
-temp.bin.log
-temp.convert.txt
-temp.options.txt
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/.project b/discovery/org.eclipse.tm.discovery.doc.isv/.project
deleted file mode 100644
index 4a0948038aa..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- org.eclipse.tm.discovery.doc.isv
-
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.doc.isv/META-INF/MANIFEST.MF
deleted file mode 100644
index 67e163a4a96..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.doc.isv;singleton:=true
-Bundle-Version: 3.0.100.qualifier
-Bundle-Localization: plugin
-Eclipse-LazyStart: false
-Bundle-Vendor: %providerName
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/about.html b/discovery/org.eclipse.tm.discovery.doc.isv/about.html
deleted file mode 100644
index d4cc693f9f0..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-
About This Content
-
-
June 5, 2007
-
License
-
-
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-
If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-Device represents a machine with a unique address in the network.
-It can contain as well a name for easier identification.
-A device contains a list of service types.
-
-
-
Attributes
-
-
Address
-
Name (optional)
-
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/guide/images/discovery.png b/discovery/org.eclipse.tm.discovery.doc.isv/guide/images/discovery.png
deleted file mode 100644
index 030ddbe9385..00000000000
Binary files a/discovery/org.eclipse.tm.discovery.doc.isv/guide/images/discovery.png and /dev/null differ
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/guide/images/discovery_model.gif b/discovery/org.eclipse.tm.discovery.doc.isv/guide/images/discovery_model.gif
deleted file mode 100644
index a3e530651e0..00000000000
Binary files a/discovery/org.eclipse.tm.discovery.doc.isv/guide/images/discovery_model.gif and /dev/null differ
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/guide/images/list.png b/discovery/org.eclipse.tm.discovery.doc.isv/guide/images/list.png
deleted file mode 100644
index e2012531c4b..00000000000
Binary files a/discovery/org.eclipse.tm.discovery.doc.isv/guide/images/list.png and /dev/null differ
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/guide/model.html b/discovery/org.eclipse.tm.discovery.doc.isv/guide/model.html
deleted file mode 100644
index 1b6f138473a..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/guide/model.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-Model
-
-
-
Model
-
-Service discovery stores the information in a EMF model as following:
-
-
-
-
-
-
-
-
-The service discovery engine will fill this model using the provided protocol and transport implementations, and can be accessed after using the standard EMF methods.
-
-Each service can contain multiple pairs of keys and values to provide extra information about the service.
-
-
-Using service discovery with the Remote System Explorer requires a "tranport" key matching the transport specified in org.eclipse.rse.core.subsystemConfigurations.
-
-
-
-
Attributes
-
-
Key
-
Value
-
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/guide/protocol.html b/discovery/org.eclipse.tm.discovery.doc.isv/guide/protocol.html
deleted file mode 100644
index d4ee7b4a777..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/guide/protocol.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-Protocol
-
-
-
Protocol
-
-It specifies the protocol that will be used to interact with the remote devices.
-Protocols have to be specified as extensions of org.eclipse.tm.discovery.engine.discoveryProtocol.
-
-
-Examples of discovery protocols are:
-
-
DNS Service Discovery (DNS-SD)
-
Service Location Protocol (SLP, srvloc)
-
Simple Service Discovery Protocol (SSDP)
-
...
-
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/guide/service.html b/discovery/org.eclipse.tm.discovery.doc.isv/guide/service.html
deleted file mode 100644
index 0d870ef74a5..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/guide/service.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-Service
-
-
-
Service
-
-Service represents a discovered service available in the remote device grouped under a common service type.
-
-
-
Attributes
-
-
Name
-
-
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/guide/servicetype.html b/discovery/org.eclipse.tm.discovery.doc.isv/guide/servicetype.html
deleted file mode 100644
index 4ae97d891f0..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/guide/servicetype.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-Service Type
-
-
-
Service Type
-
-A service type represents a group of services of the same kind discovered in the parent device.
-Service type names should follow standard service names whenever possible.
-
-
-
-
-
Attributes
-
-
Name
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/guide/transport.html b/discovery/org.eclipse.tm.discovery.doc.isv/guide/transport.html
deleted file mode 100644
index ca9f91ebd79..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/guide/transport.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-Transport
-
-
-
Transport
-
-Transport defines how the remote devices are accessed to be queried for available services.
-Transports have to be specified as extensions of org.eclipse.tm.discovery.engine.discoveryTransport.
-
-
-Examples of transport are:
-
-
UDP
-
TCP
-
serial
-
...
-
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/guide/usage.html b/discovery/org.eclipse.tm.discovery.doc.isv/guide/usage.html
deleted file mode 100644
index ac381cf98e0..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/guide/usage.html
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-Programmatic usage
-
-
-
Programmatic usage
-
-Perform service discovery session:
-
-
-
-int timeout = 500; // milliseconds
-String query = "_services._dns-sd._udp.local."; //DNS-SD query
-
-//instantiate protocol by name attribute
-IProtocol protocol = ProtocolFactory.getProtocol("DNS-SD");
-
-//instantiate transport by name attribute
-ITransport transport = TransportFactory.getTransport("UDP", "224.0.0.251", timeout);
-
-//get engine instance and kick off discovery
-ServiceDiscoveryEngine serviceDiscoveryEngine = ServiceDiscoveryEngine.getInstance();
-serviceDiscoveryEngine.doServiceDiscovery(query, protocol,transport);
-
-
-
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/guide/view.html b/discovery/org.eclipse.tm.discovery.doc.isv/guide/view.html
deleted file mode 100644
index 1189ae0be23..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/guide/view.html
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-Discovery View
-
-
-
Discovery View
-
-The Discovery view can be used to test new extensions and discover available services using the existing protocol and transport implementations.
-It can be accessed through the view "Service Discovery" -> "Service Discovery Properties".
-
-In the view, it's possible launching a wizard to select the protocol and transport to be used:
-
-
-
-
-
-
-
-And inspect the discovered services and their attributes:
-
-
-
-
-
-
-
-Since the same model is used, launching multiple times the wizard adds new discovered services to the same model, even using different protocols and transports.
-
-
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/notices.html b/discovery/org.eclipse.tm.discovery.doc.isv/notices.html
deleted file mode 100644
index 23cff8c5bae..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/notices.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
- Legal Notices
-
-
-
-
-Notices
-
-The material in this guide is Copyright (c) 2007 Symbian Software Ltd. and others.
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/options.txt b/discovery/org.eclipse.tm.discovery.doc.isv/options.txt
deleted file mode 100644
index 1b3465b64de..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/options.txt
+++ /dev/null
@@ -1,41 +0,0 @@
--quiet
--encoding "iso-8859-1"
--charset "iso-8859-1"
--source 1.4
--sourcepath "../org.eclipse.tm.discovery.engine/src
-;../org.eclipse.tm.discovery.model/src
-;../org.eclipse.tm.discovery.model.edit/src
-;../org.eclipse.tm.discovery.protocol.dnssd/src
-;../org.eclipse.tm.discovery.transport.udp/src
-;../org.eclipse.tm.discovery.view/src
-;../org.eclipse.tm.discovery.wizard/src
-;../org.eclipse.rse.discovery/src"
--d reference/api
--bootclasspath @rt@
--classpath @cp@
-;../org.eclipse.rse.core/@dot
-;../org.eclipse.rse.core/bin
-;../org.eclipse.rse.ui/@dot
-;../org.eclipse.rse.ui/bin
--breakiterator
--tag generated:X
--tag lastgen:X
--tag model:X
--tag ordered:X
--use
--splitIndex
--windowtitle "TM Service Discovery API Specification"
--doctitle "TM Service Discovery API Specification"
--header "TM Service Discovery Release 2.0"
--bottom "Copyright (c) 2007 Symbian Software Ltd. and others. All Rights Reserved."
--group "TM Service Discovery Core Plug-in Packages" "org.eclipse.tm.discovery.*"
--group "TM Service Discovery RSE Integration Plug-in Packages" "org.eclipse.rse.discovery"
--link http://java.sun.com/j2se/1.4.2/docs/api
--linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api @javadoc.link.location@/platform/reference/api/
--linkoffline ./../../../org.eclipse.emf.doc/references/javadoc @javadoc.link.location@/emf/references/javadoc/
--linkoffline ./../../../org.eclipse.rse.doc.isv/reference/api ../org.eclipse.rse.doc.isv/reference/api
--link http://bundles.osgi.org/javadoc/r4
-
-org.eclipse.tm.discovery.protocol
-org.eclipse.tm.discovery.transport
-org.eclipse.tm.discovery.model
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/plugin.properties b/discovery/org.eclipse.tm.discovery.doc.isv/plugin.properties
deleted file mode 100644
index 75e78c92107..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2007, 2009 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 Orus (Symbian) - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName=Target Management Service Discovery Developer Guide
-providerName=Eclipse.org - DSDP
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/plugin.xml b/discovery/org.eclipse.tm.discovery.doc.isv/plugin.xml
deleted file mode 100644
index 853daffd49f..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/plugin.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/provisional_api.html b/discovery/org.eclipse.tm.discovery.doc.isv/provisional_api.html
deleted file mode 100644
index 9f4c8a9036b..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/provisional_api.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-TM Service Discovery API Status
-
-
-
-
-
-
TM Service Discovery API Status
-
Provisional API
-
-
Although Service Discovery API has been reviewed, we want to give the
-Open Source Communitiy a chance to provide public
-feedback and help further improving the APIs. Therefore,
-
-
As of Service Discovery 2.0, all API is considered provisional.
-
-
This means, that we reserve the right to change any API after
-Service Discovery 2.0 in a not backward compatible way.
-We will make every sensible effort to keep at least Source API
-Compatibility intact, but in cases where this would lead to unnecessary
-code bloat we will go with API breakage.
-All such API changes will be voted on by committers on the
-dsdp-tm-dev developer mailing list, and documented in a migration guide
-for future releases. We expect that with Community Feedback, we'll reach a
-stable, hardened API for Service Discovery 3.0. Please give your feedback on
-Eclipse Bugzilla
-under category DSDP, Product Target Management.
-
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/reference/.cvsignore b/discovery/org.eclipse.tm.discovery.doc.isv/reference/.cvsignore
deleted file mode 100644
index 9e5bfb42d23..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/reference/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-api
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/reference/extension-points/.cvsignore b/discovery/org.eclipse.tm.discovery.doc.isv/reference/extension-points/.cvsignore
deleted file mode 100644
index 9c59eabff81..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/reference/extension-points/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-org_eclipse_*.html
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/reference/extension-points/index.html b/discovery/org.eclipse.tm.discovery.doc.isv/reference/extension-points/index.html
deleted file mode 100644
index a4b01b0b3b0..00000000000
--- a/discovery/org.eclipse.tm.discovery.doc.isv/reference/extension-points/index.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-Service Discovery Extension Points
-
-
-
-
Service Discovery Extension Points
-
The following extension points can be used to extend the capabilities of the
- Service Discovery infrastructure:
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-
If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.engine/about.ini b/discovery/org.eclipse.tm.discovery.engine/about.ini
deleted file mode 100644
index fbbb9f83db9..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/about.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.engine/about.mappings b/discovery/org.eclipse.tm.discovery.engine/about.mappings
deleted file mode 100644
index bddaab43109..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.engine/about.properties b/discovery/org.eclipse.tm.discovery.engine/about.properties
deleted file mode 100644
index 3d6c110f077..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber - initial API and implementation
-################################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Target Management Service Discovery\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Symbian Software Ltd. and others 2006, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
diff --git a/discovery/org.eclipse.tm.discovery.engine/build.properties b/discovery/org.eclipse.tm.discovery.engine/build.properties
deleted file mode 100644
index 117f117ff47..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-##################################################################################
-# Copyright (c) 2006, 2009 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
-##################################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- about.html,\
- plugin.properties,\
- plugin.xml,\
- .,\
- about.ini,\
- about.mappings,\
- about.properties,\
- dsdp32.png
-src.includes = schema/,\
- about.html
diff --git a/discovery/org.eclipse.tm.discovery.engine/dsdp32.png b/discovery/org.eclipse.tm.discovery.engine/dsdp32.png
deleted file mode 100644
index 3077b1220dd..00000000000
Binary files a/discovery/org.eclipse.tm.discovery.engine/dsdp32.png and /dev/null differ
diff --git a/discovery/org.eclipse.tm.discovery.engine/plugin.properties b/discovery/org.eclipse.tm.discovery.engine/plugin.properties
deleted file mode 100644
index 4fdd7ad90bd..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber - initial API and implementation
-################################################################################
-
-pluginName = Target Management Service Discovery Engine
-providerName = Eclipse.org - DSDP
diff --git a/discovery/org.eclipse.tm.discovery.engine/plugin.xml b/discovery/org.eclipse.tm.discovery.engine/plugin.xml
deleted file mode 100644
index b5f161deb9c..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.engine/schema/discoveryProtocol.exsd b/discovery/org.eclipse.tm.discovery.engine/schema/discoveryProtocol.exsd
deleted file mode 100644
index fa8444f8e09..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/schema/discoveryProtocol.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
-
-
-
- Extension point providing implementations of protocols for service discovery.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Allows specifying semicolon separated multicast addresses to be used with specific transports in the format <transport>:<address>
-An example would be:
-<code>"transportName1:address1;transportName2:address2;UDP:224.0.0.251"</code>
-
-
-
-
-
-
-
-
-
-
-
- [Enter extension point usage example here.]
-
-
-
-
-
-
-
-
- [Enter API information here.]
-
-
-
-
-
-
-
-
- [Enter information about supplied implementation of this extension point.]
-
-
-
-
-
-
-
-
- Copyright (c) 2006 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
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.engine/schema/discoveryTransport.exsd b/discovery/org.eclipse.tm.discovery.engine/schema/discoveryTransport.exsd
deleted file mode 100644
index d1d499994f5..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/schema/discoveryTransport.exsd
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
-
-
-
- Extension point providing implementations of transports for service discovery.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [Enter extension point usage example here.]
-
-
-
-
-
-
-
-
- [Enter API information here.]
-
-
-
-
-
-
-
-
- [Enter information about supplied implementation of this extension point.]
-
-
-
-
-
-
-
-
- Copyright (c) 2006 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
-
-
-
-
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
deleted file mode 100644
index 3a749bf3445..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/IProtocol.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.protocol;
-
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.tm.discovery.transport.ITransport;
-
-/**
- * Interface for service discovery protocol implementations.
- * Standard protocols that can be implementated from this interface are:
- *
- *
DNS-SD (Zeroconf)
- *
Simple Service Discovery Protocol (SSDP)
- *
Service Location Protocol (SPL)
- *
- * As well as propietary/customised protocols
- *
- */
-public interface IProtocol {
-
-
- /**
- * Instantiates a Job to populate a model given an initial query, a resource
- * containing the model to be populated and an ITranport implementation.
- *
- * @param query Initial query to be sent to the target. This initial query
- * can be obtained from the getQueries() method.
- *
- * @param resource Resource containing the model to be populated with the
- * results of the service discovery action.
- *
- * @param transport ITransport implementation of the transport to be used
- * for the discovery action.
- *
- * @return Job containing the service discovery action.
- *
- * @see Job
- * @see Resource
- * @see ITransport
- *
- */
- public abstract Job getDiscoveryJob(String query, Resource resource, ITransport transport);
-
-
- /**
- * Gets the list of recommended queries to start the service discovery process. This queries can be used in getDiscoveryJob().
- *
- * @return
- * An array containing the recommended queries.
- */
- public abstract String[] getQueries();
-
-}
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
deleted file mode 100644
index 8087a612199..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/ProtocolFactory.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.protocol;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * Static factory to handle the protocol implementations.
- */
-
-public class ProtocolFactory {
-
-
- /*
- * Extension point containing the protocol implementations available in the workbench
- */
- private static IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.tm.discovery.engine","discoveryProtocol"); //$NON-NLS-1$ //$NON-NLS-2$
-
-
- /**
- * Returns the available protocol names. This protocol names are registered in the field name of the extension point discoveryProtocol
- *
- * @return
- * Array of available protocol names
- */
- public static String[] getProtocolList()
- {
- Vector protocols = new Vector();
-
- IConfigurationElement[] ce = ep.getConfigurationElements();
- for (int i = 0; i < ce.length; i++) {
- String name = ce[i].getAttribute("name"); //$NON-NLS-1$
- if(name!=null)
- protocols.add(name);
- }
-
- String[] protocolsList = new String[protocols.size()];
- protocols.copyInto(protocolsList);
- return protocolsList;
- }
-
- /**
- * Returns the recommended queries for the specified protocol
- *
- * @param protocolName
- * Name of the protocol
- * @return
- * Array of recommended queries to be send using this protocol.
- * @throws CoreException
- */
- public static String[] getQueryList(String protocolName) throws CoreException
- {
- IProtocol protocol = null;
- String[] queries = null;
-
- IConfigurationElement[] ce = ep.getConfigurationElements();
- for (int i = 0; i < ce.length; i++) {
- String name = ce[i].getAttribute("name"); //$NON-NLS-1$
- if(name!=null)
- if(name.equalsIgnoreCase(protocolName))
- {
- protocol = (IProtocol)ce[i].createExecutableExtension("class"); //$NON-NLS-1$
- }
- }
-
- if(protocol != null)
- {
- queries = protocol.getQueries();
- if(queries==null)
- queries = new String[]{};
- }
- return queries;
-
- }
-
- /**
- * Gets the IProtocol implementation of a protocol given its name
- *
- * @param protocolName
- * Name of the protocol
- * @return
- * IProtocol implementation of the protocol matching the given name. Null if the protocol cannot be found.
- * @throws CoreException
- *
- * @see IProtocol
- */
- public static IProtocol getProtocol(String protocolName) throws CoreException {
-
- IProtocol protocol = null;
-
- IConfigurationElement[] ce = ep.getConfigurationElements();
- for (int i = 0; i < ce.length; i++) {
- String name = ce[i].getAttribute("name"); //$NON-NLS-1$
- if(name!=null)
- if(name.equalsIgnoreCase(protocolName))
- {
- protocol = (IProtocol)ce[i].createExecutableExtension("class"); //$NON-NLS-1$
- }
- }
- return protocol;
- }
-
- /**
- * Gets the multicast address given a protocol name and a transport name or returns null if this information is not available
- *
- * @param protocolName
- * Name of the protocol
- * @param transportName
- * Name of the transport
- * @return
- * String representing the multicast address of the given protocol and transport or null if not available
- * @throws CoreException
- *
- * @see IProtocol
- */
- public static String getMulticastAddress(String protocolName, String transportName) throws CoreException {
-
- String multiCastAddress = null;
-
- IConfigurationElement[] ce = ep.getConfigurationElements();
- for (int i = 0; i < ce.length; i++) {
- String name = ce[i].getAttribute("name"); //$NON-NLS-1$
- if(name!=null)
- if(name.equalsIgnoreCase(protocolName))
- {
- String multicastAddresses = ce[i].getAttribute("multicast"); //$NON-NLS-1$
- if(multicastAddresses==null)
- break;
-
- String[] pairs = multicastAddresses.split(";"); //$NON-NLS-1$
- for (int j = 0; j < pairs.length; j++) {
-
- URI uri=null;
- try {
- uri = new URI(pairs[j]);
- } catch (URISyntaxException e) {}
-
- if(uri!=null)
- {
- if(uri.getScheme().equals(transportName))
- {
- multiCastAddress = uri.getSchemeSpecificPart();
- break;
- }
- }
- }
- }
- }
- return multiCastAddress;
- }
-
-}
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
deleted file mode 100644
index 7f1c4866274..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/ITransport.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- * Martin Oberhuber (Wind River) - fix javadoc errors
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.transport;
-
-import java.io.IOException;
-
-
-/**
- * Interface for service discovery transports
- *
- */
-public interface ITransport {
-
- /**
- * Handles sending data
- *
- * @param packet Data packet to be sent.
- * @throws IOException
- */
- public abstract void send(byte[] packet) throws IOException;
-
- /**
- * Handles receiving data
- *
- * @param packet
- * Packet to be filled with the reply data.
- * @return
- * Address of the replying device.
- * @throws IOException
- */
- public abstract String receive(byte[] packet) throws IOException;
-
-
- /**
- * Sets the address of the target, depending on the implementation (IP, port...)
- * @param address
- * Address or identifier of the target.
- * @throws Exception
- *
- */
- public abstract void setTargetAddress(String address) throws Exception;
-
- /**
- * Sets the timeout for the transport implementation.
- * @param timeOut
- * The timeout in milliseconds
- * @throws Exception
- */
- public abstract void setTimeOut(int timeOut) throws Exception;
-
-
-}
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
deleted file mode 100644
index 87cab8fc076..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/TransportFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.transport;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * Factory for the remoste system connection.
- */
-
-public class TransportFactory {
-
- /*
- * Extension point containing the transport implementations available in the workbench
- */
- private static IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.tm.discovery.engine","discoveryTransport"); //$NON-NLS-1$ //$NON-NLS-2$
-
-
- /**
- * Returns the available transport names. The transport names are registered in the field name of the extension point discoveryTransport
- *
- * @return
- * Array of available transport names
- */
- public static String[] getTransportList()
- {
- Vector transports = new Vector();
-
- IConfigurationElement[] ce = ep.getConfigurationElements();
- for (int i = 0; i < ce.length; i++) {
- String name = ce[i].getAttribute("name"); //$NON-NLS-1$
- if(name!=null)
- transports.add(name);
- }
-
- String[] transportsList = new String[transports.size()];
- transports.copyInto(transportsList);
- return transportsList;
- }
-
- /**
- * Gets the ITransport implementation of a transport given its name
- *
- * @param transportName
- * Name of the transport
- * @param address
- * Address of the target device
- * @param timeOut
- * Timeout in milliseconds
- * @return
- * ITranport implementation of the transport matching the given name. Null if the transport cannot be found.
- * @throws Exception
- */
- public static ITransport getTransport(String transportName, String address, int timeOut) throws Exception {
-
- ITransport transport = null;
-
- IConfigurationElement[] ce = ep.getConfigurationElements();
- for (int i = 0; i < ce.length; i++) {
- String name = ce[i].getAttribute("name"); //$NON-NLS-1$
- if(name!=null)
- if(name.equalsIgnoreCase(transportName))
- {
- transport = (ITransport)ce[i].createExecutableExtension("class"); //$NON-NLS-1$
- transport.setTargetAddress(address);
- transport.setTimeOut(timeOut);
-
- }
- }
- return transport;
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Activator.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Activator.java
deleted file mode 100644
index 1338457fde5..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Activator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.engine;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.rse.discovery.engine"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Messages.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Messages.java
deleted file mode 100644
index 3e28677637c..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-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.internal.discovery.engine.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/ServiceDiscoveryEngine.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/ServiceDiscoveryEngine.java
deleted file mode 100644
index 92b9e9c775e..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/ServiceDiscoveryEngine.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Javier Montalvo Orus (Symbian) - initial API and implementation
- * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.engine;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-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.protocol.IProtocol;
-import org.eclipse.tm.discovery.transport.ITransport;
-import org.eclipse.tm.internal.discovery.model.util.ModelResourceFactoryImpl;
-
-/**
- * Engine for service discovery.
- * Instantiates the model that contains the discovered services information.
- * Provides methods to launch a discovery job given an implementation of ITransport and IProtocol to populate the model.
- *
- * @see ITransport
- * @see IProtocol
- *
- */
-
-public class ServiceDiscoveryEngine {
-
- private static ServiceDiscoveryEngine SERVICE_DISCOVERY_ENGINE = null;
-
- private final URI SERVICE_DISCOVERY_URI = URI.createFileURI(Messages.getString("ServiceDiscoveryEngine.DiscoveryModelFileURI")); //$NON-NLS-1$
-
- private Resource resource;
-
- /**
- * Gets an instance of the service discovery engine
- */
- public static ServiceDiscoveryEngine getInstance() {
- if (SERVICE_DISCOVERY_ENGINE == null)
- SERVICE_DISCOVERY_ENGINE = new ServiceDiscoveryEngine();
-
- return SERVICE_DISCOVERY_ENGINE;
- }
-
- /*
- * Private constructor of the ServiceDiscoveryEngine
- */
- private ServiceDiscoveryEngine() {
-
- // get model
- ResourceSet resourceSet = new ResourceSetImpl();
-
- // Register the appropriate resource factory to handle all file
- // extentions.
- resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new ModelResourceFactoryImpl());
-
- // Register the package to ensure it is available during loading.
- resourceSet.getPackageRegistry().put(ModelPackage.eNS_URI,ModelPackage.eINSTANCE);
-
- try {
- resource = resourceSet.getResource(SERVICE_DISCOVERY_URI, true);
- } catch (WrappedException e) {
- resource = resourceSet.createResource(SERVICE_DISCOVERY_URI);
- }
- }
-
- /**
- * Gets the resource
- *
- * @return the static reference to the resource model
- */
-
- public Resource getResource() {
- return resource;
- }
-
- /**
- * Starts a service discovery job given an implementation of IProtocol and ITransport
- *
- * @param transport
- * the selected transport
- * @see ITransport
- * @see IProtocol
- */
-
- public void doServiceDiscovery(String query, IProtocol protocol, ITransport transport)
- {
- protocol.getDiscoveryJob(query, resource,transport).schedule();
- }
-
-
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/messages.properties b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/messages.properties
deleted file mode 100644
index 454c8ffb01a..00000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-##################################################################################
-# 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 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
deleted file mode 100644
index ce73933404a..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/.cvsignore b/discovery/org.eclipse.tm.discovery.model.edit/.cvsignore
deleted file mode 100644
index ba077a4031a..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/.project b/discovery/org.eclipse.tm.discovery.model.edit/.project
deleted file mode 100644
index 95db698ad46..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- org.eclipse.tm.discovery.model.edit
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
- org.eclipse.pde.api.tools.apiAnalysisBuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
- org.eclipse.pde.PluginNature
- org.eclipse.pde.api.tools.apiAnalysisNature
-
-
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.tm.discovery.model.edit/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767cfc..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.tm.discovery.model.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 381fc6eb064..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,71 +0,0 @@
-#Fri Mar 28 14:14:24 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
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
deleted file mode 100644
index 6d6bdde17db..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.model.edit;singleton:=true
-Bundle-Version: 3.0.100.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.tm.internal.discovery.model.provider.DiscoveryModelEditPlugin$Implementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.tm.internal.discovery.model.provider;x-friends:="org.eclipse.tm.discovery.view,org.eclipse.tm.discovery.wizard"
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.tm.discovery.model;bundle-version="[2.0.0,3.0.0)"
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/about.html b/discovery/org.eclipse.tm.discovery.model.edit/about.html
deleted file mode 100644
index d4cc693f9f0..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-
About This Content
-
-
June 5, 2007
-
License
-
-
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-
If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/build.properties b/discovery/org.eclipse.tm.discovery.model.edit/build.properties
deleted file mode 100644
index eb22b2add17..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-##################################################################################
-# Copyright (c) 2006 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
-##################################################################################
-
-bin.includes = META-INF/,\
- about.html,\
- plugin.xml,\
- plugin.properties,\
- icons/,\
- .
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/Pair.gif b/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/Pair.gif
deleted file mode 100644
index 94c953e013b..00000000000
Binary files a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/Pair.gif and /dev/null differ
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/device.gif b/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/device.gif
deleted file mode 100644
index a871b0d7ab4..00000000000
Binary files a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/device.gif and /dev/null differ
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/network.gif b/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/network.gif
deleted file mode 100644
index ec3bb95a6dc..00000000000
Binary files a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/network.gif and /dev/null differ
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/service.gif b/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/service.gif
deleted file mode 100644
index e07b81aa6c9..00000000000
Binary files a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/service.gif and /dev/null differ
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/serviceType.gif b/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/serviceType.gif
deleted file mode 100644
index 5ae555a346c..00000000000
Binary files a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/serviceType.gif and /dev/null differ
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties b/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties
deleted file mode 100644
index 52514d6364d..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-##################################################################################
-# Copyright (c) 2006, 2009 Symbian Software Ltd. and others. All rights reserved.
-# This program and the accompanying materials are made available under the terms
-# of the Eclipse Public License v1.0 which accompanies this distribution, and is
-# available at http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Javier Montalvo Orús (Symbian) - initial API and implementation
-##################################################################################
-
-
-# ====================================================================
-# To code developer:
-# Do NOT change the properties between this line and the
-# "%%% END OF TRANSLATED PROPERTIES %%%" line.
-# Make a new property name, append to the end of the file and change
-# the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Target Management Service Discovery Edit Support
-providerName = Eclipse.org - DSDP
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d1da234efca..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DeviceItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DeviceItemProvider.java
deleted file mode 100644
index 7a17210b910..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DeviceItemProvider.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.tm.discovery.model.ModelFactory;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Device;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.tm.discovery.model.Device} object.
- *
- * @generated
- */
-public class DeviceItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * @param adapterFactory
- *
- * @generated
- */
- public DeviceItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addAddressPropertyDescriptor(object);
- addNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Address feature.
- *
- * @generated
- */
- protected void addAddressPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Device_address_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Device_address_feature", "_UI_Device_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ModelPackage.Literals.DEVICE__ADDRESS,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Device_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Device_name_feature", "_UI_Device_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ModelPackage.Literals.DEVICE__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- *
- * @generated
- */
- public Collection getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(ModelPackage.Literals.DEVICE__SERVICE_TYPE);
- }
- return childrenFeatures;
- }
-
- /**
- * This returns Device.gif.
- *
- * @generated NOT
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/device"); //$NON-NLS-1$
- //return null;
- }
-
- /**
- * This returns the label text for the adapted class.
- *
- * @generated NOT
- */
- public String getText(Object object) {
- String name = ((Device)object).getName();
- String address = ((Device)object).getAddress();
-
- StringBuffer result = new StringBuffer();
-
- if(address != null)
- result.append(address);
-
- if(name != null)
- result.append(" ("+name+")"); //$NON-NLS-1$ //$NON-NLS-2$
-
- return result.toString();
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(Device.class)) {
- case ModelPackage.DEVICE__ADDRESS:
- case ModelPackage.DEVICE__NAME:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case ModelPackage.DEVICE__SERVICE_TYPE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.DEVICE__SERVICE_TYPE,
- ModelFactory.eINSTANCE.createServiceType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return DiscoveryModelEditPlugin.INSTANCE;
- }
-
- /**
- * @generated not
- *
- */
-
- public Collection getChildren(Object object) {
- Collection collect = super.getChildren(object);
-
- return collect;
-
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DiscoveryModelEditPlugin.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DiscoveryModelEditPlugin.java
deleted file mode 100644
index f97831199d5..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DiscoveryModelEditPlugin.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the DiscoveryModel edit plugin.
- *
- * @generated
- */
-public final class DiscoveryModelEditPlugin extends EMFPlugin {
- /**
- * Keep track of the singleton.
- *
- * @generated
- */
- public static final DiscoveryModelEditPlugin INSTANCE = new DiscoveryModelEditPlugin();
-
- /**
- * Keep track of the singleton.
- *
- * @generated
- */
- private static Implementation plugin;
-
- /**
- * Create the instance.
- *
- * @generated
- */
- public DiscoveryModelEditPlugin() {
- super
- (new ResourceLocator [] {
- });
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- *
- * @return the singleton instance.
- * @generated
- */
- public ResourceLocator getPluginResourceLocator() {
- return plugin;
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- *
- * @return the singleton instance.
- * @generated
- */
- public static Implementation getPlugin() {
- return plugin;
- }
-
- /**
- * The actual implementation of the Eclipse Plugin.
- *
- * @generated
- */
- public static class Implementation extends EclipsePlugin {
- /**
- * Creates an instance.
- *
- * @generated
- */
- public Implementation() {
- super();
-
- // Remember the static instance.
- //
- plugin = this;
- }
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ModelItemProviderAdapterFactory.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ModelItemProviderAdapterFactory.java
deleted file mode 100644
index f8a963b6c06..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ModelItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.tm.internal.discovery.model.util.ModelAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- *
- * @generated
- */
-public class ModelItemProviderAdapterFactory extends ModelAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- *
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
- *
- * @generated
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance.
- *
- * @generated not
- */
- public ModelItemProviderAdapterFactory() {
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(ITableItemLabelProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.tm.discovery.model.Device} instances.
- *
- * @generated
- */
- protected DeviceItemProvider deviceItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.tm.discovery.model.Device}.
- *
- * @generated
- */
- public Adapter createDeviceAdapter() {
- if (deviceItemProvider == null) {
- deviceItemProvider = new DeviceItemProvider(this);
- }
-
- return deviceItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.tm.discovery.model.Network} instances.
- *
- * @generated
- */
- protected NetworkItemProvider networkItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.tm.discovery.model.Network}.
- *
- * @generated
- */
- public Adapter createNetworkAdapter() {
- if (networkItemProvider == null) {
- networkItemProvider = new NetworkItemProvider(this);
- }
-
- return networkItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.tm.discovery.model.Pair} instances.
- *
- * @generated
- */
- protected PairItemProvider pairItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.tm.discovery.model.Pair}.
- *
- * @generated
- */
- public Adapter createPairAdapter() {
- if (pairItemProvider == null) {
- pairItemProvider = new PairItemProvider(this);
- }
-
- return pairItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.tm.discovery.model.Service} instances.
- *
- * @generated
- */
- protected ServiceItemProvider serviceItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.tm.discovery.model.Service}.
- *
- * @generated
- */
- public Adapter createServiceAdapter() {
- if (serviceItemProvider == null) {
- serviceItemProvider = new ServiceItemProvider(this);
- }
-
- return serviceItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.tm.discovery.model.ServiceType} instances.
- *
- * @generated
- */
- protected ServiceTypeItemProvider serviceTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.tm.discovery.model.ServiceType}.
- *
- * @generated
- */
- public Adapter createServiceTypeAdapter() {
- if (serviceTypeItemProvider == null) {
- serviceTypeItemProvider = new ServiceTypeItemProvider(this);
- }
-
- return serviceTypeItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory.
- *
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory.
- *
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- *
- * @generated
- */
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter.
- *
- * @generated
- */
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- *
- * @generated
- */
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener.
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener.
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
- /**
- * This disposes all of the item providers created by this factory.
- *
- * @generated
- */
- public void dispose() {
- if (deviceItemProvider != null) deviceItemProvider.dispose();
- if (networkItemProvider != null) networkItemProvider.dispose();
- if (pairItemProvider != null) pairItemProvider.dispose();
- if (serviceItemProvider != null) serviceItemProvider.dispose();
- if (serviceTypeItemProvider != null) serviceTypeItemProvider.dispose();
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/NetworkItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/NetworkItemProvider.java
deleted file mode 100644
index 99c13746823..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/NetworkItemProvider.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.tm.discovery.model.ModelFactory;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Network;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.tm.discovery.model.Network} object.
- *
- * @generated
- */
-public class NetworkItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * @param adapterFactory
- *
- * @generated
- */
- public NetworkItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- *
- * @generated
- */
- public Collection getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(ModelPackage.Literals.NETWORK__DEVICE);
- }
- return childrenFeatures;
- }
-
- /**
- * This returns Network.gif.
- *
- * @generated NOT
- */
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/network"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- *
- * @generated NOT
- */
- public String getText(Object object) {
- return "Network"; //$NON-NLS-1$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(Network.class)) {
- case ModelPackage.NETWORK__DEVICE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.NETWORK__DEVICE,
- ModelFactory.eINSTANCE.createDevice()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return DiscoveryModelEditPlugin.INSTANCE;
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/PairItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/PairItemProvider.java
deleted file mode 100644
index 07083c5c09d..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/PairItemProvider.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Pair;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.tm.discovery.model.Pair} object.
- *
- * @generated not
- */
-public class PairItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource,
- ITableItemLabelProvider
- {
- /**
- * This constructs an instance from a factory and a notifier.
- * @param adapterFactory
- *
- * @generated
- */
- public PairItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addKeyPropertyDescriptor(object);
- addValuePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Key feature.
- *
- * @generated
- */
- protected void addKeyPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Pair_key_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Pair_key_feature", "_UI_Pair_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ModelPackage.Literals.PAIR__KEY,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Value feature.
- *
- * @generated
- */
- protected void addValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Pair_value_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Pair_value_feature", "_UI_Pair_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ModelPackage.Literals.PAIR__VALUE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns Pair.gif.
- *
- * @generated NOT
- */
- public Object getImage(Object object) {
- return null;
- }
-
- /**
- * This returns the label text for the adapted class.
- *
- * @generated NOT
- */
- public String getText(Object object) {
- return null;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(Pair.class)) {
- case ModelPackage.PAIR__KEY:
- case ModelPackage.PAIR__VALUE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return DiscoveryModelEditPlugin.INSTANCE;
- }
-
- /**
- * @generated NOT
- */
-
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-
- /**
- * @generated NOT
- */
-
-
- public String getColumnText(Object object, int columnIndex) {
-
- String returnString = null;
-
- if(columnIndex == 0)
- {
- returnString = ((Pair)object).getKey();
- }
- else if(columnIndex == 1)
- {
- returnString = ((Pair)object).getValue();
- }
- return returnString;
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceItemProvider.java
deleted file mode 100644
index 29fec2bfd45..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceItemProvider.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.tm.discovery.model.ModelFactory;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Service;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.tm.discovery.model.Service} object.
- *
- * @generated
- */
-public class ServiceItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource{
- /**
- * This constructs an instance from a factory and a notifier.
- * @param adapterFactory
- *
- * @generated
- */
- public ServiceItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Service_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Service_name_feature", "_UI_Service_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ModelPackage.Literals.SERVICE__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- *
- * @generated
- */
- public Collection getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(ModelPackage.Literals.SERVICE__PAIR);
- }
- return childrenFeatures;
- }
-
- /**
- * This returns Service.gif.
- *
- * @generated not
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/service")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- *
- * @generated NOT
- */
- public String getText(Object object) {
-
- return ((Service)object).getName();
-
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(Service.class)) {
- case ModelPackage.SERVICE__NAME:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case ModelPackage.SERVICE__PAIR:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.SERVICE__PAIR,
- ModelFactory.eINSTANCE.createPair()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return DiscoveryModelEditPlugin.INSTANCE;
- }
-
- /* NO CHILDREN IN TREE */
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceTypeItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceTypeItemProvider.java
deleted file mode 100644
index 5002338acb5..00000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceTypeItemProvider.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.tm.discovery.model.ModelFactory;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.ServiceType;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.tm.discovery.model.ServiceType} object.
- *
- * @generated
- */
-public class ServiceTypeItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
- {
- /**
- * This constructs an instance from a factory and a notifier.
- * @param adapterFactory
- *
- * @generated
- */
- public ServiceTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ServiceType_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceType_name_feature", "_UI_ServiceType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ModelPackage.Literals.SERVICE_TYPE__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- *
- * @generated
- */
- public Collection getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(ModelPackage.Literals.SERVICE_TYPE__SERVICE);
- }
- return childrenFeatures;
- }
-
- /**
- * This returns ServiceType.gif.
- *
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/serviceType")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- *
- * @generated NOT
- */
- public String getText(Object object) {
- String label = ((ServiceType)object).getName();
- return label == null || label.length() == 0 ? "": label; //$NON-NLS-1$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- *
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(ServiceType.class)) {
- case ModelPackage.SERVICE_TYPE__NAME:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case ModelPackage.SERVICE_TYPE__SERVICE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- *
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.SERVICE_TYPE__SERVICE,
- ModelFactory.eINSTANCE.createService()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- *
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return DiscoveryModelEditPlugin.INSTANCE;
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model/.classpath b/discovery/org.eclipse.tm.discovery.model/.classpath
deleted file mode 100644
index ce73933404a..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.model/.cvsignore b/discovery/org.eclipse.tm.discovery.model/.cvsignore
deleted file mode 100644
index ba077a4031a..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.tm.discovery.model/.project b/discovery/org.eclipse.tm.discovery.model/.project
deleted file mode 100644
index 3182ba07c4a..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- org.eclipse.tm.discovery.model
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
- org.eclipse.pde.api.tools.apiAnalysisBuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
- org.eclipse.pde.PluginNature
- org.eclipse.pde.api.tools.apiAnalysisNature
-
-
diff --git a/discovery/org.eclipse.tm.discovery.model/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.tm.discovery.model/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767cfc..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/discovery/org.eclipse.tm.discovery.model/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.tm.discovery.model/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index af5a8f9534a..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,71 +0,0 @@
-#Fri Mar 28 14:14:24 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF
deleted file mode 100644
index be34d47d3de..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.model;singleton:=true
-Bundle-Version: 2.0.200.qualifier
-Bundle-Activator: org.eclipse.tm.discovery.model.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)"
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.tm.discovery.model,
- org.eclipse.tm.internal.discovery.model.impl;x-internal:=true,
- org.eclipse.tm.internal.discovery.model.util;x-friends:="org.eclipse.tm.discovery.engine,org.eclipse.tm.discovery.model.edit"
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/discovery/org.eclipse.tm.discovery.model/about.html b/discovery/org.eclipse.tm.discovery.model/about.html
deleted file mode 100644
index d4cc693f9f0..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-
About This Content
-
-
June 5, 2007
-
License
-
-
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-
If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/build.properties b/discovery/org.eclipse.tm.discovery.model/build.properties
deleted file mode 100644
index e5e150a158d..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-##################################################################################
-# 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
-##################################################################################
-
-source.. = src/
-bin.includes = META-INF/,\
- about.html,\
- plugin.properties,\
- src/,\
- .,\
- plugin.xml
-src.includes = ecore/,\
- about.html
diff --git a/discovery/org.eclipse.tm.discovery.model/ecore/discoveryModel.genmodel b/discovery/org.eclipse.tm.discovery.model/ecore/discoveryModel.genmodel
deleted file mode 100644
index f163d637594..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/ecore/discoveryModel.genmodel
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- discoveryModel.xsd
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.model/ecore/discoveryModel.xsd b/discovery/org.eclipse.tm.discovery.model/ecore/discoveryModel.xsd
deleted file mode 100644
index 0ef4b84fb72..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/ecore/discoveryModel.xsd
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/ecore/model.ecore b/discovery/org.eclipse.tm.discovery.model/ecore/model.ecore
deleted file mode 100644
index 0c7608fc81c..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/ecore/model.ecore
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.model/plugin.properties b/discovery/org.eclipse.tm.discovery.model/plugin.properties
deleted file mode 100644
index e070b76015f..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/plugin.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-##################################################################################
-# Copyright (c) 2006, 2009 Symbian Software Ltd. and others. All rights reserved.
-# This program and the accompanying materials are made available under the terms
-# of the Eclipse Public License v1.0 which accompanies this distribution, and is
-# available at http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Javier Montalvo Orús (Symbian) - initial API and implementation
-##################################################################################
-
-
-# ====================================================================
-# To code developer:
-# Do NOT change the properties between this line and the
-# "%%% END OF TRANSLATED PROPERTIES %%%" line.
-# Make a new property name, append to the end of the file and change
-# the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Target Management Service Discovery Model
-providerName = Eclipse.org - DSDP
-
diff --git a/discovery/org.eclipse.tm.discovery.model/plugin.xml b/discovery/org.eclipse.tm.discovery.model/plugin.xml
deleted file mode 100644
index 7ca40854424..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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
deleted file mode 100644
index c8ad9accd88..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.tm.discovery"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
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
deleted file mode 100644
index 691f67f9b7c..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Device.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- *
- * A representation of the model object 'Device'.
- *
- *
- * The following features are supported:
- *
- *
{@link org.eclipse.tm.discovery.model.Device#getServiceType Service Type}
- *
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage#getDevice()
- * @model extendedMetaData="name='Device' kind='elementOnly'"
- * @generated
- */
-public interface Device extends EObject {
- /**
- * Returns the value of the 'Service Type' containment reference list.
- * The list contents are of type {@link org.eclipse.tm.discovery.model.ServiceType}.
- *
- * @return the value of the 'Service Type' containment reference list.
- * @see org.eclipse.tm.discovery.model.ModelPackage#getDevice_ServiceType()
- * @model type="org.eclipse.tm.discovery.model.ServiceType" containment="true" required="true"
- * extendedMetaData="kind='element' name='ServiceType'"
- * @generated
- */
- EList getServiceType();
-
- /**
- * Returns the value of the 'Address' attribute.
- *
- * @return the value of the 'Address' attribute.
- * @see #setAddress(String)
- * @see org.eclipse.tm.discovery.model.ModelPackage#getDevice_Address()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
- * extendedMetaData="kind='attribute' name='address'"
- * @generated
- */
- String getAddress();
-
- /**
- * Sets the value of the '{@link org.eclipse.tm.discovery.model.Device#getAddress Address}' attribute.
- *
- * @param value the new value of the 'Address' attribute.
- * @see #getAddress()
- * @generated
- */
- void setAddress(String value);
-
- /**
- * Returns the value of the 'Name' attribute.
- *
- * @return the value of the 'Name' attribute.
- * @see #setName(String)
- * @see org.eclipse.tm.discovery.model.ModelPackage#getDevice_Name()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
- * extendedMetaData="kind='attribute' name='name'"
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.tm.discovery.model.Device#getName Name}' attribute.
- *
- * @param value the new value of the 'Name' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
-} // Device
\ No newline at end of file
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
deleted file mode 100644
index 820c190e83e..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelFactory.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- *
- * The Factory for the model.
- * It provides a create method for each non-abstract class of the model.
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage
- * @generated
- */
-public interface ModelFactory extends EFactory {
- /**
- * The singleton instance of the factory.
- *
- * @generated
- */
- ModelFactory eINSTANCE = org.eclipse.tm.internal.discovery.model.impl.ModelFactoryImpl.init();
-
- /**
- * Returns a new object of class 'Device'.
- *
- * @return a new object of class 'Device'.
- * @generated
- */
- Device createDevice();
-
- /**
- * Returns a new object of class 'Network'.
- *
- * @return a new object of class 'Network'.
- * @generated
- */
- Network createNetwork();
-
- /**
- * Returns a new object of class 'Pair'.
- *
- * @return a new object of class 'Pair'.
- * @generated
- */
- Pair createPair();
-
- /**
- * Returns a new object of class 'Service'.
- *
- * @return a new object of class 'Service'.
- * @generated
- */
- Service createService();
-
- /**
- * Returns a new object of class 'Service Type'.
- *
- * @return a new object of class 'Service Type'.
- * @generated
- */
- ServiceType createServiceType();
-
- /**
- * Returns the package supported by this factory.
- *
- * @return the package supported by this factory.
- * @generated
- */
- ModelPackage getModelPackage();
-
-} //ModelFactory
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
deleted file mode 100644
index 087602be9e8..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java
+++ /dev/null
@@ -1,515 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * The Package for the model.
- * It contains accessors for the meta objects to represent
- *
- *
each class,
- *
each feature of each class,
- *
each enum,
- *
and each data type
- *
- *
- * @see org.eclipse.tm.discovery.model.ModelFactory
- * @model kind="package"
- * @generated
- */
-public interface ModelPackage extends EPackage {
- /**
- * The package name.
- *
- * @generated
- */
- String eNAME = "model"; //$NON-NLS-1$
-
- /**
- * The package namespace URI.
- *
- * @generated
- */
- String eNS_URI = "http://www.eclipse.org/tm/discovery/model"; //$NON-NLS-1$
-
- /**
- * The package namespace name.
- *
- * @generated
- */
- String eNS_PREFIX = "model"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package.
- *
- * @generated
- */
- ModelPackage eINSTANCE = org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl Device}' class.
- *
- * @see org.eclipse.tm.internal.discovery.model.impl.DeviceImpl
- * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getDevice()
- * @generated
- */
- int DEVICE = 0;
-
- /**
- * The feature id for the 'Service Type' containment reference list.
- *
- * @generated
- * @ordered
- */
- int DEVICE__SERVICE_TYPE = 0;
-
- /**
- * The feature id for the 'Address' attribute.
- *
- * @generated
- * @ordered
- */
- int DEVICE__ADDRESS = 1;
-
- /**
- * The feature id for the 'Name' attribute.
- *
- * @generated
- * @ordered
- */
- int DEVICE__NAME = 2;
-
- /**
- * The number of structural features of the 'Device' class.
- *
- * @generated
- * @ordered
- */
- int DEVICE_FEATURE_COUNT = 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.NetworkImpl Network}' class.
- *
- * @see org.eclipse.tm.internal.discovery.model.impl.NetworkImpl
- * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getNetwork()
- * @generated
- */
- int NETWORK = 1;
-
- /**
- * The feature id for the 'Device' containment reference list.
- *
- * @generated
- * @ordered
- */
- int NETWORK__DEVICE = 0;
-
- /**
- * The number of structural features of the 'Network' class.
- *
- * @generated
- * @ordered
- */
- int NETWORK_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.PairImpl Pair}' class.
- *
- * @see org.eclipse.tm.internal.discovery.model.impl.PairImpl
- * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getPair()
- * @generated
- */
- int PAIR = 2;
-
- /**
- * The feature id for the 'Key' attribute.
- *
- * @generated
- * @ordered
- */
- int PAIR__KEY = 0;
-
- /**
- * The feature id for the 'Value' attribute.
- *
- * @generated
- * @ordered
- */
- int PAIR__VALUE = 1;
-
- /**
- * The number of structural features of the 'Pair' class.
- *
- * @generated
- * @ordered
- */
- int PAIR_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl Service}' class.
- *
- * @see org.eclipse.tm.internal.discovery.model.impl.ServiceImpl
- * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getService()
- * @generated
- */
- int SERVICE = 3;
-
- /**
- * The feature id for the 'Pair' containment reference list.
- *
- * @generated
- * @ordered
- */
- int SERVICE__PAIR = 0;
-
- /**
- * The feature id for the 'Name' attribute.
- *
- * @generated
- * @ordered
- */
- int SERVICE__NAME = 1;
-
- /**
- * The number of structural features of the 'Service' class.
- *
- * @generated
- * @ordered
- */
- int SERVICE_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl Service Type}' class.
- *
- * @see org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl
- * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getServiceType()
- * @generated
- */
- int SERVICE_TYPE = 4;
-
- /**
- * The feature id for the 'Service' containment reference list.
- *
- * @generated
- * @ordered
- */
- int SERVICE_TYPE__SERVICE = 0;
-
- /**
- * The feature id for the 'Name' attribute.
- *
- * @generated
- * @ordered
- */
- int SERVICE_TYPE__NAME = 1;
-
- /**
- * The number of structural features of the 'Service Type' class.
- *
- * @generated
- * @ordered
- */
- int SERVICE_TYPE_FEATURE_COUNT = 2;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.tm.discovery.model.Device Device}'.
- *
- * @return the meta object for class 'Device'.
- * @see org.eclipse.tm.discovery.model.Device
- * @generated
- */
- EClass getDevice();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.tm.discovery.model.Device#getServiceType Service Type}'.
- *
- * @return the meta object for the containment reference list 'Service Type'.
- * @see org.eclipse.tm.discovery.model.Device#getServiceType()
- * @see #getDevice()
- * @generated
- */
- EReference getDevice_ServiceType();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.tm.discovery.model.Device#getAddress Address}'.
- *
- * @return the meta object for the attribute 'Address'.
- * @see org.eclipse.tm.discovery.model.Device#getAddress()
- * @see #getDevice()
- * @generated
- */
- EAttribute getDevice_Address();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.tm.discovery.model.Device#getName Name}'.
- *
- * @return the meta object for the attribute 'Name'.
- * @see org.eclipse.tm.discovery.model.Device#getName()
- * @see #getDevice()
- * @generated
- */
- EAttribute getDevice_Name();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.tm.discovery.model.Network Network}'.
- *
- * @return the meta object for class 'Network'.
- * @see org.eclipse.tm.discovery.model.Network
- * @generated
- */
- EClass getNetwork();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.tm.discovery.model.Network#getDevice Device}'.
- *
- * @return the meta object for the containment reference list 'Device'.
- * @see org.eclipse.tm.discovery.model.Network#getDevice()
- * @see #getNetwork()
- * @generated
- */
- EReference getNetwork_Device();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.tm.discovery.model.Pair Pair}'.
- *
- * @return the meta object for class 'Pair'.
- * @see org.eclipse.tm.discovery.model.Pair
- * @generated
- */
- EClass getPair();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.tm.discovery.model.Pair#getKey Key}'.
- *
- * @return the meta object for the attribute 'Key'.
- * @see org.eclipse.tm.discovery.model.Pair#getKey()
- * @see #getPair()
- * @generated
- */
- EAttribute getPair_Key();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.tm.discovery.model.Pair#getValue Value}'.
- *
- * @return the meta object for the attribute 'Value'.
- * @see org.eclipse.tm.discovery.model.Pair#getValue()
- * @see #getPair()
- * @generated
- */
- EAttribute getPair_Value();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.tm.discovery.model.Service Service}'.
- *
- * @return the meta object for class 'Service'.
- * @see org.eclipse.tm.discovery.model.Service
- * @generated
- */
- EClass getService();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.tm.discovery.model.Service#getPair Pair}'.
- *
- * @return the meta object for the containment reference list 'Pair'.
- * @see org.eclipse.tm.discovery.model.Service#getPair()
- * @see #getService()
- * @generated
- */
- EReference getService_Pair();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.tm.discovery.model.Service#getName Name}'.
- *
- * @return the meta object for the attribute 'Name'.
- * @see org.eclipse.tm.discovery.model.Service#getName()
- * @see #getService()
- * @generated
- */
- EAttribute getService_Name();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.tm.discovery.model.ServiceType Service Type}'.
- *
- * @return the meta object for class 'Service Type'.
- * @see org.eclipse.tm.discovery.model.ServiceType
- * @generated
- */
- EClass getServiceType();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.tm.discovery.model.ServiceType#getService Service}'.
- *
- * @return the meta object for the containment reference list 'Service'.
- * @see org.eclipse.tm.discovery.model.ServiceType#getService()
- * @see #getServiceType()
- * @generated
- */
- EReference getServiceType_Service();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.tm.discovery.model.ServiceType#getName Name}'.
- *
- * @return the meta object for the attribute 'Name'.
- * @see org.eclipse.tm.discovery.model.ServiceType#getName()
- * @see #getServiceType()
- * @generated
- */
- EAttribute getServiceType_Name();
-
- /**
- * Returns the factory that creates the instances of the model.
- *
- * @return the factory that creates the instances of the model.
- * @generated
- */
- ModelFactory getModelFactory();
-
- /**
- *
- * Defines literals for the meta objects that represent
- *
- *
each class,
- *
each feature of each class,
- *
each enum,
- *
and each data type
- *
- *
- * @generated
- */
-
-
-
-
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl Device}' class.
- *
- * @see org.eclipse.tm.internal.discovery.model.impl.DeviceImpl
- * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getDevice()
- * @generated
- */
-
- EClass DEVICE = eINSTANCE.getDevice();
-
- /**
- * The meta object literal for the 'Service Type' containment reference list feature.
- *
- * @generated
- */
- EReference DEVICE__SERVICE_TYPE = eINSTANCE.getDevice_ServiceType();
-
- /**
- * The meta object literal for the 'Address' attribute feature.
- *
- * @generated
- */
- EAttribute DEVICE__ADDRESS = eINSTANCE.getDevice_Address();
-
- /**
- * The meta object literal for the 'Name' attribute feature.
- *
- * @generated
- */
- EAttribute DEVICE__NAME = eINSTANCE.getDevice_Name();
-
- /**
- * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.NetworkImpl Network}' class.
- *
- * @see org.eclipse.tm.internal.discovery.model.impl.NetworkImpl
- * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getNetwork()
- * @generated
- */
- EClass NETWORK = eINSTANCE.getNetwork();
-
- /**
- * The meta object literal for the 'Device' containment reference list feature.
- *
- * @generated
- */
- EReference NETWORK__DEVICE = eINSTANCE.getNetwork_Device();
-
- /**
- * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.PairImpl Pair}' class.
- *
- * @see org.eclipse.tm.internal.discovery.model.impl.PairImpl
- * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getPair()
- * @generated
- */
- EClass PAIR = eINSTANCE.getPair();
-
- /**
- * The meta object literal for the 'Key' attribute feature.
- *
- * @generated
- */
- EAttribute PAIR__KEY = eINSTANCE.getPair_Key();
-
- /**
- * The meta object literal for the 'Value' attribute feature.
- *
- * @generated
- */
- EAttribute PAIR__VALUE = eINSTANCE.getPair_Value();
-
- /**
- * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl Service}' class.
- *
- * @see org.eclipse.tm.internal.discovery.model.impl.ServiceImpl
- * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getService()
- * @generated
- */
- EClass SERVICE = eINSTANCE.getService();
-
- /**
- * The meta object literal for the 'Pair' containment reference list feature.
- *
- * @generated
- */
- EReference SERVICE__PAIR = eINSTANCE.getService_Pair();
-
- /**
- * The meta object literal for the 'Name' attribute feature.
- *
- * @generated
- */
- EAttribute SERVICE__NAME = eINSTANCE.getService_Name();
-
- /**
- * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl Service Type}' class.
- *
- * @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();
-
- /**
- * The meta object literal for the 'Service' containment reference list feature.
- *
- * @generated
- */
- EReference SERVICE_TYPE__SERVICE = eINSTANCE.getServiceType_Service();
-
- /**
- * The meta object literal for the 'Name' attribute feature.
- *
- * @generated
- */
- EAttribute SERVICE_TYPE__NAME = eINSTANCE.getServiceType_Name();
-
- }
-
-} //ModelPackage
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
deleted file mode 100644
index 2fc8cd1a47b..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Network.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- *
- * A representation of the model object 'Network'.
- *
- *
- *
- *
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage#getNetwork()
- * @model extendedMetaData="name='Network' kind='elementOnly'"
- * @generated
- */
-public interface Network extends EObject {
- /**
- * Returns the value of the 'Device' containment reference list.
- * The list contents are of type {@link org.eclipse.tm.discovery.model.Device}.
- *
- * @return the value of the 'Device' containment reference list.
- * @see org.eclipse.tm.discovery.model.ModelPackage#getNetwork_Device()
- * @model type="org.eclipse.tm.discovery.model.Device" containment="true" required="true"
- * extendedMetaData="kind='element' name='Device'"
- * @generated
- */
- EList getDevice();
-
-} // Network
\ No newline at end of file
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
deleted file mode 100644
index b085eec750e..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Pair.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- *
- * A representation of the model object 'Pair'.
- *
- *
- *
- *
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage#getPair()
- * @model extendedMetaData="name='Pair' kind='empty'"
- * @generated
- */
-public interface Pair extends EObject {
- /**
- * Returns the value of the 'Key' attribute.
- *
- * @return the value of the 'Key' attribute.
- * @see #setKey(String)
- * @see org.eclipse.tm.discovery.model.ModelPackage#getPair_Key()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
- * extendedMetaData="kind='attribute' name='key'"
- * @generated
- */
- String getKey();
-
- /**
- * Sets the value of the '{@link org.eclipse.tm.discovery.model.Pair#getKey Key}' attribute.
- *
- * @param value the new value of the 'Key' attribute.
- * @see #getKey()
- * @generated
- */
- void setKey(String value);
-
- /**
- * Returns the value of the 'Value' attribute.
- *
- * @return the value of the 'Value' attribute.
- * @see #setValue(String)
- * @see org.eclipse.tm.discovery.model.ModelPackage#getPair_Value()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
- * extendedMetaData="kind='attribute' name='value'"
- * @generated
- */
- String getValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.tm.discovery.model.Pair#getValue Value}' attribute.
- *
- * @param value the new value of the 'Value' attribute.
- * @see #getValue()
- * @generated
- */
- void setValue(String value);
-
-} // Pair
\ No newline at end of file
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
deleted file mode 100644
index 108dbe214ea..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Service.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- *
- * A representation of the model object 'Service'.
- *
- *
- *
- *
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage#getService()
- * @model extendedMetaData="name='Service' kind='elementOnly'"
- * @generated
- */
-public interface Service extends EObject {
- /**
- * Returns the value of the 'Pair' containment reference list.
- * The list contents are of type {@link org.eclipse.tm.discovery.model.Pair}.
- *
- * @return the value of the 'Pair' containment reference list.
- * @see org.eclipse.tm.discovery.model.ModelPackage#getService_Pair()
- * @model type="org.eclipse.tm.discovery.model.Pair" containment="true"
- * extendedMetaData="kind='element' name='Pair'"
- * @generated
- */
- EList getPair();
-
- /**
- * Returns the value of the 'Name' attribute.
- *
- * @return the value of the 'Name' attribute.
- * @see #setName(String)
- * @see org.eclipse.tm.discovery.model.ModelPackage#getService_Name()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
- * extendedMetaData="kind='attribute' name='name'"
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.tm.discovery.model.Service#getName Name}' attribute.
- *
- * @param value the new value of the 'Name' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
-} // Service
\ No newline at end of file
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
deleted file mode 100644
index 3ec0b8c6994..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ServiceType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- *
- * A representation of the model object 'Service Type'.
- *
- *
- *
- *
- *
- * @generated
- */
-public class DeviceImpl extends EObjectImpl implements Device {
- /**
- * The cached value of the '{@link #getServiceType() Service Type}' containment reference list.
- *
- * @see #getServiceType()
- * @generated
- * @ordered
- */
- protected EList serviceType = null;
-
- /**
- * The default value of the '{@link #getAddress() Address}' attribute.
- *
- * @see #getAddress()
- * @generated
- * @ordered
- */
- protected static final String ADDRESS_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getAddress() Address}' attribute.
- *
- * @see #getAddress()
- * @generated
- * @ordered
- */
- protected String address = ADDRESS_EDEFAULT;
-
- /**
- * The default value of the '{@link #getName() Name}' attribute.
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() Name}' attribute.
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- *
- * @generated
- */
- protected DeviceImpl() {
- super();
- }
-
- /**
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return ModelPackage.Literals.DEVICE;
- }
-
- /**
- *
- * @generated
- */
- public EList getServiceType() {
- if (serviceType == null) {
- serviceType = new EObjectContainmentEList(ServiceType.class, this, ModelPackage.DEVICE__SERVICE_TYPE);
- }
- return serviceType;
- }
-
- /**
- *
- * @generated
- */
- public String getAddress() {
- return address;
- }
-
- /**
- *
- * @generated
- */
- public void setAddress(String newAddress) {
- String oldAddress = address;
- address = newAddress;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.DEVICE__ADDRESS, oldAddress, address));
- }
-
- /**
- *
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- *
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.DEVICE__NAME, oldName, name));
- }
-
- /**
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case ModelPackage.DEVICE__SERVICE_TYPE:
- return ((InternalEList)getServiceType()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- *
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case ModelPackage.DEVICE__SERVICE_TYPE:
- return getServiceType();
- case ModelPackage.DEVICE__ADDRESS:
- return getAddress();
- case ModelPackage.DEVICE__NAME:
- return getName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- *
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case ModelPackage.DEVICE__SERVICE_TYPE:
- getServiceType().clear();
- getServiceType().addAll((Collection)newValue);
- return;
- case ModelPackage.DEVICE__ADDRESS:
- setAddress((String)newValue);
- return;
- case ModelPackage.DEVICE__NAME:
- setName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- *
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case ModelPackage.DEVICE__SERVICE_TYPE:
- getServiceType().clear();
- return;
- case ModelPackage.DEVICE__ADDRESS:
- setAddress(ADDRESS_EDEFAULT);
- return;
- case ModelPackage.DEVICE__NAME:
- setName(NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- *
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case ModelPackage.DEVICE__SERVICE_TYPE:
- return serviceType != null && !serviceType.isEmpty();
- case ModelPackage.DEVICE__ADDRESS:
- return ADDRESS_EDEFAULT == null ? address != null : !ADDRESS_EDEFAULT.equals(address);
- case ModelPackage.DEVICE__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- *
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (address: "); //$NON-NLS-1$
- result.append(address);
- result.append(", name: "); //$NON-NLS-1$
- result.append(name);
- result.append(')');
- return result.toString();
- }
-
-} //DeviceImpl
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelFactoryImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelFactoryImpl.java
deleted file mode 100644
index 791eabafb8d..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelFactoryImpl.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.tm.discovery.model.*;
-
-/**
- *
- * An implementation of the model Factory.
- *
- * @generated
- */
-public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory {
- /**
- * Creates the default factory implementation.
- * @return model factory
- *
- * @generated
- */
- public static ModelFactory init() {
- try {
- ModelFactory theModelFactory = (ModelFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/tm/discovery/model"); //$NON-NLS-1$
- if (theModelFactory != null) {
- return theModelFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new ModelFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- *
- * @generated
- */
- public ModelFactoryImpl() {
- super();
- }
-
- /**
- *
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case ModelPackage.DEVICE: return createDevice();
- case ModelPackage.NETWORK: return createNetwork();
- case ModelPackage.PAIR: return createPair();
- case ModelPackage.SERVICE: return createService();
- case ModelPackage.SERVICE_TYPE: return createServiceType();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$//$NON-NLS-2$
- }
- }
-
- /**
- *
- * @generated
- */
- public Device createDevice() {
- DeviceImpl device = new DeviceImpl();
- return device;
- }
-
- /**
- *
- * @generated
- */
- public Network createNetwork() {
- NetworkImpl network = new NetworkImpl();
- return network;
- }
-
- /**
- *
- * @generated
- */
- public Pair createPair() {
- PairImpl pair = new PairImpl();
- return pair;
- }
-
- /**
- *
- * @generated
- */
- public Service createService() {
- ServiceImpl service = new ServiceImpl();
- return service;
- }
-
- /**
- *
- * @generated
- */
- public ServiceType createServiceType() {
- ServiceTypeImpl serviceType = new ServiceTypeImpl();
- return serviceType;
- }
-
- /**
- *
- * @generated
- */
- public ModelPackage getModelPackage() {
- return (ModelPackage)getEPackage();
- }
-
- /**
- *
- * @return model package
- * @deprecated
- * @generated
- */
- public static ModelPackage getPackage() {
- return ModelPackage.eINSTANCE;
- }
-
-} //ModelFactoryImpl
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelPackageImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelPackageImpl.java
deleted file mode 100644
index 4e4a542a3ab..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelPackageImpl.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.tm.discovery.model.Device;
-import org.eclipse.tm.discovery.model.ModelFactory;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Network;
-import org.eclipse.tm.discovery.model.Pair;
-import org.eclipse.tm.discovery.model.Service;
-import org.eclipse.tm.discovery.model.ServiceType;
-
-/**
- *
- * An implementation of the model Package.
- *
- * @generated
- */
-public class ModelPackageImpl extends EPackageImpl implements ModelPackage {
- /**
- *
- * @generated
- */
- private EClass deviceEClass = null;
-
- /**
- *
- * @generated
- */
- private EClass networkEClass = null;
-
- /**
- *
- * @generated
- */
- private EClass pairEClass = null;
-
- /**
- *
- * @generated
- */
- private EClass serviceEClass = null;
-
- /**
- *
- * @generated
- */
- private EClass serviceTypeEClass = null;
-
- /**
- * Creates an instance of the model Package, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
- * package URI value.
- *
Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
- *
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.tm.discovery.model.ModelPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private ModelPackageImpl() {
- super(eNS_URI, ModelFactory.eINSTANCE);
- }
-
- /**
- *
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the Package for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- *
Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- *
- *
- *
- * @generated
- */
-public class ServiceTypeImpl extends EObjectImpl implements ServiceType {
- /**
- * The cached value of the '{@link #getService() Service}' containment reference list.
- *
- * @see #getService()
- * @generated
- * @ordered
- */
- protected EList service = null;
-
- /**
- * The default value of the '{@link #getName() Name}' attribute.
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() Name}' attribute.
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- *
- * @generated
- */
- protected ServiceTypeImpl() {
- super();
- }
-
- /**
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return ModelPackage.Literals.SERVICE_TYPE;
- }
-
- /**
- *
- * @generated
- */
- public EList getService() {
- if (service == null) {
- service = new EObjectContainmentEList(Service.class, this, ModelPackage.SERVICE_TYPE__SERVICE);
- }
- return service;
- }
-
- /**
- *
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- *
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.SERVICE_TYPE__NAME, oldName, name));
- }
-
- /**
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case ModelPackage.SERVICE_TYPE__SERVICE:
- return ((InternalEList)getService()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- *
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case ModelPackage.SERVICE_TYPE__SERVICE:
- return getService();
- case ModelPackage.SERVICE_TYPE__NAME:
- return getName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- *
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case ModelPackage.SERVICE_TYPE__SERVICE:
- getService().clear();
- getService().addAll((Collection)newValue);
- return;
- case ModelPackage.SERVICE_TYPE__NAME:
- setName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- *
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case ModelPackage.SERVICE_TYPE__SERVICE:
- getService().clear();
- return;
- case ModelPackage.SERVICE_TYPE__NAME:
- setName(NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- *
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case ModelPackage.SERVICE_TYPE__SERVICE:
- return service != null && !service.isEmpty();
- case ModelPackage.SERVICE_TYPE__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- *
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(')');
- return result.toString();
- }
-
-} //ServiceTypeImpl
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelAdapterFactory.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelAdapterFactory.java
deleted file mode 100644
index 7b654473690..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelAdapterFactory.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tm.discovery.model.*;
-
-/**
- *
- * The Adapter Factory for the model.
- * It provides an adapter createXXX method for each class of the model.
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage
- * @generated
- */
-public class ModelAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package.
- *
- * @generated
- */
- protected static ModelPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- *
- * @generated
- */
- public ModelAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = ModelPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- *
- * This implementation returns true if the object is either the model's package or is an instance object of the model.
- *
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the createXXX methods.
- *
- * @generated
- */
- protected ModelSwitch modelSwitch =
- new ModelSwitch() {
- public Object caseDevice(Device object) {
- return createDeviceAdapter();
- }
- public Object caseNetwork(Network object) {
- return createNetworkAdapter();
- }
- public Object casePair(Pair object) {
- return createPairAdapter();
- }
- public Object caseService(Service object) {
- return createServiceAdapter();
- }
- public Object caseServiceType(ServiceType object) {
- return createServiceTypeAdapter();
- }
- public Object defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
-
- /**
- * Creates an adapter for the target.
- *
- * @param target the object to adapt.
- * @return the adapter for the target.
- * @generated
- */
- public Adapter createAdapter(Notifier target) {
- return (Adapter)modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.Device Device}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.tm.discovery.model.Device
- * @generated
- */
- public Adapter createDeviceAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.Network Network}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.tm.discovery.model.Network
- * @generated
- */
- public Adapter createNetworkAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.Pair Pair}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.tm.discovery.model.Pair
- * @generated
- */
- public Adapter createPairAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.Service Service}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.tm.discovery.model.Service
- * @generated
- */
- public Adapter createServiceAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.ServiceType Service Type}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.tm.discovery.model.ServiceType
- * @generated
- */
- public Adapter createServiceTypeAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
- *
- * This default implementation returns null.
- *
- * @return the new adapter.
- * @generated
- */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
-} //ModelAdapterFactory
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java
deleted file mode 100644
index 1e32b69b1f5..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- *
- * The Resource Factory associated with the package.
- *
- * @see org.eclipse.tm.internal.discovery.model.util.ModelResourceImpl
- * @generated
- */
-public class ModelResourceFactoryImpl extends ResourceFactoryImpl {
- /**
- * Creates an instance of the resource factory.
- *
- * @generated
- */
- public ModelResourceFactoryImpl() {
- super();
- }
-
- /**
- * Creates an instance of the resource.
- *
- * @generated
- */
- public Resource createResource(URI uri) {
- XMLResource result = new ModelResourceImpl(uri);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
- result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
- return result;
- }
-
-} //ModelResourceFactoryImpl
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java
deleted file mode 100644
index 3275b0e998d..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- *
- * The Resource associated with the package.
- *
- * @see org.eclipse.tm.internal.discovery.model.util.ModelResourceFactoryImpl
- * @generated
- */
-public class ModelResourceImpl extends XMLResourceImpl {
- /**
- * Creates an instance of the resource.
- *
- * @param uri the URI of the new resource.
- * @generated
- */
- public ModelResourceImpl(URI uri) {
- super(uri);
- }
-
-} //ModelResourceImpl
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java
deleted file mode 100644
index 9da418db2ad..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tm.discovery.model.*;
-
-/**
- *
- * The Switch for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the caseXXX method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage
- * @generated
- */
-public class ModelSwitch {
- /**
- * The cached model package
- *
- * @generated
- */
- protected static ModelPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- *
- * @generated
- */
- public ModelSwitch() {
- if (modelPackage == null) {
- modelPackage = ModelPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls caseXXX for each class of the model until one returns a non null result; it yields that result.
- * @param theEObject
- *
- * @return the first non-null result returned by a caseXXX call.
- * @generated
- */
- public Object doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls caseXXX for each class of the model until one returns a non null result; it yields that result.
- *
- * @return the first non-null result returned by a caseXXX call.
- * @generated
- */
- protected Object doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else {
- List eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch((EClass)eSuperTypes.get(0), theEObject);
- }
- }
-
- /**
- * Calls caseXXX for each class of the model until one returns a non null result; it yields that result.
- *
- * @return the first non-null result returned by a caseXXX call.
- * @generated
- */
- protected Object doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case ModelPackage.DEVICE: {
- Device device = (Device)theEObject;
- Object result = caseDevice(device);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ModelPackage.NETWORK: {
- Network network = (Network)theEObject;
- Object result = caseNetwork(network);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ModelPackage.PAIR: {
- Pair pair = (Pair)theEObject;
- Object result = casePair(pair);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ModelPackage.SERVICE: {
- Service service = (Service)theEObject;
- Object result = caseService(service);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ModelPackage.SERVICE_TYPE: {
- ServiceType serviceType = (ServiceType)theEObject;
- Object result = caseServiceType(serviceType);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of 'Device'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of 'Device'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseDevice(Device object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of 'Network'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of 'Network'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseNetwork(Network object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of 'Pair'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of 'Pair'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePair(Pair object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of 'Service'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of 'Service'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseService(Service object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of 'Service Type'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of 'Service Type'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseServiceType(ServiceType object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of 'EObject'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch, but this is the last case anyway.
- *
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of 'EObject'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public Object defaultCase(EObject object) {
- return null;
- }
-
-} //ModelSwitch
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java
deleted file mode 100644
index 38f0bfeab6d..00000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.tm.discovery.model.ModelPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- *
- * @generated
- */
-public class ModelXMLProcessor extends XMLProcessor {
- /**
- * Public constructor to instantiate the helper.
- *
- * @generated
- */
- public ModelXMLProcessor() {
- super((EPackage.Registry.INSTANCE));
- ModelPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the ModelResourceFactoryImpl factory.
- *
- * @generated
- */
- protected Map getRegistrations() {
- if (registrations == null) {
- super.getRegistrations();
- registrations.put(XML_EXTENSION, new ModelResourceFactoryImpl());
- registrations.put(STAR_EXTENSION, new ModelResourceFactoryImpl());
- }
- return registrations;
- }
-
-} //ModelXMLProcessor
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.classpath b/discovery/org.eclipse.tm.discovery.protocol.dnssd/.classpath
deleted file mode 100644
index ce73933404a..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.cvsignore b/discovery/org.eclipse.tm.discovery.protocol.dnssd/.cvsignore
deleted file mode 100644
index ba077a4031a..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.project b/discovery/org.eclipse.tm.discovery.protocol.dnssd/.project
deleted file mode 100644
index 48c8c20100d..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- org.eclipse.tm.discovery.protocol.dnssd
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
- org.eclipse.pde.api.tools.apiAnalysisBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
- org.eclipse.pde.api.tools.apiAnalysisNature
-
-
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.tm.discovery.protocol.dnssd/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767cfc..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.tm.discovery.protocol.dnssd/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 381fc6eb064..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,71 +0,0 @@
-#Fri Mar 28 14:14:24 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
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
deleted file mode 100644
index 2ad4f781cad..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.protocol.dnssd;singleton:=true
-Bundle-Version: 2.0.200.qualifier
-Bundle-Activator: org.eclipse.tm.internal.discovery.protocol.dnssd.Activator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.tm.discovery.engine;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.tm.discovery.model;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)"
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Export-Package: org.eclipse.tm.internal.discovery.protocol.dnssd;x-internal:=true
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/about.html b/discovery/org.eclipse.tm.discovery.protocol.dnssd/about.html
deleted file mode 100644
index d4cc693f9f0..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-
About This Content
-
-
June 5, 2007
-
License
-
-
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-
If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/build.properties b/discovery/org.eclipse.tm.discovery.protocol.dnssd/build.properties
deleted file mode 100644
index ff1dddb2aad..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-##################################################################################
-# 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
-##################################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- about.html,\
- plugin.properties,\
- .,\
- plugin.xml
-src.includes = about.html
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties b/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties
deleted file mode 100644
index e41ea49bd2f..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber - initial API and implementation
-################################################################################
-
-pluginName = Target Management Service Discovery DNS-SD Protocol
-providerName = Eclipse.org - DSDP
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml b/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml
deleted file mode 100644
index 077fd8792ff..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Activator.java b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Activator.java
deleted file mode 100644
index c695ffeec41..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Activator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.protocol.dnssd;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.tm.discovery.protocol.dnssd"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/DNSSDProtocol.java b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/DNSSDProtocol.java
deleted file mode 100644
index a11cc47b165..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/DNSSDProtocol.java
+++ /dev/null
@@ -1,752 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- * Javier Montalvo Orus (Symbian) - added transport key
- * Javier Montalvo Orus (Symbian) - [plan] Improve Discovery and Autodetect in RSE
- * Javier Montalvo Orus (Symbian) - [191207] DNS-SD adds duplicated transport attribute when discovery is refreshed
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.protocol.dnssd;
-
-import java.io.ByteArrayInputStream;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import java.util.Vector;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.tm.discovery.model.Device;
-import org.eclipse.tm.discovery.model.ModelFactory;
-import org.eclipse.tm.discovery.model.Network;
-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.protocol.IProtocol;
-import org.eclipse.tm.discovery.transport.ITransport;
-
-
-
-/**
- * DNS-based Service Discovery implementation based on DNS-Based
- * Service Discovery
The DNS packets supported by the implementation are:
- *
- *
- *
DNS Pointer resource record (PTR)
- *
- *
Name
- *
Type
- *
Class
- *
TTL
- *
Data Size
- *
Domain Name
- *
- *
- *
DNS Service resource record (SRV)
- *
- *
Name
- *
Type
- *
Class
- *
TTL
- *
Data Size
- *
Priority
- *
Weight
- *
Port
- *
Target
- *
- *
- *
DNS Text resource record (TXT)
- *
- *
Name
- *
Type
- *
Class
- *
TTL
- *
Data Size
- *
Data Pairs
- *
- *
- *
DNS Address resource record (A)
- *
- *
Name
- *
Type
- *
Class
- *
TTL
- *
Data Size
- *
Address
- *
- *
- *
- *
- *
- *
- */
-public class DNSSDProtocol implements IProtocol {
-
- // DNS Pointer resource record identifier
- private final static int PTR = 0x0C;
-
- // DNS Service resource record identifier
- private final static int SRV = 0x21;
-
- // DNS Text resource record identifier
- private final static int TXT = 0x10;
-
- // DNS Address resource record identifier
- private final static int A = 0x01;
-
- // DNS packet reference.
- private byte[] packet;
-
- // provide 64k for the received packet
- private final int MAX_PACKET_SIZE = 65535;
- private byte[] buffer = new byte[MAX_PACKET_SIZE];
-
- //IP address identifying the target
- private String address;
-
- // Queries for services and legacy services
- private final String SERVICE_DISCOVERY_COMMAND = Messages.getString("DNSSDProtocol.ServiceDiscoveryCommand"); //$NON-NLS-1$
- private final String LEGACY_SERVICE_DISCOVERY_COMMAND = Messages.getString("DNSSDProtocol.legacyServiceDiscoveryCommand"); //$NON-NLS-1$
-
- // Patterns to parse service name and service type
-
- private final Pattern srvPattern = Pattern.compile("^(.+)\\._(.+)._(.+)\\.local."); //$NON-NLS-1$
- private final Pattern ptrPattern = Pattern.compile("^_(.+)._.+\\.local."); //$NON-NLS-1$
-
- private final String TRANSPORT_KEY = "transport"; //$NON-NLS-1$
-
- private Resource resource = null;
- private ITransport transport = null;
- private String query = null;
-
- /* (non-Javadoc)
- * @see org.eclipse.tm.discovery.protocol.IProtocol#getQueries()
- */
- public String[] getQueries()
- {
- return new String[]{
- SERVICE_DISCOVERY_COMMAND,
- LEGACY_SERVICE_DISCOVERY_COMMAND
- };
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.tm.discovery.protocol.IProtocol#getDiscoveryJob(java.lang.String, org.eclipse.emf.ecore.resource.Resource, org.eclipse.tm.discovery.transport.ITransport)
- */
- public Job getDiscoveryJob(String aQuery, Resource aResource, ITransport aTransport){
-
- resource = aResource;
- transport = aTransport;
- query = aQuery;
-
- return new Job(Messages.getString("DNSSDProtocol.JobName")) { //$NON-NLS-1$
- protected IStatus run(IProgressMonitor monitor) {
- if (transport != null) {
- sendQuery(transport, query, PTR);
-
- Vector discoveredServices = new Vector();
-
- if (!resource.getContents().isEmpty()) {
-
- Iterator deviceIterator = ((Network) resource.getContents().get(0)).getDevice().iterator();
- while (deviceIterator.hasNext()) {
- Device device = (Device) deviceIterator.next();
- Iterator serviceTypeIterator = device.getServiceType().iterator();
- while (serviceTypeIterator.hasNext()) {
- ServiceType serviceType = (ServiceType) serviceTypeIterator.next();
- if (serviceType.getName().equals(SERVICE_DISCOVERY_COMMAND) ||
- serviceType.getName().equals(LEGACY_SERVICE_DISCOVERY_COMMAND)) {
- Iterator serviceIterator = serviceType.getService().iterator();
- while (serviceIterator.hasNext()) {
- Service service = (Service) serviceIterator.next();
-
- if (!discoveredServices.contains(service.getName())) {
- discoveredServices.add(service.getName());
- }
-
- }
- serviceTypeIterator.remove();
- }
- }
- }
-
- for (int i = 0; i < discoveredServices.size(); i++) {
- sendQuery(transport,(String) discoveredServices.elementAt(i), PTR);
- }
- }
- }
- return new Status(IStatus.OK,
- "org.eclipse.rse.discovery.engine", IStatus.OK, //$NON-NLS-1$
- Messages.getString("DNSSDProtocol.FinishedJobName"), null); //$NON-NLS-1$
- }
- };
- }
-
- /*
- * Creates and sends the specified query in a DNS-SD packet and call the function to populate the model with the received data
- */
- private void sendQuery(ITransport transport, String query, int type) {
- try {
-
- //clean buffer
- for (int i = 0; i < buffer.length; i++) {
- buffer[i]=0;
- }
-
- // number of queries (1)
- buffer[4] = (byte) 0x00;
- buffer[5] = (byte) 0x01;
-
- //jump to the data section of the packet letting the other fields as 0s
- int index = 12;
-
- StringTokenizer tokenizer = new StringTokenizer(query, "."); //$NON-NLS-1$
-
- while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
-
- buffer[index] = (byte) token.length();
- index++;
-
- for (int subIndex = 0; subIndex < token.getBytes().length; subIndex++) {
- buffer[index + subIndex] = token.getBytes()[subIndex];
- }
- index += token.getBytes().length;
- }
-
- //end of data section
- buffer[index++] = 0x00;
-
- // type TXT-SRV-PTR
- buffer[index++] = 0x00;
- buffer[index++] = (byte) (type & 0xFF);
-
- //inet
- buffer[index++] = 0x00;
- buffer[index++] = 0x01;
-
- packet = new byte[index];
- for (int position = 0; position < index; position++)
- packet[position] = buffer[position];
-
- //send the packet using the provided ITransport implementation
- transport.send(packet);
-
- // wait to receive data until timeout
- while (true) {
- address = transport.receive(buffer);
- packet = buffer;
- populateModel(resource);
- }
-
- } catch (Exception e) {
- // timeout, no more services to discover
- }
- }
-
-
- /*
- * Populates the provided model with the contents of the received packet
- */
- private void populateModel(Resource resource) {
- Network network = null;
- Device device = null;
- boolean found = false;
-
- Iterator deviceIterator = null;
-
- if (resource.getContents().isEmpty()) {
- network = ModelFactory.eINSTANCE.createNetwork();
- resource.getContents().add(network);
- } else {
- network = (Network) resource.getContents().get(0);
- }
-
- deviceIterator = network.getDevice().iterator();
- while (deviceIterator.hasNext()) {
- Device aDevice = (Device) deviceIterator.next();
- if (aDevice.getAddress().equals(address)) {
- device = aDevice;
- found = true;
- break;
- }
- }
- if (!found) {
- device = ModelFactory.eINSTANCE.createDevice();
- device.setAddress(address);
-
- network.getDevice().add(device);
- }
-
- ByteArrayInputStream packetInputStream = new ByteArrayInputStream(packet);
-
- //skip transactionID+flags
- packetInputStream.skip(4);
-
- int queriesNumber = packetInputStream.read() << 8 | packetInputStream.read();
- int answersNumber = packetInputStream.read() << 8 | packetInputStream.read();
-
- //skip authority RRs
- packetInputStream.skip(2);
-
- int additionalRecordsNumber = packetInputStream.read() << 8 | packetInputStream.read();
-
- // read queries
- for (int i = 0; i < queriesNumber; i++) {
- getName(packetInputStream, packet);
- //skip type
- packetInputStream.skip(2);
- //skip class
- packetInputStream.skip(2);
- }
-
- //read answers
- for (int i = 0; i < answersNumber + additionalRecordsNumber; i++) {
- found = false;
-
- String name = getName(packetInputStream, packet);
-
- //packet type
- int type = packetInputStream.read() << 8 | packetInputStream.read();
-
- //skip class
- packetInputStream.skip(2);
-
- //skip TTL
- packetInputStream.skip(4);
-
- switch (type) {
-
- /*
- * A PACKET (DNS Address resource record identifier)
- */
- case DNSSDProtocol.A:
- handleARecord(packetInputStream, device, name);
- break;
-
- /*
- * PTR PACKET (DNS Pointer resource record identifier)
- */
- case DNSSDProtocol.PTR:
- handlePTRRecord(packetInputStream, device, name);
- break;
-
- /*
- * SRV PACKET (DNS Service resource record identifier)
- */
- case DNSSDProtocol.SRV:
- handleSRVRecord(packetInputStream, device, name);
- break;
-
- /*
- * TXT PACKET (DNS Text resource record identifier)
- */
- case DNSSDProtocol.TXT:
- handleTXTRecord(packetInputStream, device, name);
- break;
- }
- }
- }
-
- private void handleARecord(ByteArrayInputStream packetInputStream, Device device, String name) {
- int dataLength = packetInputStream.read() << 8 | packetInputStream.read();
-
- //skip address
- packetInputStream.skip(dataLength);
-
- if (device != null) {
- device.setName(name.substring(0, name.indexOf('.') ));
- }
- }
-
-
-
- private void handlePTRRecord(ByteArrayInputStream packetInputStream, Device device, String name) {
-
- Service service = ModelFactory.eINSTANCE.createService();
- ServiceType serviceType = ModelFactory.eINSTANCE.createServiceType();
-
- //skip dataLength
- packetInputStream.skip(2);
-
- String ptrDataName = getName(packetInputStream, packet);
-
- String serviceTypeName = name;
-
- //parse the service type name
- if(!(serviceTypeName.equals(SERVICE_DISCOVERY_COMMAND) || serviceTypeName.equals(LEGACY_SERVICE_DISCOVERY_COMMAND)))
- {
- Matcher matcher = ptrPattern.matcher(name);
- if (matcher.matches())
- serviceTypeName = matcher.group(1);
- }
-
- //find if we have a serviceType with this name...
- Iterator serviceTypeIterator = device.getServiceType().iterator();
- boolean found = false;
- while (serviceTypeIterator.hasNext()) {
- ServiceType aServiceType = (ServiceType) serviceTypeIterator.next();
- if (aServiceType.getName().equals(serviceTypeName)) {
- serviceType = aServiceType;
- found = true;
- break;
- }
- }
- if (!found) {
- serviceType = ModelFactory.eINSTANCE.createServiceType();
- serviceType.setName(serviceTypeName);
- device.getServiceType().add(serviceType);
- }
-
- if (!ptrDataName.equals("")) { //$NON-NLS-1$
- //find if we have a service with this name...
-
- String serviceName = null;
-
- if(serviceTypeName.equals(SERVICE_DISCOVERY_COMMAND) || serviceTypeName.equals(LEGACY_SERVICE_DISCOVERY_COMMAND))
- {
- serviceName = ptrDataName;
- }
- else
- {
- //parse the service type name
- Matcher matcher = srvPattern.matcher(ptrDataName);
- if (matcher.matches())
- serviceName = matcher.group(1);
- }
-
- Iterator serviceIterator = serviceType.getService().iterator();
- found = false;
- while (serviceIterator.hasNext()) {
- Service aService = (Service) serviceIterator.next();
- if (aService.getName().equals(serviceName)) {
- service = aService;
- found = true;
- break;
- }
- }
-
- if (!found) {
- service = ModelFactory.eINSTANCE.createService();
- service.setName(serviceName);
- serviceType.getService().add(service);
- }
- }
- }
-
- private void handleSRVRecord(ByteArrayInputStream packetInputStream, Device device, String name) {
-
- Service service = ModelFactory.eINSTANCE.createService();
- ServiceType serviceType = ModelFactory.eINSTANCE.createServiceType();
-
- //data of the packet, without bytes for priority-weight-port
- int dataLength = (packetInputStream.read() << 8 | packetInputStream.read()) - 6;
-
- int priority = packetInputStream.read() << 8 | packetInputStream.read();
- int weight = packetInputStream.read() << 8 | packetInputStream.read();
- int port = packetInputStream.read() << 8 | packetInputStream.read();
-
- byte[] data = new byte[dataLength];
- try {
- packetInputStream.read(data);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- String serviceTypeName = null;
- String serviceName = null;
-
- //parse the service type name and the service name
- Matcher matcher = srvPattern.matcher(name);
- if (matcher.matches())
- {
- serviceTypeName = matcher.group(2);
- serviceName = matcher.group(1);
- }
-
- // find if we have a serviceType with this name...
-
- Iterator serviceTypeIterator = device.getServiceType().iterator();
- boolean found = false;
- while (serviceTypeIterator.hasNext()) {
- ServiceType aServiceType = (ServiceType) serviceTypeIterator.next();
- if (aServiceType.getName().equals(serviceTypeName)) {
- serviceType = aServiceType;
- found = true;
- break;
- }
- }
-
- if (!found) {
- serviceType = ModelFactory.eINSTANCE.createServiceType();
- serviceType.setName(serviceTypeName);
- device.getServiceType().add(serviceType);
- }
-
- //find if we have a service with this name...
- Iterator serviceIterator = serviceType.getService().iterator();
- found = false;
- while (serviceIterator.hasNext()) {
- Service temp = (Service) serviceIterator.next();
- if (temp.getName().equals(serviceName)) {
- service = temp;
- found = true;
- break;
- }
- }
-
- if (!found) {
- service = ModelFactory.eINSTANCE.createService();
- service.setName(serviceName);
- serviceType.getService().add(service);
- }
-
- service.setName(serviceName);
-
- String[] keys = new String[]{"port","priority","weight"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- String[] values = new String[]{port+"",priority+"",weight+""}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- for (int i = 0; i < keys.length; i++) {
-
- Pair text = null;
- Iterator pairIterator = service.getPair().iterator();
- found = false;
- while (pairIterator.hasNext()) {
- Pair aPair = (Pair) pairIterator.next();
- if (aPair != null)
- {
- if (aPair.getKey().equals(keys[i])) {
- String current = aPair.getValue();
- if (!current.equals(values[i]))
- aPair.setValue(values[i]);
- found = true;
- break;
- }
- }
- }
-
- if (!found) {
- text = ModelFactory.eINSTANCE.createPair();
- text.setKey(keys[i]);
- text.setValue(values[i]);
- service.getPair().add(text);
- }
- }
- }
-
- private void handleTXTRecord(ByteArrayInputStream packetInputStream, Device device, String recordName) {
- ServiceType serviceType = ModelFactory.eINSTANCE.createServiceType();
- Service service = ModelFactory.eINSTANCE.createService();
- int dataLength = packetInputStream.read() << 8 | packetInputStream.read();
-
- byte [] data = new byte[dataLength];
- try {
- packetInputStream.read(data);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- String serviceName = null;
- String serviceTypeName = null;
- String serviceTransport = null;
-
- // Find if we have a serviceType with this name...
-
- Matcher matcher = srvPattern.matcher(recordName);
- if (matcher.matches())
- {
- serviceName = matcher.group(1);
- serviceTypeName = matcher.group(2);
- serviceTransport = matcher.group(3);
- }
-
-
- Iterator serviceTypeIterator = device.getServiceType().iterator();
- boolean found = false;
- while (serviceTypeIterator.hasNext()) {
- ServiceType aServiceType = (ServiceType) serviceTypeIterator.next();
- if (aServiceType != null) {
- if (aServiceType.getName().equals(serviceTypeName)) {
- serviceType = aServiceType;
- found = true;
- break;
- }
- }
- }
-
- if (!found) {
- serviceType = ModelFactory.eINSTANCE.createServiceType();
- serviceType.setName(serviceTypeName);
- device.getServiceType().add(serviceType);
- }
-
- // Find if we have a service with this name...
-
- Iterator serviceIterator = serviceType.getService().iterator();
- found = false;
- while (serviceIterator.hasNext()) {
- Service aService = (Service) serviceIterator.next();
- if (aService != null) {
- if (aService.getName().equals(serviceName)) {
- service = aService;
- found = true;
- break;
- }
- }
- }
-
- if (!found) {
- service = ModelFactory.eINSTANCE.createService();
- service.setName(recordName);
- serviceType.getService().add(service);
- }
-
- //add or update discovered transport if available in response
- if(serviceTransport != null)
- {
-
- Iterator pairIterator = service.getPair().iterator();
- found = false;
- while (pairIterator.hasNext()) {
- Pair aPair = (Pair) pairIterator.next();
- if (aPair != null) {
- if (TRANSPORT_KEY.equals(aPair.getKey())) {
-
- //update transport value
- aPair.setValue(serviceTransport);
- found = true;
- break;
- }
- }
- }
-
- if (!found) {
- Pair transportPair = ModelFactory.eINSTANCE.createPair();
- transportPair.setKey(TRANSPORT_KEY);
- transportPair.setValue(serviceTransport);
- service.getPair().add(transportPair);
- }
-
-
- }
-
- //process "key=value" pairs
-
- StringBuffer dataBuffer = new StringBuffer();
- int entryLength = 0;
-
- for (int j = 0; j < dataLength; j += entryLength + 1) {
-
- dataBuffer.setLength(0);
-
- entryLength = data[j];
-
- for (int k = 1; k <= entryLength; k++)
- dataBuffer.append((char) data[j + k]);
-
- StringTokenizer stk = new StringTokenizer(dataBuffer.toString(),"="); //$NON-NLS-1$
-
- String key = stk.nextToken();
-
- // DNS-Based Service Discovery
- // 6.4 Rules for Names in DNS-SD Name/Value Pairs
- // If a key has no value, assume "true"
- String value = "true"; //$NON-NLS-1$
-
- try {
- value = stk.nextToken();
- } catch (Exception e) {
- // no value, assume "true"
- }
-
- // find if we are updating the value of a key...
- Pair text = null;
- Iterator pairIterator = service.getPair().iterator();
- found = false;
- while (pairIterator.hasNext()) {
- Pair aPair = (Pair) pairIterator.next();
- if (aPair != null) {
- if (aPair.getKey().equals(key)) {
- String current = aPair.getValue();
- if (!current.equals(value))
- aPair.setValue(value);
- found = true;
- break;
- }
- }
- }
-
- if (!found) {
- text = ModelFactory.eINSTANCE.createPair();
- text.setKey(key);
- text.setValue(value);
- service.getPair().add(text);
- }
- }
- }
-
- // returns the name, that can be compressed using DNS compression
- // For more information about DNS compression: RFC 1035 (4.1.4. Message compression)
- private String getName(ByteArrayInputStream packetInputStream, byte[] packet) {
- StringBuffer buffer = new StringBuffer();
- int nextByte = 0;
-
- while (true) {
- nextByte = packetInputStream.read();
-
- //check if it's a pointer
- //pointer: |11xxxxxx|-|xxxxxxxx| where xxx...x is the pointer in the packet
- if ((nextByte & 0xC0) == 0xC0) {
- int upperByte = (nextByte & (byte) 0x3F) << 8;
- int offset = packetInputStream.read() | upperByte;
- buffer.append(getReference(packet, offset));
- break;
- } else if (nextByte == 0x00) {
- break;
- } else {
- for (int i = 0; i < nextByte; i++) {
- buffer.append((char)packetInputStream.read());
- }
- buffer.append('.');
- }
- }
- return buffer.toString();
- }
-
- private String getReference(byte[] packet, int offset) {
- StringBuffer buffer = new StringBuffer();
- for (int i = 0; packet[offset + i] != 0x00;) {
- int numReads = packet[offset + i];
-
- //check if it's a pointer
- //pointer: |11xxxxxx|-|xxxxxxxx| where xxx...x is the pointer in the packet
- if ((numReads & 0xC0) == 0xC0) {
- int upperByte = (numReads & (byte) 0x3F) << 8;
- int nextOffset = packet[offset + i + 1] | upperByte;
- buffer.append(getReference(packet, nextOffset));
- break;
- } else {
- for (int j = 0; j < numReads; j++) {
- buffer.append((char) packet[offset + i + j + 1]);
- }
- buffer.append('.');
- }
- i += (numReads + 1);
- }
- return buffer.toString();
- }
-
-
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Messages.java b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Messages.java
deleted file mode 100644
index 5fbd9f98a10..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-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.internal.discovery.protocol.dnssd.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/messages.properties b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/messages.properties
deleted file mode 100644
index 05ed2428d94..00000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/messages.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-##################################################################################
-# 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 Orus (Symbian) - initial API and implementation
-##################################################################################
-
-DNSSDProtocol.ServiceDiscoveryCommand=_services._dns-sd._udp.local.
-DNSSDProtocol.legacyServiceDiscoveryCommand=_services._mdns._udp.local.
-DNSSDProtocol.JobName=DNS-SD Service Discovery
-DNSSDProtocol.FinishedJobName=DNS-SD Service Discovery finished
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/.classpath b/discovery/org.eclipse.tm.discovery.transport.udp/.classpath
deleted file mode 100644
index ce73933404a..00000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/.cvsignore b/discovery/org.eclipse.tm.discovery.transport.udp/.cvsignore
deleted file mode 100644
index ba077a4031a..00000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/.project b/discovery/org.eclipse.tm.discovery.transport.udp/.project
deleted file mode 100644
index ce23ef667b5..00000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- org.eclipse.tm.discovery.transport.udp
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
- org.eclipse.pde.api.tools.apiAnalysisBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
- org.eclipse.pde.api.tools.apiAnalysisNature
-
-
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.tm.discovery.transport.udp/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767cfc..00000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.tm.discovery.transport.udp/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 381fc6eb064..00000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,71 +0,0 @@
-#Fri Mar 28 14:14:24 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
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
deleted file mode 100644
index 36997a1eedc..00000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.transport.udp;singleton:=true
-Bundle-Version: 2.0.200.qualifier
-Bundle-Activator: org.eclipse.tm.internal.discovery.transport.udp.Activator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.tm.discovery.engine;bundle-version="[2.0.0,3.0.0)"
-Bundle-ActivationPolicy: lazy
-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/about.html b/discovery/org.eclipse.tm.discovery.transport.udp/about.html
deleted file mode 100644
index d4cc693f9f0..00000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-
About This Content
-
-
June 5, 2007
-
License
-
-
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-
If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/build.properties b/discovery/org.eclipse.tm.discovery.transport.udp/build.properties
deleted file mode 100644
index ff1dddb2aad..00000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-##################################################################################
-# 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
-##################################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- about.html,\
- plugin.properties,\
- .,\
- plugin.xml
-src.includes = about.html
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties b/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties
deleted file mode 100644
index 84ec0537a54..00000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber - initial API and implementation
-################################################################################
-
-pluginName = Target Management Service Discovery UDP Transport
-providerName = Eclipse.org - DSDP
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.xml b/discovery/org.eclipse.tm.discovery.transport.udp/plugin.xml
deleted file mode 100644
index b97d9d216b0..00000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/Activator.java b/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/Activator.java
deleted file mode 100644
index f7255a7b939..00000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/Activator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.transport.udp;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.tm.discovery.transport.udp"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/UDPTransport.java b/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/UDPTransport.java
deleted file mode 100644
index efbf7837595..00000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/UDPTransport.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/********************************************************************************
- * 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.transport.udp;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.tm.discovery.transport.ITransport;
-
-/**
- * UPD/IP transport implementation
- */
-
-public class UDPTransport implements ITransport {
-
- // Default multicast DNS port
- public static int MDNS_PORT = 5353;
-
- // DNS-SD multicast address
- public static String MULTICAST_ADDRESS = "224.0.0.251"; //$NON-NLS-1$
-
- private DatagramSocket socket = null;
-
- private InetAddress server = null;
-
- private int port = MDNS_PORT;
-
- /**
- * Constructor for transport for UDP/IP
- */
-
- public UDPTransport() {
- try {
- socket = new DatagramSocket();
- } catch (SocketException e) {
- e.printStackTrace();
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.tm.discovery.transport.ITransport#setTargetAddress(java.lang.String)
- */
- public void setTargetAddress(String address) throws UnknownHostException
- {
-
- Pattern pattern = Pattern.compile("([^:]*)(:(\\d+))?"); //$NON-NLS-1$
- Matcher matcher = pattern.matcher(address);
- if (matcher.matches()) {
- server = InetAddress.getByName(matcher.group(1));
- if (server.isLoopbackAddress()) {
- server = InetAddress.getLocalHost();
- }
-
- if (matcher.groupCount() == 3 && matcher.group(3) != null)
- port = Integer.parseInt(matcher.group(3));
- }
-
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.tm.discovery.transport.ITransport#setTimeOut(int)
- */
- public void setTimeOut(int timeOut) throws SocketException
- {
- socket.setSoTimeout(timeOut);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.tm.discovery.transport.ITransport#send(byte[])
- */
- public void send(byte[] packet) throws IOException {
- DatagramPacket packetOut = new DatagramPacket(packet, packet.length,server, port);
- socket.send(packetOut);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.tm.discovery.transport.ITransport#receive(byte[])
- */
- public String receive(byte[] packet) throws IOException {
- DatagramPacket packetIn = new DatagramPacket(packet, packet.length);
- socket.receive(packetIn);
-
- return packetIn.getAddress().getHostAddress();
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.view/.classpath b/discovery/org.eclipse.tm.discovery.view/.classpath
deleted file mode 100644
index ce73933404a..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.view/.cvsignore b/discovery/org.eclipse.tm.discovery.view/.cvsignore
deleted file mode 100644
index ba077a4031a..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.tm.discovery.view/.project b/discovery/org.eclipse.tm.discovery.view/.project
deleted file mode 100644
index c0798ca6ad3..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- org.eclipse.tm.discovery.view
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
- org.eclipse.pde.api.tools.apiAnalysisBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
- org.eclipse.pde.api.tools.apiAnalysisNature
-
-
diff --git a/discovery/org.eclipse.tm.discovery.view/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.tm.discovery.view/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767cfc..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/discovery/org.eclipse.tm.discovery.view/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.tm.discovery.view/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 381fc6eb064..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,71 +0,0 @@
-#Fri Mar 28 14:14:24 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF
deleted file mode 100644
index 8cfd5a45102..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.view;singleton:=true
-Bundle-Version: 2.0.200.qualifier
-Bundle-Activator: org.eclipse.tm.internal.discovery.view.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui.forms,
- org.eclipse.tm.discovery.engine;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.tm.discovery.model;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.tm.discovery.model.edit;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.core.resources,
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.tm.discovery.wizard;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.ui.ide
-Export-Package: org.eclipse.tm.internal.discovery.view;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/discovery/org.eclipse.tm.discovery.view/about.html b/discovery/org.eclipse.tm.discovery.view/about.html
deleted file mode 100644
index d4cc693f9f0..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-
About This Content
-
-
June 5, 2007
-
License
-
-
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-
If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.view/build.properties b/discovery/org.eclipse.tm.discovery.view/build.properties
deleted file mode 100644
index 1f857cd2e5a..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-##################################################################################
-# Copyright (c) 2006 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
-##################################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- about.html,\
- plugin.properties,\
- plugin.xml,\
- icons/,\
- .
-src.includes = about.html
-
diff --git a/discovery/org.eclipse.tm.discovery.view/icons/system_view.gif b/discovery/org.eclipse.tm.discovery.view/icons/system_view.gif
deleted file mode 100644
index c3fe221a1d9..00000000000
Binary files a/discovery/org.eclipse.tm.discovery.view/icons/system_view.gif and /dev/null differ
diff --git a/discovery/org.eclipse.tm.discovery.view/plugin.properties b/discovery/org.eclipse.tm.discovery.view/plugin.properties
deleted file mode 100644
index 7d435511c42..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber - initial API and implementation
-################################################################################
-
-pluginName = Target Management Service Discovery View
-providerName = Eclipse.org - DSDP
diff --git a/discovery/org.eclipse.tm.discovery.view/plugin.xml b/discovery/org.eclipse.tm.discovery.view/plugin.xml
deleted file mode 100644
index cacf9dcc698..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Activator.java b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Activator.java
deleted file mode 100644
index 7c1fed5daa0..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Activator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.view;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.rse.discovery.view"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
-}
diff --git a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Messages.java b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Messages.java
deleted file mode 100644
index a5564273c6a..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Messages.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-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.internal.discovery.view.messages"; //$NON-NLS-1$
-
- public static String ServiceDiscoveryView_ClearActionText;
-
- public static String ServiceDiscoveryView_ClearActionToolTipText;
-
- public static String ServiceDiscoveryView_DiscoveryActionText;
-
- public static String ServiceDiscoveryView_DiscoveryActionToolTipText;
-
- public static String ServiceDiscoveryView_KeyColumnLabel;
-
- public static String ServiceDiscoveryView_PropertiesTableTitle;
-
- public static String ServiceDiscoveryView_ProtocolErrorDialogMessage;
-
- public static String ServiceDiscoveryView_ProtocolErrorDialogTitle;
-
- public static String ServiceDiscoveryView_RefreshActionText;
-
- public static String ServiceDiscoveryView_RefreshActionToolTipText;
-
- public static String ServiceDiscoveryView_ServicesTreeTitle;
-
- public static String ServiceDiscoveryView_TransportErrorDialogMessage;
-
- public static String ServiceDiscoveryView_TransportErrorDialogTitle;
-
- public static String ServiceDiscoveryView_TransportNoAddressFoundDialogTitle;
-
- public static String ServiceDiscoveryView_TransportNoAddressFoundDialogTransport;
-
- public static String ServiceDiscoveryView_ValueColumnLabel;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/ServiceDiscoveryView.java b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/ServiceDiscoveryView.java
deleted file mode 100644
index c69a91a208e..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/ServiceDiscoveryView.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Javier Montalvo Orus (Symbian) - initial API and implementation
- * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.view;
-
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.ui.ViewerPane;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-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.model.Service;
-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.tm.internal.discovery.wizard.ServiceDiscoveryWizardMainPage;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * View to display the Service Discovery model in a tree form.
- *
- * @see TransportFactory
- * @see ServiceDiscoveryEngine
- *
- */
-public class ServiceDiscoveryView extends ViewPart {
-
- //Tree widgets
- private TreeViewer treeViewer;
- private ViewerPane viewerPaneTree;
-
- // Table widgets
- private TableViewer tableViewer;
- private ViewerPane viewerPaneTable;
-
- private String query = null;
-
- private Table table;
-
- private Action discoveryAction;
- private Action refreshAction;
- private Action clearAction;
-
- private ITransport transport = null;
- private IProtocol protocol = null;
-
- private ServiceDiscoveryWizardMainPage serviceDiscoveryWizardMainPage;
- private Resource resource;
-
- private ServiceDiscoveryEngine serviceDiscoveryEngine = ServiceDiscoveryEngine.getInstance();
-
-public void createPartControl(Composite parent) {
-
- resource = serviceDiscoveryEngine.getResource();
-
- List factories = new ArrayList();
- factories.add(new ResourceItemProviderAdapterFactory());
- factories.add(new ModelItemProviderAdapterFactory());
- factories.add(new ReflectiveItemProviderAdapterFactory());
-
- ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
- factories);
-
- Composite comp = new Composite(parent, SWT.NULL);
-
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- comp.setLayout(gridLayout);
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
-
- SashForm sashForm = new SashForm(comp,SWT.NULL );
- sashForm.setOrientation(SWT.HORIZONTAL);
-
- sashForm.setLayoutData(data);
-
- // TREE
-
- viewerPaneTree = new ViewerPane(getSite().getPage(), ServiceDiscoveryView.this) {
- public Viewer createViewer(Composite composite) {
- Tree tree = new Tree(composite, SWT.NULL);
- ContainerCheckedTreeViewer treeViewer = new ContainerCheckedTreeViewer(tree);
-
- return treeViewer;
- }
-
- public void requestActivation() {
- super.requestActivation();
- }
- };
-
- Composite sashComposite = new Composite(sashForm,SWT.BORDER);
- sashComposite.setLayout(new FillLayout());
-
- viewerPaneTree.createControl(sashComposite);
-
- treeViewer = (TreeViewer) viewerPaneTree.getViewer();
-
- treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-
- treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
- viewerPaneTree.setTitle(Messages.ServiceDiscoveryView_ServicesTreeTitle, null);
-
- treeViewer.setInput(resource);
-
- new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
-
- ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- if(!event.getSelection().isEmpty())
- {
- EObject obj = (EObject)((IStructuredSelection) event.getSelection()).getFirstElement();
-
- if(obj instanceof Service)
- tableViewer.setInput(obj);
- }
- }
- });
-
-
- // TABLE
-
- viewerPaneTable =
- new ViewerPane(getSite().getPage(), ServiceDiscoveryView.this) {
- public Viewer createViewer(Composite composite) {
- return new TableViewer(composite);
- }
- };
-
- Composite c3 = new Composite(sashForm,SWT.BORDER);
- c3.setLayout(new FillLayout());
-
- viewerPaneTable.createControl(c3);
- tableViewer = (TableViewer)viewerPaneTable.getViewer();
-
- viewerPaneTable.setTitle(Messages.ServiceDiscoveryView_PropertiesTableTitle, null);
-
-
- table = tableViewer.getTable();
-
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
-
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
-
- TableColumn objectColumn = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(3, 100, true));
- objectColumn.setText(Messages.ServiceDiscoveryView_KeyColumnLabel);
- objectColumn.setResizable(true);
-
- TableColumn selfColumn = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(2, 100, true));
- selfColumn.setText(Messages.ServiceDiscoveryView_ValueColumnLabel);
- selfColumn.setResizable(true);
-
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
- makeActions();
-
- getViewSite().getActionBars().getToolBarManager().add(discoveryAction);
- getViewSite().getActionBars().getToolBarManager().add(new Separator());
- getViewSite().getActionBars().getToolBarManager().add(refreshAction);
- getViewSite().getActionBars().getToolBarManager().add(new Separator());
- getViewSite().getActionBars().getToolBarManager().add(clearAction);
-
- }
-
- private void update(String query, String address, String transportName, String protocolName, int timeOut)
- {
- this.query = query;
-
- //instantiate protocol and transport from factories (extensions)
-
- try {
- protocol = ProtocolFactory.getProtocol(protocolName);
- } catch (Exception e) {
- MessageDialog.openError(new Shell(), Messages.ServiceDiscoveryView_ProtocolErrorDialogTitle, Messages.ServiceDiscoveryView_ProtocolErrorDialogMessage+protocolName);
- }
-
- try {
- transport = TransportFactory.getTransport(transportName, address, timeOut);
- } catch (UnknownHostException e) {
- MessageDialog.openError(new Shell(), Messages.ServiceDiscoveryView_TransportNoAddressFoundDialogTitle, Messages.ServiceDiscoveryView_TransportNoAddressFoundDialogTransport+address);
- } catch (Exception e) {
- MessageDialog.openError(new Shell(), Messages.ServiceDiscoveryView_TransportErrorDialogTitle, Messages.ServiceDiscoveryView_TransportErrorDialogMessage+transportName);
- }
-
-
- if(protocol != null && transport != null)
- {
- serviceDiscoveryEngine.doServiceDiscovery(query, protocol,transport);
- }
- }
-
-
-
- private void makeActions() {
- discoveryAction = new Action() {
- public void run() {
-
- Wizard wizard = new Wizard(){
-
- public boolean performFinish() {
-
- update(serviceDiscoveryWizardMainPage.getQuery(),
- serviceDiscoveryWizardMainPage.getAddress(),
- serviceDiscoveryWizardMainPage.getTransport(),
- serviceDiscoveryWizardMainPage.getProtocol(),
- serviceDiscoveryWizardMainPage.getTimeOut());
-
- return true;
- }};
-
- serviceDiscoveryWizardMainPage = new ServiceDiscoveryWizardMainPage();
-
- wizard.addPage(serviceDiscoveryWizardMainPage);
-
- Shell shell = new Shell();
- WizardDialog dialog = new WizardDialog(shell, wizard);
-
- Rectangle absoluteRect = shell.getMonitor().getClientArea();
- Rectangle shellRect = shell.getBounds();
- shell.setLocation(((absoluteRect.width - shellRect.width) / 2), ((absoluteRect.height - shellRect.height) / 2));
-
- dialog.open();
- }
- };
-
- discoveryAction.setText(Messages.ServiceDiscoveryView_DiscoveryActionText);
- discoveryAction.setToolTipText(Messages.ServiceDiscoveryView_DiscoveryActionToolTipText);
- discoveryAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_NEW_WIZARD));
-
- refreshAction = new Action() {
- public void run() {
- if(query != null && transport != null && protocol != null)
- {
- serviceDiscoveryEngine.doServiceDiscovery(query, protocol,transport);
- }
- }
- };
- refreshAction.setText(Messages.ServiceDiscoveryView_RefreshActionText);
- refreshAction.setToolTipText(Messages.ServiceDiscoveryView_RefreshActionToolTipText);
- refreshAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_REDO));
-
-
- clearAction = new Action() {
- public void run() {
- resource.getContents().clear();
- tableViewer.setInput(null);
- }
- };
- clearAction.setText(Messages.ServiceDiscoveryView_ClearActionText);
- clearAction.setToolTipText(Messages.ServiceDiscoveryView_ClearActionToolTipText);
- clearAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
-
- }
-
- public void setFocus() {
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/messages.properties b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/messages.properties
deleted file mode 100644
index dfe2dd58c33..00000000000
--- a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/messages.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-##################################################################################
-# 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
-##################################################################################
-
-ServiceDiscoveryView_ServicesTreeTitle=\ \ \ \ \ \ \ \ Services
-ServiceDiscoveryView_PropertiesTableTitle=\ \ \ \ \ \ \ \ Properties
-ServiceDiscoveryView_KeyColumnLabel=Key
-ServiceDiscoveryView_ValueColumnLabel=Value
-ServiceDiscoveryView_ProtocolErrorDialogTitle=Error
-ServiceDiscoveryView_ProtocolErrorDialogMessage=Error loading protocol
-ServiceDiscoveryView_TransportNoAddressFoundDialogTitle=Error
-ServiceDiscoveryView_TransportNoAddressFoundDialogTransport=Error resolving address
-ServiceDiscoveryView_TransportErrorDialogTitle=Error
-ServiceDiscoveryView_TransportErrorDialogMessage=Error loading transport
-ServiceDiscoveryView_DiscoveryActionText=New Service Discovery
-ServiceDiscoveryView_DiscoveryActionToolTipText=New Service Discovery
-ServiceDiscoveryView_RefreshActionText=Refresh
-ServiceDiscoveryView_RefreshActionToolTipText=Refresh
-ServiceDiscoveryView_ClearActionText=Clear
-ServiceDiscoveryView_ClearActionToolTipText=Clear
diff --git a/discovery/org.eclipse.tm.discovery.wizard/.classpath b/discovery/org.eclipse.tm.discovery.wizard/.classpath
deleted file mode 100644
index ce73933404a..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.wizard/.cvsignore b/discovery/org.eclipse.tm.discovery.wizard/.cvsignore
deleted file mode 100644
index ba077a4031a..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.tm.discovery.wizard/.project b/discovery/org.eclipse.tm.discovery.wizard/.project
deleted file mode 100644
index 14a36156f7f..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- org.eclipse.tm.discovery.wizard
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
- org.eclipse.pde.api.tools.apiAnalysisBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
- org.eclipse.pde.api.tools.apiAnalysisNature
-
-
diff --git a/discovery/org.eclipse.tm.discovery.wizard/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.tm.discovery.wizard/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767cfc..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/discovery/org.eclipse.tm.discovery.wizard/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.tm.discovery.wizard/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 381fc6eb064..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,71 +0,0 @@
-#Fri Mar 28 14:14:24 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/discovery/org.eclipse.tm.discovery.wizard/HelpContexts.xml b/discovery/org.eclipse.tm.discovery.wizard/HelpContexts.xml
deleted file mode 100644
index a2f7a7c6792..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/HelpContexts.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
- Service Discovery allows detecting remote servers using different protocol and transports.
-
-
-
-
- The address can be a multicast address or a multicast address can be suggested by checking the "multicast" checkbox.
-
-
-
- Transport to be used to query the remote device.
-
-
-
- Discovery protocol to be used to query the remote device.
-
-
-
- Message to be sent to the remote device to start the discovery process. It can be empty in some protocols.
-
-
-
- Maximum amount of time (in ms) between replies before ending the discovery session.
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF
deleted file mode 100644
index 252a2dac78a..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.wizard;singleton:=true
-Bundle-Version: 2.0.200.qualifier
-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)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.runtime,
- org.eclipse.tm.discovery.engine;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.tm.discovery.model;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.tm.discovery.model.edit;bundle-version="[2.0.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.tm.internal.discovery.wizard;x-friends:="org.eclipse.rse.discovery,org.eclipse.tm.discovery.view"
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/discovery/org.eclipse.tm.discovery.wizard/SDWizard.html b/discovery/org.eclipse.tm.discovery.wizard/SDWizard.html
deleted file mode 100644
index 8fd432f1305..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/SDWizard.html
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-Service Discovery Wizard
-
-
-
Service Discovery Wizard
-
-
-
Address
-Address of the device to be queried.
-The address can be a multicast address or a multicast address can be suggested by checking the "multicast" checkbox.
-
-
-
Transport
-Transport to be used to query the remote device.
-
-
-
Protocol
-Discovery protocol to be used to query the remote device.
-
-
-
Discovery Query
-Message to be sent to the remote device to start the discovery process. It can be empty in some protocols.
-
-
-
Timeout
-Maximum amount of time (in ms) between replies before ending the discovery session.
-
-
-
-When clicking the "Next" button, the discovery process will start, and the discovered services and their attributes will be shown in a tree.
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.wizard/about.html b/discovery/org.eclipse.tm.discovery.wizard/about.html
deleted file mode 100644
index d4cc693f9f0..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-
About This Content
-
-
June 5, 2007
-
License
-
-
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-
If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.wizard/build.properties b/discovery/org.eclipse.tm.discovery.wizard/build.properties
deleted file mode 100644
index 8225e115d40..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-##################################################################################
-# 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
-##################################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- about.html,\
- plugin.properties,\
- .,\
- HelpContexts.xml,\
- SDWizard.html,\
- plugin.xml,\
- toc.xml
-src.includes = about.html
diff --git a/discovery/org.eclipse.tm.discovery.wizard/plugin.properties b/discovery/org.eclipse.tm.discovery.wizard/plugin.properties
deleted file mode 100644
index 695408b45e9..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber - initial API and implementation
-################################################################################
-
-pluginName = Target Management Service Discovery Wizard
-providerName = Eclipse.org - DSDP
diff --git a/discovery/org.eclipse.tm.discovery.wizard/plugin.xml b/discovery/org.eclipse.tm.discovery.wizard/plugin.xml
deleted file mode 100644
index a8f37b6a3f8..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Activator.java b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Activator.java
deleted file mode 100644
index 340aa608b76..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Activator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.wizard;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.tm.wizard.pages"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Messages.java b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Messages.java
deleted file mode 100644
index a4c01b0153f..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/********************************************************************************
- * 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 Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-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.internal.discovery.wizard.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java
deleted file mode 100644
index c68be8855fb..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java
+++ /dev/null
@@ -1,651 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 Symbian Software Ltd. and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Javier Montalvo Orus (Symbian) - initial API and implementation
- * Javier Montalvo Orus (Symbian) - [plan] Improve Discovery and Autodetect in RSE
- * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
- * Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core
- * Javier Montalvo Orus (Symbian) - [186652] Next button should not be enabled on final page of discovery wizard
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.wizard;
-
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.ui.ViewerPane;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-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.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.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;
-
-/**
- * Wizard page providing the list of discovered services
- */
-
-public class ServiceDiscoveryWizardDisplayPage extends WizardPage {
-
- //tree widgets
- private TreeViewer treeViewer;
- private ViewerPane viewerPaneTree;
- private ViewerFilter filter;
-
- //table widgets
- private TableViewer tableViewer;
- private ViewerPane viewerPaneTable;
- private Table table;
- private TableEditor editor;
-
- private ComposedAdapterFactory adapterFactory;
-
- //button widgets
- private Button showAllButton;
-
- //static service discovery engine
- private final ServiceDiscoveryEngine serviceDiscoveryEngine = ServiceDiscoveryEngine.getInstance();
-
- //service discovery settings
- private String query = null;
- private String address = null;
- private String transportName = null;
- private String protocolName = null;
- private int timeOut = 500;
-
- //format of serviceType attribute list of names and transports
- //of extension point org.eclipse.core.subsystemConfigurations
- private final Pattern serviceTypeFormat = Pattern.compile("_(.+)\\._(.+)"); //$NON-NLS-1$
-
- private Service lastSelectedService = null;
-
- private Hashtable supportedServicesType = new Hashtable();
-
- /**
- * Constructor for the wizard page performing and displayin the results of
- * the service discovery
- *
- * @param query Query for the service discovery action
- * @param address Address of the target device
- * @param transportName Name of the transport implementation to be used
- * @param protocolName Name of the protocol implementation to be used
- * @param timeOut Timeout to be used in the transport
- */
-
- public ServiceDiscoveryWizardDisplayPage(String query, String address, String transportName, String protocolName, int timeOut) {
- super("wizardPage2"); //$NON-NLS-1$
- setTitle(Messages.getString("ServiceDiscoveryWizardDisplayPage.WizardPageTitle")); //$NON-NLS-1$
- setDescription(Messages.getString("ServiceDiscoveryWizardDisplayPage.WizardPageDescription")); //$NON-NLS-1$
-
- //load all service id's from the extension point registry
- //this id will be used to filter the supported sytem types
-
- IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.rse.core","subsystemConfigurations"); //$NON-NLS-1$ //$NON-NLS-2$
- IConfigurationElement[] ce = ep.getConfigurationElements();
- for (int i = 0; i < ce.length; i++) {
- String type = ce[i].getAttribute("serviceType"); //$NON-NLS-1$
-
- if(type!=null)
- {
- String[] variants = type.split(";"); //$NON-NLS-1$
-
- for (int j = 0; j < variants.length; j++) {
- Matcher match = serviceTypeFormat.matcher(variants[j]);
- if(match.matches())
- {
- String name = match.group(1);
- String transport = match.group(2);
- if(supportedServicesType.containsKey(name))
- {
- //insert new transport
- ((Vector)supportedServicesType.get(name)).add(transport);
- }
- else
- {
- //create vector with new transport
- Vector transports = new Vector();
- transports.add(transport);
- supportedServicesType.put(name,transports);
- }
- }
- }
- }
- }
-
- this.query = query;
- this.address = address;
- this.transportName = transportName;
- this.protocolName = protocolName;
- this.timeOut = timeOut;
-
- }
-
- /**
- * Refresh the contents of the service discovery model
- *
- * @param query Query for the service discovery action
- * @param address Address of the target device
- * @param transportName Name of the transport implementation to be used
- * @param protocolName Name of the protocol implementation to be used
- * @param timeOut Timeout to be used in the transport
- */
- public void update(String query, String address, String transportName, String protocolName, int timeOut)
- {
- //update settings
- this.query = query;
- this.address = address;
- this.transportName = transportName;
- this.protocolName = protocolName;
- this.timeOut = timeOut;
-
- //instantiate protocol and transport from factories (extensions)
- //and perform the service discovery action
-
- IProtocol protocol = null;
- ITransport transport = null;
-
- try {
- protocol = ProtocolFactory.getProtocol(protocolName);
- } catch (Exception e) {
- MessageDialog.openError(new Shell(), Messages.getString("ServiceDiscoveryWizardDisplayPage.ProtocolErrorTitle"), Messages.getString("ServiceDiscoveryWizardDisplayPage.ProtocolErrorMessage")+protocolName); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- try {
- transport = TransportFactory.getTransport(transportName, address, timeOut);
- } catch (UnknownHostException e) {
- MessageDialog.openError(new Shell(), Messages.getString("ServiceDiscoveryWizardDisplayPage.TransportAddressNotFoundTitle"), Messages.getString("ServiceDiscoveryWizardDisplayPage.TransportAddressNotFoundMessage")+address); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (Exception e) {
- MessageDialog.openError(new Shell(), Messages.getString("ServiceDiscoveryWizardDisplayPage.TransportErrorTitle"), Messages.getString("ServiceDiscoveryWizardDisplayPage.TransportErrorMessage")+transportName); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- if(protocol != null && transport != null)
- {
- try{
- serviceDiscoveryEngine.doServiceDiscovery(query, protocol,transport);
- }catch(Exception e){}
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- public void createControl(Composite parent) {
-
- List factories = new ArrayList();
- factories.add(new ResourceItemProviderAdapterFactory());
- factories.add(new ModelItemProviderAdapterFactory());
- factories.add(new ReflectiveItemProviderAdapterFactory());
-
- adapterFactory = new ComposedAdapterFactory(factories);
-
- Composite comp = new Composite(parent, SWT.NULL);
-
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- comp.setLayout(gridLayout);
-
- //TOOLBAR
-
- createToolBar(comp);
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
-
- SashForm sashForm = new SashForm(comp,SWT.NULL );
- sashForm.setOrientation(SWT.HORIZONTAL);
-
- sashForm.setLayoutData(data);
-
- // TREE
-
- Composite sashComposite = new Composite(sashForm,SWT.BORDER);
- sashComposite.setLayout(new FillLayout());
-
- createTree(sashComposite);
-
- // TABLE
-
- Composite innerComposite = new Composite(sashForm,SWT.BORDER);
- innerComposite.setLayout(new FillLayout());
-
- createTable(innerComposite);
-
-
- // SHOW ALL SERVICES BUTTON
-
- createShowAllButton(comp);
-
-
- update(query, address, transportName, protocolName, timeOut);
-
- setPageComplete(false);
-
- setControl(comp);
-
- }
-
- /*
- * ToolBar of the wizard page
- */
- private void createToolBar(Composite comp)
- {
- ToolBar toolBar = new ToolBar(comp,SWT.HORIZONTAL | SWT.FLAT | SWT.LEFT | SWT.WRAP );
-
- ToolItem refreshButton = new ToolItem(toolBar, SWT.NULL);
- refreshButton.addListener(SWT.Selection, new Listener(){
- public void handleEvent(Event event) {
- update(query, address, transportName, protocolName, timeOut);
- }
- });
-
- refreshButton.setToolTipText(Messages.getString("ServiceDiscoveryWizardDisplayPage.RefreshButtonToolTipText")); //$NON-NLS-1$
- refreshButton.setImage(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_REDO).createImage());
-
- ToolItem cleanButton = new ToolItem(toolBar, SWT.NULL);
- cleanButton.addListener(SWT.Selection, new Listener(){
- public void handleEvent(Event event) {
- serviceDiscoveryEngine.getResource().getContents().clear();
- tableViewer.setInput(null);
- }
- });
-
- cleanButton.setToolTipText(Messages.getString("ServiceDiscoveryWizardDisplayPage.ClearButtonToolTipText")); //$NON-NLS-1$
- cleanButton.setImage(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE).createImage());
-
- }
-
- /*
- * Tree of the wizard page
- */
- private void createTree(Composite comp)
- {
-
- viewerPaneTree = new ViewerPane( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(),
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart()) {
- public Viewer createViewer(Composite composite) {
- Tree tree = new Tree(composite, SWT.CHECK);
- ContainerCheckedTreeViewer treeViewer = new ContainerCheckedTreeViewer(tree);
-
- return treeViewer;
- }
-
- public void requestActivation() {
- super.requestActivation();
- }
- };
-
- viewerPaneTree.createControl(comp);
-
- treeViewer = (TreeViewer) viewerPaneTree.getViewer();
-
- treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-
- treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
- viewerPaneTree.setTitle(Messages.getString("ServiceDiscoveryWizardDisplayPage.ServicesTreeTitle"), null); //$NON-NLS-1$
-
- treeViewer.setInput(serviceDiscoveryEngine.getResource());
-
- new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
-
- ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- if(!event.getSelection().isEmpty())
- {
- EObject obj = (EObject)((IStructuredSelection) event.getSelection()).getFirstElement();
-
- if(obj instanceof Service)
- {
- tableViewer.setInput(obj);
- lastSelectedService = (Service)obj;
- }
- }
- }
- });
-
-
- ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
-
- ContainerCheckedTreeViewer treeViewer = (ContainerCheckedTreeViewer) event.getSource();
-
- if(treeViewer.getCheckedElements().length > 0)
- setPageComplete(true);
- else
- setPageComplete(false);
-
- }
- });
-
- filter = new ViewerFilter(){
-
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- boolean supported = true;
-
- if(element instanceof ServiceType) {
-
- //check if the service type is in the supported list
- String serviceTypeName = ((ServiceType)element).getName();
- if(!supportedServicesType.containsKey(serviceTypeName))
- {
- supported = false;
- }
- }
-
- if(element instanceof Service) {
-
- //if the discovered transport value is not contained in the list of supported transports filter this service
- supported = false;
-
- String serviceTypeName = ((ServiceType)((Service)element).eContainer()).getName();
-
- //check if the transport service is supported
- Vector transports = (Vector)supportedServicesType.get(serviceTypeName);
- Iterator it = ((Service)element).getPair().iterator();
- while(it.hasNext())
- {
- Pair pair = (Pair)it.next();
- if(pair.getKey().equalsIgnoreCase("transport")) //$NON-NLS-1$
- {
- String transport = pair.getValue();
-
- for (int i = 0; i < transports.size(); i++) {
- if(((String)transports.elementAt(i)).equalsIgnoreCase(transport))
- {
- //found a supported transport
- supported = true;
- }
- }
- }
-
- }
-
- }
- return supported;
-
- }};
-
-
-
- ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addFilter(filter);
-
- }
-
- /*
- * Table of the wizard page
- */
- private void createTable(Composite comp)
- {
- viewerPaneTable =
- new ViewerPane(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(),
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart()) {
- public Viewer createViewer(Composite composite) {
- return new TableViewer(composite);
- }
- };
-
- viewerPaneTable.createControl(comp);
- tableViewer = (TableViewer)viewerPaneTable.getViewer();
-
- viewerPaneTable.setTitle(Messages.getString("ServiceDiscoveryWizardDisplayPage.PropertiesTableTitle"), null); //$NON-NLS-1$
-
-
- table = tableViewer.getTable();
-
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
-
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
-
- TableColumn objectColumn = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(3, 100, true));
- objectColumn.setText(Messages.getString("ServiceDiscoveryWizardDisplayPage.KeyColumnLabel")); //$NON-NLS-1$
- objectColumn.setResizable(true);
-
- TableColumn selfColumn = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(2, 100, true));
- selfColumn.setText(Messages.getString("ServiceDiscoveryWizardDisplayPage.ValueColumnLabel")); //$NON-NLS-1$
- selfColumn.setResizable(true);
-
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
- editor = new TableEditor(table);
- editor.horizontalAlignment = SWT.LEFT;
- editor.grabHorizontal = true;
- table.addListener (SWT.MouseDown, new Listener () {
- public void handleEvent (Event event) {
- Rectangle clientArea = table.getClientArea ();
- Point pt = new Point (event.x, event.y);
- int index = table.getTopIndex ();
- while (index < table.getItemCount ()) {
- boolean visible = false;
- final TableItem item = table.getItem (index);
- for (int i=table.getColumnCount()-1; iService objects selected in the tree view from the specified host
- *
- * @param address Address of the host which services are queried
- * @return Vector containing the Service selected
- *
- * @see Service
- */
- public Vector getSelectedServices(String address)
- {
- Vector services = new Vector();
-
- Object[] checkedElements = ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).getCheckedElements();
- for(int i=0; i
- * It provides a wizard page with text boxes and combo boxes to gather the following data:
- *
- *
Protocol
- *
Transport
- *
Query
- *
Timeout
- *
- *
- * @see WizardPage
- */
-
-public class ServiceDiscoveryWizardMainPage extends WizardPage {
-
- // settings
- private int timeOut = 500; //ms
-
- // widgets
- private Combo queryCombo, transportCombo, protocolCombo;
- private Text addressText, timeOutText;
- private Button multicastButton;
-
- private String tempAddress;
-
- /**
- * Wizard main page constructor
- */
- public ServiceDiscoveryWizardMainPage() {
- super("wizardPage1"); //$NON-NLS-1$
- setTitle(Messages.getString("ServiceDiscoveryWizardMainPage.WizardPageTitle")); //$NON-NLS-1$
- setDescription(Messages.getString("ServiceDiscoveryWizardMainPage.WizardPageDescription")); //$NON-NLS-1$
- setErrorMessage(Messages.getString("ServiceDiscoveryWizardMainPage.ProvideAddressError")); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- public void createControl(Composite parent) {
-
-
- Composite comp = new Composite(parent,SWT.NULL);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- comp.setLayout(layout);
-
- //GridData
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.verticalAlignment = SWT.BEGINNING;
- data.grabExcessVerticalSpace = false;
-
- comp.setLayoutData(data);
-
- new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.AddressLabel")); //$NON-NLS-1$
-
- addressText = new Text(comp, SWT.BORDER | SWT.SINGLE | SWT.WRAP);
- addressText.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- if(((Text)e.getSource()).getText().equals("")) //$NON-NLS-1$
- {
- setErrorMessage(Messages.getString("ServiceDiscoveryWizardMainPage.ProvideAddressError")); //$NON-NLS-1$
- setPageComplete(false);
- }
- else
- {
- setErrorMessage(null);
- setPageComplete(true);
- }
-
- }
- });
-
- addressText.setLayoutData(data);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(addressText,"org.eclipse.tm.discovery.wizard.address"); //$NON-NLS-1$
-
- Composite comp2 = new Composite(comp,SWT.NULL);
- GridLayout layout2 = new GridLayout();
- layout2.numColumns = 2;
- comp2.setLayout(layout2);
-
- multicastButton = new Button(comp2,SWT.CHECK);
-
- multicastButton.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {}
-
- public void widgetSelected(SelectionEvent e) {
-
- Object src = e.getSource();
- if(((Button)src).getSelection())
- {
- String multicastAddress = null;
-
- try {
- multicastAddress = ProtocolFactory.getMulticastAddress(protocolCombo.getText(), transportCombo.getText());
- } catch (CoreException e1) {}
-
- if(multicastAddress!=null)
- {
- tempAddress = addressText.getText();
- addressText.setText(multicastAddress);
- }
- else
- {
- ((Button)src).setSelection(false);
- }
- }
- else
- {
- if(tempAddress!=null)
- addressText.setText(tempAddress);
- }
- }
- });
-
- new Label(comp2,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.MuticastAddressLabel0")); //$NON-NLS-1$
-
-
- new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.TransportLabel")); //$NON-NLS-1$
-
- transportCombo = new Combo(comp, SWT.READ_ONLY);
- transportCombo.setItems(TransportFactory.getTransportList());
- transportCombo.select(0);
-
- transportCombo.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent event) {
-
- if(multicastButton.getSelection())
- {
- String multicastAddress = null;
-
- try {
- multicastAddress = ProtocolFactory.getMulticastAddress(protocolCombo.getText(), transportCombo.getText());
- } catch (CoreException e1) {}
-
- if(multicastAddress!=null)
- {
- tempAddress = addressText.getText();
- addressText.setText(multicastAddress);
- }
- }
- }
- });
-
- transportCombo.setLayoutData(data);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(transportCombo,"org.eclipse.tm.discovery.wizard.transport"); //$NON-NLS-1$
-
- new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.ProtocolLabel")); //$NON-NLS-1$
-
- protocolCombo = new Combo(comp, SWT.READ_ONLY);
- protocolCombo.setItems(ProtocolFactory.getProtocolList());
- protocolCombo.select(0);
-
- protocolCombo.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent event) {
- String selectedProtocol = ((Combo)event.getSource()).getText();
-
- String[] queries = new String[]{};
- try {
- queries = ProtocolFactory.getQueryList(selectedProtocol);
- } catch (CoreException e) {}
- queryCombo.removeAll();
- queryCombo.setItems(queries);
- queryCombo.select(0);
-
- if(multicastButton.getSelection())
- {
- String multicastAddress = null;
-
- try {
- multicastAddress = ProtocolFactory.getMulticastAddress(protocolCombo.getText(), transportCombo.getText());
- } catch (CoreException e1) {}
-
- if(multicastAddress!=null)
- {
- tempAddress = addressText.getText();
- addressText.setText(multicastAddress);
- }
- }
- }
- });
-
- protocolCombo.setLayoutData(data);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(protocolCombo,"org.eclipse.tm.discovery.wizard.protocol"); //$NON-NLS-1$
-
- new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.DiscoveryQueryLabel")); //$NON-NLS-1$
-
- queryCombo = new Combo(comp, SWT.NONE);
- String[] queries = new String[]{};
- try {
- queries = ProtocolFactory.getQueryList(protocolCombo.getText());
- } catch (CoreException e) {}
- for (int i = 0; i < queries.length; i++) {
- queryCombo.add(queries[i]);
- }
- queryCombo.select(0);
-
- queryCombo.setLayoutData(data);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(queryCombo,"org.eclipse.tm.discovery.wizard.query"); //$NON-NLS-1$
-
- new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.TimeOutLabel")); //$NON-NLS-1$
-
- timeOutText = new Text(comp, SWT.BORDER | SWT.SINGLE | SWT.WRAP);
- timeOutText.setText(Messages.getString("ServiceDiscoveryWizardMainPage.TimeOutValue")); //$NON-NLS-1$
- timeOutText.redraw();
-
- timeOutText.setLayoutData(data);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(timeOutText,"org.eclipse.tm.discovery.wizard.timeout"); //$NON-NLS-1$
-
- setPageComplete(false);
-
- setControl(comp);
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), "org.eclipse.tm.discovery.wizard.general"); //$NON-NLS-1$
-
-
- }
-
- /**
- * Gets the service discovery command
- * @return command introduced in the settings window
- */
- public String getQuery() {
- return queryCombo.getText();
- }
-
- /**
- * Gets the service discovery address
- * @return address introduced in the settings window
- */
- public String getAddress() {
- return addressText.getText();
- }
-
- /**
- * Gets the service discovery transport
- * @return address introduced in the settings window
- */
- public String getTransport() {
- return transportCombo.getText();
- }
-
- /**
- * Gets the service discovery protocol
- * @return address introduced in the settings window
- */
- public String getProtocol() {
- return protocolCombo.getText();
- }
-
- /**
- * Gets the service discovery timeout
- * @return timeout introduced in the settings window
- */
- public int getTimeOut() {
-
- try{
- timeOut = Integer.parseInt(timeOutText.getText().trim());
- }catch(NumberFormatException e){}
-
- return timeOut;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
- */
- public boolean canFlipToNextPage() {
- return isPageComplete();
- }
-
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties
deleted file mode 100644
index bc79f987d8b..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-##################################################################################
-# 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 Orus (Symbian) - initial API and implementation
-##################################################################################
-
-ServiceDiscoveryWizardDisplayPage.WizardPageTitle=Service Discovery
-ServiceDiscoveryWizardDisplayPage.WizardPageDescription=Select discovered services.
-ServiceDiscoveryWizardMainPage.AddressLabel=Address:
-ServiceDiscoveryWizardMainPage.TransportLabel=Transport:
-ServiceDiscoveryWizardMainPage.ProtocolLabel=Protocol:
-ServiceDiscoveryWizardMainPage.TimeOutLabel=Timeout (ms):
-ServiceDiscoveryWizardMainPage.TimeOutValue=500
-ServiceDiscoveryWizardDisplayPage.ProtocolErrorTitle=Error
-ServiceDiscoveryWizardMainPage.WizardPageDescription=Discover available services in the target device.
-ServiceDiscoveryWizardMainPage.MuticastAddressLabel0=multicast address
-ServiceDiscoveryWizardDisplayPage.ProtocolErrorMessage=Error loading protocol
-ServiceDiscoveryWizardDisplayPage.TransportAddressNotFoundTitle=Error
-ServiceDiscoveryWizardDisplayPage.TransportAddressNotFoundMessage=Error resolving address
-ServiceDiscoveryWizardDisplayPage.TransportErrorTitle=Error
-ServiceDiscoveryWizardDisplayPage.TransportErrorMessage=Error loading transport
-ServiceDiscoveryWizardDisplayPage.RefreshButtonToolTipText=Refresh
-ServiceDiscoveryWizardDisplayPage.ClearButtonToolTipText=Clear
-ServiceDiscoveryWizardDisplayPage.ServicesTreeTitle=\ \ \ \ \ \ \ \ Services
-ServiceDiscoveryWizardDisplayPage.PropertiesTableTitle=\ \ \ \ \ \ \ \ Properties
-ServiceDiscoveryWizardDisplayPage.KeyColumnLabel=Key
-ServiceDiscoveryWizardMainPage.WizardPageTitle=Service Discovery
-ServiceDiscoveryWizardDisplayPage.ValueColumnLabel=Value
-ServiceDiscoveryWizardMainPage.ProvideAddressError=Provide a valid address
-ServiceDiscoveryWizardMainPage.DiscoveryQueryLabel=Discovery Query:
-ServiceDiscoveryWizardDisplayPage.ShowAllServicesButtonText=Show all services
diff --git a/discovery/org.eclipse.tm.discovery.wizard/toc.xml b/discovery/org.eclipse.tm.discovery.wizard/toc.xml
deleted file mode 100644
index 43f21cb637d..00000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/toc.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/discovery/readme.txt b/discovery/readme.txt
deleted file mode 100644
index 28c4d2e1f4b..00000000000
--- a/discovery/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-The "discovery" folder holds the DSDP-TM Discovery Component.
-It depends on Eclipse Platform and Eclipse Modeling Framework (EMF).
-All these CVS modules should be named "org.eclipse.tm.discovery.*".
-See http://www.eclipse.org/dsdp/tm
-
-
-