Bug 430476 - Allign prefix for demo / example projects in platform.ui

org.eclipse.e4.ui.examples.services ->
org.eclipse.ui.examples.adapterservice

Change-Id: I36b4a8f1669a43f1325ac302a0199b79c6a87445
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>

23 files changed, 148 insertions, 80 deletions

diff --git a/examples/org.eclipse.e4.examples.services/Adapter Snippet.launch b/examples/org.eclipse.e4.examples.services/Adapter Snippet.launch
deleted file mode 100644
index bca938778ac..00000000000
--- a/examples/org.eclipse.e4.examples.services/Adapter Snippet.launch
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.e4.examples.services.snippets.adapter"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bad_container_name" value="\org.eclipse.e4.examples.servic"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Adapter Snippet"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx512m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.e4.ui.examples.legacy.workbench.product"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.core.runtime@default:true,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@-1:true,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.preferences@default:default,javax.servlet@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.contenttype@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.e4.examples.services@3:true,org.eclipse.e4.core.services.annotations@default:false,org.eclipse.e4.core.services@2:true,javax.inject@default:default"/>
-<booleanAttribute key="show_selected_only" value="true"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="false"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
diff --git a/examples/org.eclipse.e4.examples.services/plugin.xml b/examples/org.eclipse.e4.examples.services/plugin.xml
deleted file mode 100644
index 038c6897f9d..00000000000
--- a/examples/org.eclipse.e4.examples.services/plugin.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-  	<extension id="org.eclipse.e4.examples.services.snippets.adapter" point="org.eclipse.core.runtime.applications"> 
-		<application>
- 			<run class="org.eclipse.e4.examples.services.snippets.adapter.AdapterSnippet"/> 
- 	    </application> 
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.adapters">
-      <factory
-            adaptableType="java.lang.Object"
-            class="org.eclipse.e4.examples.services.snippets.adapter.IDAssigner">
-         <adapter
-               type="org.eclipse.e4.examples.services.snippets.adapter.ThingWithId">
-         </adapter>
-      </factory>
-   </extension>
-</plugin>
diff --git a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/adapter/Greeter.java b/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/adapter/Greeter.java
deleted file mode 100644
index b80aeb0ec14..00000000000
--- a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/adapter/Greeter.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.eclipse.e4.examples.services.snippets.adapter;
-
-public interface Greeter {
-	public void greet();
-}
\ No newline at end of file
diff --git a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/adapter/ThingWithId.java b/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/adapter/ThingWithId.java
deleted file mode 100644
index d198efaae45..00000000000
--- a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/adapter/ThingWithId.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.eclipse.e4.examples.services.snippets.adapter;
-
-public interface ThingWithId {
-	public String getUniqueId();
-}
\ No newline at end of file
diff --git a/examples/org.eclipse.e4.examples.services/.classpath b/examples/org.eclipse.ui.examples.adapterservice/.classpath
index 64c5e31b7a2..4c62a8048e6 100644
--- a/examples/org.eclipse.e4.examples.services/.classpath
+++ b/examples/org.eclipse.ui.examples.adapterservice/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/examples/org.eclipse.e4.examples.services/.project b/examples/org.eclipse.ui.examples.adapterservice/.project
index 267fa0206e3..ac38db7f3e7 100644
--- a/examples/org.eclipse.e4.examples.services/.project
+++ b/examples/org.eclipse.ui.examples.adapterservice/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.e4.examples.services</name>
+	<name>org.eclipse.ui.examples.adapterservice</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/examples/org.eclipse.e4.examples.services/.settings/org.eclipse.core.runtime.prefs b/examples/org.eclipse.ui.examples.adapterservice/.settings/org.eclipse.core.runtime.prefs
index c522e1f4ae2..c522e1f4ae2 100644
--- a/examples/org.eclipse.e4.examples.services/.settings/org.eclipse.core.runtime.prefs
+++ b/examples/org.eclipse.ui.examples.adapterservice/.settings/org.eclipse.core.runtime.prefs
diff --git a/examples/org.eclipse.e4.examples.services/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.ui.examples.adapterservice/.settings/org.eclipse.jdt.core.prefs
index ed682c79099..c537b63063c 100644
--- a/examples/org.eclipse.e4.examples.services/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/org.eclipse.ui.examples.adapterservice/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Thu Feb 25 08:38:15 PST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/examples/org.eclipse.ui.examples.adapterservice/.settings/org.eclipse.jdt.ui.prefs b/examples/org.eclipse.ui.examples.adapterservice/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..bfc477a49fa
--- /dev/null
+++ b/examples/org.eclipse.ui.examples.adapterservice/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,57 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/examples/org.eclipse.ui.examples.adapterservice/Adapter Snippet.launch b/examples/org.eclipse.ui.examples.adapterservice/Adapter Snippet.launch
new file mode 100644
index 00000000000..e560914921b
--- /dev/null
+++ b/examples/org.eclipse.ui.examples.adapterservice/Adapter Snippet.launch
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.ui.examples.adapterservice.snippets.adapter"/>
+<booleanAttribute key="askclear" value="true"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bad_container_name" value="\org.eclipse.e4.examples.servic"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="false"/>
+<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Adapter Snippet"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="includeOptional" value="false"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx512m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.e4.ui.examples.legacy.workbench.product"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.contexts@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.ui.trace@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.core.commands@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@2:true,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.ui.examples.adapterservice@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="false"/>
+<booleanAttribute key="usefeatures" value="false"/>
+</launchConfiguration>
diff --git a/examples/org.eclipse.e4.examples.services/META-INF/MANIFEST.MF b/examples/org.eclipse.ui.examples.adapterservice/META-INF/MANIFEST.MF
index aa27df716c7..2940a8f396b 100644
--- a/examples/org.eclipse.e4.examples.services/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ui.examples.adapterservice/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Services Snippets (Incubation)
-Bundle-SymbolicName: org.eclipse.e4.examples.services;singleton:=true
+Bundle-SymbolicName: org.eclipse.ui.examples.adapterservice;singleton:=true
 Bundle-Version: 0.9.1.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse.org
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Activator: org.eclipse.e4.examples.services.snippets.SnippetActivator
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Activator: org.eclipse.ui.examples.adapterservice.snippets.SnippetActivator
 Import-Package: javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0"
 Require-Bundle: org.eclipse.equinox.app,
