Packaging and branding improvements and fixes.
diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/.classpath b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/.classpath
index 64c5e31..8a8f166 100644
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/.classpath
+++ b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/.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="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/META-INF/MANIFEST.MF b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/META-INF/MANIFEST.MF
index bec0306..429693b 100644
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.amp.axf.core
+Bundle-SymbolicName: org.eclipse.amp.axf.core;singleton:=true
 Bundle-Version: 0.2.0.qualifier
 Bundle-Activator: org.eclipse.amp.axf.core.ModelExecutionEnginePlugin
 Require-Bundle: org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.amp.axf.core
+Export-Package: org.eclipse.amp.axf.core;uses:="org.eclipse.core.runtime,org.osgi.framework"
diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/build.properties b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/build.properties
index 34d2e4d..a3e6a07 100644
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/build.properties
+++ b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/build.properties
@@ -1,4 +1,8 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               plugin.properties,\
+               plugin.xml,\
+               .project
+src.includes = src/
diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/plugin.properties b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/plugin.properties
index 16c3e36..fac37e6 100644
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/plugin.properties
+++ b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/plugin.properties
@@ -28,5 +28,5 @@
 # %%% END OF TRANSLATED PROPERTIES %%%

 # ====================================================================

 

-pluginName = Agent Execution Engine Core

-providerName = Eclipse.org

+pluginName = Agent Execution Engine Core (Incubation)

+providerName = Eclipse Agent Modeling Platform

diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/plugin.xml b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/plugin.xml
new file mode 100644
index 0000000..f422d55
--- /dev/null
+++ b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/plugin.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+</plugin>
diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/src/org/eclipse/amp/axf/core/EngineControl.java b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/src/org/eclipse/amp/axf/core/EngineControl.java
index bc7d62e..12d15d2 100644
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/src/org/eclipse/amp/axf/core/EngineControl.java
+++ b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/src/org/eclipse/amp/axf/core/EngineControl.java
@@ -15,6 +15,8 @@
  */

 package org.eclipse.amp.axf.core;

 

+import java.lang.Enum;

+

 /**

  * The Enum EngineControl.

  */