mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

[174292] [api] Make discovery packages internal

Browse source 
org.eclipse.rse.internal.discovery                         -> org.eclipse.rse.internal.discovery
org.eclipse.tm.internal.discovery.engine              -> org.eclipse.tm.internal.discovery.engine
org.eclipse.tm.internal.discovery.model.impl        -> org.eclipse.tm.internal.discovery.model.impl
org.eclipse.tm.internal.discovery.model.util         -> org.eclipse.tm.internal.discovery.model.util
org.eclipse.tm.internal.discovery.model.provider -> org.eclipse.tm.internal.discovery.model.provider
org.eclipse.tm.internal.discovery.protocol.dnssd -> org.eclipse.tm.internal.discovery.protocol.dnssd
org.eclipse.tm.internal.discovery.transport.udp   -> org.eclipse.tm.internal.discovery.transport.udp
org.eclipse.tm.internal.discovery.view                  -> org.eclipse.tm.internal.discovery.view
org.eclipse.tm.internal.discovery.wizard               -> org.eclipse.tm.internal.discovery.wizard
This commit is contained in:
Javier Montalvo Orus 2007-02-21 18:52:49 +00:00
parent 589c850540
commit bfe80f048c
79 changed files with 262 additions and 288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
discovery/org.eclipse.rse.discovery/.classpath
View file

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="discouraged" pattern="**/internal/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

3
discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF
View file

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.discovery;singleton:=true Bundle-SymbolicName: org.eclipse.rse.discovery;singleton:=true
Bundle-Version: 1.0.2.qualifier Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.rse.discovery.Activator Bundle-Activator: org.eclipse.rse.internal.discovery.Activator
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui, Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime, org.eclipse.core.runtime,
@ -15,3 +15,4 @@ Require-Bundle: org.eclipse.ui,
Eclipse-LazyStart: true Eclipse-LazyStart: true
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-RequiredExecutionEnvironment: J2SE-1.4
Export-Package: org.eclipse.rse.internal.discovery;x-internal:=true

10
discovery/org.eclipse.rse.discovery/plugin.xml
View file

@ -2,13 +2,13 @@
<?eclipse version="3.2"?> <?eclipse version="3.2"?>
<!-- <!--
Copyright (c) 2006 Symbian Software Ltd. All rights reserved. Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
This program and the accompanying materials are made available under the terms This program and the accompanying materials are made available under the terms
of the Eclipse Public License v1.0 which accompanies this distribution, and is of the Eclipse Public License v1.0 which accompanies this distribution, and is
available at http://www.eclipse.org/legal/epl-v10.html available at http://www.eclipse.org/legal/epl-v10.html
Contributors: Contributors:
Javier Montalvo Orús (Symbian) - initial API and implementation Javier Montalvo Orus (Symbian) - initial API and implementation
--> -->
<plugin> <plugin>
@ -18,7 +18,7 @@ Contributors:
<newConnectionWizard <newConnectionWizard
canFinishEarly="false" canFinishEarly="false"
categoryId="org.eclipse.rse.ui.wizards.newconnection.default.category" categoryId="org.eclipse.rse.ui.wizards.newconnection.default.category"
class="org.eclipse.rse.discovery.ServiceDiscoveryWizard" class="org.eclipse.rse.internal.discovery.ServiceDiscoveryWizard"
hasPages="true" hasPages="true"
id="org.eclipse.rse.discovery.ServiceDiscoveryWizard" id="org.eclipse.rse.discovery.ServiceDiscoveryWizard"
name="%NewConnectionWizard.discovery.name" name="%NewConnectionWizard.discovery.name"
@ -34,7 +34,7 @@ Contributors:
iconLive=""/> iconLive=""/>
</extension> </extension>
<extension <!-- extension
point="org.eclipse.rse.ui.subsystemConfigurations"> point="org.eclipse.rse.ui.subsystemConfigurations">
<configuration <configuration
systemTypeIds="org.eclipse.rse.systemtype.discovery" systemTypeIds="org.eclipse.rse.systemtype.discovery"
@ -47,7 +47,7 @@ Contributors:
priority="100" priority="100"
id="Discovery"> id="Discovery">
</configuration> </configuration>
</extension> </extension -->
</plugin> </plugin>

4
discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/Activator.java → discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Activator.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.discovery; package org.eclipse.rse.internal.discovery;
import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

8
discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/Messages.java → discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java
View file

