61 files changed, 8531 insertions, 0 deletions

diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBCommonVars.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBCommonVars.java
new file mode 100644
index 0000000..d905e50
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBCommonVars.java
@@ -0,0 +1,24 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.bitbake;
+
+/**
+ * Constants for commonly used bitbake variables.
+ * @author kgilmer
+ *
+ */
+public class BBCommonVars {
+        public final static String WORKDIR = "WORKDIR";
+        public static final String PN = "PN";
+        public static final String S = "S";
+        public static final String PV = "PV";
+        
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBLanguageHelper.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBLanguageHelper.java
new file mode 100644
index 0000000..8ebe134
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBLanguageHelper.java
@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Lianhao Lu (Intel) - add more bitbake keywords and functions
+ *******************************************************************************/
+package org.yocto.bc.bitbake;
+
+import java.util.Comparator;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * Here is where all BitBake-related information is centralized.
+ * @author kgilmer
+ *
+ */
+public class BBLanguageHelper {
+        
+        public static final String[] BITBAKE_KEYWORDS = new String[] { "inherit", "require", "export", "addtask", "python", "include", "fakeroot", "addhandler", "def"};
+        public static final String[] SHELL_KEYWORDS = new String[] { "while", "do", "if", "fi", "ln", "export", "install", "oe_libinstall", "for", "in", "done", "echo", "then", "cat", "rm", "rmdir", "mkdir", "printf", "exit", "test", "cd", "cp"};
+        public static final String[] BITBAKE_STANDARD_FUNCTIONS = new String[] { "fetch", "unpack", "patch", "configure", "compile", "install", "populate_sysroot", "package"};
+        public static final String BITBAKE_RECIPE_FILE_EXTENSION = "bb";
+
+        /**
+         * @return A map of names and descriptions of commonly used BitBake variables.
+         */
+        public static Map<String, String> getCommonBitbakeVariables() {
+                Map<String, String> m = new TreeMap<String, String>(new Comparator<Object>() {
+
+                        public int compare(Object o1, Object o2) {
+
+                                return ((String) o1).compareTo(((String) o2));
+                        }
+                        
+                });
+                
+                m.put("SECTION", "Category of package");
+                m.put("PR", "Package Release Number");
+                m.put("SRC_URI", "Location of package sources");
+                m.put("DESCRIPTION", "Description of package");
+                m.put("EXTRA_OEMAKE", "Extra flags to pass to the package makefile");
+                m.put("EXTRA_OECONF", "Extra configuration flags for the package makefile");
+                m.put("DEPENDS", "The set of build-time dependent packages");
+                m.put("RDEPENDS", "The set of run-time dependent packages");
+                m.put("HOMEPAGE", "Homepage of the package");
+                m.put("LICENSE", "License of the package");
+                m.put("FILES_${PN}", "Full file path of files on target.");
+                m.put("S", "Package source directory");
+                m.put("PV", "Package version");
+                m.put("AUTHOR", "Author or maintainer of package");
+                m.put("PRIORITY", "Priority of package");
+                
+                return m;
+        }
+
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBRecipe.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBRecipe.java
new file mode 100644
index 0000000..9092759
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBRecipe.java
@@ -0,0 +1,45 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer, 2013 Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.bitbake;
+
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * Represents the bitbake environment of a recipe package.
+ * @author kgilmer
+ *
+ */
+public class BBRecipe extends BBSession {
+        private final BBSession session;
+        private final URI fileURI;
+
+        public BBRecipe(BBSession session, URI filePath) throws IOException {
+                super(session.shell, session.pinfo.getOriginalURI());
+                this.session = session;
+                this.fileURI = filePath;
+                this.parsingCmd = "DISABLE_SANITY_CHECKS=\"1\" bitbake -e -b " + filePath.getPath() + " >& " + BB_ENV_FILE;
+        }
+        
+        @Override
+        public void initialize() throws Exception {
+                if (this.size() == 0) {
+                        //System.out.println("Failed to parse " + fileURI);
+                        //throw new IOException("Failed to parse " + filePath);
+                }
+        }
+
+        @Override
+        protected URI getDefaultDepends() {
+                return this.fileURI;
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBSession.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBSession.java
new file mode 100644
index 0000000..4434df8
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBSession.java
@@ -0,0 +1,785 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer, 2013 Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.bitbake;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Stack;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.Lock;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.preference.JFacePreferences;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsole;
+import org.eclipse.ui.console.IConsoleManager;
+import org.eclipse.ui.console.MessageConsole;
+import org.eclipse.ui.console.MessageConsoleStream;
+import org.eclipse.ui.progress.WorkbenchJob;
+
+import org.yocto.bc.ui.model.IModelElement;
+import org.yocto.bc.ui.model.ProjectInfo;
+import org.yocto.remote.utils.RemoteHelper;
+import org.yocto.remote.utils.YoctoCommand;
+
+/**
+ * BBSession encapsulates a global bitbake configuration and is the primary interface
+ * for actions against a BitBake installation.
+ * 
+ * @author kgilmer
+ *
+ */
+public class BBSession implements IBBSessionListener, IModelElement, Map {
+        public static final int TYPE_VARIABLE_ASSIGNMENT = 1;
+        public static final int TYPE_UNKNOWN = 2;
+        public static final int TYPE_STATEMENT = 3;
+        public static final int TYPE_FLAG = 4;
+        
+        public static final String BB_ENV_FILE = "bitbake.env";
+
+        public static final String CONF_DIR = "conf";
+        public static final String BUILDDIR_INDICATORS [] = {
+                "local.conf",
+                "bblayers.conf",
+        };
+
+        protected final ProjectInfo pinfo;
+        protected final ShellSession shell;
+        protected Map<?,?> properties = null;
+        protected List <URI> depends = null;
+        protected boolean initialized = false;
+        protected boolean errorOccured = false;
+        protected MessageConsole sessionConsole;
+        private final ReentrantReadWriteLock rwlock = new ReentrantReadWriteLock();
+        private final Lock rlock = rwlock.readLock();
+        private final Lock wlock = rwlock.writeLock();
+        protected String parsingCmd;
+        private boolean silent = false;
+        private String errorLines = "";
+
+        public BBSession(ShellSession ssession, URI projectRoot) throws IOException {
+                shell = ssession;
+                this.pinfo = new ProjectInfo();
+                pinfo.setLocationURI(projectRoot);
+                pinfo.setInitScriptPath(ProjectInfoHelper.getInitScriptPath(projectRoot));
+                this.parsingCmd = "DISABLE_SANITY_CHECKS=\"1\" bitbake -e >& " + BB_ENV_FILE;
+        }
+
+        public BBSession(ShellSession ssession, URI projectRoot, boolean silent) throws IOException {
+                this(ssession, projectRoot);
+                this.silent = silent;
+        }
+        
+        private Collection adapttoIPath(List<File> asList, IProject project) {
+
+                List pathList = new ArrayList();
+
+                for (Iterator i = asList.iterator(); i.hasNext();) {
+                        File f = (File) i.next();
+                        IFile ff = project.getFile(stripLeading(f.toString(), project.getLocationURI().getPath()));
+                        if (ff.exists()) {
+                                pathList.add(ff);
+                        }
+                }
+
+                return pathList;
+        }
+        
+        private String appendAll(String[] elems, int st) {
+                StringBuffer sb = new StringBuffer();
+
+                for (int i = st; i < elems.length; ++i) {
+                        sb.append(elems[i]);
+                }
+
+                return sb.toString();
+        }
+        
+        private int charCount(String trimmed, char c) {
+                int i = 0;
+                int p = 0;
+
+                while ((p = trimmed.indexOf(c, p)) > -1) {
+                        i++;
+                        p++;
+                }
+
+                return i;
+        }
+        
+        public void clear() {
+                throw new RuntimeException("BB configuration is read-only.");
+        }
+
+        public boolean containsKey(Object arg0) {
+                try {
+                        checkValidAndLock(true);
+                        return properties.containsKey(arg0);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        return false;
+                }finally {
+                        rlock.unlock();
+                }
+        }
+
+        public boolean containsValue(Object arg0) {
+                try {
+                        checkValidAndLock(true);
+                        return properties.containsValue(arg0);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        return false;
+                }finally {
+                        rlock.unlock();
+                }
+        }
+
+        public Set entrySet() {
+                try {
+                        checkValidAndLock(true);
+                        return properties.entrySet();
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        return null;
+                }finally {
+                        rlock.unlock();
+                }
+        }
+
+        @Override
+        public boolean equals(Object arg0) {
+                try {
+                        checkValidAndLock(true);
+                        return properties.equals(arg0);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        return false;
+                }finally {
+                        rlock.unlock();
+                }
+        }
+
+        public ShellSession getShell() {
+                return shell;
+        }
+
+        public URI getProjInfoRoot() {
+                return pinfo.getOriginalURI();
+        }
+
+        /**
+         * Recursively generate list of Recipe files from a root directory.
+         * 
+         * @param rootDir
+         * @param recipes
+         * @param fileExtension
+         * @param project
+         */
+        private void findRecipes(File rootDir, List recipes, final String fileExtension, IProject project) {
+                File[] children = rootDir.listFiles(new FileFilter() {
+
+                        public boolean accept(File pathname) {
+                                return pathname.isFile() && pathname.getName().endsWith(fileExtension);
+                        }
+
+                });
+
+                if (children != null && children.length > 0) {
+                        recipes.addAll(adapttoIPath(Arrays.asList(children), project));
+                }
+
+                File[] childDirs = rootDir.listFiles(new FileFilter() {
+
+                        public boolean accept(File pathname) {
+                                return pathname.isDirectory();
+                        }
+
+                });
+
+                if (childDirs != null && childDirs.length > 0) {
+                        for (int i = 0; i < childDirs.length; ++i) {
+                                findRecipes(childDirs[i], recipes, fileExtension, project);
+                        }
+                }
+        }
+
+        private Collection findRecipes(List paths, IProject project) {
+                List recipes = new ArrayList();
+
+                for (Iterator i = paths.iterator(); i.hasNext();) {
+                        String rawPath = (String) i.next();
+                        String[] elems = rawPath.split("\\*/\\*");
+
+                        if (elems.length == 2) {
+
+                                File rootDir = new File(elems[0]);
+
+                                findRecipes(rootDir, recipes, elems[1], project);
+                        }
+                }
+
+                return recipes;
+        }
+
+        public Object get(Object arg0) {
+                try {
+                        checkValidAndLock(true);
+                        return properties.get(arg0);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        return null;
+                }finally {
+                        rlock.unlock();
+                }
+        }
+
+        private List getBitBakeKeywords() {
+                return Arrays.asList(BBLanguageHelper.BITBAKE_KEYWORDS);
+        }
+
+        /**
+         * @return A MessageConsole for this BB session.
+         */
+        public MessageConsole getConsole() {
+                if (sessionConsole == null) {
+                        String cName = ProjectInfoHelper.getProjectName(pinfo.getOriginalURI()) + " Console";
+                        IConsoleManager conMan = ConsolePlugin.getDefault().getConsoleManager();
+                        IConsole[] existing = conMan.getConsoles();
+                        for (int i = 0; i < existing.length; i++)
+                                if (cName.equals(existing[i].getName())) {
+                                        sessionConsole = (MessageConsole) existing[i];
+                                        break;
+                                }
+                        if (sessionConsole == null) {
+                                sessionConsole = new MessageConsole(cName, null);
+                                conMan.addConsoles(new IConsole[] { sessionConsole });
+                        }
+                }
+                
+                ConsolePlugin.getDefault().getConsoleManager().showConsoleView(sessionConsole);
+                
+                return sessionConsole;
+        }
+
+        private int getLineType(String line) {
+
+                if (line.contains("=")) {
+                        return TYPE_VARIABLE_ASSIGNMENT;
+                }
+
+                for (Iterator i = getBitBakeKeywords().iterator(); i.hasNext();) {
+                        if (line.startsWith((String) i.next())) {
+                                return TYPE_STATEMENT;
+                        }
+                }
+
+                if (line.contains(":")) {
+                        return TYPE_FLAG;
+                }
+
+                return TYPE_UNKNOWN;
+        }
+
+        public Collection getRecipeFiles(IProject project) {
+                try {
+                        checkValidAndLock(true);
+                        if (!initialized) {
+                                throw new RuntimeException(this.getClass().getName() + " is not initialized.");
+                        }
+                        String bbfiles = (String) this.properties.get("BBFILES");
+                        List paths = parseBBFiles(bbfiles);
+                        return findRecipes(paths, project);
+                } catch (Exception e) {
+                        return null;
+                }
+                finally {
+                        rlock.unlock();
+                }
+        }
+
+        @Override
+        public int hashCode() {
+                try {
+                        checkValidAndLock(true);
+                        return properties.hashCode();
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        return 0;
+                }finally {
+                        rlock.unlock();
+                }
+        }
+
+        protected void checkExecuteError(String result, boolean hasErrors) {
+                URI recipeURI = getDefaultDepends();
+                String text = "Parsing " + ((recipeURI != null) ? ("recipe " + recipeURI) : "base configurations");
+                if (hasErrors) {
+                        text = text + " ERROR!\n" + result;
+                }else {
+                                text = text + " SUCCESS.\n";
+                }
+                if(!silent) {
+                        displayInConsole(text, -1, false);
+                }
+        }
+
+        protected void displayInConsole(final String result, final int code, boolean clear) {
+                MessageConsole  console = getConsole();
+                final MessageConsoleStream info = console.newMessageStream();
+                if(clear)
+                        console.clearConsole();
+                new WorkbenchJob("Display parsing result") {
+                        public IStatus runInUIThread(IProgressMonitor monitor) {
+                                if(code != 0) {
+                                        info.setColor(JFaceResources.getColorRegistry().get(JFacePreferences.ERROR_COLOR));
+                                }
+                                try {
+                                        info.println(result);
+                                        info.close();
+                                }catch (Exception e) {
+                                        e.printStackTrace();
+                                }
+                                return Status.OK_STATUS;
+                        }
+                }.schedule();
+        }
+
+        private void checkValidAndLock(boolean rdlck) throws Exception {
+                if(rdlck)
+                        rlock.lock();
+                else
+                        wlock.lock();
+                if(!initialized) {
+                        //upgrade lock manually
+                        if(rdlck) {
+                                rlock.unlock();
+                                wlock.lock();
+                        }
+                        try {
+                                if(!initialized) { //recheck
+                                        boolean hasErrors = false;
+                                        String result = shell.execute(parsingCmd, hasErrors);
+
+                                        properties = parseBBEnvironment(result);
+
+                                        if (properties.size() == 0) { // there was an error in sourcing bitbake environment
+                                                shell.printError(errorLines);
+                                                errorOccured = true;
+                                        } else {
+                                                errorLines = "";
+                                                errorOccured = false;
+                                                initialized = true;
+                                        }
+                                        RemoteHelper.handleRunCommandRemote(this.pinfo.getConnection(), new YoctoCommand("rm -rf " + result + BB_ENV_FILE, result, ""), new NullProgressMonitor());
+                                }
+                        } finally {
+                                //downgrade lock
+                                if(rdlck) {
+                                        rlock.lock();
+                                        wlock.unlock();
+                                }
+                        }
+                }
+                //not release lock
+        }
+
+        public void initialize() throws Exception {
+                try {
+                        checkValidAndLock(false);
+                }finally {
+                        wlock.unlock();
+                }
+        }
+
+        private boolean isBlockEnd(String trimmed) {
+                return charCount(trimmed, '}') > charCount(trimmed, '{');
+                // return trimmed.indexOf('}') > -1 && trimmed.indexOf('{') == -1;
+        }
+
+        private boolean isBlockStart(String trimmed) {
+                return charCount(trimmed, '{') > charCount(trimmed, '}');
+                // return trimmed.indexOf('{') > -1 && trimmed.indexOf('}') == -1;
+        }
+
+        public boolean isEmpty() {
+                try {
+                        checkValidAndLock(true);
+                        return properties.isEmpty();
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        return true;
+                }finally {
+                        rlock.unlock();
+                }
+        }
+        
+        public Set keySet() {
+                try {
+                        checkValidAndLock(true);
+                        return properties.keySet();
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        return null;
+                }finally {
+                        rlock.unlock();
+                }
+        }
+
+        protected void parse(String bbOutfilePath, Map outMap) throws Exception {
+                IHost connection = shell.getProjectInfo().getConnection();
+                InputStream is = RemoteHelper.getRemoteInputStream(connection, bbOutfilePath, BB_ENV_FILE, new NullProgressMonitor());
+                RemoteHelper.getRemoteHostFile(connection, bbOutfilePath + BB_ENV_FILE, new NullProgressMonitor());
+                BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+                String line;
+                boolean inLine = false;
+                StringBuffer sb = null;
+                Stack blockStack = new Stack();
+
+                while ((line = reader.readLine()) != null) {
+                        errorLines += line;
+                        String trimmed = line.trim();
+                        if (trimmed.length() == 0 || line.startsWith("#")) {
+                                // weed out the blank and comment lines
+                                continue;
+                        }
+                        // Now we look for block start ends, and ignore all code within
+                        // blocks.
+                        if (isBlockStart(trimmed)) {
+                                blockStack.push(trimmed);
+                        } else if (isBlockEnd(trimmed)) {
+                                blockStack.pop();
+
+                        }
+
+                        if (!blockStack.isEmpty()) {
+                                // we are in a code block, continue until we break into global
+                                // scope.
+                                continue;
+                        }
+                        if (trimmed.endsWith("\\")) {
+                                if (!inLine) {
+                                        inLine = true;
+                                        sb = new StringBuffer(trimmed.substring(0, trimmed.length() - 1));
+                                } else {
+                                        sb.append(trimmed.substring(0, trimmed.length() - 1));
+                                }
+                                // Only parse the line when we have the complete contents.
+                                continue;
+                        } else if (inLine) {
+                                inLine = false;
+                                line = sb.toString();
+                        }
+
+                        parseLine(line, outMap);
+                }
+        }
+        
+        private void parseAdditiveAssignment(String line, String operator, Map mo) throws Exception {
+                String[] elems = splitAssignment(line, "\\+=");
+
+                if (elems.length != 2) {
+                        throw new Exception("Unable to parse additive variable assignment in line: " + line);
+                }
+
+                if (!mo.containsKey(elems[0])) {
+                        mo.put(elems[0].trim(), elems[1]);
+                } else {
+                        String existing = (String) mo.get(elems[0]);
+                        if (operator.equals("+=")) {
+                                mo.put(elems[0], existing + elems[1]);
+                        } else {
+                                mo.put(elems[0], elems[1] + existing);
+                        }
+                }
+        }
+
+        protected URI getDefaultDepends() {
+                return null;
+        }
+        
+        protected Map parseBBEnvironment(String bbOutFilePath) throws Exception {
+                Map env = new Hashtable();
+                this.depends = new ArrayList<URI>();
+
+                parse(bbOutFilePath, env);
+
+                String included = (String) env.get("BBINCLUDED");
+                if(getDefaultDepends() != null) {
+                        this.depends.add(getDefaultDepends());
+                }
+                if(included != null) {
+                        String[] includedSplitted = included.split(" ");
+                        for (String incl : includedSplitted){
+                                if (!incl.contains("${")) {
+                                        this.depends.add(new URI(incl));
+                                }
+                        }
+                }
+
+                return env;
+        }
+
+
+        private List parseBBFiles(String bbfiles) {
+                return Arrays.asList(bbfiles.split(" "));
+        }
+        
+        //Map delegate methods 
+
+        private void parseConditionalAssignment(String line, Map mo) throws Exception {
+                String[] elems = splitAssignment(line, "\\?=");
+
+                if (elems.length != 2) {
+                        throw new Exception("Unable to parse conditional variable assignment in line: " + line);
+                }
+
+                if (!mo.containsKey(elems[0].trim())) {
+                        mo.put(elems[0].trim(), elems[1].trim());
+                }
+        }
+
+        private void parseImmediateAssignment(String line, String delimiter, Map mo) throws Exception {
+                String[] elems = splitAssignment(line, delimiter);
+
+                mo.put(elems[0], substitute(elems[1], mo));
+        }
+
+        private void parseKeyValue(String line, String delimiter, Map mo) throws Exception {
+                String[] elems = splitAssignment(line, delimiter);
+
+                mo.put(elems[0], elems[1]);
+        }
+
+        private void parseLine(String line, Map mo) throws Exception {
+
+                switch (getLineType(line)) {
+                case TYPE_VARIABLE_ASSIGNMENT:
+                        parseVariableAssignment(line, mo);
+                        break;
+                case TYPE_STATEMENT:
+                case TYPE_FLAG:
+                        // for now ignore statements
+                        break;
+                case TYPE_UNKNOWN:
+                        // we'll gloss over unknown lines as well;
+                        break;
+                default:
+                        throw new Exception("Unable to parse line: " + line);
+                }
+        }
+
+        private void parseVariableAssignment(String line, Map mo) throws Exception {
+                if (line.contains("?=")) {
+                        parseConditionalAssignment(line, mo);
+                } else if (line.contains("+=")) {
+                        parseAdditiveAssignment(line, "+=", mo);
+                } else if (line.contains("=+")) {
+                        parseAdditiveAssignment(line, "=+", mo);
+                } else if (line.contains(":=")) {
+                        parseImmediateAssignment(line, ":=", mo);
+                } else {
+                        parseKeyValue(line, "=", mo);
+                }
+
+        }
+
+        private List parseVars(String line) {
+                List l = new ArrayList();
+
+                int i = 0;
+
+                while ((i = line.indexOf("${", i)) > -1) {
+                        int i2 = line.indexOf("}", i);
+
+                        l.add(line.subSequence(i + 2, i2));
+                        i++;
+                }
+
+                return l;
+        }
+
+        public Object put(Object arg0, Object arg1) {
+                throw new RuntimeException("BB configuration is read-only.");
+        }
+
+        public void putAll(Map arg0) {
+                throw new RuntimeException("BB configuration is read-only.");
+        }
+
+        public Object remove(Object arg0) {
+                throw new RuntimeException("BB configuration is read-only.");
+        }
+
+        private String removeQuotes(String line) {
+                line = line.trim();
+
+                if (line.startsWith("\"")) {
+                        line = line.substring(1);
+                }
+
+                if (line.endsWith("\"")) {
+                        line = line.substring(0, line.length() - 1);
+                }
+
+                return line;
+        }
+
+        public int size() {
+                try {
+                        checkValidAndLock(true);
+                        return properties.size();
+                }catch (Exception e) {
+                        e.printStackTrace();
+                        return 0;
+                }finally {
+                        rlock.unlock();
+                }
+        }
+
+        private String[] splitAssignment(String line, String seperator) throws Exception {
+                String[] elems = line.split(seperator);
+
+                if (elems.length < 2) {
+                        throw new Exception("Unable to parse assignment in line: " + line);
+                } else if (elems.length == 2) {
+
+                        elems[0] = elems[0].trim(); // Clean up trailing or leading spaces.
+                        if (elems[0].startsWith("export ")) {
+                                elems[0] = elems[0].substring("export ".length()).trim();
+                        }
+                        elems[1] = removeQuotes(elems[1]); // Evaluate variables
+
+                        return elems;
+                } else {
+                        String[] retVal = new String[2];
+
+                        retVal[0] = elems[0];
+                        if (retVal[0].startsWith("export ")) {
+                                retVal[0] = retVal[0].substring("export ".length()).trim();
+                        }
+                        retVal[1] = appendAll(elems, 1);
+
+                        return retVal;
+                }
+        }
+
+        private String stripLeading(String target, String leading) {
+                if (target.startsWith(leading)) {
+                        target = target.substring(leading.length());
+                }
+
+                return target;
+        }
+
+        /**
+         * Return a string with variable substitutions in place.
+         * 
+         * @param expression
+         * @return Input string with any substitutions from this file.
+         */
+        public String substitute(String expression, Map mo) {
+
+                List vars = parseVars(expression);
+
+                for (Iterator i = vars.iterator(); i.hasNext();) {
+                        String varName = (String) i.next();
+                        String varToken = "${" + varName + "}";
+
+                        if (mo.containsKey(varName)) {
+                                expression = expression.replace(varToken, (String) mo.get(varName));
+                        } else if (System.getProperty(varName) != null) {
+                                expression = expression.replace(varToken, System.getProperty(varName));
+                        } else if (varName.toUpperCase().equals("HOME")) {
+                                expression = expression.replace(varToken, System.getProperty("user.home"));
+                        }
+                }
+
+                return expression;
+        }
+
+        public Collection values() {
+                try {
+                        checkValidAndLock(true);
+                        return properties.values();
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        return null;
+                }finally {
+                        rlock.unlock();
+                }
+        }
+
+        public void changeNotified(IResource[] added, IResource[] removed, IResource[] changed) {
+                wlock.lock();
+                try {
+                        if (initialized && (removed != null || changed != null)) {
+                                for(int i=0;removed != null && i<removed.length;i++) {
+                                        if (this.depends.contains(removed[i].getLocationURI())) {
+                                                initialized = false;
+                                                return;
+                                        }
+                                }
+                                if (!depends.isEmpty()) {
+                                        for(int i=0;changed != null && i<changed.length;i++) {
+                                                if (changed[i].getLocation() != null && this.depends.contains(changed[i].getLocation().toString())) {
+                                                        initialized = false;
+                                                        return;
+                                                }
+                                        }
+                                }
+                        }
+                }
+                finally {
+                        wlock.unlock();
+                }
+        }
+
+        public Map<String, String> getProperties() {
+                return (Map<String, String>) properties;
+        }
+
+        public ProjectInfo getProjectInfo() {
+                return pinfo;
+        }
+
+        public boolean hasErrorOccured() {
+                return errorOccured;
+        }
+
+        public String getErrorLines() {
+                return errorLines;
+        }
+
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/IBBSessionListener.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/IBBSessionListener.java
new file mode 100644
index 0000000..4d0054f
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/IBBSessionListener.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Intel Corporation.
+ * 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:
+ * Intel - initial API and implementation
+ *******************************************************************************/
+
+package org.yocto.bc.bitbake;
+
+import org.eclipse.core.resources.IResource;
+
+public interface IBBSessionListener {
+        public void changeNotified(IResource[] added, IResource[] removed, IResource[] changed);
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ProjectInfoHelper.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ProjectInfoHelper.java
new file mode 100644
index 0000000..800fe2b
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ProjectInfoHelper.java
@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.bitbake;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.net.URI;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.yocto.bc.ui.model.ProjectInfo;
+
+/**
+ * A helper class for ProjectInfo related tasks.
+ * 
+ * @author kgilmer
+ * 
+ */
+public class ProjectInfoHelper {
+        public static final String OEFS_SCHEME = "OEFS://";
+        public static final String FILE_SCHEME = "file";
+        public static final String RSE_SCHEME = "rse";
+
+        protected static final String DEFAULT_INIT_SCRIPT = "oe-init-build-env";
+        /**
+         * @param path
+         * @return The path to bitbake init script
+         * @throws IOException
+         */
+        public static String getInitScriptPath(URI uri) throws IOException {
+                String val = uri.getPath() + "/" + DEFAULT_INIT_SCRIPT;
+                return val;
+        }
+
+        public static String getProjectName(URI projectRoot) {
+                IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+                for (int i = 0; i < projects.length; ++i) {
+                        try {
+                                if (projects[i].getLocationURI().equals(projectRoot)) {
+                                        return projects[i].getName();
+                                }
+
+                        } catch (Exception e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                }
+
+                return null;
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ShellSession.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ShellSession.java
new file mode 100644
index 0000000..0e262b1
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ShellSession.java
@@ -0,0 +1,209 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.bitbake;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Writer;
+        
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.services.files.IHostFile;
+import org.yocto.bc.ui.model.ProjectInfo;
+import org.yocto.remote.utils.ICommandResponseHandler;
+import org.yocto.remote.utils.RemoteHelper;
+import org.yocto.remote.utils.YoctoCommand;
+
+/**
+ * A class for Linux shell sessions.
+ * @author kgilmer
+ *
+ */
+public class ShellSession {
+        private volatile boolean interrupt = false;
+        /**
+         * String used to isolate command execution
+         */
+        public static final String TERMINATOR = "#234o987dsfkcqiuwey18837032843259d";
+        public static final String LT = System.getProperty("line.separator");
+        public static final String exportCmd = "export BB_ENV_EXTRAWHITE=\\\"DISABLE_SANITY_CHECKS $BB_ENV_EXTRAWHITE\\\"";
+        public static final String exportColumnsCmd = "export COLUMNS=1000";
+        private static final String BUILD_DIR = "/build/";
+
+        
+        public static String getFilePath(String file) throws IOException {
+                File f = new File(file);
+                
+                if (!f.exists() || f.isDirectory()) {
+                        throw new IOException("Path passed is not a file: " + file);
+                }
+                
+                StringBuffer sb = new StringBuffer();
+                
+                String elems[] = file.split("//");
+                
+                for (int i = 0; i < elems.length - 1; ++i) {
+                        sb.append(elems[i]);
+                        sb.append("//");
+                }
+                
+                return sb.toString();
+        }
+        private Process process;
+
+        private OutputStream pos = null;
+        private String shellPath = null;
+        private final String initCmd;
+        private final IHostFile root;
+        private ProjectInfo projectInfo;
+
+        public ProjectInfo getProjectInfo() {
+                return projectInfo;
+        }
+
+        public void setProjectInfo(ProjectInfo projectInfo) {
+                this.projectInfo = projectInfo;
+        }
+
+        public ShellSession(ProjectInfo pInfo, IHostFile root, String initCmd) throws IOException {
+                this.projectInfo = pInfo;
+                this.root = root;
+                this.initCmd  = initCmd;
+
+                initializeShell(new NullProgressMonitor());
+        }
+
+        private void initializeShell(IProgressMonitor monitor) throws IOException {
+                try {
+                        if (root != null) {
+                                IHost connection = projectInfo.getConnection();
+                                RemoteHelper.handleRunCommandRemote(connection, new YoctoCommand("source " + initCmd, root.getAbsolutePath(), ""), monitor);
+                                RemoteHelper.handleRunCommandRemote(connection,  new YoctoCommand(exportCmd, root.getAbsolutePath(), ""), monitor);
+                        } else {
+                                throw new Exception("Root file not found!");
+                        }
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+        }
+
+        synchronized 
+        public String execute(String command) throws IOException {
+                return execute(command, false);
+        }
+
+        synchronized 
+        public String execute(String command, boolean hasErrors) throws IOException {
+                try {
+                        if (projectInfo.getConnection() != null) {
+                                command = getInitCmd() + command;
+                                RemoteHelper.handleRunCommandRemote(projectInfo.getConnection(), new YoctoCommand(command, getBuildDirAbsolutePath(), ""), new NullProgressMonitor());
+                                return getBuildDirAbsolutePath();
+                        }
+                        return null;
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+                return null;
+        }
+
+        private String getBuildDirAbsolutePath() {
+                return root.getAbsolutePath() + BUILD_DIR;
+        }
+
+        private String getInitCmd() {
+                return "source " + initCmd + " " + getBuildDirAbsolutePath()
+                                + " > tempsf; rm -rf tempsf;" + exportCmd + ";"
+                                + exportColumnsCmd + ";" + "cd " + getBuildDirAbsolutePath()
+                                + ";";
+        }
+        
+        synchronized 
+        public void execute(String command, String terminator, ICommandResponseHandler handler) throws IOException {
+                interrupt = false;
+                InputStream errIs = process.getErrorStream();
+                if (errIs.available() > 0) {
+                        clearErrorStream(errIs);
+                }
+                sendToProcessAndTerminate(command);
+                
+                BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()));
+                String std = null;
+
+                do {            
+                        if (errIs.available() > 0) {
+                                byte[] msg = new byte[errIs.available()];
+
+                                errIs.read(msg, 0, msg.length);
+                                handler.response(new String(msg), true);
+                        } 
+                        
+                        std = br.readLine();
+                        
+                        if (std != null && !std.endsWith(terminator)) {
+                                handler.response(std, false);
+                        } 
+                        
+                } while (std != null && !std.endsWith(terminator) && !interrupt);
+                
+                if (interrupt) {
+                        process.destroy();
+                        initializeShell(null);
+                        interrupt = false;
+                }
+        }
+        
+        private void clearErrorStream(InputStream is) {
+        
+                try {
+                        byte b[] = new byte[is.available()];
+                        is.read(b);                     
+                        System.out.println("clearing: " + new String(b));
+                } catch (IOException e) {
+                        e.printStackTrace();
+                        //Ignore any error
+                }
+        }
+
+        /**
+         * Send command string to shell process and add special terminator string so
+         * reader knows when output is complete.
+         * 
+         * @param command
+         * @throws IOException
+         */
+        private void sendToProcessAndTerminate(String command) throws IOException {
+                pos.write(command.getBytes());
+                pos.write(LT.getBytes());
+                pos.flush();
+                pos.write("echo $?".getBytes());
+                pos.write(TERMINATOR.getBytes());
+                pos.write(LT.getBytes());
+                pos.flush();
+        }
+
+        /**
+         * Interrupt any running processes.
+         */
+        public void interrupt() {
+                interrupt = true;
+        }
+        
+        public void printError(String errorLines) {
+                RemoteHelper.getCommandHandler(projectInfo.getConnection()).response(errorLines, true);
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/remote/utils/ConsoleWriter.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/remote/utils/ConsoleWriter.java
new file mode 100644
index 0000000..779ffa2
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/remote/utils/ConsoleWriter.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Intel Corporation.
+ * 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:
+ * Ioana Grigoropol(Intel) - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.remote.utils;
+
+import java.io.IOException;
+import java.io.Writer;
+
+public class ConsoleWriter extends Writer {
+
+        private StringBuffer sb;
+
+        public ConsoleWriter() {
+                sb = new StringBuffer();
+        }
+
+        @Override
+        public void close() throws IOException {
+        }
+
+        public String getContents() {
+                return sb.toString();
+        }
+
+        @Override
+        public void flush() throws IOException {
+        }
+
+        @Override
+        public void write(char[] cbuf, int off, int len) throws IOException {
+                sb.append(cbuf);
+        }
+
+        @Override
+        public void write(String str) throws IOException {
+                sb.append(str);
+        }
+
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/remote/utils/YoctoRunnableWithProgress.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/remote/utils/YoctoRunnableWithProgress.java
new file mode 100644
index 0000000..9654cb3
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/remote/utils/YoctoRunnableWithProgress.java
@@ -0,0 +1,220 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Intel Corporation.
+ * 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:
+ * Ioana Grigoropol(Intel) - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.remote.utils;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.ptp.remote.core.IRemoteConnection;
+import org.eclipse.ptp.remote.core.IRemoteServices;
+import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.services.shells.IHostShell;
+import org.eclipse.swt.widgets.Display;
+import org.yocto.remote.utils.CommandResponseHandler;
+import org.yocto.remote.utils.OutputProcessor;
+import org.yocto.remote.utils.RemoteHelper;
+import org.yocto.remote.utils.YoctoCommand;
+
+public class YoctoRunnableWithProgress implements IRunnableWithProgress {
+
+        private String taskName;
+        private IRemoteConnection remoteConnection;
+        private IRemoteServices remoteServices;
+        private IProgressMonitor monitor;
+        private final ICalculatePercentage calculator;
+        private int reportedWorkload;
+
+        private final YoctoCommand command;
+
+        public YoctoRunnableWithProgress(YoctoCommand command) throws IOException {
+                this.command = command;
+                this.calculator = new GitCalculatePercentage();
+        }
+
+        private interface ICalculatePercentage {
+                public float calWorkloadDone(String info) throws IllegalArgumentException;
+        }
+
+        private class GitCalculatePercentage implements ICalculatePercentage {
+                final Pattern pattern = Pattern.compile("^Receiving objects:\\s*(\\d+)%.*");
+                @Override
+                public float calWorkloadDone(String info) throws IllegalArgumentException {
+                        Matcher m = pattern.matcher(info.trim());
+                        if(m.matches()) {
+                                return new Float(m.group(1)) / 100;
+                        }else {
+                                throw new IllegalArgumentException();
+                        }
+                }
+        }
+
+        @Override
+        public void run(IProgressMonitor monitor) throws InvocationTargetException,
+                        InterruptedException {
+                try {
+                        this.monitor = monitor;
+                        this.monitor.beginTask(taskName, RemoteHelper.TOTALWORKLOAD);
+
+                        if (!remoteConnection.isOpen()) {
+                                try {
+                                        remoteConnection.open(monitor);
+                                } catch (RemoteConnectionException e1) {
+                                        e1.printStackTrace();
+                                }
+                        }
+
+                        remoteServices.initialize(new NullProgressMonitor());
+
+                        try {
+                                IHost connection = RemoteHelper.getRemoteConnectionByName(remoteConnection.getName());
+                                YoctoThread th = new YoctoThread(connection, command);
+                                th.run();
+                        } catch (Exception e) {
+                                e.printStackTrace();
+                        } finally {
+                                monitor.done();
+                        }
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+        }
+        class YoctoRunnableOutputProcessor extends OutputProcessor{
+
+                public YoctoRunnableOutputProcessor(IProgressMonitor monitor,
+                                IHostShell hostShell, CommandResponseHandler cmdHandler,
+                                String task) {
+                        super(monitor, hostShell, cmdHandler, task);
+                }
+                @Override
+                protected boolean isErrChStop(char ch) {
+                        return (ch == '\n' || ch == '\r');
+                }
+
+                @Override
+                protected boolean isOutChStop(char ch) {
+                        return (ch == '\n');
+                }
+
+                @Override
+                protected void processOutputBufferLine(char ch, String str) {
+                        processBuffer.addOutputLine(str);
+                }
+
+                @Override
+                protected void processErrorBufferLine(char ch, String str) {
+                        processBuffer.addOutputLine(str);
+                        if (ch == '\r')
+                                reportProgress(str);
+                }
+
+        }
+
+        class YoctoThread implements Runnable{
+                private final IHost connection;
+                private final YoctoCommand command;
+                private final CommandResponseHandler cmdHandler;
+                private IHostShell hostShell;
+
+                YoctoThread(IHost connection, YoctoCommand command){
+                        this.connection = connection;
+                        this.cmdHandler = RemoteHelper.getCommandHandler(connection);
+                        this.command = command;
+                }
+
+                @Override
+                public void run() {
+                        try {
+                                hostShell = RemoteHelper.runCommandRemote(this.connection, command, monitor);
+                                command.setProcessBuffer(new YoctoRunnableOutputProcessor(monitor, hostShell, cmdHandler, taskName).processOutput());
+                        } catch (CoreException e) {
+                                e.printStackTrace();
+                        } catch (Exception e) {
+                                e.printStackTrace();
+                        }
+                }
+        }
+        private void updateMonitor(final int work){
+
+                Display.getDefault().asyncExec(new Runnable() {
+
+                        @Override
+                        public void run() {
+                                if (monitor != null) {
+                                        monitor.worked(work);
+                                }
+                        }
+
+                });
+        }
+
+        private void doneMonitor(){
+                Display.getDefault().asyncExec(new Runnable() {
+                        @Override
+                        public void run() {
+                                monitor.done();
+                        }
+                });
+        }
+
+        public void reportProgress(String info) {
+                if(calculator == null) {
+                        updateMonitor(1);
+                } else {
+                        float percentage;
+                        try {
+                                percentage = calculator.calWorkloadDone(info);
+                        } catch (IllegalArgumentException e) {
+                                System.out.println(info);
+                                //can't get percentage
+                                return;
+                        }
+                        int delta = (int) (RemoteHelper.TOTALWORKLOAD * percentage - reportedWorkload);
+                        if( delta > 0 ) {
+                                updateMonitor(delta);
+                                reportedWorkload += delta;
+                        }
+
+                        if (reportedWorkload == RemoteHelper.TOTALWORKLOAD)
+                                doneMonitor();
+                }
+        }
+
+        public IRemoteConnection getRemoteConnection() {
+                return remoteConnection;
+        }
+
+        public void setRemoteConnection(IRemoteConnection remoteConnection) {
+                this.remoteConnection = remoteConnection;
+        }
+
+        public String getTaskName() {
+                return taskName;
+        }
+
+        public void setTaskName(String taskName) {
+                this.taskName = taskName;
+        }
+
+        public IRemoteServices getRemoteServices() {
+                return remoteServices;
+        }
+
+        public void setRemoteServices(IRemoteServices remoteServices) {
+                this.remoteServices = remoteServices;
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/Activator.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/Activator.java
new file mode 100644
index 0000000..f53592c
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/Activator.java
@@ -0,0 +1,254 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.rse.services.files.IHostFile;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+import org.yocto.bc.bitbake.BBRecipe;
+import org.yocto.bc.bitbake.BBSession;
+import org.yocto.bc.bitbake.ProjectInfoHelper;
+import org.yocto.bc.bitbake.ShellSession;
+import org.yocto.bc.ui.model.ProjectInfo;
+import org.yocto.bc.ui.wizards.newproject.CreateBBCProjectOperation;
+import org.yocto.remote.utils.RemoteHelper;
+
+public class Activator extends AbstractUIPlugin {
+
+        // The plug-in ID
+        public static final String PLUGIN_ID = "org.yocto.bc.ui";
+        public static final String IMAGE_VARIABLE = "IMAGE_VARIABLE";
+        public static final String IMAGE_FUNCTION = "IMAGE_FUNCTION";
+
+        // The shared instance
+        private static Activator plugin;
+        private static Map shellMap;
+        private static Map<URI, ProjectInfo> projInfoMap;
+        private static Hashtable bbSessionMap;
+        private static Hashtable bbRecipeMap;
+
+        private IResourceChangeListener listener = new BCResourceChangeListener();
+
+        public static BBRecipe getBBRecipe(BBSession session, URI fileURI) throws IOException {
+                if (bbRecipeMap == null) {
+                        bbRecipeMap = new Hashtable();
+                }
+
+                URI key = session.getProjInfoRoot();
+                BBRecipe recipe = (BBRecipe) bbRecipeMap.get(key);
+                if (recipe == null) {
+                        recipe = new BBRecipe(session, fileURI);
+                        bbRecipeMap.put(key, recipe);
+                }
+
+                return recipe;
+        }
+        
+        /**
+         * Get or create a BitBake session passing in ProjectInfo
+         * @param pinfo
+         * @return
+         * @throws IOException
+         */
+        public static BBSession getBBSession(ProjectInfo projectInfo, Writer out, IProgressMonitor monitor) throws IOException {
+                URI projectRoot = projectInfo.getOriginalURI();
+                if (bbSessionMap == null) {
+                        bbSessionMap = new Hashtable();
+                }
+                
+                BBSession bbs = (BBSession) bbSessionMap.get(projectRoot);
+                
+                if (bbs == null) {
+                        bbs = new BBSession(getShellSession(projectInfo, out, monitor), projectRoot);
+                        bbSessionMap.put(projectRoot, bbs);
+                }
+                
+                return bbs;
+        }
+        
+        /**
+         * Get or create a BitBake session passing in ProjectInfo
+         * @param pinfo
+         * @return
+         * @throws IOException
+         */
+        public static BBSession getBBSession(ProjectInfo projectInfo, IProgressMonitor monitor) throws Exception {
+                URI projectRoot = projectInfo.getOriginalURI();
+                if (bbSessionMap == null) {
+                        bbSessionMap = new Hashtable();
+                }
+                
+                BBSession bbs = (BBSession) bbSessionMap.get(projectRoot);
+                
+                if (bbs == null || bbs.getShell() == null) {
+                        bbs = new BBSession(getShellSession(projectInfo, null, monitor), projectRoot);
+                        bbSessionMap.put(projectRoot, bbs);
+                }
+                
+                return bbs;
+        }
+
+        /**
+         * Returns the shared instance
+         *
+         * @return the shared instance
+         */
+        public static Activator getDefault() {
+                return plugin;
+        }
+
+        /**
+         * Returns an image descriptor for the image file at the given
+         * plug-in relative path
+         *
+         * @param path the path
+         * @return the image descriptor
+         */
+        public static ImageDescriptor getImageDescriptor(String path) {
+                return imageDescriptorFromPlugin(PLUGIN_ID, path);
+        }
+
+        public static ProjectInfo getProjInfo(URI location) throws CoreException, InvocationTargetException, InterruptedException {
+                if (projInfoMap == null) {
+                        projInfoMap = new Hashtable<URI, ProjectInfo>();
+                }
+                if (location != null) {
+                        ProjectInfo pi = projInfoMap.get(location);
+                        if (pi == null) {
+                                pi = new ProjectInfo();
+                                pi.setLocationURI(location);
+                                try {
+                                        pi.setInitScriptPath(ProjectInfoHelper.getInitScriptPath(location));
+                                } catch (IOException e) {
+                                        throw new InvocationTargetException(e);
+                                }
+
+                                projInfoMap.put(location, pi);
+                        }
+                        return pi;
+                }
+                return null;
+        }
+
+        public static void notifyAllBBSession(IResource[] added, IResource[] removed, IResource[] changed) {
+                Iterator iter;
+                if(bbRecipeMap != null) {
+                        iter = bbRecipeMap.values().iterator();
+                        while(iter.hasNext()) {
+                                BBRecipe p = (BBRecipe)iter.next();
+                                p.changeNotified(added, removed, changed);
+                        }
+                }
+
+                if(bbSessionMap != null) {
+                        iter= bbSessionMap.values().iterator();
+                        while(iter.hasNext()) {
+                                BBSession p = (BBSession)iter.next();
+                                p.changeNotified(added, removed, changed);
+                        }
+                }
+        }
+
+        /**
+         * @param absolutePath
+         * @return a cached shell session for a given project root.
+         * @throws IOException 
+         */
+        private static ShellSession getShellSession(ProjectInfo projInfo, Writer out, IProgressMonitor monitor) throws IOException {
+                URI absolutePath = projInfo.getOriginalURI();
+                if (shellMap == null) {
+                        shellMap = new Hashtable();
+                }
+                
+                ShellSession ss = (ShellSession) shellMap.get(absolutePath);
+                
+                if (ss == null && RemoteHelper.isInitialized(projInfo.getOriginalURI())) {
+                        IHostFile remoteHostFile = RemoteHelper.getRemoteHostFile(projInfo.getConnection(), absolutePath.getPath(), monitor);
+                        ss = new ShellSession(projInfo, remoteHostFile, ProjectInfoHelper.getInitScriptPath(absolutePath));
+                }
+                
+                return ss;
+        }
+
+        public static void putProjInfo(URI location, ProjectInfo pinfo) {
+                if (projInfoMap == null) {
+                        projInfoMap = new Hashtable();
+                }
+                
+                
+                
+                projInfoMap.put(location, pinfo);
+        }
+        
+        /**
+         * The constructor
+         */
+        public Activator() {
+        }
+
+        /*
+         * (non-Javadoc)
+         * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+         */
+        @Override
+        public void start(BundleContext context) throws Exception {
+                super.start(context);
+                plugin = this;
+                ResourcesPlugin.getWorkspace().addResourceChangeListener(
+                              listener, IResourceChangeEvent.POST_CHANGE);
+        }
+
+        /*
+         * (non-Javadoc)
+         * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+         */
+        @Override
+        public void stop(BundleContext context) throws Exception {
+                ResourcesPlugin.getWorkspace().removeResourceChangeListener(
+                              listener);
+                plugin = null;
+                super.stop(context);
+        }
+
+        /**
+         * Reset a configuration
+         * @param path
+         */
+        public static void resetBBSession(String path) {
+                shellMap.remove(path);
+                bbSessionMap.remove(path);
+        }
+
+        protected void initializeImageRegistry(ImageRegistry reg) {
+                reg.put(IMAGE_VARIABLE, Activator.getImageDescriptor("icons/variable.gif"));
+                reg.put(IMAGE_FUNCTION, Activator.getImageDescriptor("icons/function.gif"));
+    }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/BCResourceChangeListener.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/BCResourceChangeListener.java
new file mode 100644
index 0000000..8a2bfdd
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/BCResourceChangeListener.java
@@ -0,0 +1,64 @@
+package org.yocto.bc.ui;
+
+import java.util.HashSet;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.runtime.*;
+import org.yocto.bc.ui.builder.BitbakeCommanderNature;
+
+public class BCResourceChangeListener implements IResourceChangeListener {
+
+        public void resourceChanged(IResourceChangeEvent event) {
+                final HashSet<IResource> removed = new HashSet<IResource>();
+                final HashSet<IResource> changed = new HashSet<IResource>();
+        switch (event.getType()) {
+           case IResourceChangeEvent.POST_CHANGE:
+              try {
+                  event.getDelta().accept(new IResourceDeltaVisitor() {
+                          public boolean visit(IResourceDelta delta) throws CoreException {
+                                        IResource res = delta.getResource();
+                                        Boolean visit= true;
+                                        if (res instanceof IProject) {
+                                                visit = false;
+                                                try {
+                                                        if(((IProject) res).isOpen() && 
+                                                                ((IProject) res).hasNature(BitbakeCommanderNature.NATURE_ID)){
+                                                                visit = true;
+                                                        }
+                                                }catch (CoreException e) {
+                                                }
+                                        }
+                                        if (visit && (res instanceof IFile))
+                                        {
+                                        switch (delta.getKind()) {
+                                           case IResourceDelta.REMOVED:
+                                                  removed.add(res);
+                                              break;
+                                           case IResourceDelta.CHANGED:
+                                                  changed.add(res);
+                                              break;
+                                        }
+                                        }
+                                return visit; // visit the children
+                          }
+                  });
+                  //notify all the sessions
+                  Activator.notifyAllBBSession(null, 
+                                  removed.toArray(new IResource[removed.size()]), 
+                                  changed.toArray(new IResource[changed.size()]));
+                  
+              }catch (CoreException e) {
+                  e.printStackTrace();
+              }
+              break;
+          default:
+                  break;
+        }
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchHobAction.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchHobAction.java
new file mode 100644
index 0000000..e92fac0
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchHobAction.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Intel Corporation.
+ * 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:
+ * Intel - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.actions;
+
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+import org.eclipse.swt.widgets.Shell;
+
+import org.yocto.bc.ui.builder.BitbakeCommanderNature;
+
+
+public class LaunchHobAction  {
+    private static final String DIALOG_TITLE  = "Launch HOB";
+        
+        public void run(IAction action) {
+                IResource resource = getSelectedResource();
+                if (resource == null)
+                        return;
+
+                IProject project = resource.getProject();
+                LaunchHobDialog hobDialog = new LaunchHobDialog(new Shell(), DIALOG_TITLE, project);
+                hobDialog.open();
+                String buildDir = hobDialog.getBuildDir();
+        
+                if (buildDir != null) {                 
+                        try {
+                                BitbakeCommanderNature.launchHob(project,buildDir);
+                        } catch (Exception e){
+                                System.out.println(e.getMessage());
+                        }
+                }
+                
+        }
+
+        public void dispose() {
+
+        }
+        
+        private IResource getSelectedResource() {
+                IWorkbench iworkbench = PlatformUI.getWorkbench();
+                if (iworkbench == null){
+                        return null;
+                }
+                IWorkbenchWindow iworkbenchwindow = iworkbench.getActiveWorkbenchWindow();
+                if (iworkbenchwindow == null) {
+                        return null;
+                }
+                IWorkbenchPage iworkbenchpage = iworkbenchwindow.getActivePage();
+                if (iworkbenchpage == null) {
+                        return null;
+                }
+                ISelection sel = iworkbenchpage.getSelection();
+
+                if (!(sel instanceof IStructuredSelection))
+                        return null;
+                IStructuredSelection ss = (IStructuredSelection) sel;
+                        Object element = ss.getFirstElement();
+                if (element instanceof IResource)
+                    return (IResource) element;
+                if (!(element instanceof IAdaptable))
+                    return null;
+                 IAdaptable adaptable = (IAdaptable)element;
+                 Object adapter = adaptable.getAdapter(IResource.class);
+                    return (IResource) adapter;
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchHobDialog.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchHobDialog.java
new file mode 100644
index 0000000..861360d
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchHobDialog.java
@@ -0,0 +1,328 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Intel Corporation.
+ * 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:
+ * Intel - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.actions;
+
+import java.util.Map;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Widget;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.ICommand;
+
+import org.yocto.bc.ui.builder.BitbakeBuilder;
+import org.yocto.bc.ui.builder.BitbakeCommanderNature;
+
+public class LaunchHobDialog extends Dialog {
+        private String title;
+        private Button buildButton;
+        private SelectionListener fSelectionListener;
+        private ModifyListener fModifyListener;
+        private Combo build_dir_combo;
+        
+        private IProject project;
+        private Shell shell;
+        private String build_dir;
+
+        public LaunchHobDialog(Shell parentShell, String dialogTitle, IProject project) {
+        super(parentShell);
+        this.shell = parentShell;
+        this.project = project;
+        this.title = dialogTitle;
+        setShellStyle(getShellStyle() | SWT.RESIZE);
+       
+        fSelectionListener= new SelectionListener() {
+                        public void widgetDefaultSelected(SelectionEvent e) {}
+
+                        public void widgetSelected(SelectionEvent e) {
+                                controlChanged(e.widget);
+                        }
+                };              
+
+                fModifyListener= new ModifyListener() {
+                        public void modifyText(ModifyEvent e) {
+                                controlModified(e.widget);
+                        }
+                };
+        
+        }
+
+        public String getBuildDir() {
+                return build_dir;
+        }
+        @Override
+        protected Control createDialogArea(Composite parent) {
+                final Composite result = (Composite) super.createDialogArea(parent);
+                                
+                try {
+                        createComposite(result);
+                } catch (Exception e) {
+                        // TODO Auto-generated catch block
+                        System.out.println("Have you ever set the project specific Yocto Settings?");
+                        System.out.println(e.getMessage());
+                }
+
+                return result;
+        }
+
+        private void createComposite(Composite composite) throws Exception{
+                Label root_label, sysroot_label;
+                
+                GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false);
+                GridLayout layout = new GridLayout(2, false);
+                composite.setLayout(layout);
+
+                gd= new GridData(SWT.FILL, SWT.CENTER, true, false);
+                gd.horizontalSpan= 2;
+                composite.setLayoutData(gd);    
+
+                Label build_dir_label = new Label(composite, SWT.NONE);
+                build_dir_label.setText("Bitbake build directory: ");
+                Composite textContainer = new Composite(composite, SWT.NONE);
+                textContainer.setLayout(new GridLayout(2, false));
+                textContainer.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+                
+                build_dir_combo = new Combo(textContainer, SWT.DROP_DOWN);
+                build_dir_combo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
+                initializeBuildCombo();
+                
+                Button buildButton = addDirSelectButton(textContainer, build_dir_combo);
+                
+                //we add the listener at the end for avoiding the useless event trigger when control
+                //changed or modified.
+                buildButton.addSelectionListener(fSelectionListener);
+                build_dir_combo.addModifyListener(fModifyListener);
+        }
+
+        private Button addDirSelectButton(final Composite parent, final Combo combo) {
+                Button button = new Button(parent, SWT.PUSH | SWT.LEAD);
+                button.setText("Browse");
+                button.addSelectionListener(new SelectionAdapter() {
+                        @Override
+                        public void widgetSelected(SelectionEvent event) {
+                                String dirName = new DirectoryDialog(parent.getShell()).open();
+                                
+                                if (dirName != null) {
+                                        combo.add(dirName);
+                                        combo.setText(dirName);
+                                }
+                        }
+                });
+                return button;
+        }               
+        @Override
+        protected void configureShell(Shell newShell) {
+                super.configureShell(newShell);
+                newShell.setText(title);
+        }
+        
+        protected void buttonPressed(int buttonId) {
+                if (buttonId == IDialogConstants.OK_ID) {
+                        try {
+                                build_dir = build_dir_combo.getText().toString();
+                                updateBuildSpec(build_dir);
+                                super.buttonPressed(buttonId); 
+                        } catch (Exception e) {
+                                // TODO Auto-generated catch block
+                                System.out.println(e.getMessage());
+                        }
+                }
+                else if (buttonId == IDialogConstants.CANCEL_ID)
+                {
+                        super.buttonPressed(buttonId);
+                }                       
+        }
+        
+        private boolean validateInput() {
+                boolean valid = false;
+                String build_dir = build_dir_combo.getText().toString();
+                if ((build_dir == null) || build_dir.isEmpty()) {
+                        Display display = Display.getCurrent();
+                        Shell shell = new Shell(display);
+                        MessageBox msgBox = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK);
+                        msgBox.setText("Yocto Configuration Error");
+                        msgBox.setMessage("The specified build directory is empty!");
+                        msgBox.open();
+                        if (shell != null)
+                                shell.dispose();
+                        return valid;
+                }
+                String project_path = project.getLocation().toString();
+                File project_dir_file = new File(project_path);
+                File build_dir_file = new File(build_dir);
+                try {
+                        if (isSubDirectory(project_dir_file, build_dir_file)) {
+                                Display display = Display.getCurrent();
+                                Shell shell = new Shell(display);
+                                MessageBox msgBox = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK);
+                                msgBox.setText("Yocto Configuration Error");
+                                msgBox.setMessage("The specified build directory is a sub-dir of project path: " + project_path);
+                                msgBox.open();
+                                if (shell != null)
+                                        shell.dispose();
+                        } else
+                                valid = true;
+                } catch (IOException e) {
+                        System.out.println(e.getMessage());
+                }
+                return valid;
+        }
+        
+        private boolean isSubDirectory(File baseDir, File subDir) throws IOException {
+                baseDir = baseDir.getCanonicalFile();
+                subDir = subDir.getCanonicalFile();
+
+                File parentFile = subDir;
+                while (parentFile != null) {
+                        if (baseDir.equals(parentFile)) {
+                                return true;
+                        }
+                        parentFile = parentFile.getParentFile();
+                }
+                return false;
+        }
+        
+        private void controlChanged(Widget widget) {
+
+                if (widget == buildButton)
+                {
+                }
+        }
+
+        private void controlModified(Widget widget) {
+                if (widget == build_dir_combo)
+                {
+                        
+                }
+        }
+        
+        private void initializeBuildCombo()
+        {
+                ArrayList<String> items = new ArrayList<String> ();
+                
+                try {
+                        IProjectDescription desc = project.getDescription();
+                    
+                        ICommand[] buildSpec = desc.getBuildSpec();
+                        if ((buildSpec != null) && (buildSpec.length != 0))
+                        {
+                                for (int i = 0; i < buildSpec.length; i++) {
+                                        ICommand cmd = buildSpec[i];
+                                        if (cmd.getBuilderName().equalsIgnoreCase(BitbakeBuilder.HOB_BUILD_ID))
+                                        {
+                                                Map<String, String> args = cmd.getArguments();
+                                                if ((args != null) && !args.isEmpty())
+                                                {
+                                                        Iterator entries = args.entrySet().iterator();
+                                                        while (entries.hasNext()) {
+                                                                Entry thisEntry = (Entry) entries.next();
+                                                                String key = (String)thisEntry.getKey();
+                                                                if (key.equalsIgnoreCase(BitbakeCommanderNature.BUILD_DIR_KEY)) {
+                                                                        build_dir_combo.removeAll();
+                                                                        build_dir_combo.setItems(getValues((String)thisEntry.getValue()));
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+                } catch (Exception e) {
+                        System.out.println(e.getMessage());
+                }
+        }
+        
+        private String[] getValues(String value) {
+        
+                if ((value != null) && !value.isEmpty()) 
+                {
+                        String[] pieces = value.split(",");
+                        for (int i = 0; i < pieces.length; i++) 
+                        {
+                                int start = pieces[i].indexOf("[");
+                                if (start >= 0)
+                                        pieces[i] = pieces[i].substring(start+1);
+                                int end = pieces[i].indexOf("]");
+                                if (end >= 0)
+                                        pieces[i] = pieces[i].substring(0, end);
+                                pieces[i] = pieces[i].trim();
+                        }
+                        return pieces;
+            }
+                return null;
+        }
+        
+        private void updateBuildSpec(String build_dir)
+        {
+                try {
+                        String[] items = build_dir_combo.getItems();
+                        HashSet values = new HashSet();
+                        Map<String, String> args = new HashMap<String, String>();
+                        values.add(build_dir);
+                        for (int i = 0; i < items.length; i++) {
+                                values.add(items[i]);
+                        }
+                        args.put(BitbakeCommanderNature.BUILD_DIR_KEY, values.toString());
+                        IProjectDescription desc = project.getDescription();
+                        ICommand[] buildSpec = desc.getBuildSpec();
+                        boolean found = false;
+                        if ((buildSpec != null) || (buildSpec.length != 0)) {
+                                for (int i = 0; i < buildSpec.length; i++) {
+                                        ICommand cmd = buildSpec[i];
+                                        if (cmd.getBuilderName().equalsIgnoreCase(BitbakeBuilder.HOB_BUILD_ID)) {
+                                                cmd.setArguments(args);
+                                                desc.setBuildSpec(buildSpec);
+                                                found = true;
+                                                break;
+                                        }
+                                }
+                        }
+                        if (!found) {
+                                ICommand[] newBuildSpec = new ICommand[buildSpec.length + 1];
+                                System.arraycopy(buildSpec, 0, newBuildSpec, 0, buildSpec.length);
+                                ICommand cmd = desc.newCommand();
+                                cmd.setBuilderName(BitbakeBuilder.HOB_BUILD_ID);
+                                cmd.setArguments(args);
+                                newBuildSpec[newBuildSpec.length - 1] = cmd;
+                                desc.setBuildSpec(newBuildSpec);                
+                        } 
+                        project.setDescription(desc, null);
+                } catch (Exception e) {
+                                System.out.println(e.getMessage());
+                }
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchHobHandler.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchHobHandler.java
new file mode 100644
index 0000000..002075a
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchHobHandler.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Intel Corporation.
+ * 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:
+ * Intel - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.core.commands.IHandler;
+
+public class LaunchHobHandler implements IHandler {
+
+        public Object execute(ExecutionEvent event) throws ExecutionException {
+                LaunchHobAction a = new LaunchHobAction();
+                a.run(null);
+                return null;
+        }
+
+        public void addHandlerListener(IHandlerListener handlerListener) {
+                // TODO Auto-generated method stub
+                
+        }
+
+        public void dispose() {
+                // TODO Auto-generated method stub
+                
+        }
+
+        public boolean isEnabled() {
+                // TODO Auto-generated method stub
+                return true;
+        }
+
+        public boolean isHandled() {
+                // TODO Auto-generated method stub
+                return true;
+        }
+
+        public void removeHandlerListener(IHandlerListener handlerListener) {
+                // TODO Auto-generated method stub
+                
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchNewBitBakeProjectWizardAction.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchNewBitBakeProjectWizardAction.java
new file mode 100644
index 0000000..b8b3144
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchNewBitBakeProjectWizardAction.java
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.actions;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+import org.yocto.bc.ui.wizards.importProject.ImportYoctoProjectWizard;
+
+public class LaunchNewBitBakeProjectWizardAction implements IWorkbenchWindowActionDelegate {
+
+        private IWorkbenchWindow window;
+        private IStructuredSelection selection;
+
+        public void dispose() {
+        }
+
+        public void init(IWorkbenchWindow window) {
+                this.window = window;
+        }
+
+        public void run(IAction action) {
+                ImportYoctoProjectWizard wizard = new ImportYoctoProjectWizard();
+                
+                wizard.init(window.getWorkbench(), selection);
+                WizardDialog wd = new WizardDialog(window.getShell(), wizard);
+                wd.create();
+                wd.open();
+        }
+
+        public void selectionChanged(IAction action, ISelection selection) {
+                if (selection instanceof IStructuredSelection) {
+                        this.selection = (IStructuredSelection) selection;
+                }
+        }
+}
\ No newline at end of file
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchNewRecipeWizardAction.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchNewRecipeWizardAction.java
new file mode 100644
index 0000000..d30d37b
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchNewRecipeWizardAction.java
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.actions;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+import org.yocto.bc.ui.wizards.NewBitBakeFileRecipeWizard;
+
+public class LaunchNewRecipeWizardAction implements IWorkbenchWindowActionDelegate {
+
+        private IWorkbenchWindow window;
+        private IStructuredSelection selection;
+
+        public void dispose() {
+        }
+
+        public void init(IWorkbenchWindow window) {
+                this.window = window;
+        }
+
+        public void run(IAction action) {
+                NewBitBakeFileRecipeWizard wizard = new NewBitBakeFileRecipeWizard();
+                
+                wizard.init(window.getWorkbench(), selection);
+                WizardDialog wd = new WizardDialog(window.getShell(), wizard);
+                wd.create();
+                wd.open();
+        }
+
+        public void selectionChanged(IAction action, ISelection selection) {
+                if (selection instanceof IStructuredSelection) {
+                        this.selection = (IStructuredSelection) selection;
+                }
+        }
+}
\ No newline at end of file
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchVariableWizardAction.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchVariableWizardAction.java
new file mode 100644
index 0000000..3104564
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/LaunchVariableWizardAction.java
@@ -0,0 +1,89 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.actions;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.yocto.bc.ui.Activator;
+import org.yocto.bc.ui.builder.BitbakeCommanderNature;
+import org.yocto.bc.ui.model.ProjectInfo;
+import org.yocto.bc.ui.wizards.variable.VariableWizard;
+
+/**
+ * Action to launch the Variable Wizard.
+ * @author kgilmer
+ *
+ */
+public class LaunchVariableWizardAction implements IWorkbenchWindowActionDelegate {
+
+        private IWorkbenchWindow window;
+        private Map session;
+
+        public void dispose() {
+        }
+
+        public void init(IWorkbenchWindow window) {
+                this.window = window;
+        }
+
+        public void run(IAction action) {
+                VariableWizard wizard = new VariableWizard(session);
+                
+                WizardDialog wd = new WizardDialog(window.getShell(), wizard);
+                wd.create();
+                wd.open();
+        }
+
+        public void selectionChanged(IAction action, ISelection selection) {
+                session = null;
+                
+                if (selection instanceof IStructuredSelection) {
+                        Object element = ((IStructuredSelection)selection).getFirstElement();
+                        
+                        if (element instanceof IResource) {
+                                IProject p = ((IResource)element).getProject();
+
+                                try {
+                                        if (p.isAccessible() && p.isOpen() && p.hasNature(BitbakeCommanderNature.NATURE_ID)) {
+                                                IProject proj = ((IResource)element).getProject();
+                                                ProjectInfo projInfo = Activator.getProjInfo(proj.getLocationURI());
+                                                session = Activator.getBBSession(projInfo, new NullProgressMonitor());
+                                        }
+                                } catch (IOException e) {
+                                        e.printStackTrace();
+                                } catch (CoreException e) {
+                                        e.printStackTrace();
+                                } catch (InvocationTargetException e) {
+                                        e.printStackTrace();
+                                } catch (InterruptedException e) {
+                                        e.printStackTrace();
+                                } catch (Exception e) {
+                                        e.printStackTrace();
+                                }
+                        }
+                }
+        
+                action.setEnabled(session != null);
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/builder/BitbakeBuilder.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/builder/BitbakeBuilder.java
new file mode 100644
index 0000000..3705d9b
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/builder/BitbakeBuilder.java
@@ -0,0 +1,177 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.builder;
+
+import java.util.Map;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.xml.sax.SAXException;
+
+public class BitbakeBuilder extends IncrementalProjectBuilder {
+
+        class SampleDeltaVisitor implements IResourceDeltaVisitor {
+                /*
+                 * (non-Javadoc)
+                 * 
+                 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
+                 */
+                public boolean visit(IResourceDelta delta) throws CoreException {
+                        IResource resource = delta.getResource();
+                        switch (delta.getKind()) {
+                        case IResourceDelta.ADDED:
+                                // handle added resource
+                                //checkXML(resource);
+                                break;
+                        case IResourceDelta.REMOVED:
+                                // handle removed resource
+                                break;
+                        case IResourceDelta.CHANGED:
+                                // handle changed resource
+                                //checkXML(resource);
+                                break;
+                        }
+                        //return true to continue visiting children.
+                        return true;
+                }
+        }
+/*
+        class SampleResourceVisitor implements IResourceVisitor {
+                public boolean visit(IResource resource) {
+                                                
+                        return true;
+                }
+        }
+*/
+/*      class XMLErrorHandler extends DefaultHandler {
+                
+                private IFile file;
+
+                public XMLErrorHandler(IFile file) {
+                        this.file = file;
+                }
+
+                private void addMarker(SAXParseException e, int severity) {
+                        BitbakeBuilder.this.addMarker(file, e.getMessage(), e
+                                        .getLineNumber(), severity);
+                }
+
+                @Override
+                public void error(SAXParseException exception) throws SAXException {
+                        addMarker(exception, IMarker.SEVERITY_ERROR);
+                }
+
+                @Override
+                public void fatalError(SAXParseException exception) throws SAXException {
+                        addMarker(exception, IMarker.SEVERITY_ERROR);
+                }
+
+                @Override
+                public void warning(SAXParseException exception) throws SAXException {
+                        addMarker(exception, IMarker.SEVERITY_WARNING);
+                }
+        }
+*/
+        public static final String BUILDER_ID = "org.yocto.bc.ui.builder.BitbakeBuilder";
+        public static final String HOB_BUILD_ID = "org.yocto.bc.ui.builder.HOB";
+                                                                                                                                 
+        private static final String MARKER_TYPE = "org.yocto.bc.ui.xmlProblem";
+
+        private SAXParserFactory parserFactory;
+
+        private void addMarker(IFile file, String message, int lineNumber,
+                        int severity) {
+                try {
+                        IMarker marker = file.createMarker(MARKER_TYPE);
+                        marker.setAttribute(IMarker.MESSAGE, message);
+                        marker.setAttribute(IMarker.SEVERITY, severity);
+                        if (lineNumber == -1) {
+                                lineNumber = 1;
+                        }
+                        marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
+                } catch (CoreException e) {
+                }
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see org.eclipse.core.internal.events.InternalBuilder#build(int,
+         *      java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
+         */
+        @Override
+        protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
+                        throws CoreException {
+                if (kind == FULL_BUILD) {
+                        fullBuild(monitor);
+                } else {
+                        IResourceDelta delta = getDelta(getProject());
+                        if (delta == null) {
+                                fullBuild(monitor);
+                        } else {
+                                incrementalBuild(delta, monitor);
+                        }
+                }
+                return null;
+        }
+
+        /*void checkXML(IResource resource) {
+                if (resource instanceof IFile && resource.getName().endsWith(".xml")) {
+                        IFile file = (IFile) resource;
+                        deleteMarkers(file);
+                        XMLErrorHandler reporter = new XMLErrorHandler(file);
+                        try {
+                                getParser().parse(file.getContents(), reporter);
+                        } catch (Exception e1) {
+                        }
+                }
+        }*/
+
+        private void deleteMarkers(IFile file) {
+                try {
+                        file.deleteMarkers(MARKER_TYPE, false, IResource.DEPTH_ZERO);
+                } catch (CoreException ce) {
+                }
+        }
+
+        protected void fullBuild(final IProgressMonitor monitor)
+                        throws CoreException {
+                /*try {
+                        getProject().accept(new SampleResourceVisitor());
+                } catch (CoreException e) {
+                }*/
+        }
+
+        private SAXParser getParser() throws ParserConfigurationException,
+                        SAXException {
+                if (parserFactory == null) {
+                        parserFactory = SAXParserFactory.newInstance();
+                }
+                return parserFactory.newSAXParser();
+        }
+
+        protected void incrementalBuild(IResourceDelta delta,
+                        IProgressMonitor monitor) throws CoreException {
+                // the visitor does the work.
+                delta.accept(new SampleDeltaVisitor());
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/builder/BitbakeCommanderNature.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/builder/BitbakeCommanderNature.java
new file mode 100644
index 0000000..25f7894
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/builder/BitbakeCommanderNature.java
@@ -0,0 +1,119 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Jessica Zhang - extend to support HOB build
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.builder;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchManager;
+
+
+public class BitbakeCommanderNature implements IProjectNature {
+
+        /**
+         * ID of this project nature
+         */
+        public static final String NATURE_ID = "org.yocto.bc.ui.builder.BitbakeCommanderNature";
+        public static final String BUILD_DIR_KEY = "org.yocto.bc.ui.builder.BitbakeCommander.BuildDir";
+        private IProject project;
+
+        public static void launchHob(IProject project, String buildDir) {
+                try {
+                        ILaunchManager lManager = DebugPlugin.getDefault().getLaunchManager();
+                        ILaunchConfigurationType configType = 
+                                lManager.getLaunchConfigurationType("org.eclipse.ui.externaltools.ProgramLaunchConfigurationType");
+                        ILaunchConfigurationWorkingCopy w_copy = configType.newInstance(null, "hob");
+                        ArrayList<String> listValue = new ArrayList<String>();
+                        listValue.add(new String("org.eclipse.ui.externaltools.launchGroup"));
+                        w_copy.setAttribute("org.eclipse.debug.ui.favoriteGroups", listValue);          
+                        w_copy.setAttribute("org.eclipse.ui.externaltools.ATTR_LOCATION", "/usr/bin/xterm");
+
+                        String init_script = project.getLocationURI().getPath() + "/oe-init-build-env ";
+                        String argument = "-e \"source " + init_script + buildDir + ";hob";// + ";bash\"";
+
+                        w_copy.setAttribute("org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS", argument);
+                        w_copy.launch(ILaunchManager.RUN_MODE, null);
+                        
+                } catch (CoreException e) {
+                        System.out.println(e.getMessage());
+                }
+        }
+        /*
+         * (non-Javadoc)
+         * 
+         * @see org.eclipse.core.resources.IProjectNature#configure()
+         */
+        public void configure() throws CoreException {
+                IProjectDescription desc = project.getDescription();
+                ICommand[] commands = desc.getBuildSpec();
+
+                for (int i = 0; i < commands.length; ++i) {
+                        if (commands[i].getBuilderName().equals(BitbakeBuilder.BUILDER_ID)) {
+                                return;
+                        }
+                }
+
+                ICommand[] newCommands = new ICommand[commands.length + 1];
+                System.arraycopy(commands, 0, newCommands, 0, commands.length);
+                ICommand command = desc.newCommand();
+                command.setBuilderName(BitbakeBuilder.BUILDER_ID);
+                newCommands[newCommands.length - 1] = command;
+                desc.setBuildSpec(newCommands);
+                project.setDescription(desc, null);
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see org.eclipse.core.resources.IProjectNature#deconfigure()
+         */
+        public void deconfigure() throws CoreException {
+                IProjectDescription description = getProject().getDescription();
+                ICommand[] commands = description.getBuildSpec();
+                for (int i = 0; i < commands.length; ++i) {
+                        if (commands[i].getBuilderName().equals(BitbakeBuilder.BUILDER_ID)) {
+                                ICommand[] newCommands = new ICommand[commands.length - 1];
+                                System.arraycopy(commands, 0, newCommands, 0, i);
+                                System.arraycopy(commands, i + 1, newCommands, i,
+                                                commands.length - i - 1);
+                                description.setBuildSpec(newCommands);
+                                return;
+                        }
+                }
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see org.eclipse.core.resources.IProjectNature#getProject()
+         */
+        public IProject getProject() {
+                return project;
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject)
+         */
+        public void setProject(IProject project) {
+                this.project = project;
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/builder/ToggleNatureAction.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/builder/ToggleNatureAction.java
new file mode 100644
index 0000000..f25148d
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/builder/ToggleNatureAction.java
@@ -0,0 +1,106 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.builder;
+
+import java.util.Iterator;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+
+public class ToggleNatureAction implements IObjectActionDelegate {
+
+        private ISelection selection;
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+         */
+        public void run(IAction action) {
+                if (selection instanceof IStructuredSelection) {
+                        for (Iterator it = ((IStructuredSelection) selection).iterator(); it
+                                        .hasNext();) {
+                                Object element = it.next();
+                                IProject project = null;
+                                if (element instanceof IProject) {
+                                        project = (IProject) element;
+                                } else if (element instanceof IAdaptable) {
+                                        project = (IProject) ((IAdaptable) element)
+                                                        .getAdapter(IProject.class);
+                                }
+                                if (project != null) {
+                                        toggleNature(project);
+                                }
+                        }
+                }
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
+         *      org.eclipse.jface.viewers.ISelection)
+         */
+        public void selectionChanged(IAction action, ISelection selection) {
+                this.selection = selection;
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction,
+         *      org.eclipse.ui.IWorkbenchPart)
+         */
+        public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+        }
+
+        /**
+         * Toggles sample nature on a project
+         * 
+         * @param project
+         *            to have sample nature added or removed
+         */
+        private void toggleNature(IProject project) {
+                try {
+                        IProjectDescription description = project.getDescription();
+                        String[] natures = description.getNatureIds();
+
+                        for (int i = 0; i < natures.length; ++i) {
+                                if (BitbakeCommanderNature.NATURE_ID.equals(natures[i])) {
+                                        // Remove the nature
+                                        String[] newNatures = new String[natures.length - 1];
+                                        System.arraycopy(natures, 0, newNatures, 0, i);
+                                        System.arraycopy(natures, i + 1, newNatures, i,
+                                                        natures.length - i - 1);
+                                        description.setNatureIds(newNatures);
+                                        project.setDescription(description, null);
+                                        return;
+                                }
+                        }
+
+                        // Add the nature
+                        String[] newNatures = new String[natures.length + 1];
+                        System.arraycopy(natures, 0, newNatures, 0, natures.length);
+                        newNatures[natures.length] = BitbakeCommanderNature.NATURE_ID;
+                        description.setNatureIds(newNatures);
+                        project.setDescription(description, null);
+                } catch (CoreException e) {
+                }
+        }
+
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/decorators/ProjectDecorator.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/decorators/ProjectDecorator.java
new file mode 100644
index 0000000..5901ee1
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/decorators/ProjectDecorator.java
@@ -0,0 +1,48 @@
+package org.yocto.bc.ui.decorators;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IDecoration;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ILightweightLabelDecorator;
+
+import org.yocto.bc.ui.Activator;
+import org.yocto.bc.ui.builder.BitbakeCommanderNature;
+
+public class ProjectDecorator implements ILightweightLabelDecorator {
+
+        private ImageDescriptor image;
+
+        public ProjectDecorator() {
+                image = Activator.getImageDescriptor("icons/oe_decorator.gif");
+        }
+        
+
+        public void decorate(Object element, IDecoration decoration) {
+                IProject p = (IProject) element;
+                
+                try {
+                        if (p.isOpen() && p.hasNature(BitbakeCommanderNature.NATURE_ID)) {
+                                decoration.addOverlay(image, IDecoration.TOP_RIGHT);
+                        }
+                } catch (CoreException e) {                     
+                        e.printStackTrace();
+                }
+        }
+
+        public void addListener(ILabelProviderListener arg0) {
+        }
+
+        public void dispose() {
+        }
+
+        public boolean isLabelProperty(Object arg0, String arg1) {
+                return false;
+        }
+
+
+        public void removeListener(ILabelProviderListener arg0) {
+        }
+
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/decorators/ReadOnly.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/decorators/ReadOnly.java
new file mode 100644
index 0000000..0bb3c20
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/decorators/ReadOnly.java
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.decorators;
+
+import java.net.URL;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourceAttributes;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IDecoration;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ILightweightLabelDecorator;
+
+/**
+ * An example showing how to control when an element is decorated. This example
+ * decorates only elements that are instances of IResource and whose attribute
+ * is 'Read-only'.
+ * 
+ * @see ILightweightLabelDecorator
+ */
+public class ReadOnly implements ILightweightLabelDecorator {
+        /**
+         * String constants for the various icon placement options from the template
+         * wizard.
+         */
+        public static final String TOP_RIGHT = "TOP_RIGHT";
+
+        public static final String TOP_LEFT = "TOP_LEFT";
+
+        public static final String BOTTOM_RIGHT = "BOTTOM_RIGHT";
+
+        public static final String BOTTOM_LEFT = "BOTTOM_LEFT";
+
+        public static final String UNDERLAY = "UNDERLAY";
+
+        /** The integer value representing the placement options */
+        private int quadrant;
+
+        /** The icon image location in the project folder */
+        private String iconPath = "icons/read_only.gif"; //NON-NLS-1
+
+        /**
+         * The image description used in
+         * <code>addOverlay(ImageDescriptor, int)</code>
+         */
+        private ImageDescriptor descriptor;
+
+        /* (non-Javadoc)
+         * @see org.eclipse.jface.viewers.ILightweightLabelDecorator#decorate(java.lang.Object, org.eclipse.jface.viewers.IDecoration)
+         */
+        public void decorate(Object element, IDecoration decoration) {
+                /**
+                 * Checks that the element is an IResource with the 'Read-only' attribute
+                 * and adds the decorator based on the specified image description and the
+                 * integer representation of the placement option.
+                 */
+                IResource resource = (IResource) element;
+                ResourceAttributes attrs = resource.getResourceAttributes();
+                if(attrs!=null) {
+                        if (attrs.isReadOnly()){
+                                URL url = Platform.find(
+                                                Platform.getBundle("org.yocto.bc.ui"), new Path(iconPath)); //NON-NLS-1
+        
+                                if (url == null)
+                                        return;
+                                descriptor = ImageDescriptor.createFromURL(url);                        
+                                quadrant = IDecoration.TOP_RIGHT;
+                                decoration.addOverlay(descriptor,quadrant);
+                        }
+                }
+        }
+
+        /* (non-Javadoc)
+         * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
+         */
+        public void addListener(ILabelProviderListener listener) {
+        }
+
+        /* (non-Javadoc)
+         * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
+         */
+        public void dispose() {
+        }
+
+        /* (non-Javadoc)
+         * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
+         */
+        public boolean isLabelProperty(Object element, String property) {
+                return false;
+        }
+
+        /* (non-Javadoc)
+         * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
+         */
+        public void removeListener(ILabelProviderListener listener) {
+        }
+}
\ No newline at end of file
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/BBVariableTextHover.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/BBVariableTextHover.java
new file mode 100644
index 0000000..5a90fca
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/BBVariableTextHover.java
@@ -0,0 +1,127 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Intel Corporation.
+ * 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:
+ * Intel - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.editors.bitbake;
+
+import java.net.URI;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
+import org.yocto.bc.bitbake.BBRecipe;
+import org.yocto.bc.bitbake.BBSession;
+import org.yocto.bc.ui.Activator;
+
+/**
+ * Maps BB Variables in the editor to BBSession
+ * @author kgilmer
+ *
+ */
+class BBVariableTextHover implements ITextHover {
+        private final BBSession session;
+        private volatile Map<String, String> envMap;
+
+        public BBVariableTextHover(BBSession session, URI file) {
+                this.session = session;
+                envMap = getEnvironmentMap();
+                LoadRecipeJob loadRecipeJob = new LoadRecipeJob(getFilename(file), file);
+                loadRecipeJob.schedule();
+        }
+
+        private Map<String, String> getEnvironmentMap() {
+                if (envMap == null)
+                        envMap = this.session.getProperties();
+                return envMap;
+        }
+
+        private String getFilename(URI uri) {
+                return uri.getPath();
+        }
+
+        public IRegion getHoverRegion(ITextViewer tv, int off) {
+                return new Region(off, 0);
+        }
+
+        public String getHoverInfo(ITextViewer tv, IRegion r) {
+                try {
+                        IRegion lineRegion = tv.getDocument().getLineInformationOfOffset(r.getOffset());
+
+                        return getBBVariable(tv.getDocument().get(lineRegion.getOffset(), lineRegion.getLength()).toCharArray(), r.getOffset() - lineRegion.getOffset());
+                } catch (Exception e) {
+                        return "";
+                }
+        }
+
+        private String getBBVariable(char[] line, int offset) {
+                // Find start of word.
+                int i = offset;
+                
+                while (line[i] != ' ' && line[i] != '$' && i > 0) {
+                        i--;
+                }
+                
+                if (i < 0 || line[i] != '$') {
+                        return "";  //this is not a BB variable.
+                }
+                
+                // find end of word
+                int start = i;
+                i = offset;
+                
+                while (line[i] != ' ' && line[i] != '}' && i <= line.length) {
+                        i++;
+                }
+                
+                if (line[i] != '}') {
+                        return "";  //this bb variable didn't terminate as expected
+                }
+                
+                String key = new String(line, start + 2, i - start - 2);
+                String val = (String) getEnvironmentMap().get(key);
+                
+                if (val == null) {
+                        val = "";
+                }
+                
+                if (val.length() > 64) {
+                        val = val.substring(0, 64) + '\n' + val.substring(65);
+                }
+                
+                return val;
+        }
+        
+        private class LoadRecipeJob extends Job {
+                private final URI filePath;
+
+                public LoadRecipeJob(String name, URI filePath) {
+                        super("Extracting BitBake environment for " + name);
+                        this.filePath = filePath;
+                }
+
+                @Override
+                protected IStatus run(IProgressMonitor mon) {
+                        try {
+                                BBRecipe recipe = Activator.getBBRecipe(session, filePath);
+                                recipe.initialize();
+                                envMap = recipe;
+                        } catch (Exception e) {
+                                return new Status(IStatus.WARNING, Activator.PLUGIN_ID, "Unable to load session for " + filePath, e);
+                        } 
+                        
+                        return Status.OK_STATUS;
+                }
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/BitBakeDocumentProvider.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/BitBakeDocumentProvider.java
new file mode 100644
index 0000000..140a3da
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/BitBakeDocumentProvider.java
@@ -0,0 +1,101 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.editors.bitbake;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentExtension3;
+import org.eclipse.jface.text.IDocumentPartitioner;
+import org.eclipse.jface.text.rules.FastPartitioner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.editors.text.FileDocumentProvider;
+import org.yocto.remote.utils.RemoteHelper;
+
+/**
+ * Document provider for BB recipe.
+ * @author kgilmer
+ *
+ */
+public class BitBakeDocumentProvider extends FileDocumentProvider {
+        /**
+         * The recipe partitioning. It contains two partition types: {@link #RECIPE_CODE} and
+         * {@link #RECIPE_COMMENT}.
+         */
+        public static final String RECIPE_PARTITIONING= "org.recipeeditor.recipepartitioning"; //$NON-NLS-1$
+
+        public static final String RECIPE_CODE= IDocument.DEFAULT_CONTENT_TYPE;
+        public static final String RECIPE_COMMENT= "RECIPE_COMMENT"; //$NON-NLS-1$
+
+        private IHost connection;
+
+        private final BitBakeSourceViewerConfiguration viewerConfiguration;
+
+        private static final String[] CONTENT_TYPES= {
+                        RECIPE_CODE,
+                        RECIPE_COMMENT
+        };
+
+        public BitBakeDocumentProvider(BitBakeSourceViewerConfiguration viewerConfiguration) {
+                this.viewerConfiguration = viewerConfiguration;
+        }
+
+        private IDocumentPartitioner createRecipePartitioner() {
+                IPredicateRule[] rules= { new SingleLineRule("#", null, new Token(RECIPE_COMMENT), (char) 0, true, false) }; //$NON-NLS-1$
+
+                RuleBasedPartitionScanner scanner= new RuleBasedPartitionScanner();
+                scanner.setPredicateRules(rules);
+                
+                return new FastPartitioner(scanner, CONTENT_TYPES);
+        }
+
+        @Override
+        protected void setupDocument(Object element,IDocument document) {
+                if (document instanceof IDocumentExtension3) {
+                        IDocumentExtension3 ext= (IDocumentExtension3) document;
+                        IDocumentPartitioner partitioner= createRecipePartitioner();
+                        ext.setDocumentPartitioner(RECIPE_PARTITIONING, partitioner);
+                        partitioner.connect(document);
+                }
+        }
+
+        @Override
+        public boolean isDeleted(Object element) {
+                if (element instanceof IFileEditorInput) {
+                        IFileEditorInput input= (IFileEditorInput) element;
+
+                    URI root = viewerConfiguration.getBBSession().getProjInfoRoot();
+                    String relPath = input.getFile().getProjectRelativePath().toPortableString();
+                    try {
+                                URI fileURI = new URI(root.getScheme(), root.getHost(), root.getPath() + "/" + relPath, root.getFragment());
+                                if (connection == null)
+                                        connection = viewerConfiguration.getBBSession().getProjectInfo().getConnection();
+                                return !RemoteHelper.fileExistsRemote(connection, new NullProgressMonitor(), fileURI.getPath());
+                        } catch (URISyntaxException e) {
+                                e.printStackTrace();
+                        }
+                }
+
+                return super.isDeleted(element);
+        }
+
+        public void setActiveConnection(IHost connection) {
+                this.connection = connection;
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/BitBakeFileEditor.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/BitBakeFileEditor.java
new file mode 100644
index 0000000..11dd335
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/BitBakeFileEditor.java
@@ -0,0 +1,89 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.editors.bitbake;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ResourceBundle;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor;
+import org.eclipse.ui.texteditor.ContentAssistAction;
+import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
+import org.yocto.bc.ui.Activator;
+import org.yocto.bc.ui.model.ProjectInfo;
+
+/**
+ * Editor for BB Recipe
+ * @author kgilmer
+ *
+ */
+public class BitBakeFileEditor extends AbstractDecoratedTextEditor {
+
+        public static final String EDITOR_ID = "org.yocto.bc.ui.editors.BitBakeFileEditor";
+        static final String CONTENT_ASSIST= "ContentAssist";
+        private BitBakeSourceViewerConfiguration viewerConfiguration;
+        private IFile targetFile;
+        
+        public BitBakeFileEditor() {
+                super();
+                viewerConfiguration = new BitBakeSourceViewerConfiguration(getSharedColors(), getPreferenceStore());
+                setSourceViewerConfiguration(viewerConfiguration);
+                setDocumentProvider(new BitBakeDocumentProvider(viewerConfiguration));
+        }
+        
+        @Override
+        protected void createActions() {
+                super.createActions();
+                
+                ResourceBundle bundle= RecipeEditorMessages.getBundle();
+                ContentAssistAction action= new ContentAssistAction(bundle, "contentAssist.", this); //$NON-NLS-1$
+                action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
+                setAction(CONTENT_ASSIST, action);
+        }
+        
+        @Override
+        public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+                        
+                if (input instanceof FileEditorInput) {
+                        IProject p = ((FileEditorInput)input).getFile().getProject();
+                        targetFile = ((FileEditorInput)input).getFile();
+                        viewerConfiguration.setTargetFile(targetFile);
+                        
+                        try {
+                                ProjectInfo projInfo = Activator.getProjInfo(p.getLocationURI());
+                                ((BitBakeDocumentProvider)getDocumentProvider()).setActiveConnection(projInfo.getConnection());
+                                viewerConfiguration.setBBSession(Activator.getBBSession(projInfo, new NullProgressMonitor()));
+                        } catch (IOException e) {
+                                e.printStackTrace();
+                                throw new PartInitException(Status.CANCEL_STATUS);
+                        } catch (InvocationTargetException e) {
+                                e.printStackTrace();
+                        } catch (CoreException e) {
+                                e.printStackTrace();
+                        } catch (InterruptedException e) {
+                                e.printStackTrace();
+                        } catch (Exception e) {
+                                e.printStackTrace();
+                        }
+                }
+                super.init(site, input);
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/BitBakeSourceViewerConfiguration.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/BitBakeSourceViewerConfiguration.java
new file mode 100644
index 0000000..87a51d2
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/BitBakeSourceViewerConfiguration.java
@@ -0,0 +1,210 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.editors.bitbake;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.contentassist.ContentAssistant;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.reconciler.IReconciler;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWordDetector;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WordRule;
+import org.eclipse.jface.text.source.ISharedTextColors;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
+import org.yocto.bc.bitbake.BBLanguageHelper;
+import org.yocto.bc.bitbake.BBSession;
+
+public class BitBakeSourceViewerConfiguration extends TextSourceViewerConfiguration {
+
+        private static final class WordDetector implements IWordDetector {
+                public boolean isWordPart(char c) {
+                        return !Character.isWhitespace(c);
+                }
+
+                public boolean isWordStart(char c) {
+                        return !Character.isWhitespace(c);
+                }
+        }
+
+        private final ISharedTextColors fSharedColors;
+        private BBSession session;
+        private IFile targetFile;
+        private BBVariableTextHover textHover = null;
+
+        public BitBakeSourceViewerConfiguration(ISharedTextColors sharedColors, IPreferenceStore store) {
+                super(store);
+                fSharedColors = sharedColors;           
+        }
+        
+        protected void setTargetFile(IFile targetFile) {
+                this.targetFile = targetFile;
+        }
+
+        public ITextHover getTextHover(ISourceViewer sv, String contentType) {
+                //only .bb file support Text Hover.
+                if (textHover == null && targetFile.getFileExtension().equals(BBLanguageHelper.BITBAKE_RECIPE_FILE_EXTENSION)) {
+                        URI root = session.getProjInfoRoot();
+                        try {
+                                String targetFileProjPath = targetFile.getProjectRelativePath().toPortableString();
+                                URI targetFileURI = new URI(root.getScheme(), root.getHost(), root.getPath() + "/" +
+                                                targetFileProjPath, root.getFragment());
+                                textHover = new BBVariableTextHover(session, targetFileURI);
+                        } catch (URISyntaxException e) {
+                                e.printStackTrace();
+                        }
+                }
+                
+                return textHover;
+        }
+
+        private void addDamagerRepairer(PresentationReconciler reconciler, RuleBasedScanner commentScanner, String contentType) {
+                DefaultDamagerRepairer commentDamagerRepairer = new DefaultDamagerRepairer(commentScanner);
+                reconciler.setDamager(commentDamagerRepairer, contentType);
+                reconciler.setRepairer(commentDamagerRepairer, contentType);
+        }
+
+        private RuleBasedScanner createCommentScanner() {
+                Color green = fSharedColors.getColor(new RGB(16, 96, 16));
+                RuleBasedScanner commentScanner = new RuleBasedScanner();
+                commentScanner.setDefaultReturnToken(new Token(new TextAttribute(green, null, SWT.ITALIC)));
+                return commentScanner;
+        }
+
+        private IRule createCustomFunctionRule() {
+                Color blue = fSharedColors.getColor(new RGB(130, 0, 0));
+                IRule rule = new CustomFunctionRule(new Token(new TextAttribute(blue, null, SWT.BOLD)));
+
+                return rule;
+        }
+
+        private SingleLineRule createFunctionNameRule() {
+                Color red = fSharedColors.getColor(new RGB(150, 0, 96));
+                SingleLineRule stepRule = new SingleLineRule("do_", ")", new Token(new TextAttribute(red, null, SWT.BOLD))); //$NON-NLS-1$ //$NON-NLS-2$
+                stepRule.setColumnConstraint(0);
+                return stepRule;
+        }
+
+        private SingleLineRule createInlineVariableRule() {
+                Color blue = fSharedColors.getColor(new RGB(50, 50, 100));
+                SingleLineRule stepRule = new SingleLineRule("${", "}", new Token(new TextAttribute(blue, null, SWT.BOLD))); //$NON-NLS-1$ //$NON-NLS-2$
+                return stepRule;
+        }
+
+        private WordRule createKeywordRule() {
+                WordRule keywordRule = new WordRule(new WordDetector());
+                IToken token = new Token(new TextAttribute(fSharedColors.getColor(new RGB(96, 96, 0)), null, SWT.NONE));
+
+                for (int i = 0; i < BBLanguageHelper.BITBAKE_KEYWORDS.length; ++i) {
+
+                        keywordRule.addWord(BBLanguageHelper.BITBAKE_KEYWORDS[i], token);
+                        keywordRule.setColumnConstraint(0);
+                }
+
+                return keywordRule;
+        }
+
+        private RuleBasedScanner createRecipeScanner() {
+                RuleBasedScanner recipeScanner = new RuleBasedScanner();
+
+                IRule[] rules = { createKeywordRule(), createShellKeywordRule(), createStringLiteralRule(), createVariableRule(), createFunctionNameRule(), createCustomFunctionRule(),
+                                createInlineVariableRule() };
+                recipeScanner.setRules(rules);
+                return recipeScanner;
+        }
+
+        private WordRule createShellKeywordRule() {
+                WordRule keywordRule = new WordRule(new WordDetector());
+                IToken token = new Token(new TextAttribute(fSharedColors.getColor(new RGB(0, 64, 92)), null, SWT.NONE));
+
+                for (int i = 0; i < BBLanguageHelper.SHELL_KEYWORDS.length; ++i) {
+                        keywordRule.addWord(BBLanguageHelper.SHELL_KEYWORDS[i], token);
+                }
+
+                return keywordRule;
+        }
+
+        private SingleLineRule createStringLiteralRule() {
+                Color red = fSharedColors.getColor(new RGB(50, 50, 100));
+                SingleLineRule rule = new SingleLineRule("\"", "\"", new Token(new TextAttribute(red, null, SWT.NONE)), '\\');
+
+                return rule;
+        }
+
+        private IRule createVariableRule() {
+                Color blue = fSharedColors.getColor(new RGB(0, 0, 200));
+                IRule rule = new VariableRule(new Token(new TextAttribute(blue, null, SWT.NONE)));
+
+                return rule;
+        }
+
+        @Override
+        public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
+                return new String[] { BitBakeDocumentProvider.RECIPE_CODE, BitBakeDocumentProvider.RECIPE_COMMENT };
+        }
+
+        @Override
+        public String getConfiguredDocumentPartitioning(ISourceViewer sourceViewer) {
+                return BitBakeDocumentProvider.RECIPE_PARTITIONING;
+        }
+
+        @Override
+        public IContentAssistant getContentAssistant(final ISourceViewer sourceViewer) {
+                ContentAssistant assistant = new ContentAssistant();
+                assistant.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer));
+
+                // assistant.setContentAssistProcessor(new HippieProposalProcessor(),
+                // BitBakeDocumentProvider.RECIPE_COMMENT);
+                assistant.setContentAssistProcessor(new RecipeCompletionProcessor(), BitBakeDocumentProvider.RECIPE_CODE);
+
+                return assistant;
+        }
+
+        public IReconciler getReconciler(ISourceViewer sourceViewer) {
+                return null;
+        }
+
+        @Override
+        public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
+                PresentationReconciler reconciler = new PresentationReconciler();
+                reconciler.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer));
+
+                addDamagerRepairer(reconciler, createCommentScanner(), BitBakeDocumentProvider.RECIPE_COMMENT);
+                addDamagerRepairer(reconciler, createRecipeScanner(), BitBakeDocumentProvider.RECIPE_CODE);
+
+                return reconciler;
+        }
+
+        public void setBBSession(BBSession session) {
+                this.session = session;         
+        }
+
+        public BBSession getBBSession() {
+                return this.session;
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/CustomFunctionRule.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/CustomFunctionRule.java
new file mode 100644
index 0000000..223a25d
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/CustomFunctionRule.java
@@ -0,0 +1,94 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.editors.bitbake;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+
+/**
+ * Rule for def_ BB Recipe functions
+ * @author kgilmer
+ *
+ */
+final class CustomFunctionRule implements IRule {
+
+        /** Token to return for this rule */
+        private final IToken fToken;
+
+        /**
+         * Creates a new operator rule.
+         * 
+         * @param token
+         *            Token to use for this rule
+         */
+        public CustomFunctionRule(IToken token) {
+                fToken = token;
+        }
+
+        public IToken evaluate(ICharacterScanner scanner) {
+                if (scanner.getColumn() > 0) {
+                        return Token.UNDEFINED;
+                }
+
+                int i = scanner.read();
+                int c = 1;
+                
+                if (!Character.isLetter(i) && i != 10) {
+                        scanner.unread();
+                        return Token.UNDEFINED;
+                }
+                
+                if (i == 'd' && scanAhead(scanner, "o_".toCharArray())) {
+                        scanner.unread();
+                        return Token.UNDEFINED;
+                }
+
+                while (i != ICharacterScanner.EOF && i != 10) {
+                        i = scanner.read();
+                        c++;
+                        
+                        if (i == '(') {
+                                readUntil(scanner, ')');
+                                
+                                return fToken;
+                        }
+                }
+
+                for (int t = 0; t < c; t++) {
+                        scanner.unread();
+                }
+                
+                return Token.UNDEFINED;
+        }
+
+        private void readUntil(ICharacterScanner scanner, int c) {
+                int i;
+                do {
+                        i = scanner.read();
+                } while (! (i == ICharacterScanner.EOF) && ! (i == c));
+        }
+
+        private boolean scanAhead(ICharacterScanner scanner, char [] chars) {
+                        boolean v = true;
+                        for (int i = 0; i < chars.length; ++i) {
+                                if (! (scanner.read() == chars[i])) {
+                                        v = false;
+                                        for (int j = 0; j < i; ++j) {
+                                                scanner.unread();
+                                        }
+                                        break;
+                                }
+                        }
+                        return v;
+        }
+}
\ No newline at end of file
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/RecipeCompletionProcessor.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/RecipeCompletionProcessor.java
new file mode 100644
index 0000000..034187a
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/RecipeCompletionProcessor.java
@@ -0,0 +1,127 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Lianhao Lu (Intel) - remove compile warnings
+ *******************************************************************************/
+package org.yocto.bc.ui.editors.bitbake;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.eclipse.jface.text.templates.DocumentTemplateContext;
+import org.eclipse.jface.text.templates.Template;
+import org.eclipse.jface.text.templates.TemplateContext;
+import org.eclipse.jface.text.templates.TemplateContextType;
+import org.eclipse.jface.text.templates.TemplateProposal;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ide.IDE.SharedImages;
+import org.eclipse.ui.PlatformUI;
+
+import org.yocto.bc.bitbake.BBLanguageHelper;
+import org.yocto.bc.ui.Activator;
+
+class RecipeCompletionProcessor implements IContentAssistProcessor {
+
+        private static final String CONTEXT_ID= "bitbake_variables"; //$NON-NLS-1$
+        private final TemplateContextType fContextType= new TemplateContextType(CONTEXT_ID, "Common BitBake Variables"); //$NON-NLS-1$
+        //private final TemplateContextType fKeywordContextType= new TemplateContextType("bitbake_keywords", "BitBake Keywords"); //$NON-NLS-1$
+        private final TemplateContextType fFunctionContextType = new TemplateContextType("bitbake_functions", "BitBake Functions");
+
+        RecipeCompletionProcessor() {
+        }
+
+        public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
+                IDocument document= viewer.getDocument();
+                Region region= new Region(offset, 0);
+                
+                TemplateContext templateContext= new DocumentTemplateContext(fContextType, document, offset, 0);
+                //TemplateContext keywordContext = new DocumentTemplateContext(fKeywordContextType, document, offset, 0);
+                TemplateContext functionContext = new DocumentTemplateContext(fFunctionContextType, document, offset, 0);
+                
+                List<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
+                
+                getVariableTemplateProposals(templateContext, region, proposals);
+                // getKeywordTemplateProposals(keywordContext, region, proposals);
+                getAddTaskTemplateProposals(templateContext, region, proposals);
+                getFunctionTemplateProposals(functionContext, region, proposals);
+                
+                return (ICompletionProposal[]) proposals.toArray(new ICompletionProposal[proposals.size()]);
+        }
+        
+        public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
+                return null;
+        }
+        
+        private Template generateVariableTemplate(String name, String description) {
+
+                return new Template(name, description, CONTEXT_ID, name + " = \"${" + name.toLowerCase() + "}\"", false);
+        }
+
+        private void getAddTaskTemplateProposals(TemplateContext templateContext, Region region, List<ICompletionProposal> p) {
+                        p.add(new TemplateProposal(new Template("addtask", "addtask statement", CONTEXT_ID, "addtask ${task_name} after ${do_previous_task} before ${do_next_task}", false),templateContext, region, PlatformUI.getWorkbench().getSharedImages().getImage(SharedImages.IMG_OBJS_BKMRK_TSK)));
+        }
+
+
+        public char[] getCompletionProposalAutoActivationCharacters() {
+                return null;
+        }
+
+        public char[] getContextInformationAutoActivationCharacters() {
+                return null;
+        }
+        
+        public IContextInformationValidator getContextInformationValidator() {
+                return null;
+        }
+
+        public String getErrorMessage() {
+                return null;
+        }
+
+        private void getFunctionTemplateProposals(TemplateContext templateContext, Region region, List<ICompletionProposal> p) {
+                String [] keywords = BBLanguageHelper.BITBAKE_STANDARD_FUNCTIONS;
+                Image img = Activator.getDefault().getImageRegistry().get(Activator.IMAGE_FUNCTION);
+                Arrays.sort(keywords);
+                
+                for (int i = 0; i < keywords.length; ++i) {
+                        p.add(new TemplateProposal(new Template(keywords[i], keywords[i] + " function", CONTEXT_ID, "do_" + keywords[i] + "() {\n\n}", false), templateContext, region, img));
+                }
+        }
+        /*
+        private void getKeywordTemplateProposals(TemplateContext templateContext, Region region, List<TemplateProposal> p) {
+                String [] keywords = BBLanguageHelper.BITBAKE_KEYWORDS;
+                
+                Arrays.sort(keywords);
+                
+                for (int i = 0; i < keywords.length; ++i) {
+                        p.add(new TemplateProposal(new Template(keywords[i], keywords[i] + " keyword", CONTEXT_ID, keywords[i] + " ", false),templateContext, region, null));
+                }
+        }
+        */
+
+        private void getVariableTemplateProposals(TemplateContext templateContext, Region region, List<ICompletionProposal> p) {
+                Map<String, String> n = BBLanguageHelper.getCommonBitbakeVariables();
+                Image img = Activator.getDefault().getImageRegistry().get(Activator.IMAGE_VARIABLE);
+                for (Iterator<String> i = n.keySet().iterator(); i.hasNext();) {
+                        String name = (String) i.next();
+                        String description = (String) n.get(name);
+                        p.add(new TemplateProposal(generateVariableTemplate(name, description), templateContext, region, img)); 
+                }       
+        }
+}
\ No newline at end of file
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/RecipeEditorActionContributor.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/RecipeEditorActionContributor.java
new file mode 100644
index 0000000..f27951b
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/RecipeEditorActionContributor.java
@@ -0,0 +1,47 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.editors.bitbake;
+
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.editors.text.TextEditorActionContributor;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
+import org.eclipse.ui.texteditor.RetargetTextEditorAction;
+
+public class RecipeEditorActionContributor extends TextEditorActionContributor {
+
+        private RetargetTextEditorAction fContentAssist;
+
+        public RecipeEditorActionContributor() {
+                fContentAssist= new RetargetTextEditorAction(RecipeEditorMessages.getBundle(), "contentAssist."); //$NON-NLS-1$
+                fContentAssist.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
+        }
+        
+        @Override
+        public void contributeToMenu(IMenuManager menu) {
+                super.contributeToMenu(menu);
+                
+                IMenuManager editMenu= menu.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
+                if (editMenu != null) {
+                        editMenu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, fContentAssist);
+                }
+        }
+        
+        @Override
+        public void setActiveEditor(IEditorPart part) {
+                super.setActiveEditor(part);
+                if (part instanceof ITextEditor) {
+                        fContentAssist.setAction(getAction((ITextEditor) part, BitBakeFileEditor.CONTENT_ASSIST));
+                }
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/RecipeEditorMessages.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/RecipeEditorMessages.java
new file mode 100644
index 0000000..020a25a
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/RecipeEditorMessages.java
@@ -0,0 +1,21 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.editors.bitbake;
+
+import java.util.ResourceBundle;
+
+public class RecipeEditorMessages {
+
+        public static ResourceBundle getBundle() {
+                return ResourceBundle.getBundle(RecipeEditorMessages.class.getName());
+        }
+
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/RecipeEditorMessages.properties b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/RecipeEditorMessages.properties
new file mode 100644
index 0000000..76c670b
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/RecipeEditorMessages.properties
@@ -0,0 +1,14 @@
+#########################################################
+# Copyright (c) 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Common Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/cpl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+##########################################################
+contentAssist.label=Content Assist
+contentAssist.tooltip=Content Assist
+contentAssist.image=
+contentAssist.description= Invokes content assist
\ No newline at end of file
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/VariableRule.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/VariableRule.java
new file mode 100644
index 0000000..750705a
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/editors/bitbake/VariableRule.java
@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.editors.bitbake;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+
+final class VariableRule implements IRule {
+
+        /** Token to return for this rule */
+        private final IToken fToken;
+
+        /**
+         * Creates a new operator rule.
+         * 
+         * @param token
+         *            Token to use for this rule
+         */
+        public VariableRule(IToken token) {
+                fToken = token;
+        }
+
+        public IToken evaluate(ICharacterScanner scanner) {
+                if (scanner.getColumn() > 0) {
+                        return Token.UNDEFINED;
+                }
+
+                int i = scanner.read();
+                int c = 1;
+                
+                if (!Character.isLetter(i) && i != 10) {
+                        scanner.unread();
+                        return Token.UNDEFINED;
+                }
+
+                int p = i;
+
+                while (i != ICharacterScanner.EOF && i != 10) {
+                        p = i;
+                        i = scanner.read();
+                        c++;
+                        
+                        if (i == '=') {
+                                scanner.unread();
+
+                                if (p == '?' || p == '+') {
+                                        scanner.unread();
+                                }
+                                return fToken;
+                        }
+                }
+
+                for (int t = 0; t < c; t++) {
+                        scanner.unread();
+                }
+                
+                return Token.UNDEFINED;
+        }
+}
\ No newline at end of file
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/CustomLocalFile.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/CustomLocalFile.java
new file mode 100644
index 0000000..b62a1da
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/CustomLocalFile.java
@@ -0,0 +1,13 @@
+package org.yocto.bc.ui.filesystem;
+
+import java.io.File;
+
+import org.eclipse.core.internal.filesystem.local.LocalFile;
+import org.yocto.remote.utils.RemoteHelper;
+
+public class CustomLocalFile extends LocalFile{
+        
+        public CustomLocalFile(String projName, File file) {
+                super(new File(RemoteHelper.retrieveProjRootFromMetaArea(projName)));
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/Messages.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/Messages.java
new file mode 100644
index 0000000..0a82fdd
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/Messages.java
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.filesystem;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Provides translatable messages for the file system bundle
+ */
+public class Messages extends NLS {
+        private static final String BUNDLE_NAME = "org.eclipse.core.internal.filesystem.messages"; //$NON-NLS-1$
+
+        public static String copying;
+        public static String couldnotDelete;
+        public static String couldnotDeleteReadOnly;
+        public static String couldNotLoadLibrary;
+        public static String couldNotMove;
+        public static String couldNotRead;
+        public static String couldNotWrite;
+        public static String deleteProblem;
+        public static String deleting;
+        public static String failedCreateWrongType;
+        public static String failedMove;
+        public static String failedReadDuringWrite;
+        public static String fileExists;
+        public static String fileNotFound;
+        public static String moving;
+        public static String noFileSystem;
+        public static String noImplDelete;
+        public static String noImplWrite;
+        public static String noScheme;
+        public static String notAFile;
+        public static String readOnlyParent;
+
+        static {
+                // initialize resource bundles
+                NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+        }
+
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/OEFile.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/OEFile.java
new file mode 100644
index 0000000..afcd372
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/OEFile.java
@@ -0,0 +1,375 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation, 2013 Intel Corporation.
+ * 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:
+ *     IBM Corporation - initial API and implementation
+ *     Ken Gilmer - adaptation from internal class.
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.filesystem;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.util.List;
+
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileInfo;
+import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.filesystem.IFileSystem;
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.filesystem.provider.FileInfo;
+import org.eclipse.core.filesystem.provider.FileStore;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
+import org.eclipse.rse.services.files.IFileService;
+import org.eclipse.rse.services.files.IHostFile;
+import org.yocto.bc.bitbake.BBSession;
+import org.yocto.bc.bitbake.ProjectInfoHelper;
+import org.yocto.bc.bitbake.ShellSession;
+import org.yocto.bc.ui.Activator;
+import org.yocto.bc.ui.model.ProjectInfo;
+import org.yocto.bc.ui.model.YoctoHostFile;
+
+/**
+ * File system implementation based on storage of files in the local
+ * operating system's file system.
+ */
+public class OEFile extends FileStore {
+        private static int attributes(File aFile) {
+                if (!aFile.exists() || aFile.canWrite())
+                        return EFS.NONE;
+                return EFS.ATTRIBUTE_READ_ONLY;
+        }
+        
+
+        protected final YoctoHostFile file;
+
+        private List<Object> ignoredPaths;
+
+        /**
+         * The absolute file system path of the file represented by this store.
+         */
+        protected final String filePath;
+
+        private final URI root;
+
+        /**
+         * Creates a new local file.
+         * 
+         * @param file The file this local file represents
+         * @param root 
+         */
+        public OEFile(URI fileURI, List<Object> ignoredPaths, URI root, ProjectInfo projInfo, IProgressMonitor monitor) throws SystemMessageException {
+                this.ignoredPaths = ignoredPaths;
+                this.root = root;
+                this.file = new YoctoHostFile(projInfo, fileURI, monitor);
+                this.filePath = file.getAbsolutePath();
+        }
+
+        @Override
+        public String[] childNames(int options, IProgressMonitor monitor) {
+                return file.getChildNames(monitor);
+        }
+
+        /*
+         * detect if the path is potential builddir
+         */
+        private boolean isPotentialBuildDir(String path) {
+                String parentPath = path.substring(0, path.lastIndexOf("/"));
+                String name = path.substring(path.lastIndexOf("/") + 1);
+                boolean ret = true;
+                try {
+                        IFileService fs = file.getFileService();
+                        IHostFile hostFile = fs.getFile(parentPath, name, new NullProgressMonitor());
+                        if (!hostFile.isDirectory())
+                                return false;
+                        IHostFile confDir = fs.getFile(path, BBSession.CONF_DIR, new NullProgressMonitor());
+                        if (!confDir.exists() || !confDir.isDirectory())
+                                return false;
+                        for (int i = 0; i < BBSession.BUILDDIR_INDICATORS.length && ret == true; i++) {
+                                IHostFile child = fs.getFile(path + "/" + BBSession.CONF_DIR, BBSession.BUILDDIR_INDICATORS[i], new NullProgressMonitor());
+                                if(!child.exists() || !child.isFile()) {
+                                        ret = false;
+                                        break;
+                                }
+                        }
+
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                }
+                return ret;
+        }
+
+        /*
+         * try to find items for ignoreList
+         */
+        private void updateIgnorePaths(String path, List<Object> list, IProgressMonitor monitor) {
+                if(isPotentialBuildDir(path)) {
+                        BBSession config = null;
+                        try {
+                                config = Activator.getBBSession(Activator.getProjInfo(root), monitor);
+                                config.initialize();
+                        } catch(Exception e) {
+                                e.printStackTrace();
+                                return;
+                        }
+                        if (config.get("TMPDIR") == null || config.get("DL_DIR") == null || config.get("SSTATE_DIR") == null) {
+                                //wrong guess about the buildDir
+                                return;
+                        }else {
+                                if(!list.contains(config.get("TMPDIR"))) {
+                                        list.add(config.get("TMPDIR"));
+                                }
+                                if(!list.contains(config.get("DL_DIR"))) {
+                                        list.add(config.get("DL_DIR"));
+                                }
+                                if(!list.contains(config.get("SSTATE_DIR"))) {
+                                        list.add(config.get("SSTATE_DIR"));
+                                }
+                        }
+                }
+        }
+
+        @Override
+        public IFileStore[] childStores(int options, IProgressMonitor monitor) throws CoreException {
+                String[] children = childNames(options, monitor);
+                IFileStore[] wrapped = new IFileStore[children.length];
+                
+                for (int i = 0; i < wrapped.length; i++) {
+                        String fullPath = file.getAbsolutePath() + "/" + children[i];
+                        updateIgnorePaths(fullPath, ignoredPaths, monitor);
+                        if (ignoredPaths.contains(fullPath)) {
+                                wrapped[i] = getDeadChild(children[i]);
+                        } else {
+                                wrapped[i] = getChild(children[i]);
+                        }                       
+                }
+                
+                return wrapped;
+        }
+
+        @Override
+        public void copy(IFileStore destFileStore, int options, IProgressMonitor monitor) throws CoreException {
+                if (destFileStore instanceof OEFile) {
+                        file.copy(destFileStore, monitor);
+                }
+        }
+
+        @Override
+        public void delete(int options, IProgressMonitor monitor) throws CoreException {
+                if (monitor == null)
+                        monitor = new NullProgressMonitor();
+                else
+                        monitor = new NullProgressMonitor();
+                try {
+                        monitor.beginTask(NLS.bind(Messages.deleting, this), 200);
+                        String message = Messages.deleteProblem;
+                        MultiStatus result = new MultiStatus(Policy.PI_FILE_SYSTEM, EFS.ERROR_DELETE, message, null);
+                        
+                        //don't allow Eclipse to delete entire OE directory
+                        
+                        if (!isProject()) {
+                                internalDelete(file, filePath, result, monitor);
+                        }
+                        
+                        if (!result.isOK())
+                                throw new CoreException(result);
+                } finally {
+                        monitor.done();
+                }
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (!(obj instanceof OEFile))
+                        return false;
+
+                OEFile otherFile = (OEFile) obj;
+
+                return file.equals(otherFile.file);
+        }
+
+        @Override
+        public IFileInfo fetchInfo(int options, IProgressMonitor monitor) {
+                //in-lined non-native implementation
+                FileInfo info = new FileInfo(file.getName());
+                final long lastModified = file.getModifiedDate();
+                if (lastModified <= 0) {
+                        //if the file doesn't exist, all other attributes should be default values
+                        info.setExists(false);
+                        return info;
+                }
+                info.setLastModified(lastModified);
+                info.setExists(true);
+                info.setLength(file.getSize());
+                info.setDirectory(file.isDirectory());
+                info.setAttribute(EFS.ATTRIBUTE_READ_ONLY, file.exists() && !file.canWrite());
+                info.setAttribute(EFS.ATTRIBUTE_HIDDEN, file.isHidden());
+                return info;
+        }
+        
+        @Override
+        public IFileStore getChild(IPath path) {
+                try {
+                        return new OEFile(file.getChildURIformPath(path), ignoredPaths, root, file.getProjectInfo(), new NullProgressMonitor());
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                        return null;
+                }
+        }
+
+        @Override
+        public IFileStore getChild(String name) {
+
+                try {
+                        return new OEFile(file.getChildURI(name), ignoredPaths, root, file.getProjectInfo(), new NullProgressMonitor());
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                }
+                return null;
+
+        }
+
+        private IFileStore getDeadChild(String name) {
+                return new OEIgnoreFile(file.getChildHostFile(name));
+        }
+
+        /*
+         * (non-Javadoc)
+         * @see org.eclipse.core.filesystem.IFileStore#getFileSystem()
+         */
+        @Override
+        public IFileSystem getFileSystem() {
+                return OEFileSystem.getInstance();
+        }
+
+        @Override
+        public String getName() {
+                return file.getName();
+        }
+
+        @Override
+        public IFileStore getParent() {
+                URI parentURI = file.getParentFile();
+                try {
+                        return parentURI == null ? null : new OEFile(parentURI, ignoredPaths, root, file.getProjectInfo(), new NullProgressMonitor());
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                        return null;
+                }
+        }
+
+        @Override
+        public int hashCode() {
+                return file.hashCode();
+        }
+
+        /**
+         * Deletes the given file recursively, adding failure info to
+         * the provided status object.  The filePath is passed as a parameter
+         * to optimize java.io.File object creation.
+         */
+        private boolean internalDelete(YoctoHostFile target, String pathToDelete, MultiStatus status, IProgressMonitor monitor) {
+                target.delete(monitor);
+                return false;
+        }
+
+        @Override
+        public boolean isParentOf(IFileStore other) {
+                if (!(other instanceof OEFile))
+                        return false;
+                String thisPath = filePath;
+                String thatPath = ((OEFile) other).filePath;
+                int thisLength = thisPath.length();
+                int thatLength = thatPath.length();
+                //if equal then not a parent
+                if (thisLength >= thatLength)
+                        return false;
+                if (getFileSystem().isCaseSensitive()) {
+                        if (thatPath.indexOf(thisPath) != 0)
+                                return false;
+                } else {
+                        if (thatPath.toLowerCase().indexOf(thisPath.toLowerCase()) != 0)
+                                return false;
+                }
+                //The common portion must end with a separator character for this to be a parent of that
+                return thisPath.charAt(thisLength - 1) == File.separatorChar || thatPath.charAt(thisLength) == File.separatorChar;
+        }
+
+        /**
+         * @return
+         */
+        private boolean isProject() {
+                return this.file.toString().equals(root);
+        }
+
+        @Override
+        public IFileStore mkdir(int options, IProgressMonitor monitor) throws CoreException {
+                file.mkdir(options);
+                return this;
+        }
+
+        @Override
+        public void move(IFileStore destFile, int options, IProgressMonitor monitor) throws CoreException {
+                file.move(destFile, monitor);
+        }
+
+        @Override
+        public InputStream openInputStream(int options, IProgressMonitor monitor) throws CoreException {
+                return file.getInputStream(options, monitor);
+        }
+
+        @Override
+        public OutputStream openOutputStream(int options, IProgressMonitor monitor) throws CoreException {
+                return file.getOutputStream(options, monitor);
+        }
+
+        @Override
+        public void putInfo(IFileInfo info, int options, IProgressMonitor monitor) throws CoreException {
+                file.putInfo(info, options, monitor);
+        }
+
+        /* (non-Javadoc)
+         * @see org.eclipse.core.filesystem.provider.FileStore#toLocalFile(int, org.eclipse.core.runtime.IProgressMonitor)
+         */
+        @Override
+        public File toLocalFile(int options, IProgressMonitor monitor) throws CoreException {
+                return file.toLocalFile();
+        }
+
+        /* (non-Javadoc)
+         * @see org.eclipse.core.filesystem.IFileStore#toString()
+         */
+        @Override
+        public String toString() {
+                return file.toString();
+        }
+
+        /* (non-Javadoc)
+         * @see org.eclipse.core.filesystem.IFileStore#toURI()
+         */
+        @Override
+        public URI toURI() {
+                return URIUtil.toURI(filePath);
+        }
+        public String getParentPath() {
+                return filePath.substring(0, filePath.lastIndexOf("/"));
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/OEFileSystem.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/OEFileSystem.java
new file mode 100644
index 0000000..a9712d3
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/OEFileSystem.java
@@ -0,0 +1,103 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.filesystem;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.filesystem.IFileSystem;
+import org.eclipse.core.filesystem.provider.FileSystem;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
+import org.yocto.bc.bitbake.BBSession;
+import org.yocto.bc.ui.Activator;
+import org.yocto.bc.ui.model.ProjectInfo;
+
+/**
+ * A filesystem that ignores specific OE directories that contain derived information.
+ * @author kgilmer
+ *
+ */
+public class OEFileSystem extends FileSystem {
+
+        private static IFileSystem ref;
+        private ProjectInfo projInfo;
+
+        public static IFileSystem getInstance() {
+                return ref;
+        }
+
+        private Map fileStoreCache;
+
+        public OEFileSystem() {
+                ref = this;
+                fileStoreCache = new Hashtable();
+        }
+        
+        @Override
+        public IFileStore getStore(URI uri) {
+                
+                OEFile uf = (OEFile) fileStoreCache.get(uri);
+                setProjInfo(uri);
+                
+                if (uf == null) {
+                        BBSession config = null;
+                        try {
+                                config = Activator.getBBSession(projInfo, new NullProgressMonitor());
+                                config.initialize();
+                        } catch (Exception e) {
+                                return new CustomLocalFile(projInfo.getProjectName(), new File(uri.getPath()));
+                        }
+
+                        if (config.get("TMPDIR") == null || config.get("DL_DIR") == null || config.get("SSTATE_DIR")== null) {
+                                throw new RuntimeException("Invalid local.conf: TMPDIR or DL_DIR or SSTATE_DIR undefined.");
+                        }
+                        
+                        List ignoreList = new ArrayList();
+
+                        //These directories are ignored because they contain too many files for Eclipse to handle efficiently.
+                        ignoreList.add(config.get("TMPDIR"));
+                        ignoreList.add(config.get("DL_DIR"));
+                        ignoreList.add(config.get("SSTATE_DIR"));
+
+                        //FIXME: add project info
+                        try {
+                                uf = new OEFile(uri, ignoreList, uri, projInfo, new NullProgressMonitor());
+                                fileStoreCache.put(uri, uf);
+                        } catch (SystemMessageException e) {
+                                e.printStackTrace();
+                        }
+                }
+                
+                return uf;
+        }
+
+        private void setProjInfo(URI uri) {
+                try {
+                        if(projInfo == null)
+                                projInfo = Activator.getProjInfo(uri);
+                } catch (CoreException e) {
+                        e.printStackTrace();
+                } catch (InvocationTargetException e) {
+                        e.printStackTrace();
+                } catch (InterruptedException e) {
+                        e.printStackTrace();
+                }
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/OEFileSystemContributor.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/OEFileSystemContributor.java
new file mode 100644
index 0000000..cfff7d6
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/OEFileSystemContributor.java
@@ -0,0 +1,34 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol(Intel) - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.filesystem;
+
+import java.net.URI;
+
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.ide.fileSystem.FileSystemContributor;
+
+public class OEFileSystemContributor extends FileSystemContributor  {
+
+        public OEFileSystemContributor() {
+        }
+
+        @Override
+        public URI browseFileSystem(String initialPath, Shell shell) {
+                return null;
+        }
+        
+        @Override
+        public URI getURI(String string) {
+                return super.getURI(string);
+        }
+        
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/OEIgnoreFile.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/OEIgnoreFile.java
new file mode 100644
index 0000000..2434347
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/OEIgnoreFile.java
@@ -0,0 +1,135 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.filesystem;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+
+import org.eclipse.core.filesystem.IFileInfo;
+import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.filesystem.IFileSystem;
+import org.eclipse.core.filesystem.provider.FileInfo;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.yocto.bc.ui.model.YoctoHostFile;
+
+public class OEIgnoreFile implements IFileStore {
+
+        private final YoctoHostFile file;
+
+        public OEIgnoreFile(YoctoHostFile file) {
+                this.file = file;
+        }
+
+        public IFileInfo[] childInfos(int options, IProgressMonitor monitor) throws CoreException {
+
+                return new IFileInfo[0];
+        }
+
+        public String[] childNames(int options, IProgressMonitor monitor) throws CoreException {
+                return new String[0];
+        }
+
+        public IFileStore[] childStores(int options, IProgressMonitor monitor) throws CoreException {
+
+                return new IFileStore[0];
+        }
+
+        public void copy(IFileStore destination, int options, IProgressMonitor monitor) throws CoreException {
+                // TODO Auto-generated method stub
+                
+        }
+
+        public void delete(int options, IProgressMonitor monitor) throws CoreException {
+                // TODO Auto-generated method stub
+                
+        }
+        
+        public IFileInfo fetchInfo() {
+                // TODO Auto-generated method stub
+                return new FileInfo(file.getName());
+        }
+
+        public IFileInfo fetchInfo(int options, IProgressMonitor monitor) throws CoreException {
+                return new FileInfo(file.getName());
+        }
+
+        public Object getAdapter(Class adapter) {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        public IFileStore getChild(IPath path) {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+
+
+        public IFileStore getChild(String name) {
+                return null;
+        }
+
+        public IFileSystem getFileSystem() {
+                // TODO Auto-generated method stub
+                return OEFileSystem.getInstance();
+        }
+
+        public String getName() {
+                return file.getName();
+        }
+
+        public IFileStore getParent() {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        public boolean isParentOf(IFileStore other) {
+                // TODO Auto-generated method stub
+                return false;
+        }
+
+        public IFileStore mkdir(int options, IProgressMonitor monitor) throws CoreException {
+                return null;
+        }
+
+        public void move(IFileStore destination, int options, IProgressMonitor monitor) throws CoreException {
+        }
+
+        public InputStream openInputStream(int options, IProgressMonitor monitor) throws CoreException {
+                return null;
+        }
+
+        public OutputStream openOutputStream(int options, IProgressMonitor monitor) throws CoreException {
+                return null;
+        }
+
+        public void putInfo(IFileInfo info, int options, IProgressMonitor monitor) throws CoreException {
+        }
+
+        public File toLocalFile(int options, IProgressMonitor monitor) throws CoreException {
+                return file.toLocalFile();
+        }
+
+        public URI toURI() {
+                return file.toURI();
+        }
+
+        public IFileStore getFileStore(IPath path) {
+                return null;
+        }
+        
+        
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/Policy.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/Policy.java
new file mode 100644
index 0000000..84c0f32
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/Policy.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.filesystem;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Date;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubProgressMonitor;
+
+import org.yocto.bc.ui.Activator;
+
+/**
+ * Grab bag of utility methods for the file system plugin
+ */
+public class Policy {
+
+        /**
+         * General debug flag for the plugin
+         */
+        public static boolean DEBUG = false;
+
+        public static final String PI_FILE_SYSTEM = "org.eclipse.core.filesystem"; //$NON-NLS-1$
+
+        public static void checkCanceled(IProgressMonitor monitor) {
+                if (monitor.isCanceled())
+                        throw new OperationCanceledException();
+        }
+
+        /**
+         * Print a debug message to the console. 
+         * Pre-pend the message with the current date and the name of the current thread.
+         */
+        public static void debug(String message) {
+                StringBuffer buffer = new StringBuffer();
+                buffer.append(new Date(System.currentTimeMillis()));
+                buffer.append(" - ["); //$NON-NLS-1$
+                buffer.append(Thread.currentThread().getName());
+                buffer.append("] "); //$NON-NLS-1$
+                buffer.append(message);
+                System.out.println(buffer.toString());
+        }
+
+        public static void error(int code, String message) throws CoreException {
+                error(code, message, null);
+        }
+
+        public static void error(int code, String message, Throwable exception) throws CoreException {
+                int severity = code == 0 ? 0 : 1 << (code % 100 / 33);
+                throw new CoreException(new Status(severity, PI_FILE_SYSTEM, code, message, exception));
+        }
+
+        public static void log(int severity, String message, Throwable t) {
+                if (message == null)
+                        message = ""; //$NON-NLS-1$
+                Activator.getDefault().getLog().log(new Status(severity, PI_FILE_SYSTEM, 1, message, t));
+        }
+
+        public static IProgressMonitor monitorFor(IProgressMonitor monitor) {
+                return monitor == null ? new NullProgressMonitor() : monitor;
+        }
+
+        /**
+         * Closes a stream and ignores any resulting exception.
+         */
+        public static void safeClose(InputStream in) {
+                try {
+                        if (in != null)
+                                in.close();
+                } catch (IOException e) {
+                        //ignore
+                }
+        }
+
+        /**
+         * Closes a stream and ignores any resulting exception.
+         */
+        public static void safeClose(OutputStream out) {
+                try {
+                        if (out != null)
+                                out.close();
+                } catch (IOException e) {
+                        //ignore
+                }
+        }
+
+        public static IProgressMonitor subMonitorFor(IProgressMonitor monitor, int ticks) {
+                if (monitor == null)
+                        return new NullProgressMonitor();
+                if (monitor instanceof NullProgressMonitor)
+                        return monitor;
+                return new SubProgressMonitor(monitor, ticks);
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/YoctoLocation.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/YoctoLocation.java
new file mode 100755
index 0000000..40d9345
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/filesystem/YoctoLocation.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Intel Corporation.
+ * 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:
+ * Ioana Grigoropol(Intel) - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.filesystem;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+public class YoctoLocation{
+        URI oefsURI;
+        URI originalURI;
+
+        public YoctoLocation(){
+                try {
+                        oefsURI = new URI("");
+                        originalURI = new URI("");
+                } catch (URISyntaxException e) {
+                        e.printStackTrace();
+                }
+        }
+
+        public URI getOEFSURI() {
+                return oefsURI;
+        }
+
+        public URI getOriginalURI() {
+                return originalURI;
+        }
+
+        public void setOriginalURI(URI originalURI) {
+                this.originalURI = originalURI;
+        }
+
+        public void setOEFSURI(URI uri) {
+                this.oefsURI = uri;
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/model/IModelElement.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/model/IModelElement.java
new file mode 100644
index 0000000..2892df5
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/model/IModelElement.java
@@ -0,0 +1,15 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.model;
+
+public interface IModelElement {
+        public void initialize() throws Exception;
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/model/ProjectInfo.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/model/ProjectInfo.java
new file mode 100644
index 0000000..119782d
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/model/ProjectInfo.java
@@ -0,0 +1,117 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.model;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.ptp.remote.core.IRemoteServices;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.services.files.IFileService;
+import org.yocto.bc.bitbake.ProjectInfoHelper;
+import org.yocto.bc.ui.filesystem.YoctoLocation;
+import org.yocto.remote.utils.RemoteHelper;
+
+public class ProjectInfo implements IModelElement {
+        private String name;
+        private YoctoLocation location;
+        private String init;
+        private IHost connection;
+        private IRemoteServices remoteServices;
+
+        public ProjectInfo() {
+        }
+        
+        public String getInitScriptPath() {
+                return init;
+        }
+        public String getProjectName() {
+                return name;
+        }
+        public URI getOriginalURI() {
+                return location.getOriginalURI();
+        }
+
+        public URI getOEFSURI() {
+                return location.getOEFSURI();
+        }
+
+        @Override
+        public void initialize() throws Exception {
+                name = new String();
+                location = new YoctoLocation();
+                init = new String();
+        }
+
+        public void setInitScriptPath(String init) {
+                this.init = init;
+        }
+
+        public void setLocationURI(URI location) {
+                if (this.location == null)
+                        this.location = new YoctoLocation();
+                if (location.getScheme().equalsIgnoreCase("oefs")) {
+                        if (this.name ==  null) {
+                                String path = location.getPath();
+                                this.name = path.substring(path.lastIndexOf("/") + 1);
+                        }
+                        location = RemoteHelper.retrieveURIFromMetaArea(this.name);
+                }
+                this.location.setOriginalURI(location);
+                try {
+                        this.location.setOEFSURI(new URI(ProjectInfoHelper.OEFS_SCHEME + location.getPath() ));
+                } catch (URISyntaxException e) {
+                        try {
+                                this.location.setOEFSURI(new URI(""));
+                        } catch (URISyntaxException e1) {
+                                e1.printStackTrace();
+                        }
+                        e.printStackTrace();
+                }
+        }
+
+        public void setName(String name) {
+                this.name = name;
+        }
+
+        public IHost getConnection() {
+                if (connection == null && RemoteHelper.isInitialized(getOriginalURI())) {
+                        connection = RemoteHelper.getRemoteConnectionForURI(location.getOriginalURI(), new NullProgressMonitor());
+                }
+                return connection;
+        }
+
+        public void setConnection(IHost connection) {
+                this.connection = connection;
+        }
+
+        public IRemoteServices getRemoteServices() {
+                return remoteServices;
+        }
+
+        public void setRemoteServices(IRemoteServices remoteServices) {
+                this.remoteServices = remoteServices;
+        }
+
+        public IFileService getFileService(IProgressMonitor monitor){
+                try {
+                        if (!RemoteHelper.isInitialized(getOriginalURI()))
+                                return null;
+                        return RemoteHelper.getConnectedRemoteFileService(connection, monitor);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        return null;
+                }
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/model/YoctoHostFile.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/model/YoctoHostFile.java
new file mode 100644
index 0000000..7113efb
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/model/YoctoHostFile.java
@@ -0,0 +1,326 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Intel Corporation.
+ * 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:
+ * Ioana Grigoropol(Intel) - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.model;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileInfo;
+import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
+import org.eclipse.rse.services.files.IFileService;
+import org.eclipse.rse.services.files.IHostFile;
+import org.yocto.bc.ui.filesystem.Messages;
+import org.yocto.bc.ui.filesystem.OEFile;
+import org.yocto.bc.ui.filesystem.Policy;
+import org.yocto.remote.utils.RemoteHelper;
+
+public class YoctoHostFile implements IHostFile{
+        private IHostFile file;
+        private final URI fileURI;
+        private ProjectInfo projectInfo;
+        private IFileService fileService;
+
+        public YoctoHostFile(ProjectInfo pInfo, URI fileURI, IProgressMonitor monitor) throws SystemMessageException {
+                this.projectInfo = pInfo;
+                this.fileURI = fileURI;
+                String path = fileURI.getPath();
+                fileService = projectInfo.getFileService(monitor);
+                file = RemoteHelper.getRemoteHostFile(projectInfo.getConnection(), path, monitor);
+        }
+
+        public YoctoHostFile(ProjectInfo projectInfo, URI uri) {
+                this.fileURI = uri;
+                this.projectInfo = projectInfo;
+        }
+
+        public IHostFile getFile() {
+                return file;
+        }
+        public void setFile(IHostFile file) {
+                this.file = file;
+        }
+        public ProjectInfo getProjectInfo() {
+                return projectInfo;
+        }
+        public void setProjectInfo(ProjectInfo projectInfo) {
+                this.projectInfo = projectInfo;
+        }
+        @Override
+        public String getAbsolutePath() {
+                return file.getAbsolutePath();
+        }
+        @Override
+        public String getName() {
+                return file.getName();
+        }
+        public URI getProjectLocationURI() {
+                return projectInfo.getOriginalURI();
+        }
+        public URI getLocationURI() {
+                projectInfo.getOriginalURI().getPath().indexOf(file.getAbsolutePath());
+                return projectInfo.getOriginalURI();
+        }
+        @Override
+        public boolean isDirectory() {
+                return file.isDirectory();
+        }
+        @Override
+        public String getParentPath() {
+                return file.getParentPath();
+        }
+        public boolean copy(IFileStore destFileStore, IProgressMonitor monitor) {
+                IHostFile destFile;
+                try {
+                        OEFile oeFile = (OEFile)destFileStore;
+                        String parentPath = oeFile.getParentPath();
+                        destFile = fileService.createFile(parentPath, destFileStore.getName(), monitor);
+                        fileService.copy(file.getParentPath(), file.getName(), destFile.getParentPath(), destFile.getName(), monitor);
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                        return false;
+                }
+                return true;
+        }
+        @Override
+        public boolean exists() {
+                return file.exists();
+        }
+        @Override
+        public boolean canRead() {
+                return file.canRead();
+        }
+        @Override
+        public boolean canWrite() {
+                return file.canWrite();
+        }
+        @Override
+        public long getModifiedDate() {
+                return file.getModifiedDate();
+        }
+        @Override
+        public long getSize() {
+                return file.getSize();
+        }
+        @Override
+        public boolean isArchive() {
+                return file.isArchive();
+        }
+        @Override
+        public boolean isFile() {
+                return file.isFile();
+        }
+        @Override
+        public boolean isHidden() {
+                return file.isHidden();
+        }
+        @Override
+        public boolean isRoot() {
+                return file.isRoot();
+        }
+        @Override
+        public void renameTo(String newName) {
+                file.renameTo(newName);
+        }
+        public URI getParentFile() {
+                if (file.getParentPath().isEmpty())
+                        return null;
+                try {
+                        return new URI(fileURI.getScheme(), fileURI.getHost(), file.getParentPath(), fileURI.getFragment());
+                } catch (URISyntaxException e) {
+                        e.printStackTrace();
+                        return null;
+                }
+        }
+        public boolean delete(IProgressMonitor monitor) {
+                try {
+                        fileService.delete(file.getParentPath(), file.getName(), monitor);
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                        return false;
+                }
+                return true;
+        }
+
+        /**
+         * This method is called after a failure to modify a file or directory.
+         * Check to see if the parent is read-only and if so then
+         * throw an exception with a more specific message and error code.
+         *
+         * @param target The file that we failed to modify
+         * @param exception The low level exception that occurred, or <code>null</code>
+         * @throws CoreException A more specific exception if the parent is read-only
+         */
+        private void checkReadOnlyParent() throws CoreException {
+                String parent = file.getParentPath();
+                String parentOfParent = parent.substring(0, parent.lastIndexOf("/"));
+                IHostFile parentFile;
+                try {
+                        parentFile = fileService.getFile(parentOfParent, parent, new NullProgressMonitor());
+                        if (parentFile == null || !parentFile.canRead() || !parentFile.canWrite()) {
+                                String message = NLS.bind(Messages.readOnlyParent, parent);
+                                Policy.error(EFS.ERROR_PARENT_READ_ONLY, message, null);
+                        }
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                }
+
+        }
+
+        public void mkdir(int options) {
+                try {
+
+                        if (!file.isDirectory()) {
+                                file = fileService.createFolder(file.getParentPath(), file.getName(), new NullProgressMonitor());
+                                if (!file.isDirectory()) {
+                                        checkReadOnlyParent();
+                                        String message = NLS.bind(Messages.failedCreateWrongType, file.getAbsolutePath());
+                                        Policy.error(EFS.ERROR_WRONG_TYPE, message);
+                                }
+                        }
+                } catch (SystemMessageException e1) {
+                        e1.printStackTrace();
+                } catch (CoreException e) {
+                        e.printStackTrace();
+                }
+
+        }
+
+        public String[] getChildNames(IProgressMonitor monitor) {
+                if (file.isDirectory()) {
+                        IHostFile[] files;
+                        try {
+                                files = fileService.list(file.getAbsolutePath(), "*", IFileService.FILE_TYPE_FILES_AND_FOLDERS, monitor);
+                                ArrayList<String> names = new ArrayList<String>();
+
+                                for (IHostFile f : files) {
+                                        names.add(f.getName());
+                                }
+
+                                String[] arrNames = new String[names.size()];
+                                names.toArray(arrNames);
+                                return arrNames;
+                        } catch (SystemMessageException e) {
+                                e.printStackTrace();
+                        }
+                }
+                return  new String[]{};
+        }
+        public IHost getConnection() {
+                return projectInfo.getConnection();
+        }
+
+        public URI getChildURI(String name) {
+                try {
+                        return new URI(fileURI.getScheme(), fileURI.getHost(), fileService.getFile(file.getAbsolutePath(), name, null).getAbsolutePath(), fileURI.getFragment());
+                } catch (URISyntaxException e) {
+                        e.printStackTrace();
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                }
+                return null;
+        }
+        public File toLocalFile() {
+                //TODO
+                //fileService.getFile(file.getParentPath(), file.getName(), null);
+                return null;
+        }
+        public URI toURI() {
+                return fileURI;
+        }
+        public YoctoHostFile getChildHostFile(String name) {
+                try {
+                        return new YoctoHostFile(projectInfo, getChildURI(name), new NullProgressMonitor());
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                        return null;
+                }
+        }
+
+        public URI getChildURIformPath(IPath path) {
+                try {
+                        String fileName =  path.lastSegment();
+                        path = path.removeLastSegments(1);
+                        String newPath = fileService.getFile(file.getAbsolutePath() + "/" + path.toPortableString(), fileName, null).getAbsolutePath();
+                        return new URI(fileURI.getScheme(), fileURI.getHost(), newPath, fileURI.getFragment());
+                } catch (URISyntaxException e) {
+                        e.printStackTrace();
+                        return null;
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                        return null;
+                }
+        }
+
+        public void move(IFileStore destFile, IProgressMonitor monitor) {
+                try {
+                        fileService.move(file.getParentPath(), file.getName(), destFile.getParent().toURI().getPath(), destFile.getName(), monitor);
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                }
+        }
+
+        public OutputStream getOutputStream(int options, IProgressMonitor monitor) {
+                try {
+                        return fileService.getOutputStream(file.getParentPath(), file.getName(), options, monitor);
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                        return null;
+                }
+        }
+
+        public InputStream getInputStream(int options, IProgressMonitor monitor) {
+                try {
+                        return fileService.getInputStream(file.getParentPath(), file.getName(), false, monitor);
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                        return null;
+                }
+        }
+
+        public void putInfo(IFileInfo info, int options, IProgressMonitor monitor) {
+                try {
+                        if ((options & EFS.SET_LAST_MODIFIED) != 0)
+                                fileService.setLastModified(file.getParentPath(), file.getName(), info.getLastModified(), monitor);
+                } catch (SystemMessageException e) {
+                        e.printStackTrace();
+                }
+        }
+
+        public IFileService getFileService() {
+                return fileService;
+        }
+
+        public void setFileService(IFileService fileService) {
+                this.fileService = fileService;
+        }
+
+        @Override
+        public String toString() {
+                URI uri = this.projectInfo.getOriginalURI();
+                try {
+                        return new URI(uri.getScheme(), uri.getHost(), fileURI.getPath(), uri.getFragment()).toString();
+                } catch (URISyntaxException e) {
+                        return fileURI.toString();
+                }
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/perspectives/BitbakeCommanderPerspective.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/perspectives/BitbakeCommanderPerspective.java
new file mode 100644
index 0000000..b9ddcb6
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/perspectives/BitbakeCommanderPerspective.java
@@ -0,0 +1,89 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.perspectives;
+
+import org.eclipse.ui.IFolderLayout;
+import org.eclipse.ui.IPageLayout;
+import org.eclipse.ui.IPerspectiveFactory;
+import org.eclipse.ui.console.IConsoleConstants;
+
+import org.yocto.bc.ui.views.RecipeView;
+
+public class BitbakeCommanderPerspective implements IPerspectiveFactory {
+
+        private IPageLayout factory;
+
+        public BitbakeCommanderPerspective() {
+                super();
+        }
+
+        private void addActionSets() {
+                factory.addActionSet("org.yocto.bc.ui.actionSet");
+                factory.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET); // NON-NLS-1
+        }
+
+        private void addNewWizardShortcuts() {
+                factory.addNewWizardShortcut("org.yocto.bc.ui.wizards.NewRecipeWizard");// NON-NLS-1
+                //factory.addNewWizardShortcut("org.yocto.bc.ui.wizards.newproject.NewBBCProjectWizard");// NON-NLS-1
+                factory.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");// NON-NLS-1
+        }
+
+        private void addPerspectiveShortcuts() {
+                // factory.addPerspectiveShortcut("org.eclipse.team.ui.TeamSynchronizingPerspective");
+                // //NON-NLS-1
+                // factory.addPerspectiveShortcut("org.eclipse.team.cvs.ui.cvsPerspective");
+                // //NON-NLS-1
+                factory.addPerspectiveShortcut("org.eclipse.ui.resourcePerspective"); // NON-NLS-1
+        }
+
+        private void addViews() {
+                IFolderLayout bottom = factory.createFolder("bottomRight", // NON-NLS-1
+                                IPageLayout.BOTTOM, 0.75f, factory.getEditorArea());
+
+                bottom.addView(IPageLayout.ID_PROBLEM_VIEW);
+                bottom.addView("org.eclipse.team.ui.GenericHistoryView"); // NON-NLS-1
+                bottom.addPlaceholder(IConsoleConstants.ID_CONSOLE_VIEW);
+                
+                IFolderLayout topLeft = factory.createFolder("topLeft", // NON-NLS-1
+                                IPageLayout.LEFT, 0.25f, factory.getEditorArea());
+                topLeft.addView(IPageLayout.ID_RES_NAV);
+                //llu detach RecipeView
+                //topLeft.addView(RecipeView.ID_VIEW); // NON-NLS-1
+                
+        }
+
+        private void addViewShortcuts() {
+                // factory.addShowViewShortcut("org.eclipse.ant.ui.views.AntView");
+                // //NON-NLS-1
+                // factory.addShowViewShortcut("org.eclipse.team.ccvs.ui.AnnotateView");
+                // //NON-NLS-1
+                // factory.addShowViewShortcut("org.eclipse.pde.ui.DependenciesView");
+                // //NON-NLS-1
+                // factory.addShowViewShortcut("org.eclipse.jdt.junit.ResultView");
+                // //NON-NLS-1
+                factory.addShowViewShortcut("org.eclipse.team.ui.GenericHistoryView"); // NON-NLS-1
+                factory.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW);
+                // factory.addShowViewShortcut(JavaUI.ID_PACKAGES);
+                factory.addShowViewShortcut(IPageLayout.ID_RES_NAV);
+                // factory.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
+                // factory.addShowViewShortcut(IPageLayout.ID_OUTLINE);
+        }
+
+        public void createInitialLayout(IPageLayout factory) {
+                this.factory = factory;
+                addViews();
+                addActionSets();
+                addNewWizardShortcuts();
+                addPerspectiveShortcuts();
+                addViewShortcuts();
+        }
+
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/popup/actions/NewAction.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/popup/actions/NewAction.java
new file mode 100644
index 0000000..3bdf5d3
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/popup/actions/NewAction.java
@@ -0,0 +1,43 @@
+package org.yocto.bc.ui.popup.actions;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IActionDelegate;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+
+public class NewAction implements IObjectActionDelegate {
+
+        /**
+         * Constructor for Action1.
+         */
+        public NewAction() {
+                super();
+        }
+
+        /**
+         * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
+         */
+        public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+        }
+
+        /**
+         * @see IActionDelegate#run(IAction)
+         */
+        public void run(IAction action) {
+                Shell shell = new Shell();
+                MessageDialog.openInformation(
+                        shell,
+                        "Yocto Project BitBake Commander UI Plug-in",
+                        "New Action was executed.");
+        }
+
+        /**
+         * @see IActionDelegate#selectionChanged(IAction, ISelection)
+         */
+        public void selectionChanged(IAction action, ISelection selection) {
+        }
+
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/views/RecipeContentProvider.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/views/RecipeContentProvider.java
new file mode 100644
index 0000000..2346031
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/views/RecipeContentProvider.java
@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.views;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+import org.yocto.bc.bitbake.BBSession;
+import org.yocto.bc.ui.Activator;
+import org.yocto.bc.ui.builder.BitbakeCommanderNature;
+
+class RecipeContentProvider implements IStructuredContentProvider {
+        public void dispose() {
+        }
+
+        public Object[] getElements(Object parent) {
+                List recipes = new ArrayList();
+                IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+                IProjectNature nature = null;
+                for (int i = 0; i < projects.length; ++i) {
+                        try {
+                                if (projects[i].isOpen() && projects[i].hasNature(BitbakeCommanderNature.NATURE_ID)) {
+                                        recipes.addAll(getRecipesFromProject(projects[i]));
+                                }
+                        } catch (CoreException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        } catch (Exception e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                }
+
+                return recipes.toArray();
+        }
+
+        private Collection getRecipesFromProject(IProject project) throws Exception {
+                BBSession session = Activator.getBBSession(Activator.getProjInfo(project.getLocationURI()), null);
+                return session.getRecipeFiles(project);
+        }
+
+        public void inputChanged(Viewer v, Object oldInput, Object newInput) {
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/views/RecipeView.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/views/RecipeView.java
new file mode 100644
index 0000000..fdbd8e0
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/views/RecipeView.java
@@ -0,0 +1,165 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.views;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ViewPart;
+
+import org.yocto.bc.ui.editors.bitbake.BitBakeFileEditor;
+
+public class RecipeView extends ViewPart {
+        class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {
+                public Image getColumnImage(Object obj, int index) {
+                        return getImage(obj);
+                }
+
+                public String getColumnText(Object obj, int index) {
+
+                        if (obj instanceof IFile) {
+                                return ((IFile) obj).getName();
+                        }
+
+                        return getText(obj);
+                }
+
+                @Override
+                public Image getImage(Object obj) {
+                        return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
+                }
+        }
+        public static final String ID_VIEW = "org.yocto.bc.ui.views.RecipeView";
+private TableViewer viewer;
+        
+        /*      private Action action1;
+                private Action action2;
+        */      private Action doubleClickAction;
+
+        private void contributeToActionBars() {
+                IActionBars bars = getViewSite().getActionBars();
+                fillLocalPullDown(bars.getMenuManager());
+                fillLocalToolBar(bars.getToolBarManager());
+        }
+
+        @Override
+        public void createPartControl(Composite parent) {
+                viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
+                viewer.setContentProvider(new RecipeContentProvider());
+                viewer.setLabelProvider(new ViewLabelProvider());
+                viewer.setSorter(new ViewerSorter());
+                viewer.setInput(getViewSite());
+                makeActions();
+                hookContextMenu();
+                hookDoubleClickAction();
+                contributeToActionBars();
+        }
+
+        private void fillContextMenu(IMenuManager manager) {
+/*              manager.add(action1);
+                manager.add(action2);
+*/              // Other plug-ins can contribute there actions here
+                manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+        }
+
+        private void fillLocalPullDown(IMenuManager manager) {
+/*              manager.add(action1);
+                manager.add(new Separator());
+                manager.add(action2);
+*/      }
+
+        private void fillLocalToolBar(IToolBarManager manager) {
+/*              manager.add(action1);
+                manager.add(action2);
+*/      }
+
+        private void hookContextMenu() {
+                MenuManager menuMgr = new MenuManager("#PopupMenu");
+                menuMgr.setRemoveAllWhenShown(true);
+                menuMgr.addMenuListener(new IMenuListener() {
+                        public void menuAboutToShow(IMenuManager manager) {
+                                RecipeView.this.fillContextMenu(manager);
+                        }
+                });
+                Menu menu = menuMgr.createContextMenu(viewer.getControl());
+                viewer.getControl().setMenu(menu);
+                getSite().registerContextMenu(menuMgr, viewer);
+        }
+
+        private void hookDoubleClickAction() {
+                viewer.addDoubleClickListener(new IDoubleClickListener() {
+                        public void doubleClick(DoubleClickEvent event) {
+                                doubleClickAction.run();
+                        }
+                });
+        }
+
+        private void makeActions() {
+/*              action1 = new Action() {
+                        public void run() {
+                        }
+                };
+                action1.setText("Action 1");
+                action1.setToolTipText("Action 1 tooltip");
+                action1.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
+
+                action2 = new Action() {
+                        public void run() {
+                        }
+                };
+                action2.setText("Action 2");
+                action2.setToolTipText("Action 2 tooltip");
+                action2.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
+*/              doubleClickAction = new Action() {
+                        @Override
+                        public void run() {
+                                ISelection selection = viewer.getSelection();
+                                Object obj = ((IStructuredSelection) selection).getFirstElement();
+
+                                if (obj instanceof IFile) {
+                                        try {
+                                                RecipeView.this.getViewSite().getPage().openEditor(new FileEditorInput((IFile) obj), BitBakeFileEditor.EDITOR_ID);
+                                        } catch (PartInitException e) {
+                                                // TODO Auto-generated catch block
+                                                e.printStackTrace();
+                                        }
+                                }
+                        }
+                };
+        }
+
+        @Override
+        public void setFocus() {
+                viewer.getControl().setFocus();
+        }
+}
\ No newline at end of file
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/BitbakeRecipeUIElement.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/BitbakeRecipeUIElement.java
new file mode 100644
index 0000000..c8eea71
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/BitbakeRecipeUIElement.java
@@ -0,0 +1,153 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Intel Corporation.
+ * 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:
+ * Intel - initial API and implementation
+ * Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.wizards;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.widgets.Text;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+
+public class BitbakeRecipeUIElement {
+        
+        private String container;
+        private String file;
+        private String description;
+        private String license;
+        private String checksum;
+        private String homepage;
+        private String author;
+        private String section;
+        private String srcuri;
+        private String md5sum;
+        private String sha256sum;
+        private URI metaDir;
+        private ArrayList inheritance;
+
+        public BitbakeRecipeUIElement()
+        {
+                this.container = "";
+                this.file = "";
+                this.description = "";
+                this.license = "";
+                this.checksum = "";
+                this.homepage = "";
+                this.author = "";
+                this.section = "";
+                this.srcuri = "";
+                this.md5sum = "";
+                this.sha256sum = "";
+                this.inheritance = new ArrayList();
+                try {
+                        this.metaDir = new URI("");
+                } catch (URISyntaxException e) {
+                        e.printStackTrace();
+                }
+        }
+
+        public String getContainer() {
+                return container;
+        }
+        public void setContainer(String value) {
+                this.container = value;
+        }
+        public String getFile() {
+                return file;
+        }
+        public void setFile(String value) {
+                this.file = value;
+        }
+        public String getDescription() {
+                return description;
+        }
+        
+        public void setDescription(String value) {
+                this.description = value;
+        }
+        
+        public String getLicense() {
+                return license;
+        }
+        
+        public void setLicense(String value) {
+                this.license = value;
+        }
+        
+        public String getChecksum() {
+                return checksum;
+        }
+        public void setChecksum(String value) {
+                this.checksum = value;
+        }
+        
+        public String getHomePage() {
+                return homepage;
+        }
+        
+        public void setHomePage(String value) {
+                this.homepage = value;
+        }
+        
+        public String getAuthor() {
+                return author;
+        }
+        
+        public void setAuthor(String value) {
+                this.author = value;
+        }
+        
+        public String getSection() {
+                return section;
+        }
+        public void setSection(String value) {
+                this.section = value;
+        }
+        public String getSrcuri() {
+                return srcuri;
+        }
+        public void setSrcuri(String value) {
+                this.srcuri = value;
+        }
+        
+        public String getMd5sum() {
+                return md5sum;
+        }
+        
+        public void setMd5sum(String value) {
+                this.md5sum = value;
+        }
+        
+        public String getsha256sum() {
+                return sha256sum;
+        }
+        
+        public void setSha256sum(String value) {
+                this.sha256sum = value;
+        }
+        
+        public ArrayList<String> getInheritance() {
+                return inheritance;
+        }
+        
+        public void setInheritance(ArrayList<String> value) {
+                this.inheritance = value;
+        }
+        
+        public URI getMetaDir() {
+                return metaDir;
+        }
+        
+        public void setMetaDir(URI value) {
+                metaDir = value;
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/FiniteStateWizard.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/FiniteStateWizard.java
new file mode 100644
index 0000000..8b47498
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/FiniteStateWizard.java
@@ -0,0 +1,56 @@
+package org.yocto.bc.ui.wizards;

+import java.util.Map;

+

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.swt.widgets.Composite;

+

+

+

+public abstract class FiniteStateWizard extends Wizard {

+    private boolean finishable = false;

+    private boolean canFinish = false;

+

+    public FiniteStateWizard() {                

+    }

+    

+    public abstract boolean performFinish();

+

+    /**

+     * @return Returns if the wizard is finishable in its current state.

+     */

+    public boolean isFinishable() {

+        return finishable;

+    }

+    /**

+     * @param finishable Change the finish state of the wizard.

+     */

+    public void setFinishable(boolean finishable) {

+        this.finishable = finishable;

+    }

+    

+    /* (non-Javadoc)

+     * @see org.eclipse.jface.wizard.IWizard#createPageControls(org.eclipse.swt.widgets.Composite)

+     */

+    public void createPageControls(Composite pageContainer) {

+        super.createPageControls(pageContainer);        

+    }

+

+    /*

+     * (non-Javadoc) Method declared on IWizard.

+     */

+    public boolean canFinish() {

+      if (canFinish)

+        return true;

+      return super.canFinish();

+    }

+    

+    public void setCanFinish(boolean canFinish) {

+      this.canFinish = canFinish;

+    }

+    

+    /**

+     * Retrive the model object from the wizard.

+     * @return

+     */

+    public abstract Map getModel();

+}

diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/FiniteStateWizardPage.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/FiniteStateWizardPage.java
new file mode 100644
index 0000000..a83a389
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/FiniteStateWizardPage.java
@@ -0,0 +1,149 @@
+package org.yocto.bc.ui.wizards;

+import java.util.Map;

+

+import org.eclipse.jface.viewers.ISelectionChangedListener;

+import org.eclipse.jface.viewers.SelectionChangedEvent;

+import org.eclipse.jface.wizard.WizardPage;

+import org.eclipse.swt.events.ModifyEvent;

+import org.eclipse.swt.events.ModifyListener;

+import org.eclipse.swt.events.SelectionEvent;

+import org.eclipse.swt.events.SelectionListener;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Event;

+import org.eclipse.swt.widgets.Listener;

+

+public abstract class FiniteStateWizardPage extends WizardPage {

+    protected Map model = null;

+    protected FiniteStateWizard wizard = null;

+    private static boolean previousState = false;

+    /**

+     * @param pageName

+     */

+    protected FiniteStateWizardPage(String name, Map model) {

+        super(name);

+        this.model = model;

+        this.setPageComplete(false);

+    }

+

+    /*

+     * (non-Javadoc)

+     * 

+     * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)

+     */

+    public abstract void createControl(Composite parent);

+

+    protected void setModelWizard() {

+        if (wizard == null) {

+            wizard = (FiniteStateWizard)FiniteStateWizardPage.this.getWizard();

+        }

+    }

+    

+    /**

+     * Add page validation logic here. Returning <code>true</code> means that

+     * the page is complete and the user can go to the next page.

+     * 

+     * @return

+     */

+    protected abstract boolean validatePage();

+

+    /**

+     * This method should be implemented by ModelWizardPage classes. This method

+     * is called after the <code>validatePage()</code> returns successfully.

+     * Update the model with the contents of the controls on the page.

+     */

+    protected abstract void updateModel();

+

+    /**

+     * Helper method to see if a field has some sort of text in it.

+     * @param value

+     * @return

+     */

+    protected boolean hasContents(String value) {

+        if (value == null || value.length() == 0) {

+            return false;

+        } 

+        

+        return true;

+    }

+    

+    /**

+     * This method is called right before a page is displayed.

+     * This occurs on user action (Next/Back buttons).

+     */

+    public abstract void pageDisplay();

+    

+        /**

+         * This method is called on the concrete WizardPage after the user has

+         * gone to the page after.

+         */

+        public abstract void pageCleanup();

+        

+        /* (non-Javadoc)

+         * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)

+         */

+        public void setVisible(boolean arg0) {

+            

+                if (!arg0 && previousState) {

+                        pageCleanup();

+                } else if (arg0 && !previousState) {

+                        pageDisplay();

+                } else if (arg0 && previousState) {

+                        pageDisplay();

+                }

+                

+                previousState = arg0;

+                

+                super.setVisible(arg0);

+        }

+        

+    public class ValidationListener implements SelectionListener, ModifyListener, Listener, ISelectionChangedListener {

+

+        /*

+         * (non-Javadoc)

+         * 

+         * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)

+         */

+        public void widgetSelected(SelectionEvent e) {

+            validate();

+        }

+

+        /*

+         * (non-Javadoc)

+         * 

+         * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)

+         */

+        public void widgetDefaultSelected(SelectionEvent e) {

+        }

+

+        /*

+         * (non-Javadoc)

+         * 

+         * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)

+         */

+        public void modifyText(ModifyEvent e) {

+            validate();

+        }

+

+        public void validate() {                       

+            if (validatePage()) {

+                updateModel();

+                setPageComplete(true);

+                return;

+            }

+

+            setPageComplete(false);

+        }

+

+        /* (non-Javadoc)

+         * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)

+         */

+        public void handleEvent(Event event) {

+            

+            validate();

+        }

+

+        public void selectionChanged(SelectionChangedEvent event) {

+            validate();

+        }

+    }

+}

diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/NewBitBakeFileRecipeWizard.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/NewBitBakeFileRecipeWizard.java
new file mode 100644
index 0000000..3a2ac71
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/NewBitBakeFileRecipeWizard.java
@@ -0,0 +1,231 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Jessica Zhang (Intel) - Extend to support auto-fill base on src_uri value
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.wizards;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWizard;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+
+import org.yocto.bc.bitbake.BBLanguageHelper;
+import org.yocto.bc.ui.Activator;
+import org.yocto.bc.ui.model.ProjectInfo;
+import org.yocto.remote.utils.RemoteHelper;
+import org.yocto.remote.utils.YoctoCommand;
+
+public class NewBitBakeFileRecipeWizard extends Wizard implements INewWizard {
+        private NewBitBakeFileRecipeWizardPage page;
+        private ISelection selection;
+        private IHost connection;
+
+        public NewBitBakeFileRecipeWizard() {
+                super();
+                setNeedsProgressMonitor(true);
+        }
+
+        @Override
+        public void addPages() {
+                page = new NewBitBakeFileRecipeWizardPage(selection, connection);
+                addPage(page);
+        }
+
+        private void doFinish(BitbakeRecipeUIElement element, IProgressMonitor monitor) throws CoreException {
+                String fileName = element.getFile();
+                monitor.beginTask("Creating " + fileName, 2);
+                IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+                IResource resource = root.findMember(new Path(element.getContainer()));
+                if (!resource.exists() || !(resource instanceof IContainer)) {
+                        throwCoreException("Container \"" + element.getContainer() + "\" does not exist.");
+                }
+                IContainer container = (IContainer) resource;
+                
+                // If the extension wasn't specified, assume .bb
+                if (!fileName.endsWith(".bb") && !fileName.endsWith(".inc") && !fileName.endsWith(".conf")) {
+                        fileName = fileName + ".bb";
+                }
+                
+                final IFile file = container.getFile(new Path(fileName));
+                try {
+                        InputStream stream = openContentStream(element);
+                        if (file.exists()) {
+                                file.setContents(stream, true, true, monitor);
+                        } else {
+                                file.create(stream, true, monitor);
+                        }
+                        stream.close();
+                } catch (IOException e) {
+                }
+                monitor.worked(1);
+                monitor.setTaskName("Opening file for editing...");
+                getShell().getDisplay().asyncExec(new Runnable() {
+                        public void run() {
+                                IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+                                try {
+                                        IDE.openEditor(page, file, true);
+                                } catch (PartInitException e) {
+                                }
+                        }
+                });
+                monitor.worked(1);
+        }
+
+        /**
+         * We will accept the selection in the workbench to see if we can initialize
+         * from it.
+         * 
+         * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
+         */
+        public void init(IWorkbench workbench, IStructuredSelection selection) {
+                this.selection = selection;
+                if (selection instanceof IStructuredSelection) {
+                        Object element = selection.getFirstElement();
+
+                        if (element instanceof IResource) {
+                                IProject p = ((IResource)element).getProject();
+                                try {
+                                        ProjectInfo projInfo = Activator.getProjInfo(p.getLocationURI());
+                                        this.connection = projInfo.getConnection();
+                                } catch (CoreException e) {
+                                        e.printStackTrace();
+                                } catch (InvocationTargetException e) {
+                                        e.printStackTrace();
+                                } catch (InterruptedException e) {
+                                        e.printStackTrace();
+                                }
+
+                        }
+                }
+        }
+
+        /**
+         * We will initialize file contents with a sample text.
+         * @param srcuri 
+         * @param author 
+         * @param homepage 
+         * @param license 
+         * @param description 
+         * @param fileName 
+         * @param newPage 
+         */
+
+        private InputStream openContentStream(BitbakeRecipeUIElement element) {
+                
+                StringBuffer sb = new StringBuffer();
+                
+                sb.append("DESCRIPTION = \"" + element.getDescription() + "\"\n");
+                
+                if (element.getAuthor().length() > 0) {
+                        sb.append("AUTHOR = \"" + element.getAuthor() + "\"\n");
+                }
+
+                if (element.getHomePage().length() > 0) {
+                        sb.append("HOMEPAGE = \"" + element.getHomePage() + "\"\n");
+                }
+                
+                if (element.getSection().length() > 0) {
+                        sb.append("SECTION = \"" + element.getSection() + "\"\n");
+                }
+                
+                if (element.getLicense().length() > 0) {
+                        sb.append("LICENSE = \"" + element.getLicense() + "\"\n");
+                }
+
+                if (element.getChecksum().length() > 0) {
+                        sb.append("LIC_FILES_CHKSUM = \"" + element.getChecksum() + "\"\n");
+                }
+                
+                if (element.getSrcuri().length() > 0) {
+                        sb.append("SRC_URI = \"" + element.getSrcuri() + "\"\n");
+                }
+                
+                if (element.getMd5sum().length() > 0) {
+                        sb.append("SRC_URI[md5sum] = \"" + element.getMd5sum() + "\"\n");
+                }
+        
+                if (element.getsha256sum().length() > 0) {
+                        sb.append("SRC_URI[sha256sum] = \"" + element.getsha256sum() + "\"\n");
+                }
+                
+                ArrayList<String> inheritance = element.getInheritance();
+                if (!inheritance.isEmpty()) {
+                        Object ia[] = inheritance.toArray();
+                        String inheritance_str = "inherit ";
+                        for(int i=0; i<ia.length; i++)
+                                inheritance_str += ((String) ia[i]) + " ";
+                        sb.append(inheritance_str); 
+                }
+                sb.append("\n");
+
+                return new ByteArrayInputStream(sb.toString().getBytes());
+        }
+
+        @Override
+        public boolean performFinish() {
+                final BitbakeRecipeUIElement element = page.populateUIElement();
+                
+                IRunnableWithProgress op = new IRunnableWithProgress() {
+                        public void run(IProgressMonitor monitor) throws InvocationTargetException {
+                                try {
+                                        doFinish(element, monitor);
+                                        RemoteHelper.handleRunCommandRemote(connection, new YoctoCommand("rm -rf " + element.getMetaDir() + "/temp", "", ""), monitor);
+                                } catch (Exception e) {
+                                        throw new InvocationTargetException(e);
+                                } finally {
+                                        monitor.done();
+                                }
+                        }
+                };
+                try {
+                        getContainer().run(true, false, op);
+                } catch (InterruptedException e) {
+                        return false;
+                } catch (InvocationTargetException e) {
+                        Throwable realException = e.getTargetException();
+                        MessageDialog.openError(getShell(), "Error", realException.getMessage());
+                        return false;
+                }
+                return true;
+        }
+
+        private void throwCoreException(String message) throws CoreException {
+                IStatus status = new Status(IStatus.ERROR, "org.yocto.bc.ui", IStatus.OK, message, null);
+                throw new CoreException(status);
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/NewBitBakeFileRecipeWizardPage.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/NewBitBakeFileRecipeWizardPage.java
new file mode 100644
index 0000000..3bdcffd
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/NewBitBakeFileRecipeWizardPage.java
@@ -0,0 +1,592 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Jessica Zhang (Intel) - Extend to support auto-fill base on src_uri value
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.wizards;
+
+import java.util.List;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.services.files.IFileService;
+import org.eclipse.rse.services.files.IHostFile;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.ContainerSelectionDialog;
+import org.yocto.bc.ui.Activator;
+import org.yocto.bc.ui.model.ProjectInfo;
+import org.yocto.remote.utils.ProcessStreamBuffer;
+import org.yocto.remote.utils.RemoteHelper;
+import org.yocto.remote.utils.YoctoCommand;
+
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Set;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.regex.Pattern;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.FilenameFilter;
+import java.security.MessageDigest;
+import java.lang.reflect.InvocationTargetException;
+import java.math.BigInteger;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+public class NewBitBakeFileRecipeWizardPage extends WizardPage {
+        private Text containerText;
+        private Text fileText;
+        
+        private Text descriptionText;
+        private Text licenseText;
+        private Text checksumText;
+        private Text homepageText;
+        private Text authorText;
+        private Text sectionText;
+        private Text txtSrcURI;
+        private Text md5sumText;
+        private Text sha256sumText;
+        private Button btnPopulate;
+
+        private BitbakeRecipeUIElement element;
+        
+        private ISelection selection;
+        private URI metaDirLoc;
+        private ArrayList inheritance;
+        private final IHost connection;
+
+        private String tempFolderPath;
+        private String srcFileNameExt;
+        private String srcFileName;
+
+        public static final String TEMP_FOLDER_NAME = "temp";
+        public static final String TAR_BZ2_EXT = ".tar.bz2";
+        public static final String TAR_GZ_EXT = ".tar.gz";
+        public static final String HTTP = "http";
+        public static final String FTP ="ftp";
+        public static final String BB_RECIPE_EXT =".bb";
+        private static final String COPYING_FILE = "COPYING";
+
+        private static final String CMAKE_LIST = "cmakelists.txt";
+        private static final String CMAKE = "cmake";
+        private static final String SETUP_SCRIPT = "setup.py";
+        private static final String DISUTILS = "disutils";
+        private static final String CONFIGURE_IN = "configure.in";
+        private static final String CONFIGURE_AC = "configure.ac";
+        private static final String AUTOTOOLS = "autotools";
+
+        private static final String md5Pattern = "^[0-9a-f]{32}$";
+        protected static final String sha256Pattern = "^[0-9a-f]{64}$";
+
+        private static final String MIRRORS_FILE = "mirrors.bbclass";
+        private static final String CLASSES_FOLDER = "classes";
+
+        private HashMap<String, String> mirrorTable;
+        private URI extractDir;
+
+        protected ProcessStreamBuffer md5Buffer;
+        protected ProcessStreamBuffer sha256Buffer;
+        protected ProcessStreamBuffer md5CopyingBuffer;
+
+        public NewBitBakeFileRecipeWizardPage(ISelection selection, IHost connection) {
+                super("wizardPage");
+                setTitle("BitBake Recipe");
+                setDescription("Create a new BitBake recipe.");
+                this.selection = selection;
+                this.connection = connection;
+                element = new BitbakeRecipeUIElement();
+                inheritance = new ArrayList();
+        }
+
+        public void createControl(Composite parent) {
+                final Composite container = new Composite(parent, SWT.NULL);
+                GridLayout layout = new GridLayout();
+                container.setLayout(layout);
+                layout.numColumns = 3;
+                layout.verticalSpacing = 9;
+
+                Label label = new Label(container, SWT.NULL);
+                GridData gd = new GridData();
+                gd.horizontalSpan = 3;
+                label.setLayoutData(gd);
+
+                label = new Label(container, SWT.NULL);
+                label.setText("Recipe &Directory:");
+
+                containerText = new Text(container, SWT.BORDER | SWT.SINGLE);
+                gd = new GridData(GridData.FILL_HORIZONTAL);
+                containerText.setLayoutData(gd);
+                containerText.addModifyListener(new ModifyListener() {
+                        public void modifyText(ModifyEvent e) {
+                                dialogChanged();
+                        }
+                });
+
+                Button buttonBrowse = new Button(container, SWT.PUSH);
+                buttonBrowse.setText("Browse...");
+                buttonBrowse.addSelectionListener(new SelectionAdapter() {
+                        @Override
+                        public void widgetSelected(SelectionEvent e) {
+                                handleBrowse(container, containerText);
+                        }
+                });
+                
+                label = new Label(container, SWT.NULL);
+                gd = new GridData();
+                gd.horizontalSpan = 3;
+                label.setLayoutData(gd);
+                
+                label = new Label(container, SWT.NULL);
+                label.setText("SRC_&URI:");
+
+                txtSrcURI = new Text(container, SWT.BORDER | SWT.SINGLE);
+                gd = new GridData(GridData.FILL_HORIZONTAL);
+                txtSrcURI.setLayoutData(gd);
+                txtSrcURI.addModifyListener(new ModifyListener() {
+                        public void modifyText(ModifyEvent e) {
+                                if (txtSrcURI.getText().trim().isEmpty()) {
+                                        if (btnPopulate != null)
+                                                btnPopulate.setEnabled(false);
+                                } else if (btnPopulate != null){
+                                        btnPopulate.setEnabled(true);
+                                }
+                                dialogChanged();
+                        }
+                });
+
+                btnPopulate = new Button(container, SWT.PUSH);
+                btnPopulate.setText("Populate...");
+                btnPopulate.setEnabled(false);
+                btnPopulate.addSelectionListener(new SelectionAdapter() {
+                        @Override
+                        public void widgetSelected(SelectionEvent e) {
+                                handlePopulate();
+                        }
+                });
+
+                createField(container, "&Recipe Name:", (fileText = new Text(container, SWT.BORDER | SWT.SINGLE)));
+                createField(container, "SRC_URI[&md5sum]:", (md5sumText = new Text(container, SWT.BORDER | SWT.SINGLE)));
+                createField(container, "SRC_URI[&sha256sum]:", (sha256sumText = new Text(container, SWT.BORDER | SWT.SINGLE)));
+                createField(container, "License File &Checksum:", (checksumText = new Text(container, SWT.BORDER | SWT.SINGLE)));
+                createField(container, "&Package Description:", (descriptionText = new Text(container, SWT.BORDER | SWT.SINGLE)));
+                createField(container, "&License:", (licenseText = new Text(container, SWT.BORDER | SWT.SINGLE)));
+                
+                createField(container, "&Homepage:", (homepageText = new Text(container, SWT.BORDER | SWT.SINGLE)));
+                createField(container, "Package &Author:", (authorText = new Text(container, SWT.BORDER | SWT.SINGLE)));
+                createField(container, "&Section:", (sectionText = new Text(container, SWT.BORDER | SWT.SINGLE)));
+
+                initialize();
+                dialogChanged();
+                setControl(container);
+        }
+
+        private void createField(Composite container, String title, Text control) {
+                Label label = new Label(container, SWT.NONE);
+                label.setText(title);
+                label.moveAbove(control);
+        
+                GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+                gd.horizontalSpan = 2;
+                control.setLayoutData(gd);
+                control.addModifyListener(new ModifyListener() {
+
+                        public void modifyText(ModifyEvent e) {
+                                dialogChanged();
+                        }
+
+                });
+        }
+
+        private void dialogChanged() {
+                String containerName = containerText.getText();
+                IResource container = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(containerName));
+                String fileName = fileText.getText();
+
+                if (containerName.length() == 0) {
+                        updateStatus("Directory must be specified");
+                        return;
+                }
+        
+                if (container == null || (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
+                        updateStatus("File container must exist");
+                        return;
+                }
+                if (!container.isAccessible()) {
+                        updateStatus("Project must be writable");
+                        return;
+                }
+                
+                IProject project = container.getProject();
+                ProjectInfo projInfo = null;
+                try {
+                        projInfo = Activator.getProjInfo(project.getLocationURI());
+                } catch (InvocationTargetException e) {
+                        e.printStackTrace();
+                } catch (CoreException e) {
+                        e.printStackTrace();
+                } catch (InterruptedException e) {
+                        e.printStackTrace();
+                }
+                metaDirLoc = RemoteHelper.createNewURI(projInfo.getOriginalURI(), "meta");
+        
+                if (fileName.length() == 0) {
+                        updateStatus("File name must be specified");
+                        return;
+                }
+                if (fileName.contains(" ")) {
+                        updateStatus("File name must be valid with no space in it");
+                        return;
+                }
+                if (fileName.replace('\\', '/').indexOf('/', 1) > 0) {
+                        updateStatus("File name must be valid");
+                        return;
+                }
+
+                if (descriptionText.getText().length() == 0) {
+                        updateStatus("Recipe must have a description");
+                        return;
+                }
+                
+                if (licenseText.getText().length() == 0) {
+                        updateStatus("Recipe must have a license");
+                        return;
+                }
+
+                if (txtSrcURI.getText().length() == 0) {
+                        updateStatus("SRC_URI can't be empty");
+                }
+                
+                updateStatus(null);
+        }
+
+        public BitbakeRecipeUIElement populateUIElement() {
+                element.setAuthor(authorText.getText());
+                element.setChecksum(checksumText.getText());
+                element.setContainer(containerText.getText());
+                element.setDescription(descriptionText.getText());
+                element.setFile(fileText.getText());
+                element.setHomePage(homepageText.getText());
+                element.setLicense(licenseText.getText());
+                element.setMd5sum(md5sumText.getText());
+                element.setSection(sectionText.getText());
+                element.setSha256sum(sha256sumText.getText());
+                element.setSrcuri(txtSrcURI.getText());
+                element.setInheritance(inheritance);
+                element.setMetaDir(metaDirLoc);
+                
+                return element;
+        }
+        
+        private void handleBrowse(final Composite parent, final Text text) {
+                ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), false, "Select project directory");
+                if (dialog.open() == Window.OK) {
+                        Object[] result = dialog.getResult();
+                        if (result.length == 1) {
+                                text.setText(((Path) result[0]).toString());
+                        }
+                }
+        }
+        
+        private void handlePopulate() {
+                try {
+                        IProgressMonitor monitor = new NullProgressMonitor();
+                        URI srcURI = new URI(txtSrcURI.getText().trim());
+                        String scheme = srcURI.getScheme();
+                        this.srcFileNameExt = getSrcFileName(true);
+                        this.srcFileName = getSrcFileName(false);
+                        if ((scheme.equals(HTTP) || scheme.equals(FTP))
+                                        && (srcFileNameExt.endsWith(TAR_GZ_EXT) || srcFileNameExt.endsWith(TAR_BZ2_EXT))) {
+                                handleRemotePopulate(srcURI, monitor);
+                        } else {
+                                String packageName = srcFileName.replace("-", "_");
+                                fileText.setText(packageName + BB_RECIPE_EXT);
+
+                                handleLocalPopulate(srcURI, monitor);
+                        }
+                } catch (URISyntaxException e) {
+                        e.printStackTrace();
+                } catch (InvocationTargetException e) {
+                        e.printStackTrace();
+                } catch (InterruptedException e) {
+                        e.printStackTrace();
+                }
+        }
+
+        private String getSrcFileName(boolean withExt){
+                URI srcURI;
+                try {
+                        srcURI = new URI(txtSrcURI.getText().trim());
+                        String path = srcURI.getPath();
+                        String fileName = path.substring(path.lastIndexOf("/") + 1);
+                        if (withExt)
+                                return fileName;
+                        else {
+                                if (fileName.endsWith(TAR_BZ2_EXT)) {
+                                        return fileName.substring(0, fileName.indexOf(TAR_BZ2_EXT));
+                                } else if(fileName.endsWith(TAR_GZ_EXT)){
+                                        return fileName.substring(0, fileName.indexOf(TAR_GZ_EXT));
+                                }
+                        }
+                } catch (URISyntaxException e) {
+                        e.printStackTrace();
+                }
+                return "";
+        }
+        private void handleRemotePopulate(final URI srcURI, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+                populateRecipeName();
+                
+                this.getContainer().run(true, true, new IRunnableWithProgress() {
+
+                        @Override
+                        public void run(IProgressMonitor monitor) throws InvocationTargetException,
+                                        InterruptedException {
+                                monitor.beginTask("Populating recipe fields ... ", 100);
+                                try {
+                                        String metaDirLocPath = metaDirLoc.getPath();
+                                        monitor.subTask("Cleaning environment");
+                                        YoctoCommand rmYCmd = new YoctoCommand("rm -rf " + TEMP_FOLDER_NAME, metaDirLocPath, "");
+                                        RemoteHelper.handleRunCommandRemote(connection, rmYCmd, new SubProgressMonitor(monitor, 5));
+                
+                                        YoctoCommand mkdirYCmd = new YoctoCommand( "mkdir " + TEMP_FOLDER_NAME, metaDirLocPath, "");
+                                        RemoteHelper.handleRunCommandRemote(connection, mkdirYCmd, new SubProgressMonitor(monitor, 5));
+                
+                                        updateTempFolderPath();
+                                        monitor.worked(10);
+                
+                                        monitor.subTask("Downloading package sources");
+                
+                                        updateTempFolderPath();
+                
+                                        YoctoCommand wgetYCmd = new YoctoCommand("wget " + srcURI.toURL(), tempFolderPath, "");
+                                        RemoteHelper.handleRunCommandRemote(connection, wgetYCmd, new SubProgressMonitor(monitor, 40));
+                
+                                        monitor.worked(50);
+                
+                                        monitor.subTask("Compute package checksums");
+                                        String md5Cmd = "md5sum " + srcFileNameExt;
+                                        YoctoCommand md5YCmd = new YoctoCommand(md5Cmd, tempFolderPath, "");
+                
+                                        RemoteHelper.handleRunCommandRemote(connection, md5YCmd, new SubProgressMonitor(monitor, 10));
+                                        md5Buffer =  md5YCmd.getProcessBuffer();
+                
+                                        monitor.worked(60);
+                
+                                        String sha256Cmd = "sha256sum " + srcFileNameExt;
+                                        YoctoCommand sha256YCmd = new YoctoCommand(sha256Cmd, tempFolderPath, "");
+                                        RemoteHelper.handleRunCommandRemote(connection, sha256YCmd, new SubProgressMonitor(monitor, 10));
+                                        sha256Buffer = sha256YCmd.getProcessBuffer();
+                
+                                        monitor.worked(70);
+                
+                                        monitor.subTask("Extracting package");
+                                        extractDir = extractPackage(srcURI, new SubProgressMonitor(monitor, 0));
+                                        monitor.worked(80);
+                
+                                        YoctoCommand licenseChecksumCmd = populateLicenseFileChecksum(extractDir, new SubProgressMonitor(monitor, 10));
+                                        md5CopyingBuffer =      licenseChecksumCmd.getProcessBuffer();
+                
+                                        monitor.subTask("Creating mirror lookup table");
+                                        mirrorTable = createMirrorLookupTable(new SubProgressMonitor(monitor, 10));
+                
+                                        monitor.worked(90);
+                                        monitor.done();
+                                } catch (Exception e) {
+                                        e.printStackTrace();
+                                }
+                        }
+                });
+                updateSrcUri(mirrorTable, srcURI);
+                populateInheritance(extractDir, monitor);
+
+                String md5Val = md5Buffer.getOutputLineContaining(srcFileNameExt, md5Pattern);
+                md5sumText.setText(Pattern.matches(md5Pattern,  md5Val) ? md5Val : "");
+                String sha256Val = sha256Buffer.getOutputLineContaining(srcFileNameExt, sha256Pattern);
+                sha256sumText.setText(Pattern.matches(sha256Pattern,  sha256Val) ? sha256Val : "");
+                String checkSumVal =  md5CopyingBuffer.getOutputLineContaining(COPYING_FILE, md5Pattern);
+                checksumText.setText(RemoteHelper.createNewURI(extractDir, COPYING_FILE).toString() + ";md5=" + (Pattern.matches(md5Pattern,  checkSumVal) ? checkSumVal : ""));
+        }
+        
+        private void updateTempFolderPath(){
+                this.tempFolderPath = getMetaFolderPath() + TEMP_FOLDER_NAME + "/";
+        }
+
+        private String getMetaFolderPath(){
+                String sep = metaDirLoc.getPath().endsWith("/")? "" : "/";
+                return metaDirLoc.getPath() + sep;
+        }
+
+        private void handleLocalPopulate(URI srcURI, IProgressMonitor monitor) {
+                populateLicenseFileChecksum(srcURI, monitor);
+                populateInheritance(srcURI, monitor);
+        }
+
+        private URI extractPackage(URI srcURI, IProgressMonitor monitor) {
+                try {
+                        String path = srcFileNameExt;
+                        String tarCmd = "tar ";
+                        if (path.endsWith(TAR_BZ2_EXT)) {
+                                tarCmd += "-zxvf ";
+                        } else if(path.endsWith(TAR_GZ_EXT)){
+                                tarCmd += "-xvf ";
+                        }
+
+                        RemoteHelper.handleRunCommandRemote(connection, new YoctoCommand(tarCmd + path, tempFolderPath, ""), monitor);
+
+                        return RemoteHelper.createNewURI(metaDirLoc, TEMP_FOLDER_NAME + "/" + srcFileName);
+
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+                return null;
+        }
+        
+        private void populateInheritance(URI extractDir, IProgressMonitor monitor) {
+                IHostFile[] hostFiles = RemoteHelper.getRemoteDirContent(connection, metaDirLoc.getPath(), "", IFileService.FILE_TYPE_FILES, monitor);
+                if (hostFiles == null)
+                        return;
+
+                for (IHostFile file: hostFiles) {
+                        String fileName = file.getName();
+                        if (fileName.equalsIgnoreCase(CMAKE_LIST)){
+                                inheritance.add(CMAKE);
+                        } else if (fileName.equalsIgnoreCase(SETUP_SCRIPT)) {
+                                inheritance.add(DISUTILS);
+                        } else if (fileName.equalsIgnoreCase(CONFIGURE_AC) || file.getName().equalsIgnoreCase(CONFIGURE_IN)) {
+                                inheritance.add(AUTOTOOLS);
+                        }
+                }
+        }
+        
+        private YoctoCommand populateLicenseFileChecksum(URI extractDir, IProgressMonitor monitor) {
+                if (extractDir == null)
+                        throw new RuntimeException("Something went wrong during source extraction!");
+
+                try {
+                        YoctoCommand catCmd = new YoctoCommand("md5sum " + COPYING_FILE, extractDir.getPath(), "");
+                        RemoteHelper.handleRunCommandRemote(connection, catCmd, monitor);
+                        return catCmd;
+                } catch (Exception e) {
+                        throw new RuntimeException("Unable to process file for MD5 calculation", e);
+                }
+
+        }
+
+        private HashMap<String, String> createMirrorLookupTable(IProgressMonitor monitor) throws Exception {
+                HashMap<String, String> mirrorMap = new HashMap<String, String>();
+
+                YoctoCommand cmd = new YoctoCommand("cat " + MIRRORS_FILE, getMetaFolderPath() + CLASSES_FOLDER, "");
+                RemoteHelper.handleRunCommandRemote(connection, cmd, monitor);
+
+                if (!cmd.getProcessBuffer().hasErrors()){
+                        String delims = "[\\t]+";
+                        List<String> outputLines = cmd.getProcessBuffer().getOutputLines();
+                        for (String outLine : outputLines) {
+                                String[] tokens = outLine.split(delims);
+                                if (tokens.length < 2)
+                                        continue;
+                                String endingStr = " \\n \\";
+                                int idx = tokens[1].lastIndexOf(endingStr);
+                                String key = tokens[1].substring(0, idx);
+                                mirrorMap.put(key, tokens[0]);
+                        }
+                }
+                return mirrorMap;
+        }
+        
+        private void populateRecipeName() {
+                String fileName = fileText.getText();
+                if (!fileName.isEmpty())
+                        return;
+
+                String recipeFile = srcFileName.replace("-", "_");
+                recipeFile += BB_RECIPE_EXT;
+                if (recipeFile != null)
+                        fileText.setText(recipeFile);
+        }
+        
+        private void updateSrcUri(HashMap<String, String> mirrorsMap, URI srcUri) {
+                Set<String> mirrors = mirrorsMap.keySet();
+                Iterator<String> iter = mirrors.iterator();
+                String mirror_key = null;
+                String srcURL = srcUri.toString();
+
+                while (iter.hasNext()) {
+                        String value = iter.next();
+                        if (srcURL.startsWith(value)) {
+                                mirror_key = value;
+                                break;
+                        }
+                }
+
+                if (mirror_key != null) {
+                        String replace_string = mirrorsMap.get(mirror_key);
+                        if (replace_string != null)
+                                srcURL = replace_string + srcURL.substring(mirror_key.length());
+                }
+                int idx = srcURL.lastIndexOf("-");
+                String new_src_uri = srcURL.substring(0, idx)+"-${PV}" + TAR_GZ_EXT;
+                txtSrcURI.setText(new_src_uri);
+        }
+        
+        private void initialize() {
+                if (selection != null && selection.isEmpty() == false && selection instanceof IStructuredSelection) {
+                        IStructuredSelection ssel = (IStructuredSelection) selection;
+                        if (ssel.size() > 1)
+                                return;
+                        Object obj = ssel.getFirstElement();
+                        if (obj instanceof IResource) {
+                                IContainer container;
+                                if (obj instanceof IContainer)
+                                        container = (IContainer) obj;
+                                else
+                                        container = ((IResource) obj).getParent();
+                                containerText.setText(container.getFullPath().toString());
+                        }
+                }
+        }
+
+        private void updateStatus(String message) {
+                setErrorMessage(message);
+                setPageComplete(message == null);
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/importProject/BBCProjectPage.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/importProject/BBCProjectPage.java
new file mode 100644
index 0000000..71ea70c
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/importProject/BBCProjectPage.java
@@ -0,0 +1,236 @@
+/*****************************************************************************
+ * Copyright (c) 2009 Ken Gilmer
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.wizards.importProject;
+
+import java.io.File;
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+
+import org.yocto.bc.ui.wizards.FiniteStateWizardPage;
+
+/**
+ * Main property page for new project wizard.
+ * @author kgilmer
+ *
+ */
+public class BBCProjectPage extends FiniteStateWizardPage {
+
+        private class FileOpenSelectionAdapter extends SelectionAdapter {
+                @Override
+                public void widgetSelected(SelectionEvent e) {
+                        FileDialog fd = new FileDialog(PlatformUI.getWorkbench()
+                                        .getDisplay().getActiveShell(), SWT.OPEN);
+
+                        fd.setText("Open Configuration Script");
+                        fd.setFilterPath(txtProjectLocation.getText());
+
+                        String selected = fd.open();
+
+                        if (selected != null) {
+                                txtInit.setText(selected);
+                                updateModel();
+                        }
+                }
+        }
+        public static final String PAGE_TITLE = "Yocto Project BitBake Commander Project";
+        private Text txtProjectLocation;
+
+        private Text txtInit;
+        private ValidationListener validationListener;
+        private Text txtProjectName;
+
+        public BBCProjectPage(Map model) {
+                super(PAGE_TITLE, model);
+                setTitle("Create new Yocto Project BitBake Commander project");
+                setMessage("Enter information to create a BitBake Commander project.");
+        }
+
+        public void createControl(Composite parent) {
+                GridData gdFillH = new GridData(GridData.FILL_HORIZONTAL);
+                GridData gdVU = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
+                
+                Composite top = new Composite(parent, SWT.NONE);
+                top.setLayoutData(new GridData(GridData.FILL_BOTH));
+                top.setLayout(new GridLayout());
+
+                Composite projectNameComp = new Composite(top, SWT.NONE);
+                GridData gdProjName = new GridData(GridData.FILL_HORIZONTAL);
+                projectNameComp.setLayoutData(gdProjName);
+                projectNameComp.setLayout(new GridLayout(2, false));
+                Label lblProjectName = new Label(projectNameComp, SWT.NONE);
+                lblProjectName.setText("N&ame:");
+
+                txtProjectName = new Text(projectNameComp, SWT.BORDER);
+                txtProjectName.setLayoutData(gdFillH);
+                txtProjectName.setFocus();
+                validationListener = new ValidationListener();
+                
+                txtProjectName.addModifyListener(validationListener);
+
+                Label lblProjectLocation = new Label(projectNameComp, SWT.None);
+                lblProjectLocation.setText("&Location:");
+
+                Composite locComposite = new Composite(projectNameComp, SWT.NONE);
+                GridData gd = new GridData(GridData.VERTICAL_ALIGN_END
+                                | GridData.FILL_HORIZONTAL);
+                gd.horizontalIndent = 0;
+                locComposite.setLayoutData(gd);
+                GridLayout gl = new GridLayout(2, false);
+                gl.marginWidth = 0;
+                locComposite.setLayout(gl);
+
+                txtProjectLocation = new Text(locComposite, SWT.BORDER);
+                txtProjectLocation.setLayoutData(gdFillH);
+                txtProjectLocation.addModifyListener(validationListener);
+
+                Button button = new Button(locComposite, SWT.PUSH);
+                button.setText("Browse...");
+                button.addSelectionListener(new SelectionAdapter() {
+                        @Override
+                        public void widgetSelected(SelectionEvent e) {
+                                handleBrowse();
+                        }
+                });
+
+                Label lblInit = new Label(projectNameComp, SWT.NONE);
+                lblInit.setText("Init Script:");
+
+                Composite initComposite = new Composite(projectNameComp, SWT.NONE);
+                gd = new GridData(GridData.VERTICAL_ALIGN_END
+                                | GridData.FILL_HORIZONTAL);
+                gd.horizontalIndent = 0;
+                initComposite.setLayoutData(gd);
+                gl = new GridLayout(2, false);
+                gl.marginWidth = 0;
+                initComposite.setLayout(gl);
+
+                txtInit = new Text(initComposite, SWT.BORDER);
+                GridData gdi = new GridData(GridData.FILL_HORIZONTAL);
+                txtInit.setLayoutData(gdi);
+                txtInit.addModifyListener(validationListener);
+
+                Button btnLoadInit = new Button(initComposite, SWT.PUSH);
+                btnLoadInit.setLayoutData(gdVU);
+                btnLoadInit.setText("Choose...");
+                btnLoadInit.addSelectionListener(new FileOpenSelectionAdapter());
+
+                if (System.getenv("OEROOT") != null) {
+                        txtProjectLocation.setText(System.getenv("OEROOT"));
+                }
+
+                setControl(top);
+        }
+
+        private void handleBrowse() {
+                DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.None);
+                String dir = dialog.open();
+                if (dir != null) {
+                        txtProjectLocation.setText(dir);
+                }
+        }
+
+        private String getFileSegment(String initScriptPath) {
+                //return the first segment of " " seperated array, or full string if no " " exists
+                return initScriptPath.split(" ")[0];
+        }
+
+        private boolean isValidProjectName(String projectName) {
+                if (projectName.indexOf('$') > -1) {
+                        return false;
+                }
+
+                return true;
+        }
+
+
+        @Override
+        public void pageCleanup() {
+                // TODO Auto-generated method stub
+                
+        }
+
+        @Override
+        public void pageDisplay() {
+                // TODO Auto-generated method stub
+                
+        }
+
+        @Override
+        protected void updateModel() {
+                model.put(ImportYoctoProjectWizard.KEY_NAME, txtProjectName.getText());
+                model.put(ImportYoctoProjectWizard.KEY_LOCATION, txtProjectLocation.getText());
+                model.put(ImportYoctoProjectWizard.KEY_INITPATH, txtInit.getText());
+        }
+        
+
+        @Override
+        protected boolean validatePage() {
+                IWorkspaceRoot wsroot = ResourcesPlugin.getWorkspace().getRoot();
+
+                IStatus validate = ResourcesPlugin.getWorkspace().validateName(txtProjectName.getText(), IResource.PROJECT);
+
+                if (!validate.isOK() || !isValidProjectName(txtProjectName.getText())) {
+                        setErrorMessage("Invalid project name: " + txtProjectName.getText());
+                        return false;
+                }
+
+                IProject proj = wsroot.getProject(txtProjectName.getText());
+                if (proj.exists()) {
+                        setErrorMessage("A project with the name " + txtProjectName.getText()
+                                        + " already exists");
+                        return false;
+                }
+
+                if (txtProjectLocation.getText().trim().length() == 0) {
+                        setErrorMessage("Set directory that contains Poky tree");
+                        return false;
+                }
+
+                File f = new File(txtProjectLocation.getText());
+                if (!f.exists() || !f.isDirectory()) {
+                        setErrorMessage("Invalid Directory");
+                        return false;
+                }
+                
+                if (txtInit.getText().length() == 0) {
+                        setErrorMessage("Set configuration file before BitBake is launched.");
+                        return false;
+                }
+                
+                File f2 = new File(getFileSegment(txtInit.getText()));
+                if (!f2.exists() || f2.isDirectory()) {
+                        setErrorMessage("The configuration file is invalid.");
+                        return false;
+                }
+
+                setErrorMessage(null);
+                setMessage("All the entries are valid, press \"Finish\" to create the new yocto bitbake project,"+
+                "this will take a while. Please don't interrupt till there's output in the Yocto Console window...");
+                return true;
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/importProject/ImportYoctoProjectWizard.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/importProject/ImportYoctoProjectWizard.java
new file mode 100644
index 0000000..75f1763
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/importProject/ImportYoctoProjectWizard.java
@@ -0,0 +1,166 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Intel Corporation.
+ * 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:
+ * Intel - initial API and implementation
+ * Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.wizards.importProject;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.net.URI;
+import java.util.Hashtable;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsole;
+import org.eclipse.ui.console.IConsoleConstants;
+import org.eclipse.ui.console.IConsoleManager;
+import org.eclipse.ui.console.IConsoleView;
+import org.eclipse.ui.console.MessageConsole;
+import org.yocto.bc.ui.Activator;
+import org.yocto.bc.ui.model.ProjectInfo;
+import org.yocto.bc.ui.wizards.FiniteStateWizard;
+import org.yocto.bc.ui.wizards.newproject.BBConfigurationInitializeOperation;
+import org.yocto.bc.ui.wizards.newproject.CreateBBCProjectOperation;
+
+public class ImportYoctoProjectWizard extends FiniteStateWizard  implements IImportWizard {
+        protected final static String KEY_OEROOT = "OEROOT";
+        public static final String KEY_NAME = "NAME";
+        public static final String KEY_LOCATION = "LOCATION";
+        public static final String KEY_INITPATH = "INITPATH";
+        protected static final String KEY_PINFO = "PINFO";
+        
+        private Map projectModel;
+        private IWorkbench workbench;
+        private IStructuredSelection selection;
+        
+        private MessageConsole myConsole;
+        
+        public ImportYoctoProjectWizard() {
+                projectModel = new Hashtable();
+        }
+        
+        public Map getModel() {
+                return projectModel;
+        }
+        
+        @Override
+        public void addPages() {
+                addPage(new BBCProjectPage(projectModel));
+                //addPage(new ConsolePage(projectModel));
+        }
+
+        
+        public boolean performFinish() {
+                ProjectInfo pinfo = new ProjectInfo();
+                pinfo.setInitScriptPath((String) projectModel.get(ImportYoctoProjectWizard.KEY_INITPATH));
+                pinfo.setLocationURI((URI) projectModel.get(ImportYoctoProjectWizard.KEY_LOCATION));
+                pinfo.setName((String) projectModel.get(ImportYoctoProjectWizard.KEY_NAME));
+                
+                try {
+                        ConsoleWriter cw = new ConsoleWriter();
+                        this.getContainer().run(false, false, new BBConfigurationInitializeOperation(pinfo, cw));
+                        myConsole.newMessageStream().println(cw.getContents());
+                } catch (Exception e) {
+                        Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, e.getMessage(), e));
+                        this.getContainer().getCurrentPage().setDescription("Failed to create project: " + e.getMessage());
+                        //valid = false;
+                        //setPageComplete(valid);
+                        return false;
+                } 
+                
+                //valid = true;
+                projectModel.put(ImportYoctoProjectWizard.KEY_PINFO, pinfo);
+                //setPageComplete(valid);
+                //ProjectInfo pinfo = (ProjectInfo) projectModel.get(KEY_PINFO);
+                Activator.putProjInfo(pinfo.getOEFSURI(), pinfo);
+                try {
+                        getContainer().run(false, false, new CreateBBCProjectOperation(pinfo));
+                } catch (Exception e) {
+                        Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, e.getMessage(), e));
+                        this.getContainer().getCurrentPage().setDescription("Failed to create project: " + e.getMessage());
+                        return false;
+                } 
+                
+                return true;
+        }
+
+        public void init(IWorkbench workbench, IStructuredSelection selection) {
+                this.workbench = workbench;
+                this.selection = selection;
+                this.setNeedsProgressMonitor(true);
+                setWindowTitle("BitBake Commander Project");
+                
+                myConsole = findConsole("Yocto Console");
+                IWorkbench wb = PlatformUI.getWorkbench();
+                IWorkbenchWindow win = wb.getActiveWorkbenchWindow();
+                IWorkbenchPage page = win.getActivePage();
+                String id = IConsoleConstants.ID_CONSOLE_VIEW;
+                try {
+                        IConsoleView view = (IConsoleView) page.showView(id);
+                        view.display(myConsole);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+        }
+                
+                private MessageConsole findConsole(String name) {
+                        ConsolePlugin plugin = ConsolePlugin.getDefault();
+                        IConsoleManager conMan = plugin.getConsoleManager();
+                        IConsole[] existing = conMan.getConsoles();
+                        for (int i = 0; i < existing.length; i++)
+                                if (name.equals(existing[i].getName()))
+                                        return (MessageConsole) existing[i];
+                        // no console found, so create a new one
+                        MessageConsole myConsole = new MessageConsole(name, null);
+                        conMan.addConsoles(new IConsole[] { myConsole });
+                        return myConsole;
+                }
+                
+                private class ConsoleWriter extends Writer {
+
+                        private StringBuffer sb;
+
+                        public ConsoleWriter() {
+                                sb = new StringBuffer();
+                        }
+                        @Override
+                        public void close() throws IOException {                        
+                        }
+                        
+                        public String getContents() {
+                                return sb.toString();
+                        }
+
+                        @Override
+                        public void flush() throws IOException {
+                        }
+
+                        @Override
+                        public void write(char[] cbuf, int off, int len) throws IOException {
+                                //txtConsole.getText().concat(new String(cbuf));
+                                sb.append(cbuf);
+                        }
+                        
+                        @Override
+                        public void write(String str) throws IOException {
+                                sb.append(str);
+                        }
+                        
+                }
+        
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/BBCRemoteProjectContentsLocationArea.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/BBCRemoteProjectContentsLocationArea.java
new file mode 100644
index 0000000..6d7c440
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/BBCRemoteProjectContentsLocationArea.java
@@ -0,0 +1,371 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Intel Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Intel - Initial API and implementation
+ *******************************************************************************/
+package org.yocto.bc.ui.wizards.install;
+
+import java.net.URI;
+
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.operation.IRunnableContext;
+import org.eclipse.ptp.rdt.ui.wizards.RemoteProjectContentsLocationArea;
+import org.eclipse.ptp.remote.core.IRemoteFileManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
+import org.eclipse.ui.internal.ide.dialogs.IDEResourceInfoUtils;
+
+import java.net.URI;
+
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.operation.IRunnableContext;
+import org.eclipse.ptp.rdt.ui.messages.Messages;
+//import org.eclipse.ptp.rdt.ui.serviceproviders.RemoteBuildServiceProvider;
+//import org.eclipse.ptp.rdt.core.serviceproviders.
+import org.eclipse.ptp.remote.core.IRemoteConnection;
+import org.eclipse.ptp.remote.core.IRemoteFileManager;
+import org.eclipse.ptp.remote.core.IRemoteServices;
+import org.eclipse.ptp.remote.ui.IRemoteUIConnectionManager;
+import org.eclipse.ptp.remote.ui.IRemoteUIConstants;
+import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
+import org.eclipse.ptp.remote.ui.IRemoteUIServices;
+import org.eclipse.ptp.remote.ui.RemoteUIServices;
+import org.eclipse.ptp.remote.ui.widgets.RemoteConnectionWidget;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
+import org.eclipse.ui.internal.ide.dialogs.IDEResourceInfoUtils;
+
+
+public class BBCRemoteProjectContentsLocationArea {
+
+        /**
+         * IErrorMessageReporter is an interface for type that allow message
+         * reporting.
+         * 
+         */
+        public interface IErrorMessageReporter {
+                /**
+                 * Report the error message
+                 * 
+                 * @param errorMessage
+                 *            String or <code>null</code>. If the errorMessage is null
+                 *            then clear any error state.
+                 * @param infoOnly
+                 *            the message is an informational message, but the dialog
+                 *            cannot continue
+                 * 
+                 */
+                public void reportError(String errorMessage, boolean infoOnly);
+        }
+
+        private static final String FILE_SCHEME = "file"; //$NON-NLS-1$
+
+        private IProject fExistingProject;
+
+        private final IErrorMessageReporter fErrorReporter;
+        
+        private final IRunnableContext fContext;
+
+        //private RemoteBuildServiceProvider fProvider;
+
+        private IRemoteConnection fSelectedConnection;
+
+        private String fProjectName = IDEResourceInfoUtils.EMPTY_STRING;
+
+        private Button fBrowseButton;
+
+        private Text fLocationText;
+        
+        private RemoteConnectionWidget fRemoteConnectionWidget;
+
+        // public RemoteProjectContentsLocationArea(IServiceProvider provider,
+        // Composite composite) {
+        // if(provider instanceof RemoteBuildServiceProvider)
+        // fProvider = (RemoteBuildServiceProvider) provider;
+        // else
+        // throw new IllegalArgumentException(); // should never happen
+        // createContents(composite);
+        // }
+        /**
+         * @since 3.1
+         */
+        public BBCRemoteProjectContentsLocationArea(IErrorMessageReporter reporter, Composite composite, IRunnableContext context) {
+                fErrorReporter = reporter;
+                fContext = context;
+                createContents(composite);
+        }
+
+        /**
+         * Check if the entry in the widget location is valid. If it is valid return
+         * null. Otherwise return a string that indicates the problem.
+         * 
+         * @return String
+         */
+        public String checkValidLocation() {
+
+                String locationFieldContents = fLocationText.getText();
+                if (locationFieldContents.length() == 0) {
+                        return IDEWorkbenchMessages.WizardNewProjectCreationPage_projectLocationEmpty;
+                }
+
+                URI newPath = getProjectLocationURI();
+                if (newPath == null) {
+                        return IDEWorkbenchMessages.ProjectLocationSelectionDialog_locationError;
+                }
+
+                if (fExistingProject != null) {
+                        URI projectPath = fExistingProject.getLocationURI();
+                        if (projectPath != null && URIUtil.equals(projectPath, newPath)) {
+                                return IDEWorkbenchMessages.ProjectLocationSelectionDialog_locationIsSelf;
+                        }
+                }
+
+                return null;
+        }
+
+        /**
+         * Return the browse button. Usually referenced in order to set the layout
+         * data for a dialog.
+         * 
+         * @return Button
+         */
+        public Button[] getButtons() {
+                return new Button[] { fBrowseButton, fRemoteConnectionWidget.getButton() };
+        }
+
+        /**
+         * Returns the name of the selected connection.
+         */
+        public IRemoteConnection getConnection() {
+                return fSelectedConnection;
+        }
+
+        /**
+         * Return the location for the project.
+         * 
+         * @return String
+         */
+        public String getProjectLocation() {
+                return fLocationText.getText();
+        }
+
+        /**
+         * Get the URI for the location field if possible.
+         * 
+         * @return URI or <code>null</code> if it is not valid.
+         */
+        public URI getProjectLocationURI() {
+                if (fSelectedConnection == null)
+                        return null;
+                return fSelectedConnection.getRemoteServices().getFileManager(fSelectedConnection).toURI(fLocationText.getText());
+        }
+
+        public IRemoteConnection getRemoteConnection() {
+                return fSelectedConnection;
+        }
+
+        public IRemoteServices getRemoteServices() {
+                if (fSelectedConnection != null)
+                        return fSelectedConnection.getRemoteServices();
+                return null;
+        }
+
+        /**
+         * Return whether or not we are currently showing the default location for
+         * the project.
+         * 
+         * @return boolean
+         */
+        public boolean isDefault() {
+                // return useDefaultsButton.getSelection();
+                return false;
+        }
+
+        /**
+         * Set the project to base the contents off of.
+         * 
+         * @param existingProject
+         */
+        public void setExistingProject(IProject existingProject) {
+                fProjectName = existingProject.getName();
+                fExistingProject = existingProject;
+        }
+
+        /**
+         * Set the text to the default or clear it if not using the defaults.
+         * 
+         * @param newName
+         *            the name of the project to use. If <code>null</code> use the
+         *            existing project name.
+         */
+        public void updateProjectName(String newName) {
+                fProjectName = newName;
+                if (isDefault()) {
+                        fLocationText.setText(getDefaultPathDisplayString());
+                }
+
+        }
+
+        /**
+         * Attempt to open a connection.
+         */
+        private void checkConnection() {
+                IRemoteUIConnectionManager mgr = getUIConnectionManager();
+                if (mgr != null) {
+                        mgr.openConnectionWithProgress(fRemoteConnectionWidget.getShell(), fContext, fSelectedConnection);
+                }
+        }
+
+        /**
+         * Return the path we are going to display. If it is a file URI then remove
+         * the file prefix.
+         * 
+         * Only do this if the connection is open. Otherwise we will attempt to
+         * connect to the first machine in the list, which is annoying.
+         * 
+         * @return String
+         */
+        private String getDefaultPathDisplayString() {
+                if (getRemoteConnection() != null && getRemoteConnection().isOpen()) {
+                        IRemoteFileManager fileMgr = fSelectedConnection.getRemoteServices().getFileManager(getRemoteConnection());
+                        URI defaultURI = fileMgr.toURI(getRemoteConnection().getWorkingDirectory());
+
+                        // Handle files specially. Assume a file if there is no project to
+                        // query
+                        if (defaultURI != null && defaultURI.getScheme().equals(FILE_SCHEME)) {
+                                return Platform.getLocation().append(fProjectName).toOSString();
+                        }
+                        if (defaultURI == null) {
+                                return ""; //$NON-NLS-1$
+                        }
+                        return new Path(defaultURI.getPath()).append(fProjectName).toOSString();
+                }
+                return ""; //$NON-NLS-1$
+        }
+
+        /**
+         * @return
+         */
+        private IRemoteUIConnectionManager getUIConnectionManager() {
+                IRemoteUIConnectionManager connectionManager = RemoteUIServices.getRemoteUIServices(fSelectedConnection.getRemoteServices())
+                                .getUIConnectionManager();
+                return connectionManager;
+        }
+
+        private void handleConnectionSelected() {
+                fSelectedConnection = fRemoteConnectionWidget.getConnection();
+                fLocationText.setText(getDefaultPathDisplayString());
+        }
+
+        protected Control createContents(Composite parent) {
+                Group container = new Group(parent, SWT.SHADOW_ETCHED_IN);
+
+                GridLayout layout = new GridLayout();
+                layout.numColumns = 3;
+                container.setLayout(layout);
+                GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
+                container.setLayoutData(gd);
+                
+                fRemoteConnectionWidget = new RemoteConnectionWidget(container, SWT.NONE, null, RemoteConnectionWidget.FLAG_FORCE_PROVIDER_SELECTION, null);
+                gd = new GridData();
+                gd.horizontalSpan = 3;
+                fRemoteConnectionWidget.setLayoutData(gd);
+                fRemoteConnectionWidget.addSelectionListener(new SelectionAdapter() {
+                        @Override
+                        public void widgetSelected(SelectionEvent e) {
+                                handleConnectionSelected();
+                        }
+                });
+
+                Label locationLabel = new Label(container, SWT.LEFT);
+                locationLabel.setText(Messages.getString("RemoteProjectContentsLocationArea.3")); //$NON-NLS-1$
+
+                fLocationText = new Text(container, SWT.SINGLE | SWT.BORDER);
+                gd = new GridData(GridData.FILL_HORIZONTAL);
+                gd.horizontalSpan = 1;
+                gd.grabExcessHorizontalSpace = true;
+                gd.widthHint = 250;
+                fLocationText.setLayoutData(gd);
+                fLocationText.addModifyListener(new ModifyListener() {
+                        public void modifyText(ModifyEvent e) {
+                                fErrorReporter.reportError(checkValidLocation(), false);
+                        }
+                });
+
+                // new connection button
+                fBrowseButton = new Button(container, SWT.PUSH);
+                fBrowseButton.setText(Messages.getString("RemoteProjectContentsLocationArea.4")); //$NON-NLS-1$
+                fBrowseButton.addSelectionListener(new SelectionAdapter() {
+                        @Override
+                        public void widgetSelected(SelectionEvent e) {
+                                if (fSelectedConnection != null) {
+                                        checkConnection();
+                                        if (fSelectedConnection.isOpen()) {
+                                                IRemoteUIServices remoteUIServices = RemoteUIServices.getRemoteUIServices(fSelectedConnection.getRemoteServices());
+                                                if (remoteUIServices != null) {
+                                                        IRemoteUIFileManager fileMgr = remoteUIServices.getUIFileManager();
+                                                        if (fileMgr != null) {
+                                                                fileMgr.setConnection(fSelectedConnection);
+                                                                String correctPath = fLocationText.getText();
+                                                                String selectedPath = fileMgr.browseDirectory(
+                                                                                fLocationText.getShell(),
+                                                                                Messages.getString("RemoteProjectContentsLocationArea.5", fSelectedConnection.getName()), correctPath, IRemoteUIConstants.NONE); //$NON-NLS-1$
+                                                                if (selectedPath != null) {
+                                                                        fLocationText.setText(selectedPath);
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+                });
+
+                return container;
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see org.eclipse.jface.dialogs.Dialog#okPressed()
+         */
+        protected void okPressed() {
+                // set the connection
+                //fProvider.setRemoteToolsConnection(fSelectedConnection);
+
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/InstallWizard.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/InstallWizard.java
new file mode 100644
index 0000000..f64401c
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/InstallWizard.java
@@ -0,0 +1,213 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Intel Corporation.
+ * 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:
+ * Intel - initial API and implementation
+ * Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.wizards.install;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Writer;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.IWizardContainer;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.ptp.remote.core.IRemoteConnection;
+import org.eclipse.ptp.remote.core.IRemoteServices;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWizard;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsole;
+import org.eclipse.ui.console.IConsoleConstants;
+import org.eclipse.ui.console.IConsoleManager;
+import org.eclipse.ui.console.IConsoleView;
+import org.eclipse.ui.console.MessageConsole;
+import org.eclipse.ui.console.MessageConsoleStream;
+import org.yocto.bc.remote.utils.YoctoRunnableWithProgress;
+import org.yocto.bc.ui.Activator;
+import org.yocto.bc.ui.model.ProjectInfo;
+import org.yocto.bc.ui.wizards.FiniteStateWizard;
+import org.yocto.bc.ui.wizards.newproject.BBConfigurationInitializeOperation;
+import org.yocto.bc.ui.wizards.newproject.CreateBBCProjectOperation;
+import org.yocto.remote.utils.CommandResponseHandler;
+import org.yocto.remote.utils.ICommandResponseHandler;
+import org.yocto.remote.utils.RemoteHelper;
+import org.yocto.remote.utils.YoctoCommand;
+import org.yocto.bc.remote.utils.ConsoleWriter;
+
+/**
+ * A wizard for installing a fresh copy of an OE system.
+ * 
+ * @author kgilmer
+ * 
+ * A Wizard for creating a fresh Yocto bitbake project and new poky build tree from git
+ * 
+ * @modified jzhang
+ * 
+ */
+public class InstallWizard extends FiniteStateWizard implements
+                IWorkbenchWizard {
+
+        static final String KEY_PINFO = "KEY_PINFO";
+        protected static final String OPTION_MAP = "OPTION_MAP";
+        protected static final String INSTALL_SCRIPT = "INSTALL_SCRIPT";
+        protected static final String INSTALL_DIRECTORY = "Install Directory";
+        protected static final String INIT_SCRIPT = "Init Script";
+
+        protected static final String SELECTED_CONNECTION = "SEL_CONNECTION";
+        protected static final String SELECTED_REMOTE_SERVICE = "SEL_REMOTE_SERVICE";
+
+        protected static final String PROJECT_NAME = "Project Name";
+        protected static final String DEFAULT_INIT_SCRIPT = "oe-init-build-env";
+        protected static final String DEFAULT_INSTALL_DIR = "~/yocto";
+        
+        protected static final String GIT_CLONE = "Git Clone";
+        public static final String VALIDATION_FILE = DEFAULT_INIT_SCRIPT;
+
+        private Map model;
+        private MessageConsole myConsole;
+        private OptionsPage optionsPage;
+
+        public InstallWizard() {
+                this.model = new Hashtable();
+                model.put(INSTALL_DIRECTORY, DEFAULT_INSTALL_DIR);
+                model.put(INIT_SCRIPT, DEFAULT_INIT_SCRIPT);
+                
+                setWindowTitle("Yocto Project BitBake Commander");
+                setNeedsProgressMonitor(true);
+        }
+
+
+
+        public InstallWizard(IStructuredSelection selection) {
+                model = new Hashtable();
+        }
+
+        /*
+         * @Override public IWizardPage getNextPage(IWizardPage page) { if (page
+         * instanceof WelcomePage) { if (model.containsKey(WelcomePage.ACTION_USE))
+         * { return bbcProjectPage; } } else if (page instanceof ProgressPage) {
+         * return bitbakePage; }
+         * 
+         * if (super.getNextPage(page) != null) { System.out.println("next page: " +
+         * super.getNextPage(page).getClass().getName()); } else {
+         * System.out.println("end page"); }
+         * 
+         * return super.getNextPage(page); }
+         * 
+         * @Override public boolean canFinish() { System.out.println("can finish: "
+         * + super.canFinish()); return super.canFinish(); }
+         */
+        @Override
+        public void addPages() {
+                optionsPage = new OptionsPage(model);
+                addPage(optionsPage);
+        }
+
+        @Override
+        public Map getModel() {
+                return model;
+        }
+
+        @Override
+        public boolean performFinish() {
+                WizardPage page = (WizardPage) getPage("Options");
+                page.setPageComplete(true);
+                Map<String, Object> options = model;
+
+                try {
+                        URI uri = new URI("");
+                        if (options.containsKey(INSTALL_DIRECTORY)) {
+                                uri = (URI) options.get(INSTALL_DIRECTORY);
+                        }
+                        IRemoteConnection remoteConnection = ((IRemoteConnection)model.get(InstallWizard.SELECTED_CONNECTION));
+                        IRemoteServices remoteServices = ((IRemoteServices)model.get(InstallWizard.SELECTED_REMOTE_SERVICE));
+                        IHost connection = RemoteHelper.getRemoteConnectionByName(remoteConnection.getName());
+                        CommandResponseHandler cmdHandler = new CommandResponseHandler(RemoteHelper.getConsole(connection));
+                        IWizardContainer container = this.getContainer();
+                        if (((Boolean)options.get(GIT_CLONE)).booleanValue()) {
+                                String cmd = "git clone --progress git://git.yoctoproject.org/poky.git " + uri.getPath();
+                                String taskName = "Checking out Yocto git repository";
+
+                                YoctoRunnableWithProgress adapter = new YoctoRunnableWithProgress(new YoctoCommand(cmd, "", ""));
+
+                                adapter.setRemoteConnection(remoteConnection);
+                                adapter.setRemoteServices(remoteServices);
+                                adapter.setTaskName(taskName);
+                                try {
+                                        container.run(true, true, adapter);
+                                } catch (InvocationTargetException e) {
+                                        e.printStackTrace();
+                                } catch (InterruptedException e) {
+                                        e.printStackTrace();
+                                }
+                        }
+                        if (!cmdHandler.hasError()) {
+                                String initPath = "";
+                                if (uri.getPath() != null) {
+                                         initPath = uri.getPath() + "/" + (String) options.get(INIT_SCRIPT);
+                                } else {
+                                        initPath = uri.getFragment() + "/" + (String) options.get(INIT_SCRIPT);
+                                }
+                                String prjName = (String) options.get(PROJECT_NAME);
+                                ProjectInfo pinfo = new ProjectInfo();
+                                pinfo.setInitScriptPath(initPath);
+                                pinfo.setLocationURI(uri);
+                                pinfo.setName(prjName);
+                                pinfo.setConnection(connection);
+                                pinfo.setRemoteServices(remoteServices);
+
+                                final ConsoleWriter cw = new ConsoleWriter();
+                                BBConfigurationInitializeOperation configInitOp = new BBConfigurationInitializeOperation(pinfo, null);
+                                container.run(false, false, configInitOp);
+                                myConsole = RemoteHelper.getConsole(connection);
+                                myConsole.newMessageStream().println(cw.getContents());
+
+                                if (configInitOp.hasErrorOccured()) {
+                                        optionsPage.setErrorMessage(configInitOp.getErrorMessage());
+                                        return false;
+                                }
+
+                                model.put(InstallWizard.KEY_PINFO, pinfo);
+                                Activator.putProjInfo(pinfo.getOEFSURI(), pinfo);
+
+                                container.run(false, false, new CreateBBCProjectOperation(pinfo));
+                                RemoteHelper.storeURIInMetaArea(pinfo.getProjectName(), uri);
+                                RemoteHelper.storeProjDescrInMetaArea(pinfo.getConnection(), pinfo.getProjectName(), pinfo.getOriginalURI().getPath());
+                                return true;
+                        }
+                } catch (Exception e) {
+                        Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
+                                        IStatus.ERROR, e.getMessage(), e));
+                        this.getContainer().getCurrentPage().setDescription(
+                                                        "Failed to create project: " + e.getMessage());
+                }
+                return false;
+        }
+
+        public void init(IWorkbench workbench, IStructuredSelection selection) {
+        }
+
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/OptionsPage.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/OptionsPage.java
new file mode 100644
index 0000000..75d9f99
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/OptionsPage.java
@@ -0,0 +1,327 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Intel Corporation.
+ * 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:
+ * Intel - initial API and implementation
+ * Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.wizards.install;
+
+import java.io.IOException;
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.ptp.rdt.ui.wizards.RemoteProjectContentsLocationArea;
+import org.eclipse.ptp.rdt.ui.wizards.RemoteProjectContentsLocationArea.IErrorMessageReporter;
+import org.eclipse.ptp.remote.core.IRemoteConnection;
+import org.eclipse.ptp.internal.remote.rse.core.RSEConnection;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.services.files.IFileService;
+import org.eclipse.rse.services.files.IHostFile;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+
+import org.yocto.bc.ui.wizards.FiniteStateWizard;
+import org.yocto.bc.ui.wizards.FiniteStateWizardPage;
+import org.yocto.bc.ui.wizards.FiniteStateWizardPage.ValidationListener;
+import org.yocto.remote.utils.RemoteHelper;
+
+/**
+ * Select which flavor of OE is to be installed.
+ * 
+ * @author kgilmer
+ * 
+ * Setting up the parameters for creating the new Yocto Bitbake project
+ * 
+ * @modified jzhang
+ */
+public class OptionsPage extends FiniteStateWizardPage {
+
+        public static final String URI_SEPARATOR = "/";
+        public static final String LOCALHOST = "LOCALHOST";
+
+        private Composite top;
+
+        private RemoteProjectContentsLocationArea locationArea;
+
+        private ValidationListener validationListener;
+        private Text txtProjectName;
+        private Button btnGit;
+
+        protected OptionsPage(Map model) {
+                super("Options", model);
+                //setTitle("Create new yocto bitbake project");
+                setMessage("Enter these parameters to create new Yocto Project BitBake commander project");
+        }
+
+        @Override
+        public void createControl(Composite parent) {
+                top = new Composite(parent, SWT.None);
+                top.setLayout(new GridLayout());
+                top.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+                GridData gdFillH = new GridData(GridData.FILL_HORIZONTAL);
+
+                Composite projectNameComp = new Composite(top, SWT.NONE);
+                GridData gdProjName = new GridData(GridData.FILL_HORIZONTAL);
+                projectNameComp.setLayoutData(gdProjName);
+                projectNameComp.setLayout(new GridLayout(2, false));
+                Label lblProjectName = new Label(projectNameComp, SWT.NONE);
+                lblProjectName.setText("Project N&ame:");
+
+                txtProjectName = new Text(projectNameComp, SWT.BORDER);
+                txtProjectName.setLayoutData(gdFillH);
+                txtProjectName.setFocus();
+                validationListener = new ValidationListener();
+                
+                txtProjectName.addModifyListener(validationListener);
+
+                IErrorMessageReporter errorReporter = new IErrorMessageReporter() {
+
+                        @Override
+                        public void reportError(String errorMessage, boolean infoOnly) {
+                                setMessage(errorMessage);
+                                if (validatePage()) {
+                        updateModel();
+                        setPageComplete(true);
+                        return;
+                    }
+
+                    setPageComplete(false);
+                        }
+                };
+
+                locationArea = new RemoteProjectContentsLocationArea(errorReporter, top, null);
+
+                btnGit = new Button(top, SWT.CHECK);
+                btnGit.setText("Clone from Yocto Project &Git Repository into new location");
+                btnGit.setEnabled(true);
+                btnGit.setSelection(true);
+                btnGit.addSelectionListener(validationListener);
+                GridData gd = new GridData(GridData.VERTICAL_ALIGN_END | GridData.FILL_HORIZONTAL);
+                btnGit.setLayoutData(gd);
+
+                setControl(top);
+        }
+
+        @Override
+        public void pageCleanup() {
+
+        }
+
+        @Override
+        public void pageDisplay() {
+        }
+
+        @Override
+        
+        protected void updateModel() {
+                try {
+                        URI uri = getProjectLocationURI();
+                        if (uri != null)
+                                model.put(InstallWizard.INSTALL_DIRECTORY, getProjectLocationURI());
+                } catch (Exception e){
+                        e.printStackTrace();
+                }
+                model.put(InstallWizard.PROJECT_NAME, txtProjectName.getText());
+                model.put(InstallWizard.GIT_CLONE, new Boolean(btnGit.getSelection()));
+                model.put(InstallWizard.SELECTED_CONNECTION, locationArea.getRemoteConnection());
+                model.put(InstallWizard.SELECTED_REMOTE_SERVICE, locationArea.getRemoteServices());
+        }
+
+        public URI getProjectLocationURI() throws URISyntaxException {
+                URI uri = locationArea.getProjectLocationURI();
+
+                if (uri != null) {
+                        String location = locationArea.getProjectLocation();
+                        if (!uri.getPath().isEmpty()) {
+                                String separator = uri.getPath().endsWith(URI_SEPARATOR) ? "" : URI_SEPARATOR;
+
+                                return new URI( uri.getScheme(),
+                                                                uri.getHost(),
+                                                                uri.getPath() + separator + txtProjectName.getText(),
+                                                                uri.getFragment());
+                        } else {
+                                return null;
+                        }
+                } else {
+                        String location = locationArea.getProjectLocation();
+                        String separator = location.endsWith(URI_SEPARATOR) ? "" : URI_SEPARATOR;
+
+                        IRemoteConnection conn = locationArea.getConnection();
+                        if (conn instanceof RSEConnection) {
+                                RSEConnection rseConn = (RSEConnection)conn;
+                                return new URI("rse", rseConn.getHost().getHostName(), location);
+                        } else {
+                                return new URI( "file", location + separator + txtProjectName.getText(),"");
+                        }
+                }
+        }
+
+        private boolean isValidProjectName(String projectName) {
+                if (projectName.indexOf('$') > -1) {
+                        return false;
+                }
+
+                return true;
+        }
+
+        private boolean validateProjectName() {
+                IWorkspaceRoot wsroot = ResourcesPlugin.getWorkspace().getRoot();
+
+                IStatus validate = ResourcesPlugin.getWorkspace().validateName(txtProjectName.getText(), IResource.PROJECT);
+
+                if (txtProjectName.getText().trim().isEmpty()) {
+                        setErrorMessage("Project name cannot be empty!");
+                        return false;
+                }
+
+                if (!validate.isOK() || !isValidProjectName(txtProjectName.getText())) {
+                        setErrorMessage("Invalid project name: " + txtProjectName.getText());
+                        return false;
+                }
+
+                IProject proj = wsroot.getProject(txtProjectName.getText());
+                if (proj.exists()) {
+                        setErrorMessage("A project with the name " + txtProjectName.getText() + " already exists");
+                        return false;
+                }
+                return true;
+        }
+        private String convertToRealPath(String path) {
+            String patternStr = File.separator + File.separator;
+            if (patternStr.equals(URI_SEPARATOR))
+                return path;
+            String replaceStr = URI_SEPARATOR;
+            String convertedpath;
+
+            //Compile regular expression
+            Pattern pattern = Pattern.compile(patternStr); //pattern to look for
+
+            //replace all occurance of percentage character to file separator
+            Matcher matcher = pattern.matcher(path);
+            convertedpath = matcher.replaceAll(replaceStr);
+
+            return convertedpath;
+        }
+
+        public String getProjectName(){
+                return txtProjectName.getText().trim();
+        }
+
+        protected boolean validateProjectLocation() {
+
+                String projectLoc = locationArea.getProjectLocation().trim();
+
+                IRemoteConnection remoteConnection = locationArea.getRemoteConnection();
+                if (remoteConnection == null)
+                        return false;
+
+                if (projectLoc.isEmpty())
+                        return true;
+
+                IHost connection = RemoteHelper.getRemoteConnectionByName(remoteConnection.getName());
+
+                projectLoc = convertToRealPath(projectLoc);
+                String separator = projectLoc.endsWith(URI_SEPARATOR) ? "" : URI_SEPARATOR;
+                String projectPath = projectLoc + separator + getProjectName();
+                IHostFile repoDest = RemoteHelper.getRemoteHostFile(connection, projectPath, new NullProgressMonitor());
+
+                if(!btnGit.getSelection()) {
+                        if (repoDest == null || !repoDest.exists()) {
+                                setErrorMessage("Directory " + projectPath + " does not exist, please select git clone.");
+                                return false;
+                        }
+
+                        IHostFile validationFile = RemoteHelper.getRemoteHostFile(connection, projectPath + URI_SEPARATOR + InstallWizard.VALIDATION_FILE, new NullProgressMonitor());
+                        if (validationFile == null || !validationFile.exists()) {
+                                setErrorMessage("Directory " + projectPath + " seems invalid, please use other directory or project name.");
+                                return false;
+                        }
+                } else { //git clone
+                        if (repoDest != null && repoDest.exists() && repoDest.isDirectory()) {
+                                IHostFile[] hostFiles = RemoteHelper.getRemoteDirContent(connection, repoDest.getAbsolutePath(), "", IFileService.FILE_TYPE_FILES_AND_FOLDERS, new NullProgressMonitor());
+                                if (hostFiles.length != 0) {
+                                        setErrorMessage("Directory " + projectPath + " is not empty, please choose another location.");
+                                        return false;
+                                }
+                                IHostFile gitDescr = RemoteHelper.getRemoteHostFile(connection, projectPath + "/.git", new NullProgressMonitor());
+                                if (gitDescr != null && gitDescr.exists()) {
+                                        setErrorMessage("Directory " + projectPath + " contains a repository, please choose another location or skip cloning the repository.");
+                                        return false;
+                                }
+                        }
+                }
+
+                try {
+                        String projName = txtProjectName.getText();
+                        if (!projName.trim().isEmpty() && validateProjectName()) {
+                                IWorkspaceRoot wsroot = ResourcesPlugin.getWorkspace().getRoot();
+                                IProject proj = wsroot.getProject();
+                                if (proj != null && proj.exists()) {
+                                        setErrorMessage("A project with the name " + projName + " already exists");
+                                        return false;
+                                }
+                                URI location = new URI("file:" + URI_SEPARATOR + URI_SEPARATOR + convertToRealPath(projectLoc) + URI_SEPARATOR + txtProjectName.getText());
+
+                                IStatus status = ResourcesPlugin.getWorkspace().validateProjectLocationURI(proj, location);
+                                if (!status.isOK()) {
+                                        setErrorMessage(status.getMessage());
+                                        return false;
+                                }
+                        }
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        setErrorMessage("Run into error while trying to validate entries!");
+                        return false;
+                }
+
+                setErrorMessage(null);
+                return true;
+        }
+        @Override
+        protected boolean validatePage() {
+                if  (!validateProjectName())
+                        return false;
+
+                if (!validateProjectLocation())
+                        return false;
+
+                setErrorMessage(null);
+                setMessage("All the entries are valid, press \"Finish\" to start the process, "+
+                                "this will take a while. Please don't interrupt till there's output in the Yocto Console window...");
+                return true;
+        }
+        
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/newproject/BBConfigurationInitializeOperation.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/newproject/BBConfigurationInitializeOperation.java
new file mode 100644
index 0000000..c44b7b5
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/newproject/BBConfigurationInitializeOperation.java
@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.wizards.newproject;
+
+import java.io.Writer;
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+
+import org.yocto.bc.bitbake.BBSession;
+import org.yocto.bc.bitbake.ProjectInfoHelper;
+import org.yocto.bc.ui.Activator;
+import org.yocto.bc.ui.model.ProjectInfo;
+import org.yocto.remote.utils.RemoteHelper;
+
+public class BBConfigurationInitializeOperation implements IRunnableWithProgress {
+
+        private final ProjectInfo pinfo;
+        private final Writer writer;
+        private boolean errorOccured = false;
+        private String errorMessage = "";
+
+        public BBConfigurationInitializeOperation(ProjectInfo pinfo) {
+                this.pinfo = pinfo;
+                writer = null;
+        }
+        public boolean hasErrorOccured() {
+                return errorOccured;
+        }
+        public BBConfigurationInitializeOperation(ProjectInfo pinfo, Writer writer) {
+                this.pinfo = pinfo;
+                this.writer = writer;
+        }
+
+        public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+                BBSession session;
+                try {
+                        System.out.println("Initialize bitbake session ...");
+                        monitor.beginTask("Initialize bitbake session ...", RemoteHelper.TOTALWORKLOAD);
+                        session = Activator.getBBSession(pinfo, writer, monitor);
+                        session.initialize();
+                        monitor.worked(90);
+                        monitor.done();
+                        errorOccured = session.hasErrorOccured();
+                        errorMessage = session.getErrorLines();
+                        if (!errorOccured) {
+                                System.out.println("Bitbake session initialized successfully.");
+                                errorMessage = "";
+                        } else
+                                System.out.println("An error occured and Bitbake session was not initialized.");
+                } catch (Exception e) {
+                        throw new InvocationTargetException(e);
+                }
+        }
+
+        public String getErrorMessage() {
+                return errorMessage;
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/newproject/CreateBBCProjectOperation.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/newproject/CreateBBCProjectOperation.java
new file mode 100644
index 0000000..54f16c3
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/newproject/CreateBBCProjectOperation.java
@@ -0,0 +1,93 @@
+/*****************************************************************************
+ * Copyright (c) 2013 Ken Gilmer, Intel Corporation
+ * 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:
+ *     Ken Gilmer - initial API and implementation
+ *     Ioana Grigoropol (Intel) - adapt class for remote support
+ *******************************************************************************/
+package org.yocto.bc.ui.wizards.newproject;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.Vector;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+import org.yocto.bc.bitbake.ProjectInfoHelper;
+import org.yocto.bc.ui.Activator;
+import org.yocto.bc.ui.builder.BitbakeCommanderNature;
+import org.yocto.bc.ui.model.ProjectInfo;
+
+
+/**
+ * Creates a bbc project
+ * @author kgilmer
+ *
+ */
+public class CreateBBCProjectOperation extends WorkspaceModifyOperation {
+
+        public static final String OEFS_SCHEME = "OEFS://";
+        public static final QualifiedName BBC_PROJECT_INIT = new QualifiedName(null, "BBC_PROJECT_INIT");
+        public static void addNatureToProject(IProject proj, String nature_id, IProgressMonitor monitor) throws CoreException {
+                IProjectDescription desc = proj.getDescription();
+                Vector natureIds = new Vector();
+                
+                natureIds.add(nature_id);
+                natureIds.addAll(Arrays.asList(desc.getNatureIds()));
+                desc.setNatureIds((String[]) natureIds.toArray(new String[natureIds.size()]));
+                
+                proj.setDescription(desc, monitor);
+        }
+        
+        private ProjectInfo projInfo;
+
+        public CreateBBCProjectOperation(ProjectInfo projInfo) {
+                this.projInfo = projInfo;
+        }
+        
+        protected void addNatures(IProject proj, IProgressMonitor monitor) throws CoreException {
+                addNatureToProject(proj, BitbakeCommanderNature.NATURE_ID, monitor);
+        }
+
+        private IProjectDescription createProjectDescription(IWorkspace workspace, ProjectInfo projInfo) throws CoreException {
+                IProjectDescription desc = workspace.newProjectDescription(projInfo.getProjectName());
+
+                desc.setLocationURI(projInfo.getOEFSURI());
+                return desc;
+        }
+
+        @Override
+        protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
+                IProjectDescription desc = createProjectDescription(ResourcesPlugin.getWorkspace(), projInfo);
+                
+                IWorkspaceRoot wsroot = ResourcesPlugin.getWorkspace().getRoot();
+
+                IProject proj = wsroot.getProject(projInfo.getProjectName());
+                proj.create(desc, monitor);
+
+                proj.open(monitor);
+
+                addNatures(proj, monitor);
+        }
+        
+        public ProjectInfo getProjectInfo() {
+                return projInfo;
+        }
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/variable/VariablePage.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/variable/VariablePage.java
new file mode 100644
index 0000000..810a014
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/variable/VariablePage.java
@@ -0,0 +1,262 @@
+package org.yocto.bc.ui.wizards.variable;
+
+import java.util.Comparator;
+import java.util.Map;
+
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Text;
+
+import org.yocto.bc.ui.wizards.FiniteStateWizardPage;
+
+/**
+ * The wizard page for the Variable Wizard.
+ * @author kgilmer
+ *
+ */
+public class VariablePage extends FiniteStateWizardPage {
+
+        private Text txtName;
+        private Text txtValue;
+        private TableViewer viewer;
+        private TableColumn c1;
+        private TableColumn c2;
+
+        protected VariablePage(Map model) {
+                super("Yocto Project BitBake Commander", model);
+                setTitle("Yocto Project BitBake Variable Viewer");
+                setDescription("Sort and fitler global BitBake variables by name or value.");
+        }
+
+        @Override
+        public void createControl(Composite parent) {
+                Composite top = new Composite(parent, SWT.None);
+                top.setLayout(new GridLayout(2, true));
+                top.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+                ValidationListener listener = new ValidationListener();
+
+                txtName = new Text(top, SWT.BORDER);
+                txtName.addModifyListener(listener);
+                txtName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+                txtValue = new Text(top, SWT.BORDER);
+                txtValue.addModifyListener(listener);
+                txtValue.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+                viewer = new TableViewer(top);
+
+                Table table = viewer.getTable();
+                table.setLinesVisible(true);
+                table.setHeaderVisible(true);
+                GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
+                data.heightHint = 200;
+                data.horizontalSpan = 2;
+                table.setLayoutData(data);
+                c1 = new TableColumn(table, SWT.NONE);
+                c1.setText("Name");
+                c1.setWidth(200);
+                c1.addSelectionListener(new SelectionAdapter() {
+                        public void widgetSelected(SelectionEvent event) {
+                                ((VariableViewerSorter) viewer.getSorter()).doSort(0);
+                                viewer.refresh();
+                        }
+                });
+
+                c2 = new TableColumn(table, SWT.NONE);
+                c2.setText("Value");
+                c2.setWidth(200);
+                c2.addSelectionListener(new SelectionAdapter() {
+                        public void widgetSelected(SelectionEvent event) {
+                                ((VariableViewerSorter) viewer.getSorter()).doSort(1);
+                                viewer.refresh();
+                        }
+                });
+
+                viewer.setContentProvider(new VariableContentProvider());
+                viewer.setLabelProvider(new VariableLabelProvider());
+                viewer.setSorter(new VariableViewerSorter());
+
+                viewer.setFilters(new ViewerFilter[] {new MapViewerFilter()});
+                setControl(top);
+        }
+
+        @Override
+        public void pageCleanup() {
+
+        }
+
+        @Override
+        public void pageDisplay() {
+                viewer.setInput(model);
+        }
+
+        @Override
+        protected void updateModel() {
+                viewer.refresh();
+        }
+
+        @Override
+        protected boolean validatePage() {
+                return true;
+        }
+
+        /**
+         * A content provider for the variable wizard dialog.
+         * @author kgilmer
+         *
+         */
+        private class VariableContentProvider implements IStructuredContentProvider {
+
+                public Object[] getElements(Object inputElement) {
+                        return model.keySet().toArray();
+                }
+
+                public void dispose() {
+
+                }
+
+                public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+
+                }
+        }
+
+        /**
+         * A label provider for variable wizard dialog.
+         * @author kgilmer
+         *
+         */
+        private class VariableLabelProvider implements ITableLabelProvider {
+
+                public Image getColumnImage(Object element, int columnIndex) {
+                        return null;
+                }
+
+                public String getColumnText(Object element, int columnIndex) {
+                        String val;
+
+                        switch (columnIndex) {
+                        case 0:
+                                val = element.toString();
+                                break;
+                        case 1:
+                                val = (String) model.get(element);
+                                break;
+                        default:
+                                val = "";
+                                break;
+                        }
+
+                        return val;
+                }
+
+                public void addListener(ILabelProviderListener listener) {
+
+                }
+
+                public void dispose() {
+
+                }
+
+                public boolean isLabelProperty(Object element, String property) {
+                        return false;
+                }
+
+                public void removeListener(ILabelProviderListener listener) {
+
+                }
+
+        }
+
+        /**
+         * 
+         * A tableviewer sorter found on the internet.
+         *
+         */
+        class VariableViewerSorter extends ViewerSorter {
+                private static final int ASCENDING = 0;
+
+                private static final int DESCENDING = 1;
+
+                private int column;
+
+                private int direction;
+
+                public void doSort(int column) {
+                        if (column == this.column) {
+                                // Same column as last sort; toggle the direction
+                                direction = 1 - direction;
+                        } else {
+                                // New column; do an ascending sort
+                                this.column = column;
+                                direction = ASCENDING;
+                        }
+                }
+
+                public int compare(Viewer viewer, Object e1, Object e2) {
+                        int rc = 0;
+                        Comparator c = this.getComparator();
+                        // Determine which column and do the appropriate sort
+                        switch (column) {
+                        case 0:
+                                rc = c.compare(e1, e2);
+                                break;
+                        case 1:
+                                rc = c.compare(model.get(e1), model.get(e2));
+                                break;
+                        }
+
+                        // If descending order, flip the direction
+                        if (direction == DESCENDING)
+                                rc = -rc;
+
+                        return rc;
+                }
+        }
+        
+        /**
+         * A filter for the name/value model.
+         * @author kgilmer
+         *
+         */
+        private class MapViewerFilter extends ViewerFilter {
+
+                public MapViewerFilter() {
+                }
+                
+                @Override
+                public boolean select(Viewer viewer, Object parentElement, Object element) {
+                        String keyFilter = txtName.getText();
+                        String valFilter = txtValue.getText();
+                        
+                        String elem = (String) element;
+                        String val = (String) model.get(element);
+                        
+                        if (keyFilter.length() > 0 && elem.indexOf(keyFilter) == -1 ) {
+                                return false;
+                        }
+                        
+                        if (valFilter.length() > 0 && val.indexOf(valFilter) == -1 ) {
+                                return false;
+                        }
+                        
+                        return true;
+                }
+                
+        }
+
+}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/variable/VariableWizard.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/variable/VariableWizard.java
new file mode 100644
index 0000000..d1bee1a
--- /dev/null
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/variable/VariableWizard.java
@@ -0,0 +1,43 @@
+package org.yocto.bc.ui.wizards.variable;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+import org.yocto.bc.ui.wizards.FiniteStateWizard;
+
+/**
+ * This wizard is used to view, filter, and search for BitBake variables and variable contents.
+ * @author kgilmer
+ *
+ */
+public class VariableWizard extends FiniteStateWizard {
+
+        private Map model;
+
+        public VariableWizard(Map model) {
+                this.model = model;
+                setWindowTitle("Yocto Project BitBake Commander");
+        }
+
+        public VariableWizard(IStructuredSelection selection) {
+                model = new Hashtable();
+        }
+        
+        @Override
+        public void addPages() {
+                addPage(new VariablePage(model));
+        }
+        
+        @Override
+        public Map getModel() {
+                return model;
+        }
+
+        @Override
+        public boolean performFinish() {
+                return true;
+        }
+
+}