diff --git a/examples/org.eclipse.ui.examples.adapterservice/README.md b/examples/org.eclipse.ui.examples.adapterservice/README.md
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/examples/org.eclipse.ui.examples.adapterservice/README.md
diff --git a/examples/org.eclipse.e4.examples.services/build.properties b/examples/org.eclipse.ui.examples.adapterservice/build.properties
index b476c1fb379..b476c1fb379 100644
--- a/examples/org.eclipse.e4.examples.services/build.properties
+++ b/examples/org.eclipse.ui.examples.adapterservice/build.properties
diff --git a/examples/org.eclipse.e4.examples.services/forceQualifierUpdate.txt b/examples/org.eclipse.ui.examples.adapterservice/forceQualifierUpdate.txt
index 56f1032a8a4..56f1032a8a4 100644
--- a/examples/org.eclipse.e4.examples.services/forceQualifierUpdate.txt
+++ b/examples/org.eclipse.ui.examples.adapterservice/forceQualifierUpdate.txt
diff --git a/examples/org.eclipse.ui.examples.adapterservice/plugin.xml b/examples/org.eclipse.ui.examples.adapterservice/plugin.xml
new file mode 100644
index 00000000000..0ebf807b129
--- /dev/null
+++ b/examples/org.eclipse.ui.examples.adapterservice/plugin.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+  	<extension id="org.eclipse.ui.examples.adapterservice.snippets.adapter" point="org.eclipse.core.runtime.applications"> 
+		<application>
+ 			<run class="org.eclipse.ui.examples.adapterservice.snippets.adapter.AdapterSnippet"/> 
+ 	    </application> 
+   </extension>
+   <extension
+         point="org.eclipse.core.runtime.adapters">
+      <factory
+            adaptableType="java.lang.Object"
+            class="org.eclipse.ui.examples.adapterservice.snippets.adapter.IDAssigner">
+         <adapter
+               type="org.eclipse.ui.examples.adapterservice.snippets.adapter.ThingWithId">
+         </adapter>
+      </factory>
+   </extension>
+</plugin>
diff --git a/examples/org.eclipse.e4.examples.services/pom.xml b/examples/org.eclipse.ui.examples.adapterservice/pom.xml
index adfd8ef0f97..d79c199f4b0 100644
--- a/examples/org.eclipse.e4.examples.services/pom.xml
+++ b/examples/org.eclipse.ui.examples.adapterservice/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012 Eclipse Foundation.
+  Copyright (c) 2012, 2014 Eclipse Foundation.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  
   Contributors:
      Igor Fedorenko - initial implementation
+     Lars Vogel <Lars.Vogel@gmail.com> - Bug 430476
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -18,7 +19,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.e4</groupId>
-  <artifactId>org.eclipse.e4.examples.services</artifactId>
+  <artifactId>org.eclipse.ui.examples.adapterservice</artifactId>
   <version>0.9.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/SnippetActivator.java b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/SnippetActivator.java
index 5749e3e19dd..6f9307c2e73 100644
--- a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/SnippetActivator.java
+++ b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/SnippetActivator.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.e4.examples.services.snippets;
+package org.eclipse.ui.examples.adapterservice.snippets;
 
 import org.osgi.framework.BundleContext;
 