@ -1,19 +1,19 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.discovery; package org.eclipse.rse.internal.discovery;
import org.eclipse.osgi.util.NLS; import org.eclipse.osgi.util.NLS;
public class Messages extends NLS { public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.rse.discovery.messages"; //$NON-NLS-1$ private static final String BUNDLE_NAME = "org.eclipse.rse.internal.discovery.messages"; //$NON-NLS-1$
public static String ServiceDiscoveryWizard_DiscoveryPropertySet; public static String ServiceDiscoveryWizard_DiscoveryPropertySet;

6
discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoverySubSystemConfiguration.java → discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoverySubSystemConfiguration.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.discovery; package org.eclipse.rse.internal.discovery;
import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPool;
import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterPoolManager;

8
discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizard.java → discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.discovery; package org.eclipse.rse.internal.discovery;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Iterator; import java.util.Iterator;
@ -24,8 +24,8 @@ import org.eclipse.rse.ui.actions.SystemRefreshAllAction;
import org.eclipse.tm.discovery.model.Pair; import org.eclipse.tm.discovery.model.Pair;
import org.eclipse.tm.discovery.model.Service; import org.eclipse.tm.discovery.model.Service;
import org.eclipse.tm.discovery.model.ServiceType; import org.eclipse.tm.discovery.model.ServiceType;
import org.eclipse.tm.discovery.wizard.ServiceDiscoveryWizardDisplayPage; import org.eclipse.tm.internal.discovery.wizard.ServiceDiscoveryWizardDisplayPage;
import org.eclipse.tm.discovery.wizard.ServiceDiscoveryWizardMainPage; import org.eclipse.tm.internal.discovery.wizard.ServiceDiscoveryWizardMainPage;
/** /**
* Service Discovery Wizard * Service Discovery Wizard

6
discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/messages.properties → discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties
View file

@ -1,15 +1,15 @@
################################################################################## ##################################################################################
# Copyright (c) 2006 Symbian Software Ltd. All rights reserved. # Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
# This program and the accompanying materials are made available under the terms # This program and the accompanying materials are made available under the terms
# of the Eclipse Public License v1.0 which accompanies this distribution, and is # of the Eclipse Public License v1.0 which accompanies this distribution, and is
# available at http://www.eclipse.org/legal/epl-v10.html # available at http://www.eclipse.org/legal/epl-v10.html
# #
# Contributors: # Contributors:
# Javier Montalvo Orús (Symbian) - initial API and implementation # Javier Montalvo Orus (Symbian) - initial API and implementation
################################################################################## ##################################################################################
ServiceDiscoveryWizard_DiscoveryPropertySet=Discovery ServiceDiscoveryWizard_DiscoveryPropertySet=Discovery
ServiceDiscoveryWizard_Port=port ServiceDiscoveryWizard_Port=port
ServiceDiscoveryWizard_SavingMessage=Saving RSE model ServiceDiscoveryWizard_SavingMessage=Saving RSE model
ServiceDiscoveryWizard_StatusId=org.eclipse.tm.discovery.wizard ServiceDiscoveryWizard_StatusId=org.eclipse.tm.internal.discovery.wizard
ServiceDiscoveryWizard_StatusMessage=RSE model saved ServiceDiscoveryWizard_StatusMessage=RSE model saved

6
discovery/org.eclipse.tm.discovery.engine/.classpath
View file

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="discouraged" pattern="**/internal/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

10
discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF
View file

@ -3,17 +3,17 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.discovery.engine;singleton:=true Bundle-SymbolicName: org.eclipse.tm.discovery.engine;singleton:=true
Bundle-Version: 1.0.1.qualifier Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.tm.discovery.engine.Activator Bundle-Activator: org.eclipse.tm.internal.discovery.engine.Activator
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui, Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime, org.eclipse.core.runtime,
org.eclipse.emf.ecore.xmi, org.eclipse.emf.ecore.xmi,
org.eclipse.tm.discovery.model org.eclipse.tm.discovery.model
Eclipse-LazyStart: true Eclipse-LazyStart: true
Export-Package: org.eclipse.tm.discovery.engine, Export-Package: org.eclipse.tm.discovery.protocol,
org.eclipse.tm.discovery.protocol, org.eclipse.tm.discovery.transport,
org.eclipse.tm.discovery.transport org.eclipse.tm.internal.discovery.engine;x-friends:="org.eclipse.tm.internal.discovery.wizard"
Import-Package: org.eclipse.tm.discovery.model, Import-Package: org.eclipse.tm.discovery.model,
org.eclipse.tm.discovery.model.util org.eclipse.tm.internal.discovery.model.util
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-RequiredExecutionEnvironment: J2SE-1.4

11
discovery/org.eclipse.tm.discovery.engine/plugin.xml
View file

@ -1,5 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?> <?eclipse version="3.2"?>
<!--
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
-->
<plugin> <plugin>
<extension-point id="discoveryTransport" name="discoveryTransport" schema="schema/discoveryTransport.exsd"/> <extension-point id="discoveryTransport" name="discoveryTransport" schema="schema/discoveryTransport.exsd"/>
<extension-point id="discoveryProtocol" name="discoveryProtocol" schema="schema/discoveryProtocol.exsd"/> <extension-point id="discoveryProtocol" name="discoveryProtocol" schema="schema/discoveryProtocol.exsd"/>

4
discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/IProtocol.java
View file

@ -1,11 +1,11 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.protocol; package org.eclipse.tm.discovery.protocol;

2
discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/ProtocolFactory.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html

2
discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/ITransport.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html

4
discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/TransportFactory.java
View file

@ -1,11 +1,11 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.transport; package org.eclipse.tm.discovery.transport;

4
discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/Activator.java → discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Activator.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.engine; package org.eclipse.tm.internal.discovery.engine;
import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

8
discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/Messages.java → discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Messages.java
View file

@ -1,20 +1,20 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.wizard; package org.eclipse.tm.internal.discovery.engine;
import java.util.MissingResourceException; import java.util.MissingResourceException;
import java.util.ResourceBundle; import java.util.ResourceBundle;
public class Messages { public class Messages {
private static final String BUNDLE_NAME = "org.eclipse.tm.discovery.wizard.messages"; //$NON-NLS-1$ private static final String BUNDLE_NAME = "org.eclipse.tm.internal.discovery.engine.messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
.getBundle(BUNDLE_NAME); .getBundle(BUNDLE_NAME);

8
discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/ServiceDiscoveryEngine.java → discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/ServiceDiscoveryEngine.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.engine; package org.eclipse.tm.internal.discovery.engine;
import org.eclipse.emf.common.util.URI; import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.common.util.WrappedException; import org.eclipse.emf.common.util.WrappedException;
@ -16,9 +16,9 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.tm.discovery.model.ModelPackage; import org.eclipse.tm.discovery.model.ModelPackage;
import org.eclipse.tm.discovery.model.util.ModelResourceFactoryImpl;
import org.eclipse.tm.discovery.protocol.IProtocol; import org.eclipse.tm.discovery.protocol.IProtocol;
import org.eclipse.tm.discovery.transport.ITransport; import org.eclipse.tm.discovery.transport.ITransport;
import org.eclipse.tm.internal.discovery.model.util.ModelResourceFactoryImpl;
/** /**
* Engine for service discovery. * Engine for service discovery.

4
discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/messages.properties → discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/messages.properties
View file

@ -1,11 +1,11 @@
################################################################################## ##################################################################################
# Copyright (c) 2006 Symbian Software Ltd. All rights reserved. # Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
# This program and the accompanying materials are made available under the terms # This program and the accompanying materials are made available under the terms
# of the Eclipse Public License v1.0 which accompanies this distribution, and is # of the Eclipse Public License v1.0 which accompanies this distribution, and is
# available at http://www.eclipse.org/legal/epl-v10.html # available at http://www.eclipse.org/legal/epl-v10.html
# #
# Contributors: # Contributors:
# Javier Montalvo Orús (Symbian) - initial API and implementation # Javier Montalvo Orus (Symbian) - initial API and implementation
################################################################################## ##################################################################################
ServiceDiscoveryEngine.DiscoveryModelFileURI=discoveryModel.xml ServiceDiscoveryEngine.DiscoveryModelFileURI=discoveryModel.xml

6
discovery/org.eclipse.tm.discovery.model.edit/.classpath
View file

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="discouraged" pattern="**/internal/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

4
discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF
View file

@ -4,10 +4,10 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.discovery.model.edit;singleton:=true Bundle-SymbolicName: org.eclipse.tm.discovery.model.edit;singleton:=true
Bundle-Version: 1.0.1.qualifier Bundle-Version: 1.0.1.qualifier
Bundle-ClassPath: . Bundle-ClassPath: .
Bundle-Activator: org.eclipse.tm.discovery.model.provider.DiscoveryModelEditPlugin$Implementation Bundle-Activator: org.eclipse.tm.internal.discovery.model.provider.DiscoveryModelEditPlugin$Implementation
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin
Export-Package: org.eclipse.tm.discovery.model.provider Export-Package: org.eclipse.tm.internal.discovery.model.provider;x-friends:="org.eclipse.tm.internal.discovery.wizard"
Require-Bundle: org.eclipse.core.runtime, Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.edit;visibility:=reexport, org.eclipse.emf.edit;visibility:=reexport,
org.eclipse.tm.discovery.model org.eclipse.tm.discovery.model

29
discovery/org.eclipse.tm.discovery.model.edit/plugin.properties
View file

@ -24,37 +24,8 @@
pluginName = TM Service Discovery Edit Support pluginName = TM Service Discovery Edit Support
providerName = Eclipse.org providerName = Eclipse.org
_UI_CreateChild_text = {0}
_UI_CreateChild_text2 = {1} {0}
_UI_CreateChild_text3 = {1}
_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
_UI_PropertyDescriptor_description = The {0} of the {1}
_UI_Unknown_type = Object
_UI_Unknown_datatype= Value
_UI_SDDevice_sDServiceType_feature = SD Service Type
_UI_SDNetwork_sDDevice_feature = SD Device
_UI_SDService_sDPair_feature = SD Pair
_UI_SDServiceType_sDService_feature = SD Service
_UI_Device_type = Device
_UI_Network_type = Network
_UI_Pair_type = Pair
_UI_Service_type = Service
_UI_ServiceType_type = Service Type
_UI_Device_serviceType_feature = Service Type
_UI_Device_address_feature = Address
_UI_Device_name_feature = Name
_UI_Network_device_feature = Device
_UI_Pair_key_feature = Key
_UI_Pair_value_feature = Value
_UI_Service_pair_feature = Pair
_UI_Service_name_feature = Name
_UI_ServiceType_service_feature = Service
_UI_ServiceType_name_feature = Name
_UI_Unknown_feature = Unspecified

2
discovery/org.eclipse.tm.discovery.model.edit/plugin.xml
View file

@ -2,7 +2,7 @@
<?eclipse version="3.0"?> <?eclipse version="3.0"?>
<!-- <!--
Copyright (c) 2006 Symbian Software Ltd. All rights reserved. Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
This program and the accompanying materials are made available under the terms This program and the accompanying materials are made available under the terms
of the Eclipse Public License v1.0 which accompanies this distribution, and is of the Eclipse Public License v1.0 which accompanies this distribution, and is
available at http://www.eclipse.org/legal/epl-v10.html available at http://www.eclipse.org/legal/epl-v10.html

4
discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/DeviceItemProvider.java → discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DeviceItemProvider.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.provider; package org.eclipse.tm.internal.discovery.model.provider;
import java.util.Collection; import java.util.Collection;

6
discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/DiscoveryModelEditPlugin.java → discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DiscoveryModelEditPlugin.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.provider; package org.eclipse.tm.internal.discovery.model.provider;
import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.EMFPlugin;

8
discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/ModelItemProviderAdapterFactory.java → discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ModelItemProviderAdapterFactory.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.provider; package org.eclipse.tm.internal.discovery.model.provider;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -28,7 +28,7 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.tm.discovery.model.util.ModelAdapterFactory; import org.eclipse.tm.internal.discovery.model.util.ModelAdapterFactory;
/** /**
* This is the factory that is used to provide the interfaces needed to support Viewers. * This is the factory that is used to provide the interfaces needed to support Viewers.

4
discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/NetworkItemProvider.java → discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/NetworkItemProvider.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.provider; package org.eclipse.tm.internal.discovery.model.provider;
import java.util.Collection; import java.util.Collection;

4
discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/PairItemProvider.java → discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/PairItemProvider.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.provider; package org.eclipse.tm.internal.discovery.model.provider;
import java.util.Collection; import java.util.Collection;

4
discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/ServiceItemProvider.java → discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceItemProvider.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.provider; package org.eclipse.tm.internal.discovery.model.provider;
import java.util.Collection; import java.util.Collection;

4
discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/ServiceTypeItemProvider.java → discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceTypeItemProvider.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.provider; package org.eclipse.tm.internal.discovery.model.provider;
import java.util.Collection; import java.util.Collection;

6
discovery/org.eclipse.tm.discovery.model/.classpath
View file

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="discouraged" pattern="**/internal/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

4
discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF
View file

@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)" org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)"
Eclipse-LazyStart: true Eclipse-LazyStart: true
Export-Package: org.eclipse.tm.discovery.model, Export-Package: org.eclipse.tm.discovery.model,
org.eclipse.tm.discovery.model.impl, org.eclipse.tm.internal.discovery.model.impl;x-internal:=true,
org.eclipse.tm.discovery.model.util org.eclipse.tm.internal.discovery.model.util;x-internal:=true
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-RequiredExecutionEnvironment: J2SE-1.4

6
discovery/org.eclipse.tm.discovery.model/plugin.xml
View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?> <?eclipse version="3.0"?>
<!-- <!--
Copyright (c) 2006 Symbian Software Ltd. All rights reserved. Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
This program and the accompanying materials are made available under the terms This program and the accompanying materials are made available under the terms
of the Eclipse Public License v1.0 which accompanies this distribution, and is of the Eclipse Public License v1.0 which accompanies this distribution, and is
available at http://www.eclipse.org/legal/epl-v10.html available at http://www.eclipse.org/legal/epl-v10.html
Contributors: Contributors:
Javier Montalvo Orús (Symbian) - initial API and implementation Javier Montalvo Orus (Symbian) - initial API and implementation
--> -->
<plugin> <plugin>
@ -21,7 +21,7 @@ Contributors:
<extension point="org.eclipse.emf.ecore.extension_parser"> <extension point="org.eclipse.emf.ecore.extension_parser">
<parser <parser
type="discovery" type="discovery"
class="org.eclipse.tm.discovery.model.util.ModelResourceFactoryImpl" /> class="org.eclipse.tm.internal.discovery.model.util.ModelResourceFactoryImpl" />
</extension> </extension>
</plugin> </plugin>

4
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java
View file

@ -1,11 +1,11 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model; package org.eclipse.tm.discovery.model;

4
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Device.java
View file

@ -1,11 +1,11 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model; package org.eclipse.tm.discovery.model;

6
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelFactory.java
View file

@ -1,11 +1,11 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model; package org.eclipse.tm.discovery.model;
@ -26,7 +26,7 @@ public interface ModelFactory extends EFactory {
* *
* @generated * @generated
*/ */
ModelFactory eINSTANCE = org.eclipse.tm.discovery.model.impl.ModelFactoryImpl.init(); ModelFactory eINSTANCE = org.eclipse.tm.internal.discovery.model.impl.ModelFactoryImpl.init();
/** /**
* Returns a new object of class '<em>Device</em>'. * Returns a new object of class '<em>Device</em>'.

66
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java
View file

@ -1,11 +1,11 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model; package org.eclipse.tm.discovery.model;
@ -56,13 +56,13 @@ public interface ModelPackage extends EPackage {
* *
* @generated * @generated
*/ */
ModelPackage eINSTANCE = org.eclipse.tm.discovery.model.impl.ModelPackageImpl.init(); ModelPackage eINSTANCE = org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl.init();
/** /**
* The meta object id for the '{@link org.eclipse.tm.discovery.model.impl.DeviceImpl <em>Device</em>}' class. * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl <em>Device</em>}' class.
* *
* @see org.eclipse.tm.discovery.model.impl.DeviceImpl * @see org.eclipse.tm.internal.discovery.model.impl.DeviceImpl
* @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getDevice() * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getDevice()
* @generated * @generated
*/ */
int DEVICE = 0; int DEVICE = 0;
@ -100,10 +100,10 @@ public interface ModelPackage extends EPackage {
int DEVICE_FEATURE_COUNT = 3; int DEVICE_FEATURE_COUNT = 3;
/** /**
* The meta object id for the '{@link org.eclipse.tm.discovery.model.impl.NetworkImpl <em>Network</em>}' class. * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.NetworkImpl <em>Network</em>}' class.
* *
* @see org.eclipse.tm.discovery.model.impl.NetworkImpl * @see org.eclipse.tm.internal.discovery.model.impl.NetworkImpl
* @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getNetwork() * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getNetwork()
* @generated * @generated
*/ */
int NETWORK = 1; int NETWORK = 1;
@ -125,10 +125,10 @@ public interface ModelPackage extends EPackage {
int NETWORK_FEATURE_COUNT = 1; int NETWORK_FEATURE_COUNT = 1;
/** /**
* The meta object id for the '{@link org.eclipse.tm.discovery.model.impl.PairImpl <em>Pair</em>}' class. * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.PairImpl <em>Pair</em>}' class.
* *
* @see org.eclipse.tm.discovery.model.impl.PairImpl * @see org.eclipse.tm.internal.discovery.model.impl.PairImpl
* @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getPair() * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getPair()
* @generated * @generated
*/ */
int PAIR = 2; int PAIR = 2;
@ -158,10 +158,10 @@ public interface ModelPackage extends EPackage {
int PAIR_FEATURE_COUNT = 2; int PAIR_FEATURE_COUNT = 2;
/** /**
* The meta object id for the '{@link org.eclipse.tm.discovery.model.impl.ServiceImpl <em>Service</em>}' class. * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl <em>Service</em>}' class.
* *
* @see org.eclipse.tm.discovery.model.impl.ServiceImpl * @see org.eclipse.tm.internal.discovery.model.impl.ServiceImpl
* @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getService() * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getService()
* @generated * @generated
*/ */
int SERVICE = 3; int SERVICE = 3;
@ -191,10 +191,10 @@ public interface ModelPackage extends EPackage {
int SERVICE_FEATURE_COUNT = 2; int SERVICE_FEATURE_COUNT = 2;
/** /**
* The meta object id for the '{@link org.eclipse.tm.discovery.model.impl.ServiceTypeImpl <em>Service Type</em>}' class. * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl <em>Service Type</em>}' class.
* *
* @see org.eclipse.tm.discovery.model.impl.ServiceTypeImpl * @see org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl
* @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getServiceType() * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getServiceType()
* @generated * @generated
*/ */
int SERVICE_TYPE = 4; int SERVICE_TYPE = 4;
@ -395,10 +395,10 @@ public interface ModelPackage extends EPackage {
interface Literals { interface Literals {
/** /**
* The meta object literal for the '{@link org.eclipse.tm.discovery.model.impl.DeviceImpl <em>Device</em>}' class. * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl <em>Device</em>}' class.
* *
* @see org.eclipse.tm.discovery.model.impl.DeviceImpl * @see org.eclipse.tm.internal.discovery.model.impl.DeviceImpl
* @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getDevice() * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getDevice()
* @generated * @generated
*/ */
@ -426,10 +426,10 @@ public interface ModelPackage extends EPackage {
EAttribute DEVICE__NAME = eINSTANCE.getDevice_Name(); EAttribute DEVICE__NAME = eINSTANCE.getDevice_Name();
/** /**
* The meta object literal for the '{@link org.eclipse.tm.discovery.model.impl.NetworkImpl <em>Network</em>}' class. * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.NetworkImpl <em>Network</em>}' class.
* *
* @see org.eclipse.tm.discovery.model.impl.NetworkImpl * @see org.eclipse.tm.internal.discovery.model.impl.NetworkImpl
* @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getNetwork() * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getNetwork()
* @generated * @generated
*/ */
EClass NETWORK = eINSTANCE.getNetwork(); EClass NETWORK = eINSTANCE.getNetwork();
@ -442,10 +442,10 @@ public interface ModelPackage extends EPackage {
EReference NETWORK__DEVICE = eINSTANCE.getNetwork_Device(); EReference NETWORK__DEVICE = eINSTANCE.getNetwork_Device();
/** /**
* The meta object literal for the '{@link org.eclipse.tm.discovery.model.impl.PairImpl <em>Pair</em>}' class. * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.PairImpl <em>Pair</em>}' class.
* *
* @see org.eclipse.tm.discovery.model.impl.PairImpl * @see org.eclipse.tm.internal.discovery.model.impl.PairImpl
* @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getPair() * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getPair()
* @generated * @generated
*/ */
EClass PAIR = eINSTANCE.getPair(); EClass PAIR = eINSTANCE.getPair();
@ -465,10 +465,10 @@ public interface ModelPackage extends EPackage {
EAttribute PAIR__VALUE = eINSTANCE.getPair_Value(); EAttribute PAIR__VALUE = eINSTANCE.getPair_Value();
/** /**
* The meta object literal for the '{@link org.eclipse.tm.discovery.model.impl.ServiceImpl <em>Service</em>}' class. * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl <em>Service</em>}' class.
* *
* @see org.eclipse.tm.discovery.model.impl.ServiceImpl * @see org.eclipse.tm.internal.discovery.model.impl.ServiceImpl
* @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getService() * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getService()
* @generated * @generated
*/ */
EClass SERVICE = eINSTANCE.getService(); EClass SERVICE = eINSTANCE.getService();
@ -488,10 +488,10 @@ public interface ModelPackage extends EPackage {
EAttribute SERVICE__NAME = eINSTANCE.getService_Name(); EAttribute SERVICE__NAME = eINSTANCE.getService_Name();
/** /**
* The meta object literal for the '{@link org.eclipse.tm.discovery.model.impl.ServiceTypeImpl <em>Service Type</em>}' class. * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl <em>Service Type</em>}' class.
* *
* @see org.eclipse.tm.discovery.model.impl.ServiceTypeImpl * @see org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl
* @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getServiceType() * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getServiceType()
* @generated * @generated
*/ */
EClass SERVICE_TYPE = eINSTANCE.getServiceType(); EClass SERVICE_TYPE = eINSTANCE.getServiceType();

4
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Network.java
View file

@ -1,11 +1,11 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model; package org.eclipse.tm.discovery.model;

4
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Pair.java
View file

@ -1,11 +1,11 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model; package org.eclipse.tm.discovery.model;

4
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Service.java
View file

@ -1,11 +1,11 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model; package org.eclipse.tm.discovery.model;

4
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ServiceType.java
View file

@ -1,11 +1,11 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model; package org.eclipse.tm.discovery.model;

12
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/DeviceImpl.java → discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/DeviceImpl.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.impl; package org.eclipse.tm.internal.discovery.model.impl;
import java.util.Collection; import java.util.Collection;
@ -37,9 +37,9 @@ import org.eclipse.tm.discovery.model.ServiceType;
* <p> * <p>
* The following features are implemented: * The following features are implemented:
* <ul> * <ul>
* <li>{@link org.eclipse.tm.discovery.model.impl.DeviceImpl#getServiceType <em>Service Type</em>}</li> * <li>{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl#getServiceType <em>Service Type</em>}</li>
* <li>{@link org.eclipse.tm.discovery.model.impl.DeviceImpl#getAddress <em>Address</em>}</li> * <li>{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl#getAddress <em>Address</em>}</li>
* <li>{@link org.eclipse.tm.discovery.model.impl.DeviceImpl#getName <em>Name</em>}</li> * <li>{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl#getName <em>Name</em>}</li>
* </ul> * </ul>
* </p> * </p>
* *

6
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelFactoryImpl.java → discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelFactoryImpl.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.impl; package org.eclipse.tm.internal.discovery.model.impl;
import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EObject;

4
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelPackageImpl.java → discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelPackageImpl.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.impl; package org.eclipse.tm.internal.discovery.model.impl;
import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClass;

8
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/NetworkImpl.java → discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/NetworkImpl.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.impl; package org.eclipse.tm.internal.discovery.model.impl;
import java.util.Collection; import java.util.Collection;
@ -35,7 +35,7 @@ import org.eclipse.tm.discovery.model.Network;
* <p> * <p>
* The following features are implemented: * The following features are implemented:
* <ul> * <ul>
* <li>{@link org.eclipse.tm.discovery.model.impl.NetworkImpl#getDevice <em>Device</em>}</li> * <li>{@link org.eclipse.tm.internal.discovery.model.impl.NetworkImpl#getDevice <em>Device</em>}</li>
* </ul> * </ul>
* </p> * </p>
* *

10
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/PairImpl.java → discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/PairImpl.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.impl; package org.eclipse.tm.internal.discovery.model.impl;
import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notification;
@ -27,8 +27,8 @@ import org.eclipse.tm.discovery.model.Pair;
* <p> * <p>
* The following features are implemented: * The following features are implemented:
* <ul> * <ul>
* <li>{@link org.eclipse.tm.discovery.model.impl.PairImpl#getKey <em>Key</em>}</li> * <li>{@link org.eclipse.tm.internal.discovery.model.impl.PairImpl#getKey <em>Key</em>}</li>
* <li>{@link org.eclipse.tm.discovery.model.impl.PairImpl#getValue <em>Value</em>}</li> * <li>{@link org.eclipse.tm.internal.discovery.model.impl.PairImpl#getValue <em>Value</em>}</li>
* </ul> * </ul>
* </p> * </p>
* *

10
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceImpl.java → discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceImpl.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.impl; package org.eclipse.tm.internal.discovery.model.impl;
import java.util.Collection; import java.util.Collection;
@ -37,8 +37,8 @@ import org.eclipse.tm.discovery.model.Service;
* <p> * <p>
* The following features are implemented: * The following features are implemented:
* <ul> * <ul>
* <li>{@link org.eclipse.tm.discovery.model.impl.ServiceImpl#getPair <em>Pair</em>}</li> * <li>{@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl#getPair <em>Pair</em>}</li>
* <li>{@link org.eclipse.tm.discovery.model.impl.ServiceImpl#getName <em>Name</em>}</li> * <li>{@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl#getName <em>Name</em>}</li>
* </ul> * </ul>
* </p> * </p>
* *

10
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ServiceTypeImpl.java → discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceTypeImpl.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.impl; package org.eclipse.tm.internal.discovery.model.impl;
import java.util.Collection; import java.util.Collection;
@ -37,8 +37,8 @@ import org.eclipse.tm.discovery.model.ServiceType;
* <p> * <p>
* The following features are implemented: * The following features are implemented:
* <ul> * <ul>
* <li>{@link org.eclipse.tm.discovery.model.impl.ServiceTypeImpl#getService <em>Service</em>}</li> * <li>{@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl#getService <em>Service</em>}</li>
* <li>{@link org.eclipse.tm.discovery.model.impl.ServiceTypeImpl#getName <em>Name</em>}</li> * <li>{@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl#getName <em>Name</em>}</li>
* </ul> * </ul>
* </p> * </p>
* *

6
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelAdapterFactory.java → discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelAdapterFactory.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.util; package org.eclipse.tm.internal.discovery.model.util;
import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.Notifier;

8
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelResourceFactoryImpl.java → discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.util; package org.eclipse.tm.internal.discovery.model.util;
import org.eclipse.emf.common.util.URI; import org.eclipse.emf.common.util.URI;
@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
* *
* The <b>Resource Factory</b> associated with the package. * The <b>Resource Factory</b> associated with the package.
* *
* @see org.eclipse.tm.discovery.model.util.ModelResourceImpl * @see org.eclipse.tm.internal.discovery.model.util.ModelResourceImpl
* @generated * @generated
*/ */
public class ModelResourceFactoryImpl extends ResourceFactoryImpl { public class ModelResourceFactoryImpl extends ResourceFactoryImpl {

8
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelResourceImpl.java → discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.util; package org.eclipse.tm.internal.discovery.model.util;
import org.eclipse.emf.common.util.URI; import org.eclipse.emf.common.util.URI;
@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
* *
* The <b>Resource </b> associated with the package. * The <b>Resource </b> associated with the package.
* *
* @see org.eclipse.tm.discovery.model.util.ModelResourceFactoryImpl * @see org.eclipse.tm.internal.discovery.model.util.ModelResourceFactoryImpl
* @generated * @generated
*/ */
public class ModelResourceImpl extends XMLResourceImpl { public class ModelResourceImpl extends XMLResourceImpl {

4
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelSwitch.java → discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.util; package org.eclipse.tm.internal.discovery.model.util;
import java.util.List; import java.util.List;

6
discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelXMLProcessor.java → discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.model.util; package org.eclipse.tm.internal.discovery.model.util;
import java.util.Map; import java.util.Map;

6
discovery/org.eclipse.tm.discovery.protocol.dnssd/.classpath
View file

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="discouraged" pattern="**/internal/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

2
discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF
View file

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.discovery.protocol.dnssd;singleton:=true Bundle-SymbolicName: org.eclipse.tm.discovery.protocol.dnssd;singleton:=true
Bundle-Version: 1.0.1.qualifier Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.tm.discovery.protocol.dnssd.Activator Bundle-Activator: org.eclipse.tm.internal.discovery.protocol.dnssd.Activator
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui, Require-Bundle: org.eclipse.ui,

13
discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml
View file

@ -1,9 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?> <?eclipse version="3.2"?>
<!--
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
-->
<plugin> <plugin>
<extension point="org.eclipse.tm.discovery.engine.discoveryProtocol"> <extension point="org.eclipse.tm.discovery.engine.discoveryProtocol">
<protocol <protocol
class="org.eclipse.tm.discovery.protocol.dnssd.DNSSDProtocol" class="org.eclipse.tm.internal.discovery.protocol.dnssd.DNSSDProtocol"
name="DNS-SD"/> name="DNS-SD"/>
</extension> </extension>
</plugin> </plugin>

4
discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/Activator.java → discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Activator.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.protocol.dnssd; package org.eclipse.tm.internal.discovery.protocol.dnssd;
import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

4
discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/DNSSDProtocol.java → discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/DNSSDProtocol.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.protocol.dnssd; package org.eclipse.tm.internal.discovery.protocol.dnssd;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.util.Iterator; import java.util.Iterator;

8
discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/Messages.java → discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Messages.java
View file

@ -1,20 +1,20 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.protocol.dnssd; package org.eclipse.tm.internal.discovery.protocol.dnssd;
import java.util.MissingResourceException; import java.util.MissingResourceException;
import java.util.ResourceBundle; import java.util.ResourceBundle;
public class Messages { public class Messages {
private static final String BUNDLE_NAME = "org.eclipse.tm.discovery.protocol.dnssd.messages"; //$NON-NLS-1$ private static final String BUNDLE_NAME = "org.eclipse.tm.internal.discovery.protocol.dnssd.messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
.getBundle(BUNDLE_NAME); .getBundle(BUNDLE_NAME);

4
discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/messages.properties → discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/messages.properties
View file

@ -1,11 +1,11 @@
################################################################################## ##################################################################################
# Copyright (c) 2006 Symbian Software Ltd. All rights reserved. # Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
# This program and the accompanying materials are made available under the terms # This program and the accompanying materials are made available under the terms
# of the Eclipse Public License v1.0 which accompanies this distribution, and is # of the Eclipse Public License v1.0 which accompanies this distribution, and is
# available at http://www.eclipse.org/legal/epl-v10.html # available at http://www.eclipse.org/legal/epl-v10.html
# #
# Contributors: # Contributors:
# Javier Montalvo Orús (Symbian) - initial API and implementation # Javier Montalvo Orus (Symbian) - initial API and implementation
################################################################################## ##################################################################################
DNSSDProtocol.ServiceDiscoveryCommand=_services._dns-sd._udp.local. DNSSDProtocol.ServiceDiscoveryCommand=_services._dns-sd._udp.local.

6
discovery/org.eclipse.tm.discovery.transport.udp/.classpath
View file

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="discouraged" pattern="**/internal/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

3
discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF
View file

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.discovery.transport.udp;singleton:=true Bundle-SymbolicName: org.eclipse.tm.discovery.transport.udp;singleton:=true
Bundle-Version: 1.0.1.qualifier Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.tm.discovery.transport.udp.Activator Bundle-Activator: org.eclipse.tm.internal.discovery.transport.udp.Activator
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui, Require-Bundle: org.eclipse.ui,
@ -11,3 +11,4 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.tm.discovery.engine org.eclipse.tm.discovery.engine
Eclipse-LazyStart: true Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-RequiredExecutionEnvironment: J2SE-1.4
Export-Package: org.eclipse.tm.internal.discovery.transport.udp;x-internal:=true

13
discovery/org.eclipse.tm.discovery.transport.udp/plugin.xml
View file

@ -1,10 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?> <?eclipse version="3.2"?>
<!--
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
-->
<plugin> <plugin>
<extension <extension
point="org.eclipse.tm.discovery.engine.discoveryTransport"> point="org.eclipse.tm.discovery.engine.discoveryTransport">
<transport <transport
class="org.eclipse.tm.discovery.transport.udp.UDPTransport" class="org.eclipse.tm.internal.discovery.transport.udp.UDPTransport"
name="UDP"/> name="UDP"/>
</extension> </extension>
</plugin> </plugin>

4
discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/discovery/transport/udp/Activator.java → discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/Activator.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.transport.udp; package org.eclipse.tm.internal.discovery.transport.udp;
import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

4
discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/discovery/transport/udp/UDPTransport.java → discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/UDPTransport.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orús (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.transport.udp; package org.eclipse.tm.internal.discovery.transport.udp;
import java.io.IOException; import java.io.IOException;
import java.net.DatagramPacket; import java.net.DatagramPacket;

6
discovery/org.eclipse.tm.discovery.view/.classpath
View file

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="discouraged" pattern="**/internal/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

10
discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF
View file

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.discovery.view;singleton:=true Bundle-SymbolicName: org.eclipse.tm.discovery.view;singleton:=true
Bundle-Version: 1.0.1.qualifier Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.tm.discovery.view.Activator Bundle-Activator: org.eclipse.tm.internal.discovery.view.Activator
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime, Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.forms, org.eclipse.ui.forms,
@ -17,9 +17,9 @@ Require-Bundle: org.eclipse.core.runtime,
Eclipse-LazyStart: false Eclipse-LazyStart: false
Import-Package: org.eclipse.emf.common.ui, Import-Package: org.eclipse.emf.common.ui,
org.eclipse.emf.common.util, org.eclipse.emf.common.util,
org.eclipse.tm.discovery.engine, org.eclipse.tm.internal.discovery.engine,
org.eclipse.tm.discovery.model.provider, org.eclipse.tm.internal.discovery.model.provider,
org.eclipse.tm.discovery.model.util org.eclipse.tm.internal.discovery.model.util
Export-Package: org.eclipse.tm.discovery.view Export-Package: org.eclipse.tm.internal.discovery.view
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-RequiredExecutionEnvironment: J2SE-1.4

6
discovery/org.eclipse.tm.discovery.view/plugin.xml
View file

@ -2,13 +2,13 @@
<?eclipse version="3.2"?> <?eclipse version="3.2"?>
<!-- <!--
Copyright (c) 2006 Symbian Software Ltd. All rights reserved. Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
This program and the accompanying materials are made available under the terms This program and the accompanying materials are made available under the terms
of the Eclipse Public License v1.0 which accompanies this distribution, and is of the Eclipse Public License v1.0 which accompanies this distribution, and is
available at http://www.eclipse.org/legal/epl-v10.html available at http://www.eclipse.org/legal/epl-v10.html
Contributors: Contributors:
Javier Montalvo Orús (Symbian) - initial API and implementation Javier Montalvo Orus (Symbian) - initial API and implementation
--> -->
<plugin> <plugin>
@ -21,7 +21,7 @@ Contributors:
</category> </category>
<view <view
category="org.eclipse.rse.discovery.category" category="org.eclipse.rse.discovery.category"
class="org.eclipse.tm.discovery.view.ServiceDiscoveryView" class="org.eclipse.tm.internal.discovery.view.ServiceDiscoveryView"
icon="icons/system_view.gif" icon="icons/system_view.gif"
id="org.eclipse.rse.discovery.view.MultipleView" id="org.eclipse.rse.discovery.view.MultipleView"
name="Service Discovery Properties"/> name="Service Discovery Properties"/>

4
discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/Activator.java → discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Activator.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.view; package org.eclipse.tm.internal.discovery.view;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.ui.plugin.AbstractUIPlugin;

8
discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/Messages.java → discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Messages.java
View file

@ -1,19 +1,19 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.view; package org.eclipse.tm.internal.discovery.view;
import org.eclipse.osgi.util.NLS; import org.eclipse.osgi.util.NLS;
public class Messages extends NLS { public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.tm.discovery.view.messages"; //$NON-NLS-1$ private static final String BUNDLE_NAME = "org.eclipse.tm.internal.discovery.view.messages"; //$NON-NLS-1$
public static String ServiceDiscoveryView_ClearActionText; public static String ServiceDiscoveryView_ClearActionText;

12
discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/ServiceDiscoveryView.java → discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/ServiceDiscoveryView.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.view; package org.eclipse.tm.internal.discovery.view;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
@ -47,14 +47,14 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.Tree;
import org.eclipse.tm.discovery.engine.ServiceDiscoveryEngine;
import org.eclipse.tm.discovery.model.Service; import org.eclipse.tm.discovery.model.Service;
import org.eclipse.tm.discovery.model.provider.ModelItemProviderAdapterFactory;
import org.eclipse.tm.discovery.protocol.IProtocol; import org.eclipse.tm.discovery.protocol.IProtocol;
import org.eclipse.tm.discovery.protocol.ProtocolFactory; import org.eclipse.tm.discovery.protocol.ProtocolFactory;
import org.eclipse.tm.discovery.transport.ITransport; import org.eclipse.tm.discovery.transport.ITransport;
import org.eclipse.tm.discovery.transport.TransportFactory; import org.eclipse.tm.discovery.transport.TransportFactory;
import org.eclipse.tm.discovery.wizard.ServiceDiscoveryWizardMainPage; import org.eclipse.tm.internal.discovery.engine.ServiceDiscoveryEngine;
import org.eclipse.tm.internal.discovery.model.provider.ModelItemProviderAdapterFactory;
import org.eclipse.tm.internal.discovery.wizard.ServiceDiscoveryWizardMainPage;
import org.eclipse.ui.ISharedImages; import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI; import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer; import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;

0
discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/discovery/view/messages.properties → discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/messages.properties
View file

6
discovery/org.eclipse.tm.discovery.wizard/.classpath
View file

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="discouraged" pattern="**/internal/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

4
discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF
View file

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.discovery.wizard Bundle-SymbolicName: org.eclipse.tm.discovery.wizard
Bundle-Version: 1.0.1.qualifier Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.tm.discovery.wizard.Activator Bundle-Activator: org.eclipse.tm.internal.discovery.wizard.Activator
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui, Require-Bundle: org.eclipse.ui,
org.eclipse.emf.ecore.edit;bundle-version="[2.2.0,3.0.0)", org.eclipse.emf.ecore.edit;bundle-version="[2.2.0,3.0.0)",
@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.tm.discovery.model, org.eclipse.tm.discovery.model,
org.eclipse.tm.discovery.model.edit org.eclipse.tm.discovery.model.edit
Eclipse-LazyStart: true Eclipse-LazyStart: true
Export-Package: org.eclipse.tm.discovery.wizard Export-Package: org.eclipse.tm.internal.discovery.wizard;x-friends:="org.eclipse.rse.internal.discovery"
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-RequiredExecutionEnvironment: J2SE-1.4

4
discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/Activator.java → discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Activator.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.wizard; package org.eclipse.tm.internal.discovery.wizard;
import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

8
discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/engine/Messages.java → discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Messages.java
View file

@ -1,20 +1,20 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.engine; package org.eclipse.tm.internal.discovery.wizard;
import java.util.MissingResourceException; import java.util.MissingResourceException;
import java.util.ResourceBundle; import java.util.ResourceBundle;
public class Messages { public class Messages {
private static final String BUNDLE_NAME = "org.eclipse.tm.discovery.engine.messages"; //$NON-NLS-1$ private static final String BUNDLE_NAME = "org.eclipse.tm.internal.discovery.wizard.messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
.getBundle(BUNDLE_NAME); .getBundle(BUNDLE_NAME);

8
discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java → discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -8,7 +8,7 @@
* Javier Montalvo Orus (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.wizard; package org.eclipse.tm.internal.discovery.wizard;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
@ -62,16 +62,16 @@ import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem; import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.Tree;
import org.eclipse.tm.discovery.engine.ServiceDiscoveryEngine;
import org.eclipse.tm.discovery.model.Device; import org.eclipse.tm.discovery.model.Device;
import org.eclipse.tm.discovery.model.Pair; import org.eclipse.tm.discovery.model.Pair;
import org.eclipse.tm.discovery.model.Service; import org.eclipse.tm.discovery.model.Service;
import org.eclipse.tm.discovery.model.ServiceType; import org.eclipse.tm.discovery.model.ServiceType;
import org.eclipse.tm.discovery.model.provider.ModelItemProviderAdapterFactory;
import org.eclipse.tm.discovery.protocol.IProtocol; import org.eclipse.tm.discovery.protocol.IProtocol;
import org.eclipse.tm.discovery.protocol.ProtocolFactory; import org.eclipse.tm.discovery.protocol.ProtocolFactory;
import org.eclipse.tm.discovery.transport.ITransport; import org.eclipse.tm.discovery.transport.ITransport;
import org.eclipse.tm.discovery.transport.TransportFactory; 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.ISharedImages;
import org.eclipse.ui.PlatformUI; import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer; import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;

6
discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardMainPage.java → discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardMainPage.java
View file

@ -1,14 +1,14 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 Symbian Software Ltd. All rights reserved. * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Javier Montalvo Orús (Symbian) - initial API and implementation * Javier Montalvo Orus (Symbian) - initial API and implementation
********************************************************************************/ ********************************************************************************/
package org.eclipse.tm.discovery.wizard; package org.eclipse.tm.internal.discovery.wizard;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.wizard.WizardPage; import org.eclipse.jface.wizard.WizardPage;

4
discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/messages.properties → discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties
View file

@ -1,11 +1,11 @@
################################################################################## ##################################################################################
# Copyright (c) 2006 Symbian Software Ltd. All rights reserved. # Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
# This program and the accompanying materials are made available under the terms # This program and the accompanying materials are made available under the terms
# of the Eclipse Public License v1.0 which accompanies this distribution, and is # of the Eclipse Public License v1.0 which accompanies this distribution, and is
# available at http://www.eclipse.org/legal/epl-v10.html # available at http://www.eclipse.org/legal/epl-v10.html
# #
# Contributors: # Contributors:
# Javier Montalvo Orús (Symbian) - initial API and implementation # Javier Montalvo Orus (Symbian) - initial API and implementation
################################################################################## ##################################################################################
ServiceDiscoveryWizardDisplayPage.WizardPageTitle=Service Discovery ServiceDiscoveryWizardDisplayPage.WizardPageTitle=Service Discovery