--- a/core/com.nokia.carbide.cpp/.project	Thu May 20 11:40:37 2010 -0500
+++ b/core/com.nokia.carbide.cpp/.project	Thu May 20 13:54:19 2010 -0500
@@ -20,6 +20,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>

--- a/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Thu May 20 11:40:37 2010 -0500
+++ b/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Thu May 20 13:54:19 2010 -0500
@@ -18,3 +18,4 @@
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp,
  com.nokia.carbide.cpp.logging
+Service-Component: component.xml

--- a/core/com.nokia.carbide.cpp/build.properties	Thu May 20 11:40:37 2010 -0500
+++ b/core/com.nokia.carbide.cpp/build.properties	Thu May 20 13:54:19 2010 -0500
@@ -1,4 +1,3 @@
-source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
@@ -19,8 +18,8 @@
                nokiaTOC.xml,\
                introDATA.xml,\
                themes/,\
-               book.css
-bin.excludes = src/com/nokia/carbide/cpp/cs/
+               book.css,\
+               component.xml
 src.includes = META-INF/,\
                about.html,\
                about.ini,\
@@ -40,3 +39,5 @@
                introDATA.xml,\
                themes/,\
                book.css
+source.. = src/
+bin.excludes = src/com/nokia/carbide/cpp/cs/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp/component.xml	Thu May 20 13:54:19 2010 -0500
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="com.nokia.carbide.cpp">
+   <implementation class="com.nokia.carbide.cpp.p2.CarbideP2Policy"/>
+   <service>
+      <provide interface="org.eclipse.equinox.p2.ui.Policy"/>
+   </service>
+   <property name="service.ranking" type="Integer" value="100"/>
+</scr:component>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/p2/CarbideP2Policy.java	Thu May 20 13:54:19 2010 -0500
@@ -0,0 +1,12 @@
+package com.nokia.carbide.cpp.p2;
+
+import org.eclipse.equinox.p2.ui.Policy;
+
+public class CarbideP2Policy extends Policy {
+	
+	public CarbideP2Policy() {
+		setRestartPolicy(RESTART_POLICY_PROMPT);
+		System.setProperty("eclipse.p2.unsignedPolicy", "allow");
+	}
+
+}

--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Activator.java	Thu May 20 11:40:37 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Activator.java	Thu May 20 13:54:19 2010 -0500
@@ -16,17 +16,11 @@
 */
 package com.nokia.carbide.discovery.ui;
 
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.Map;
-
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.p2.ui.Policy;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
 
 /**
  * The activator class controls the plug-in life cycle
@@ -38,8 +32,6 @@
 	// The shared instance
 	private static Activator plugin;
 
-	private ServiceRegistration policyRegistration;
-
 	/**
 	 * The constructor
 	 */
@@ -52,11 +44,6 @@
 	 */
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
-		Policy policy = new Policy();
-		policy.setRestartPolicy(Policy.RESTART_POLICY_PROMPT);
-		Map<String, Integer> map = Collections.singletonMap("service.ranking", 100);
-		policyRegistration = context.registerService(Policy.class.getName(), policy, new Hashtable<Object, Object>(map));
-		System.setProperty("eclipse.p2.unsignedPolicy", "allow");
 	}
 
 	/*
@@ -64,7 +51,6 @@
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
 	public void stop(BundleContext context) throws Exception {
-		policyRegistration.unregister();
 		super.stop(context);
 		plugin = null;
 	}