@@ -22,10 +22,12 @@ public class SnippetActivator implements BundleActivator {
 	public SnippetActivator() {
 	}
 
+	@Override
 	public void start(BundleContext aContext) throws Exception {
 		bundleContext = aContext;
 		SnippetSetup.initializeServices();
 	}
+	@Override
 	public void stop(BundleContext aContext) throws Exception {
 		bundleContext = null;
 	}
diff --git a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/SnippetSetup.java b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/SnippetSetup.java
index cb8ee8356c1..3d36036e6ae 100644
--- a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/SnippetSetup.java
+++ b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/SnippetSetup.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.e4.examples.services.snippets;
+package org.eclipse.ui.examples.adapterservice.snippets;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
diff --git a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/adapter/AdapterSnippet.java b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/adapter/AdapterSnippet.java
index 3b3d2967a01..ca1409cb430 100644
--- a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/adapter/AdapterSnippet.java
+++ b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/adapter/AdapterSnippet.java
@@ -9,15 +9,15 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.e4.examples.services.snippets.adapter;
+package org.eclipse.ui.examples.adapterservice.snippets.adapter;
 
 import javax.inject.Inject;
 
 import org.eclipse.core.runtime.IAdapterManager;
 import org.eclipse.e4.core.services.adapter.Adapter;
-import org.eclipse.e4.examples.services.snippets.SnippetSetup;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
+import org.eclipse.ui.examples.adapterservice.snippets.SnippetSetup;
 
 /**
  * This snippet demonstrates user of the Adapter service.
@@ -59,6 +59,7 @@ public class AdapterSnippet implements IApplication{
 
 	}
 
+	@Override
 	public Object start(IApplicationContext context) throws Exception {
 		// Inject services into this snippet
 		SnippetSetup.setup(this);
@@ -67,6 +68,7 @@ public class AdapterSnippet implements IApplication{
 		return IApplication.EXIT_OK;
 	}
 
+	@Override
 	public void stop() {
 		// TODO Auto-generated method stub
 		
diff --git a/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/adapter/Greeter.java b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/adapter/Greeter.java
new file mode 100644
index 00000000000..2cea60d9b87
--- /dev/null
+++ b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/adapter/Greeter.java
@@ -0,0 +1,5 @@
+package org.eclipse.ui.examples.adapterservice.snippets.adapter;
+
+public interface Greeter {
+	public void greet();
+}
\ No newline at end of file
diff --git a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/adapter/IDAssigner.java b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/adapter/IDAssigner.java
index 2a38b1de183..9ac96388761 100644
--- a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/adapter/IDAssigner.java
+++ b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/adapter/IDAssigner.java
@@ -1,4 +1,4 @@
-package org.eclipse.e4.examples.services.snippets.adapter;
+package org.eclipse.ui.examples.adapterservice.snippets.adapter;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -13,6 +13,7 @@ public class IDAssigner implements IAdapterFactory {
 	public IDAssigner() {
 		currentId = 1000;
 	}
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Object getAdapter(final Object adaptableObject, Class adapterType) {
 		if (adapterType.equals(ThingWithId.class)) {
@@ -22,6 +23,7 @@ public class IDAssigner implements IAdapterFactory {
 				assignedIds.put(adaptableObject, id);
 			}
 			return new ThingWithId() {
+				@Override
 				public String getUniqueId() {
 					return assignedIds.get(adaptableObject);
 				}
@@ -30,6 +32,7 @@ public class IDAssigner implements IAdapterFactory {
 		return null;
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Class[] getAdapterList() {
 		return new Class[] { ThingWithId.class };
diff --git a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/adapter/MultiFacetedObject.java b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/adapter/MultiFacetedObject.java
index acd36513281..855af9d4c1e 100644
--- a/examples/org.eclipse.e4.examples.services/src/org/eclipse/e4/examples/services/snippets/adapter/MultiFacetedObject.java
+++ b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/adapter/MultiFacetedObject.java
@@ -1,4 +1,4 @@
-package org.eclipse.e4.examples.services.snippets.adapter;
+package org.eclipse.ui.examples.adapterservice.snippets.adapter;
 
 import org.eclipse.core.runtime.IAdaptable;
 
@@ -10,13 +10,16 @@ class MultiFacetedObject implements IAdaptable, Greeter {
 		this.name = name;
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Class adapter) {
-		if (adapter.equals(Greeter.class))
+		if (adapter.equals(Greeter.class)) {
 			return this;
+		}
 		return null;
 	}
 
+	@Override
 	public void greet() {
 		System.out.println("Hello, my name is " + name);
 	}
diff --git a/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/adapter/ThingWithId.java b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/adapter/ThingWithId.java
new file mode 100644
index 00000000000..052dd2e149e
--- /dev/null
+++ b/examples/org.eclipse.ui.examples.adapterservice/src/org/eclipse/ui/examples/adapterservice/snippets/adapter/ThingWithId.java
@@ -0,0 +1,5 @@
+package org.eclipse.ui.examples.adapterservice.snippets.adapter;
+
+public interface ThingWithId {
+	public String getUniqueId();
+}
\ No newline at end of file