Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/chroot-agent into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

- Bug #1400741: API tab links to the wrong version of the API
- Add click-chroot-agent, a user session daemon that preloads chroot sessions
- Adding support for new package naming scheme

- Bug #1400741: API tab links to the wrong version of the API
- Add click-chroot-agent, a user session daemon that preloads chroot sessions
- Adding support for new package naming scheme

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/chroot-agent]

337. By Benjamin Zeller on 2015-01-07

Adding support for new package naming scheme

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:337
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/484/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/484/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/chroot-agent]

338. By Benjamin Zeller on 2015-01-07

Only try to connect chroot-agent if it makes sense

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:338
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/485/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/485/rebuild

review: Approve (continuous-integration)

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/chroot-agent]

339. By Benjamin Zeller on 2015-01-08

Make sure invalid QtVersions are recreated

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:339
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/486/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/486/rebuild

review: Approve (continuous-integration)

=== added directory 'chroot-agent'
=== added file 'chroot-agent/chroot-agent.pro'
--- chroot-agent/chroot-agent.pro	1970-01-01 00:00:00 +0000
+++ chroot-agent/chroot-agent.pro	2015-01-08 08:00:01 +0000
@@ -0,0 +1,36 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2014-12-09T14:24:45
+#
+#-------------------------------------------------
+
+QT       += core dbus
+
+QT       -= gui
+
+TARGET    = click-chroot-agent
+CONFIG   += console
+CONFIG   -= app_bundle
+
+QMAKE_CXXFLAGS += -Werror
+CONFIG += c++11 dbusadaptors
+
+TEMPLATE = app
+
+
+SOURCES += main.cpp \
+    chrootagent.cpp
+
+HEADERS += \
+    chrootagent.h
+
+xml_desc.target=com.ubuntu.sdk.ClickChrootAgent.xml
+xml_desc.commands=qdbuscpp2xml -o $$xml_desc.target $$PWD/chrootagent.h
+xml_desc.depends=$$PWD/chrootagent.h
+
+QMAKE_EXTRA_TARGETS+=xml_desc
+
+DBUS_ADAPTORS += $$xml_desc.target
+
+target.path=/bin
+INSTALLS+=target

=== added file 'chroot-agent/chrootagent.cpp'
--- chroot-agent/chrootagent.cpp	1970-01-01 00:00:00 +0000
+++ chroot-agent/chrootagent.cpp	2015-01-08 08:00:01 +0000
@@ -0,0 +1,324 @@
+#include "chrootagent.h"
+#include "clickchrootagent_adaptor.h"
+
+#include <QCoreApplication>
+#include <QFileSystemWatcher>
+#include <QDebug>
+#include <QProcess>
+#include <QRegularExpression>
+#include <QDir>
+#include <QUuid>
+
+#include <unistd.h>
+#include <sys/types.h>
+
+ChrootAgent *ChrootAgent::m_instance = nullptr;
+
+const char UBUNTU_CLICK_CHROOT_BASEPATH[] = "/var/lib/schroot/chroots";
+const char UBUNTU_CLICK_TARGETS_REGEX[]   = "^click-(.*)-([A-Za-z0-9]+)$";
+
+ChrootAgent::ChrootAgent(QObject *parent) :
+    QObject(parent),
+    m_chrootDirWatcher(nullptr)
+{
+    m_instance = this;
+    new ClickChrootAgentAdaptor(this);
+
+    m_sessionPrefix = QString(QStringLiteral("ucca-%1")).arg(getuid());
+
+    //invoke the initialize once we enter the event loop
+    QMetaObject::invokeMethod(this,"initialize",Qt::QueuedConnection);
+}
+
+void ChrootAgent::initialize()
+{
+    foreach(const Chroot &ch, listAvailableClickChroots()) {
+        m_knownChroots.insert(
+                    toInternalName(ch.framework,ch.architecture),
+                    ch);
+    }
+
+    findExistingChrootSessions();
+
+    foreach(const QString &key, m_knownChroots.keys()) {
+        if(!m_knownChroots[key].session.isEmpty())
+            continue;
+
+        m_knownChroots[key].session = createClickSession(m_knownChroots[key]);
+    }
+
+    emit chrootListChanged();
+    emit sessionListChanged();
+
+    if(!m_chrootDirWatcher) {
+        m_chrootDirWatcher = new QFileSystemWatcher(QStringList{QStringLiteral("/etc/schroot/chroot.d")},this);
+        connect(m_chrootDirWatcher,SIGNAL(directoryChanged(QString)),this,SLOT(directoryChanged()));
+    }
+}
+
+void ChrootAgent::directoryChanged()
+{
+    QList<Chroot> chRootOnSys = listAvailableClickChroots();
+    QSet<QString> chRootOnSysKeys;
+
+    foreach(const Chroot &ch, chRootOnSys)
+        chRootOnSysKeys.insert(toInternalName(ch.framework,ch.architecture));
+
+    bool changed = false;
+    foreach(const QString &key, m_knownChroots.keys()) {
+        if(!chRootOnSysKeys.contains(key)) {
+            qDebug()<<"Removing chroot"<<key<<"from internal List";
+            changed = true;
+            m_knownChroots.remove(key);
+        }
+    }
+
+    if(changed)
+        emit chrootListChanged();
+}
+
+ChrootAgent *ChrootAgent::instance()
+{
+    return m_instance;
+}
+
+QString ChrootAgent::spawnSession(const QString &framework, const QString &architecture)
+{
+    QString intName = toInternalName(framework,architecture);
+
+    qDebug()<<"Request to spawn session "<<framework<<architecture;
+
+    Chroot *ch = nullptr;
+    bool createSession = false;
+    if(m_knownChroots.contains(intName)) {
+        if(!m_knownChroots[intName].session.isEmpty()) {
+            return m_knownChroots[intName].session;
+        } else {
+            createSession = true;
+            ch = &m_knownChroots[intName];
+        }
+    } else {
+        createSession = true;
+        Chroot newChroot;
+        if(!chrootFromPath(QString::fromLatin1("click-%1-%2"),&newChroot))
+            return QString();
+        m_knownChroots.insert(intName,newChroot);
+        ch = &m_knownChroots[intName];
+
+        emit chrootListChanged();
+    }
+
+    if(createSession) {
+        ch->session = createClickSession(*ch);
+        emit sessionListChanged();
+        return ch->session;
+    }
+    return QString();
+}
+
+bool ChrootAgent::releaseSession(const QString &framework, const QString &architecture)
+{
+    qDebug()<<"Request to release session "<<framework<<architecture;
+
+    QString intName = toInternalName(framework,architecture);
+    if(!m_knownChroots.contains(intName))
+        return true;
+
+    bool s = endClickSession(m_knownChroots[intName]);
+    emit sessionListChanged();
+
+    return s;
+}
+
+void ChrootAgent::shutdown()
+{
+    foreach(const QString &key, m_knownChroots.keys())
+        endClickSession(m_knownChroots[key]);
+
+    qApp->exit(0);
+}
+
+void ChrootAgent::hangup()
+{
+    foreach(const QString &key, m_knownChroots.keys())
+        endClickSession(m_knownChroots[key]);
+
+    m_knownChroots.clear();
+    initialize();
+}
+
+/**
+ * @brief UbuntuClickTool::listAvailableTargets
+ * @return all currently existing chroot targets in the system
+ */
+QList<ChrootAgent::Chroot> ChrootAgent::listAvailableClickChroots( )
+{
+    QList<Chroot> items;
+
+    //use the etc dir, config files show only up if we can actually create session
+    QDir chrootDir( QStringLiteral("/etc/schroot/chroot.d") );
+
+    //if the dir does not exist there are no available chroots
+    if(!chrootDir.exists())
+        return items;
+
+    QStringList availableChroots = chrootDir.entryList(QDir::Files | QDir::NoDotAndDotDot,
+                                                       QDir::Name  | QDir::Reversed);
+
+    QRegularExpression clickFilter(QString::fromLatin1(UBUNTU_CLICK_TARGETS_REGEX));
+    //iterate over all chroots and check if they are click chroots
+    foreach (const QString &chroot, availableChroots) {
+        QRegularExpressionMatch match = clickFilter.match(chroot);
+        if(!match.hasMatch())
+            continue;
+
+        Chroot t;
+        if(!chrootFromPath(chroot,&t))
+            continue;
+
+        items.append(t);
+    }
+    return items;
+}
+
+void ChrootAgent::findExistingChrootSessions()
+{
+    QStringList args{
+        QStringLiteral("--list"),
+        QStringLiteral("--all-sessions")
+    };
+
+    QProcess proc;
+    proc.setProgram(QStringLiteral("schroot"));
+    proc.setArguments(args);
+    proc.start();
+    proc.waitForFinished();
+
+    //session string format
+    //session:click-ubuntu-sdk-15.04-armhf-13e7f626-a933-47f1-a501-329749612445
+    QRegularExpression exp(QString::fromLatin1("session:click-(ubuntu-sdk-[0-9.]*)-([\\w]*)-(%1-.*)").arg(m_sessionPrefix));
+    while(proc.canReadLine()) {
+        QString line = QString::fromLocal8Bit(proc.readLine());
+        QRegularExpressionMatch match = exp.match(line);
+        if(!match.hasMatch())
+            continue;
+
+        QString fw   = match.captured(1);
+        QString arch = match.captured(2);
+        QString internal_name = toInternalName(fw,arch);
+
+        qDebug()<<"Pickung up existing session: "<<fw<<arch<<match.captured(3);
+
+        if(m_knownChroots.contains(internal_name))
+            m_knownChroots[internal_name].session = match.captured(3);
+        else {
+            Chroot ch;
+            ch.architecture = arch;
+            ch.framework    = fw;
+            ch.internalName = internal_name;
+            ch.session      = match.captured(3);
+            m_knownChroots.insert(internal_name,ch);
+        }
+    }
+}
+
+/*!
+ * \brief UbuntuClickTool::targetFromPath
+ * returns true if the given path is a click target
+ * if it is, \a tg will be initialized with that targets values
+ */
+bool ChrootAgent::chrootFromPath(const QString &targetPath, ChrootAgent::Chroot *tg) const
+{
+    QRegularExpression clickFilter(QString::fromLatin1(UBUNTU_CLICK_TARGETS_REGEX));
+    QRegularExpressionMatch match = clickFilter.match(targetPath);
+    if(!match.hasMatch()) {
+        return false;
+    }
+
+    Chroot t;
+    t.framework    = match.captured(1);
+    t.architecture = match.captured(2);
+    t.internalName = toInternalName(t.framework,t.architecture);
+
+    //now read informations about the target
+    QFile f(QString::fromLatin1("%1/%2")
+            .arg(chrootBasePath(t))
+            .arg(QLatin1String("/etc/lsb-release")));
+
+    if (!f.exists()) {
+        //there is no lsb-release file... the chroot is broken
+        return false;
+
+    }
+
+    *tg = t;
+    return true;
+}
+
+QString ChrootAgent::chrootBasePath(const ChrootAgent::Chroot &target) const
+{
+    return QString::fromLatin1("%1/click-%2-%3")
+            .arg(QLatin1String(UBUNTU_CLICK_CHROOT_BASEPATH))
+            .arg(target.framework)
+            .arg(target.architecture);
+}
+
+QString ChrootAgent::toInternalName(const QString &framework, const QString &arch) const
+{
+    return  QString::fromLatin1("%1-%2").arg(framework).arg(arch);;
+}
+
+QString ChrootAgent::createClickSession(const ChrootAgent::Chroot &ch)
+{
+    QString name = QString::fromLatin1("%1-%2").arg(m_sessionPrefix).arg(QUuid::createUuid().toString());
+    QStringList args = {
+        QStringLiteral("chroot"),
+        QStringLiteral("-a"),
+        ch.architecture,
+        QStringLiteral("-f"),
+        ch.framework,
+        QStringLiteral("begin-session"),
+        name
+    };
+
+    if(QProcess::execute(QStringLiteral("click"),args) == 0) {
+        qDebug()<<"Created session "<<name;
+        return name;
+    }
+
+    qDebug()<<"Failed to create Session for "<<ch.architecture<<ch.framework;
+    return QString();
+}
+
+bool ChrootAgent::endClickSession(ChrootAgent::Chroot &ch)
+{
+    if(endClickSession(ch.framework,ch.architecture,ch.session)) {
+        ch.session = QString();
+        return true;
+    }
+    return false;
+}
+
+bool ChrootAgent::endClickSession(const QString &framework, const QString &architecture, const QString &sessionName)
+{
+    if(sessionName.isEmpty())
+        return true;
+
+    QStringList args = {
+        QStringLiteral("chroot"),
+        QStringLiteral("-a"),
+        architecture,
+        QStringLiteral("-f"),
+        framework,
+        QStringLiteral("end-session"),
+        sessionName
+    };
+
+    if(QProcess::execute(QStringLiteral("click"),args) == 0) {
+        qDebug()<<"Removed session"<<sessionName<<"for"<<architecture<<framework;
+        return true;
+    }
+
+    qDebug()<<"Could not remove session for "<<architecture<<framework<<sessionName;
+    return false;
+}

=== added file 'chroot-agent/chrootagent.h'
--- chroot-agent/chrootagent.h	1970-01-01 00:00:00 +0000
+++ chroot-agent/chrootagent.h	2015-01-08 08:00:01 +0000
@@ -0,0 +1,62 @@
+#ifndef CHROOTAGENT_H
+#define CHROOTAGENT_H
+
+#include <qdbusmacros.h>
+
+#include <QObject>
+#include <QStringList>
+
+class QFileSystemWatcher;
+
+class ChrootAgent : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.ubuntu.sdk.ClickChrootAgent")
+
+    struct Chroot{
+        QString internalName;
+        QString framework;
+        QString architecture;
+        QString session;
+    };
+
+public:
+    explicit ChrootAgent(QObject *parent = 0);
+
+    static ChrootAgent *instance ();
+
+signals:
+    void chrootListChanged  ();
+    void sessionListChanged ();
+
+public slots:
+    QString spawnSession   (const QString &framework, const QString &architecture);
+    bool releaseSession (const QString &framework, const QString &architecture);
+
+    Q_NOREPLY void shutdown ();
+    void hangup   ();
+
+private slots:
+    void initialize ();
+    void directoryChanged ();
+
+private:
+    void findExistingChrootSessions();
+    bool chrootFromPath(const QString &targetPath, ChrootAgent::Chroot *tg) const;
+    QString chrootBasePath(const ChrootAgent::Chroot &target) const;
+    QString toInternalName (const QString &framework, const QString &arch) const;
+    QString createClickSession(const Chroot &ch);
+    bool endClickSession(Chroot &ch);
+    bool endClickSession(const QString &framework, const QString &architecture, const QString &sessionName);
+
+private:
+    QMap<QString,Chroot> m_knownChroots;
+    QFileSystemWatcher *m_chrootDirWatcher;
+    QString             m_sessionPrefix;
+    static ChrootAgent *m_instance;
+
+
+    QList<ChrootAgent::Chroot> listAvailableClickChroots();
+};
+
+#endif // CHROOTAGENT_H

=== added file 'chroot-agent/main.cpp'
--- chroot-agent/main.cpp	1970-01-01 00:00:00 +0000
+++ chroot-agent/main.cpp	2015-01-08 08:00:01 +0000
@@ -0,0 +1,159 @@
+/**
+  *
+  * based on code taken from http://www.enderunix.org/docs/eng/daemon.php
+  */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <unistd.h>
+#include <pwd.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <syslog.h>
+
+#include <QCoreApplication>
+#include <QDir>
+#include <QDBusConnection>
+#include <QDebug>
+#include <QDBusError>
+#include <QStandardPaths>
+
+#include "chrootagent.h"
+
+void syslogMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+{
+    bool do_abort = false;
+    openlog ("click-chroot-agent", LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1);
+
+    QByteArray localMsg = msg.toLocal8Bit();
+    switch (type) {
+    case QtDebugMsg:
+        syslog (LOG_DEBUG,  "Debug: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtWarningMsg:
+        syslog (LOG_WARNING,"Warning: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtCriticalMsg:
+        syslog (LOG_CRIT,   "Critical: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtFatalMsg:
+        syslog (LOG_EMERG,  "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        do_abort=true;
+    }
+
+    closelog();
+
+    if(do_abort) abort();
+}
+
+void log_message (const char *message, int logType = LOG_INFO)
+{
+    openlog ("click-chroot-agent", LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1);
+    syslog (logType,  message,0);
+    closelog();
+}
+
+void signal_handler(int sig)
+{
+    switch(sig) {
+    case SIGHUP:
+        log_message("hangup signal catched");
+        ChrootAgent::instance()->hangup();
+        break;
+    case SIGTERM:
+        log_message("terminate signal catched");
+        ChrootAgent::instance()->shutdown();
+        break;
+    }
+}
+
+void daemonize()
+{
+    if(getppid()==1) return; /* already a daemon */
+
+    int i=fork();
+    if (i<0) {
+        log_message("Could not fork.",LOG_EMERG);
+        exit(1); /* fork error */
+    }
+    if (i>0) {
+        _exit(0); /* parent exits */
+    }
+
+    /* child (daemon) continues */
+    setsid(); /* obtain a new process group */
+    for (i=getdtablesize();i>=0;--i)
+        close(i); /* close all descriptors */
+
+    /* handle standart I/O */
+    i=open("/dev/null",O_RDWR);
+    if(dup(i) < 0)
+        log_message("Could not redirect std filedescriptor",LOG_ERR);
+    if(dup(i) < 0)
+        log_message("Could not redirect std filedescriptor",LOG_ERR);
+
+    umask(027); /* set newly created file permissions */
+
+    QString lockFile = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)+
+            QDir::separator()+
+            QStringLiteral("click-chroot-agent.pid");
+
+    int lfp=open(qPrintable(lockFile),O_RDWR|O_CREAT,0640);
+    if (lfp<0) {
+        log_message("Can not open lockfile",LOG_ERR);
+        exit(1); /* can not open */
+    }
+
+    if (lockf(lfp,F_TLOCK,0)<0) {
+        log_message("Can not lock lockfile");
+        exit(2); /* can not lock, server already running */
+    }
+
+    /* first instance continues */
+    QByteArray arr = QByteArray::number(getpid());
+    if(write(lfp,arr.constData(),strlen(arr.constData())) < 0) /* record pid to lockfile */
+        log_message("Could not write pid to the lockfile");
+
+    signal(SIGCHLD,SIG_IGN); /* ignore child */
+    signal(SIGTSTP,SIG_IGN); /* ignore tty signals */
+    signal(SIGTTOU,SIG_IGN);
+    signal(SIGTTIN,SIG_IGN);
+}
+
+int main(int argc, char *argv[])
+{
+    daemonize();
+
+    qInstallMessageHandler(syslogMessageHandler);
+    QCoreApplication a(argc, argv);
+
+    //the control signals
+    signal(SIGHUP,signal_handler); /* catch hangup signal */
+    signal(SIGTERM,signal_handler); /* catch term signal */
+
+    ChrootAgent agent;
+
+    QDBusConnection sessionBus = QDBusConnection::sessionBus();
+
+    //when the session bus goes down we want to exit
+    if(!sessionBus.connect(QString(),QString(),QStringLiteral("org.freedesktop.DBus.Local"),QStringLiteral("Disconnected"), &agent, SLOT(shutdown()))) {
+        log_message("Could not connect to DBUS session bus",LOG_EMERG);
+        return 1;
+    }
+
+    if(!sessionBus.registerObject(QStringLiteral("/com/ubuntu/sdk/ClickChrootAgent"),&agent)) {
+        log_message("Could not register DBUS interface",LOG_EMERG);
+        qDebug()<<sessionBus.lastError();
+        return 1;
+    }
+
+    if(!sessionBus.registerService(QStringLiteral("com.ubuntu.sdk.ClickChrootAgent"))) {
+        log_message("Could not register DBUS service",LOG_EMERG);
+        qDebug()<<sessionBus.lastError();
+        return 1;
+    }
+
+    return a.exec();
+}

=== modified file 'debian/control'
--- debian/control	2014-12-17 17:27:29 +0000
+++ debian/control	2015-01-08 08:00:01 +0000
@@ -7,6 +7,7 @@
                libqt5scripttools5 (>= 5.3),
                libqt5webkit5-dev,
                libqt5widgets5 (>= 5.3),
+               libqt5dbus5 (>= 5.3),
                libsqlite3-dev,
                qt5-qmake (>= 5.3),
                qtcreator-dev (>= 3.1.1-0ubuntu7),
@@ -51,6 +52,7 @@
          gdb-multiarch,
          click-reviewers-tools,
          phablet-tools,
+         python-dbus,
          ${shlibs:Depends},
          ${misc:Depends},
 Recommends: ubuntu-sdk,

=== modified file 'debian/qtcreator-plugin-ubuntu.install'
--- debian/qtcreator-plugin-ubuntu.install	2013-09-06 04:16:42 +0000
+++ debian/qtcreator-plugin-ubuntu.install	2015-01-08 08:00:01 +0000
@@ -2,3 +2,4 @@
 ubuntu-qtcreator.png usr/share/icons
 usr/lib/*/qtcreator/plugins/Canonical/Ubuntu.pluginspec
 usr/lib/*/qtcreator/plugins/Canonical/libUbuntu.so
+usr/bin/click-chroot-agent

=== modified file 'qtcreator-plugin-ubuntu.pro'
--- qtcreator-plugin-ubuntu.pro	2014-05-15 19:25:53 +0000
+++ qtcreator-plugin-ubuntu.pro	2015-01-08 08:00:01 +0000
@@ -1,3 +1,4 @@
 TEMPLATE = subdirs
 SUBDIRS = src/ubuntu \
-          tests
+          tests \
+          chroot-agent

=== modified file 'share/qtcreator/templates/wizards/ubuntu/backendplustabs/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/backendplustabs/CMakeLists.txt	2014-11-17 15:09:02 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backendplustabs/CMakeLists.txt	2015-01-08 08:00:01 +0000
@@ -25,7 +25,7 @@
 option(INSTALL_TESTS "Install the tests on make install" on)
 
 set(APP_NAME          %ProjectName%)
-set(APP_ID            "%ClickDomain:l%.%ProjectName:l%")
+set(APP_ID            "%ProjectName:l%.%ClickDomain:l%")
 set(%ProjectName:u%_DIR "share/qml/%ProjectName%")
 set(MAIN_QML          "%ProjectName%.qml")
 set(ICON              "graphics/%ProjectName%.png")

=== modified file 'share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/displayName.qml'
--- share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/displayName.qml	2014-09-03 11:49:49 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/displayName.qml	2015-01-08 08:00:01 +0000
@@ -13,7 +13,7 @@
     objectName: "mainView"
 
     // Note! applicationName needs to match the "name" field of the click manifest
-    applicationName: "%ClickDomain:l%.%ProjectName:l%"
+    applicationName: "%ProjectName:l%.%ClickDomain:l%"
 
     /* 
      This property enables the application to change orientation 

=== modified file 'share/qtcreator/templates/wizards/ubuntu/backendplustabs/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/backendplustabs/wizard.xml	2014-11-17 16:13:26 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backendplustabs/wizard.xml	2015-01-08 08:00:01 +0000
@@ -49,9 +49,9 @@
 		<fieldpagetitle>Click package parameters</fieldpagetitle>
 		<fields>
 			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-			                defaulttext="" placeholdertext="Domain"/>
-			  <fielddescription>Domain:</fielddescription>
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
 			</field>
 			<field mandatory="true" name="ClickMaintainer">
 			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'

=== modified file 'share/qtcreator/templates/wizards/ubuntu/bin_app-qmake/appName/main.qml'
--- share/qtcreator/templates/wizards/ubuntu/bin_app-qmake/appName/main.qml	2014-11-13 15:45:24 +0000
+++ share/qtcreator/templates/wizards/ubuntu/bin_app-qmake/appName/main.qml	2015-01-08 08:00:01 +0000
@@ -10,7 +10,7 @@
     objectName: "mainView"
     
     // Note! applicationName needs to match the "name" field of the click manifest
-    applicationName: "%ClickDomain:l%.%ProjectName:l%"
+    applicationName: "%ProjectName:l%.%ClickDomain:l%"
 
     /* 
      This property enables the application to change orientation 

=== modified file 'share/qtcreator/templates/wizards/ubuntu/bin_app-qmake/manifest/manifest.json.in'
--- share/qtcreator/templates/wizards/ubuntu/bin_app-qmake/manifest/manifest.json.in	2014-11-21 08:06:14 +0000
+++ share/qtcreator/templates/wizards/ubuntu/bin_app-qmake/manifest/manifest.json.in	2015-01-08 08:00:01 +0000
@@ -1,5 +1,5 @@
 {
-    "name": "%ClickDomain:l%.%ProjectName:l%",
+    "name": "%ProjectName:l%.%ClickDomain:l%",
     "description": "description of %ProjectName%",
     "architecture": "@CLICK_ARCH@",
     "title": "%ProjectName%",

=== modified file 'share/qtcreator/templates/wizards/ubuntu/bin_app-qmake/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/bin_app-qmake/wizard.xml	2014-11-21 08:06:14 +0000
+++ share/qtcreator/templates/wizards/ubuntu/bin_app-qmake/wizard.xml	2015-01-08 08:00:01 +0000
@@ -31,9 +31,9 @@
 		<fieldpagetitle>Click package parameters</fieldpagetitle>
 		<fields>
 			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-			                defaulttext="" placeholdertext="Domain"/>
-			  <fielddescription>Domain:</fielddescription>
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
 			</field>
 			<field mandatory="true" name="ClickMaintainer">
 			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'

=== modified file 'share/qtcreator/templates/wizards/ubuntu/goproject/share/displayName/main.qml'
--- share/qtcreator/templates/wizards/ubuntu/goproject/share/displayName/main.qml	2014-09-03 11:49:49 +0000
+++ share/qtcreator/templates/wizards/ubuntu/goproject/share/displayName/main.qml	2015-01-08 08:00:01 +0000
@@ -10,7 +10,7 @@
     objectName: "mainView"
     
     // Note! applicationName needs to match the "name" field of the click manifest
-    applicationName: "%ClickDomain:l%.%ProjectName:l%"
+    applicationName: "%ProjectName:l%.%ClickDomain:l%"
 
     /* 
      This property enables the application to change orientation 

=== modified file 'share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml	2014-11-17 16:13:26 +0000
+++ share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml	2015-01-08 08:00:01 +0000
@@ -22,9 +22,9 @@
 		<fieldpagetitle>Details</fieldpagetitle>
 		<fields>
 			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-			                defaulttext="" placeholdertext="Domain"/>
-			  <fielddescription>Domain:</fielddescription>
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
 			</field>
 			<field mandatory="true" name="ClickMaintainer">
 			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'

=== modified file 'share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml	2014-11-17 16:13:26 +0000
+++ share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml	2015-01-08 08:00:01 +0000
@@ -29,9 +29,9 @@
 		<fieldpagetitle>Click package parameters</fieldpagetitle>
 		<fields>
 			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-			                defaulttext="" placeholdertext="Domain"/>
-			  <fielddescription>Domain:</fielddescription>
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
 			</field>
 			<field mandatory="true" name="ClickMaintainer">
 			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt	2014-11-21 15:37:11 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt	2015-01-08 08:00:01 +0000
@@ -64,7 +64,7 @@
 set(CMAKE_INSTALL_PREFIX /)
 set(SCOPE_INSTALL_DIR "/%ClickHookName:l%")
 set(GETTEXT_PACKAGE "%ProjectName:l%")
-set(PACKAGE_NAME "%ClickDomain:l%.%ProjectName:l%")
+set(PACKAGE_NAME "%ProjectName:l%.%ClickDomain:l%")
 set(SCOPE_NAME "${PACKAGE_NAME}_%ClickHookName:l%")
 
 # If we need to refer to the scope's name or package in code, these definitions will help

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/manifest.json.in'
--- share/qtcreator/templates/wizards/ubuntu/scope/manifest.json.in	2014-11-17 14:24:59 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/manifest.json.in	2015-01-08 08:00:01 +0000
@@ -6,7 +6,7 @@
 @endif
   "maintainer": "%ClickMaintainer%",
   "architecture": "@CLICK_ARCH@",
-  "name": "%ClickDomain:l%.%ProjectName:l%",
+  "name": "%ProjectName:l%.%ClickDomain:l%",
   "title": "%ProjectName:l%",
   "framework" : "%ClickFrameworkVersion%",
   "hooks": {

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/po/POTFILES.in'
--- share/qtcreator/templates/wizards/ubuntu/scope/po/POTFILES.in	2014-11-21 14:45:30 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/po/POTFILES.in	2015-01-08 08:00:01 +0000
@@ -1,4 +1,4 @@
-[type: gettext/ini] data/%ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%.ini.in
+[type: gettext/ini] data/%ProjectName:l%.%ClickDomain:l%_%ClickHookName:l%.ini.in
 include/api/config.h
 include/api/client.h
 include/scope/preview.h

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2014-11-21 14:45:30 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2015-01-08 08:00:01 +0000
@@ -13,7 +13,7 @@
         <file source="cmake/FindIntltool.cmake"/>
 
         <file source="data/CMakeLists.txt"/>
-        <file source="data/displayName.ini.in" target="data/%ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%.ini.in"/>
+        <file source="data/displayName.ini.in" target="data/%ProjectName:l%.%ClickDomain:l%_%ClickHookName:l%.ini.in"/>
         <file source="data/icon.png" binary="true"/>
         <file source="data/logo.png" binary="true"/>
         <file source="data/screenshot.png" binary="true"/>
@@ -58,11 +58,11 @@
     <!-- Create a 2nd wizard page with click package parameters -->
     <fieldpagetitle>Click package parameters</fieldpagetitle>
     <fields>
-        <field mandatory="true" name="ClickDomain">
-            <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-                            defaulttext="" placeholdertext="Domain"/>
-            <fielddescription>Domain:</fielddescription>
-        </field>
+			<field mandatory="true" name="ClickDomain">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
+			</field>
         <field mandatory="true" name="ClickMaintainer">
             <fieldcontrol class="QLineEdit" validator='^[^"]+$'
                             defaulttext="" placeholdertext="Maintainer"/>

=== modified file 'share/qtcreator/templates/wizards/ubuntu/share/manifest.json'
--- share/qtcreator/templates/wizards/ubuntu/share/manifest.json	2014-11-17 14:24:59 +0000
+++ share/qtcreator/templates/wizards/ubuntu/share/manifest.json	2015-01-08 08:00:01 +0000
@@ -1,5 +1,5 @@
 {
-    "name": "%ClickDomain:l%.%ProjectName:l%",
+    "name": "%ProjectName:l%.%ClickDomain:l%",
     "description": "description of %ProjectName%",
     "architecture": "all",
     "title": "%ProjectName%",

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple/main.qml'
--- share/qtcreator/templates/wizards/ubuntu/simple/main.qml	2014-09-15 15:31:26 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple/main.qml	2015-01-08 08:00:01 +0000
@@ -10,7 +10,7 @@
     objectName: "mainView"
     
     // Note! applicationName needs to match the "name" field of the click manifest
-    applicationName: "%ClickDomain:l%.%ProjectName:l%"
+    applicationName: "%ProjectName:l%.%ClickDomain:l%"
 
     /* 
      This property enables the application to change orientation 

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/simple/wizard.xml	2014-11-17 16:13:26 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple/wizard.xml	2015-01-08 08:00:01 +0000
@@ -30,9 +30,9 @@
 		<fieldpagetitle>Click package parameters</fieldpagetitle>
 		<fields>
 			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-			                defaulttext="" placeholdertext="Domain"/>
-			  <fielddescription>Domain:</fielddescription>
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
 			</field>
 			<field mandatory="true" name="ClickMaintainer">
 			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simplei18n/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/simplei18n/CMakeLists.txt	2014-11-17 15:09:02 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simplei18n/CMakeLists.txt	2015-01-08 08:00:01 +0000
@@ -34,7 +34,7 @@
 option(INSTALL_TESTS "Install the tests on make install" on)
 
 set(APP_NAME          %ProjectName%)
-set(APP_ID            "%ClickDomain:l%.%ProjectName:l%")
+set(APP_ID            "%ProjectName:l%.%ClickDomain:l%")
 set(%ProjectName:u%_DIR "share/qml/%ProjectName%")
 set(MAIN_QML          "%ProjectName%.qml")
 set(ICON              "graphics/%ProjectName%.png")

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simplei18n/app/displayName.qml'
--- share/qtcreator/templates/wizards/ubuntu/simplei18n/app/displayName.qml	2014-10-14 08:33:49 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simplei18n/app/displayName.qml	2015-01-08 08:00:01 +0000
@@ -13,7 +13,7 @@
     objectName: "mainView"
 
     // Note! applicationName needs to match the "name" field of the click manifest
-    applicationName: "%ClickDomain:l%.%ProjectName:l%"
+    applicationName: "%ProjectName:l%.%ClickDomain:l%"
 
     /* 
      This property enables the application to change orientation 

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simplei18n/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/simplei18n/wizard.xml	2014-11-17 16:13:26 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simplei18n/wizard.xml	2015-01-08 08:00:01 +0000
@@ -38,9 +38,9 @@
 		<fieldpagetitle>Click package parameters</fieldpagetitle>
 		<fields>
 			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-			                defaulttext="" placeholdertext="Domain"/>
-			  <fielddescription>Domain:</fielddescription>
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
 			</field>
 			<field mandatory="true" name="ClickMaintainer">
 			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'

=== modified file 'share/qtcreator/templates/wizards/ubuntu/tabs/main.qml'
--- share/qtcreator/templates/wizards/ubuntu/tabs/main.qml	2014-09-03 11:49:49 +0000
+++ share/qtcreator/templates/wizards/ubuntu/tabs/main.qml	2015-01-08 08:00:01 +0000
@@ -13,7 +13,7 @@
     objectName: "mainView"
 
     // Note! applicationName needs to match the "name" field of the click manifest
-    applicationName: "%ClickDomain:l%.%ProjectName:l%"
+    applicationName: "%ProjectName:l%.%ClickDomain:l%"
 
     /* 
      This property enables the application to change orientation 

=== modified file 'share/qtcreator/templates/wizards/ubuntu/tabs/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/tabs/wizard.xml	2014-11-17 16:13:26 +0000
+++ share/qtcreator/templates/wizards/ubuntu/tabs/wizard.xml	2015-01-08 08:00:01 +0000
@@ -35,9 +35,9 @@
 		<fieldpagetitle>Click package parameters</fieldpagetitle>
 		<fields>
 			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-			                defaulttext="" placeholdertext="Domain"/>
-			  <fielddescription>Domain:</fielddescription>
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
 			</field>
 			<field mandatory="true" name="ClickMaintainer">
 			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'

=== modified file 'share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml	2014-11-17 16:13:26 +0000
+++ share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml	2015-01-08 08:00:01 +0000
@@ -16,10 +16,11 @@
     <!-- Create a 2nd wizard page with click package parameters -->
     <fieldpagetitle>Click package parameters</fieldpagetitle>
     <fields>
-        <field mandatory="true" name="ClickDomain">
-            <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' defaulttext="" placeholdertext="Domain"/>
-            <fielddescription>Domain:</fielddescription>
-        </field>
+			<field mandatory="true" name="ClickDomain">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
+			</field>
         <field mandatory="true" name="ClickMaintainer">
             <fieldcontrol class="QLineEdit" validator='^[^"]+$' defaulttext="" placeholdertext="Maintainer"/>
             <fielddescription>Maintainer:</fielddescription>

=== modified file 'share/qtcreator/ubuntu/scripts/qtc_chroot_wrapper.py'
--- share/qtcreator/ubuntu/scripts/qtc_chroot_wrapper.py	2014-11-24 11:17:19 +0000
+++ share/qtcreator/ubuntu/scripts/qtc_chroot_wrapper.py	2015-01-08 08:00:01 +0000
@@ -34,6 +34,7 @@
 import fcntl
 import uuid
 import signal
+import dbus
 
 #find out the directory holding the link
 dirname = os.path.basename(os.path.dirname(os.path.abspath(sys.argv[0])))
@@ -45,12 +46,12 @@
 #find out the path this script is in, required for local plugin installation
 scriptpath = os.path.dirname(os.path.realpath(__file__))
 
-#@BUG get this dynamically
-chroot_name_prefix = "click"
+#get the click prefix from env, or use click if the var is not set
+#if the variable is set we do not try to reach the click-chroot-agent
+chroot_name_prefix = os.getenv('CLICK_CHROOT_SUFFIX', "click")
 
 architecture = dirname[idx+1:]
 framework    = dirname[0:idx]
-session_id   = str(uuid.uuid4())
 
 args    = sys.argv[1:]
 command = os.path.basename(sys.argv[0])
@@ -62,9 +63,9 @@
         success = subprocess.call(["/bin/bash",legacy_script,framework,architecture,chroot_name_prefix]+args,stdout=sys.stdout,stderr=sys.stderr)
         sys.exit(success)
 
-subproc = None
-
-click   = shutil.which("click")
+subproc    = None
+session_id = ""
+click      = shutil.which("click")
 
 if( click is None ):
     print("Could not find click in the path, please make sure it is installed")
@@ -89,7 +90,25 @@
 signal.signal(signal.SIGINT , exit_gracefully)
 signal.signal(signal.SIGHUP , exit_gracefully)
 
-success = subprocess.call([click, "chroot","-a",architecture,"-f",framework,"-n",chroot_name_prefix,"begin-session",session_id],stdout=subprocess.DEVNULL)
+#only ask the chroot-agent if we use the default click prefix
+if chroot_name_prefix == "click":
+    try:
+        sessionBus = dbus.SessionBus()
+        clickChrootAgent = sessionBus.get_object('com.ubuntu.sdk.ClickChrootAgent','/com/ubuntu/sdk/ClickChrootAgent')
+        clickChrootAgentIFace = dbus.Interface(clickChrootAgent,dbus_interface='com.ubuntu.sdk.ClickChrootAgent')
+        session_id = clickChrootAgentIFace.spawnSession(framework,architecture)
+    except dbus.exceptions.DBusException:
+        session_id = ""
+
+if (len(session_id) == 0):
+    session_id   = str(uuid.uuid4())
+    pre_spawned_session = False
+else:
+    pre_spawned_session = True
+
+if ( not pre_spawned_session ):
+    success = subprocess.call([click, "chroot","-a",architecture,"-f",framework,"-n",chroot_name_prefix,"begin-session",session_id],stdout=subprocess.DEVNULL)
+
 subproc = subprocess.Popen([click, "chroot","-a",architecture,"-f",framework,"-n",chroot_name_prefix,"run","-n",session_id]+[command]+args,stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
 stdout = ""
@@ -142,5 +161,7 @@
 if(len(stderr) != 0):
     sys.stderr.write(mapPaths(stderr))
 
-subprocess.call([click, "chroot","-a",architecture,"-f",framework,"-n",chroot_name_prefix,"end-session",session_id],stdout=subprocess.DEVNULL)
+if (not pre_spawned_session):
+    subprocess.call([click, "chroot","-a",architecture,"-f",framework,"-n",chroot_name_prefix,"end-session",session_id],stdout=subprocess.DEVNULL)
+
 sys.exit(subproc.returncode)

=== modified file 'src/plugin.pri'
--- src/plugin.pri	2014-07-29 07:58:30 +0000
+++ src/plugin.pri	2015-01-08 08:00:01 +0000
@@ -16,6 +16,9 @@
 
     DEFINES += UBUNTU_RESOURCE_PATH_LOCAL=\"$${PATHSTR}\" UBUNTU_BUILD_LOCAL
 
+    BUILD_ROOT_STR = '\\"$$clean_path($${OUT_PWD}/../../)\\"'
+    DEFINES += UBUNTU_BUILD_ROOT=\"$${BUILD_ROOT_STR}\"
+
     #create a link so we get our wizards in the new project wizard
     system("rm '$$(HOME)/.config/QtProject/qtcreator/templates'")
     system("ln -s '$${PWD}/../share/qtcreator/templates' '$$(HOME)/.config/QtProject/qtcreator/templates'")

=== modified file 'src/ubuntu/manifest.json.template'
--- src/ubuntu/manifest.json.template	2014-08-19 09:50:02 +0000
+++ src/ubuntu/manifest.json.template	2015-01-08 08:00:01 +0000
@@ -1,5 +1,5 @@
 {
-    "name": "com.ubuntu.developer.username.myapp",
+    "name": "myapp.username",
     "description": "description of myapp",
     "framework": "myFramework",
     "architecture": "all",

=== modified file 'src/ubuntu/ubuntu.pro'
--- src/ubuntu/ubuntu.pro	2014-11-27 16:23:51 +0000
+++ src/ubuntu/ubuntu.pro	2015-01-08 08:00:01 +0000
@@ -1,9 +1,9 @@
-QT += network qml quick webkitwidgets script scripttools
+QT += network qml quick webkitwidgets script scripttools dbus
 
 include(../plugin.pri)
 
 QMAKE_CXXFLAGS += -Werror
-CONFIG += c++11
+CONFIG += c++11 dbusinterfaces
 
 #####################################
 # required for Ubuntu Device Notifier
@@ -222,3 +222,12 @@
     ubuntuscopefinalizer.h \
     wizards/ubuntuprojectmigrationwizard.h
 
+INCLUDEPATH+=$$OUT_PWD
+
+xml_desc.target=com.ubuntu.sdk.ClickChrootAgent.xml
+xml_desc.commands=qdbuscpp2xml -o $$xml_desc.target $$PWD/../../chroot-agent/chrootagent.h
+xml_desc.depends=$$PWD/../../chroot-agent/chrootagent.h
+QMAKE_EXTRA_TARGETS+=xml_desc
+
+DBUS_INTERFACES += $$xml_desc.target
+

=== modified file 'src/ubuntu/ubuntuapimode.cpp'
--- src/ubuntu/ubuntuapimode.cpp	2014-08-04 13:46:45 +0000
+++ src/ubuntu/ubuntuapimode.cpp	2015-01-08 08:00:01 +0000
@@ -149,5 +149,4 @@
     }
 
     return QUrl::fromUserInput(QLatin1String(Ubuntu::Constants::UBUNTU_API_ONLINE));
-
 }

=== modified file 'src/ubuntu/ubuntuclickdialog.cpp'
--- src/ubuntu/ubuntuclickdialog.cpp	2014-08-01 13:11:09 +0000
+++ src/ubuntu/ubuntuclickdialog.cpp	2015-01-08 08:00:01 +0000
@@ -30,6 +30,7 @@
 #include <texteditor/fontsettings.h>
 
 #include "ubuntucreatenewchrootdialog.h"
+#include "clickchrootagent_interface.h"
 
 namespace Ubuntu {
 namespace Internal {
@@ -120,6 +121,19 @@
         QString text  = tr(Constants::UBUNTU_CLICK_DELETE_MESSAGE);
         if( QMessageBox::question(Core::ICore::mainWindow(),title,text) != QMessageBox::Yes )
             return 0;
+
+        if(UbuntuClickTool::clickChrootSuffix() == QLatin1String(Constants::UBUNTU_CLICK_CHROOT_DEFAULT_NAME)) {
+            ComUbuntuSdkClickChrootAgentInterface clickAgent(QStringLiteral("com.ubuntu.sdk.ClickChrootAgent"),
+                                                             QStringLiteral("/com/ubuntu/sdk/ClickChrootAgent"),
+                                                             QDBusConnection::sessionBus());
+            if(clickAgent.isValid()) {
+                QDBusPendingReply<bool> ret = clickAgent.releaseSession(target.framework,target.architecture);
+                if(ret.isError())
+                    qDebug()<<ret.error();
+
+                ret.waitForFinished();
+            }
+        }
     }
 
     ProjectExplorer::ProcessParameters params;

=== modified file 'src/ubuntu/ubuntuclicktool.cpp'
--- src/ubuntu/ubuntuclicktool.cpp	2014-12-02 14:20:35 +0000
+++ src/ubuntu/ubuntuclicktool.cpp	2015-01-08 08:00:01 +0000
@@ -60,11 +60,19 @@
     debug = 0
 };
 
+static QString getChrootSuffixFromEnv ()
+{
+    QByteArray value = qgetenv(Constants::UBUNTU_CLICK_CHROOT_SUFFIX_ENV_VAR);
+    if(value.isNull())
+        return QLatin1String(Constants::UBUNTU_CLICK_CHROOT_DEFAULT_NAME);
+
+    return QString::fromLatin1(value);
+}
 
 /**
 * Initialize the m_strClickChrootSuffix from the environment variable
 */
-QString UbuntuClickTool::m_strClickChrootSuffix = QProcessEnvironment::systemEnvironment().value(QLatin1String(Constants::UBUNTU_CLICK_CHROOT_SUFFIX_ENV_VAR),QLatin1String(Constants::UBUNTU_CLICK_CHROOT_DEFAULT_NAME));
+QString UbuntuClickTool::m_strClickChrootSuffix = getChrootSuffixFromEnv();
 
 /**
  * @brief UbuntuClickTool::UbuntuClickTool

=== modified file 'src/ubuntu/ubuntuconstants.h'
--- src/ubuntu/ubuntuconstants.h	2014-12-19 03:41:39 +0000
+++ src/ubuntu/ubuntuconstants.h	2015-01-08 08:00:01 +0000
@@ -183,7 +183,7 @@
 const char UBUNTUPACKAGINGWIDGET_BUILDCMAKEPACKAGE_ID[] ="Ubuntu.Build.PackageCMake";
 const char UBUNTUPACKAGINGWIDGET_DEFAULT_MANIFEST[] =":/ubuntu/manifest.json.template";
 const char UBUNTUPACKAGINGWIDGET_DEFAULT_MYAPP[] =":/ubuntu/myapp.json.template";
-const char UBUNTUPACKAGINGWIDGET_DEFAULT_NAME[] ="com.ubuntu.developer.%0.%1";
+const char UBUNTUPACKAGINGWIDGET_DEFAULT_NAME[] ="%0.%1";
 const char UBUNTUPACKAGINGWIDGET_LOCAL_REVIEWER_INSTALLED[] = "Checking installed click reviewer tools package.";
 const char UBUNTUPACKAGINGWIDGET_ONFINISHED_LOCAL_NO_EMULATOR_INSTALLED[] = "The package is not installed.";
 const char UBUNTUPACKAGINGWIDGET_CLICK_REVIEWER_TOOLS_AGAINST_PACKAGE[] = "Click Reviewers tools against %0";
@@ -380,7 +380,7 @@
 const char  UBUNTU_MODE_WIKI_DISPLAYNAME[] = "Wiki";
 
 const char  UBUNTU_IRC[] = "http://webchat.freenode.net/?channels=ubuntu-app-devel";
-const char  UBUNTU_API_ONLINE[] = "http://developer.ubuntu.com/api/devel/ubuntu-13.10/qml/ui-toolkit/overview-ubuntu-sdk.html";
+const char  UBUNTU_API_ONLINE[] = "http://developer.ubuntu.com/api/qml/current";
 const char  UBUNTU_API_OFFLINE[] = "%1/share/ubuntu-ui-toolkit/doc/html/overview-ubuntu-sdk.html";
 const char  UBUNTU_COREAPPS[] = "https://launchpad.net/ubuntu-phone-coreapps/";
 const char  UBUNTU_WIKI[] = "https://wiki.ubuntu.com/Touch";

=== modified file 'src/ubuntu/ubuntukitmanager.cpp'
--- src/ubuntu/ubuntukitmanager.cpp	2014-11-14 11:29:05 +0000
+++ src/ubuntu/ubuntukitmanager.cpp	2015-01-08 08:00:01 +0000
@@ -82,7 +82,6 @@
             if (qtVersion->type() != QLatin1String(Constants::UBUNTU_QTVERSION_TYPE))
                 continue;
 
-            qDebug()<<qtVersion->qmakeCommand().toFileInfo().absoluteFilePath();
             if (qtVersion->qmakeCommand().toFileInfo().absoluteFilePath() == QFileInfo(qmakePath).absoluteFilePath())
                 return static_cast<UbuntuQtVersion*> (qtVersion);
         }
@@ -168,14 +167,14 @@
             continue;
 
         UbuntuQtVersion* ver = static_cast<UbuntuQtVersion*> (qtVersion);
-        if(ver->scriptVersion() < UbuntuQtVersion::minimalScriptVersion()) {
+        if(ver->scriptVersion() < UbuntuQtVersion::minimalScriptVersion() || !qtVersion->isValid()) {
             //we need to remove that QtVersion
             QFile::remove(ver->qmakeCommand().toString());
             QtSupport::QtVersionManager::removeVersion(ver);
         }
     }
 
-    // having a empty toolchains list will remove all autodetected kits for android
+    // having a empty toolchains list will remove all autodetected kits for ubuntu
     // exactly what we want in that case
     QList<ClickToolChain *> toolchains = clickToolChains();
 
@@ -202,27 +201,6 @@
         existingKits << k;
     }
 
-#if 0
-    QMap<Abi::Architecture, QList<QtSupport::BaseQtVersion *> > qtVersionsForArch;
-    foreach (QtSupport::BaseQtVersion *qtVersion, QtSupport::QtVersionManager::versions()) {
-        if (qtVersion->type() != QLatin1String(Constants::ANDROIDQT))
-            continue;
-        QList<Abi> qtAbis = qtVersion->qtAbis();
-        if (qtAbis.empty())
-            continue;
-        qtVersionsForArch[qtAbis.first().architecture()].append(qtVersion);
-    }
-
-    DeviceManager *dm = DeviceManager::instance();
-    IDevice::ConstPtr device = dm->find(Core::Id(Constants::ANDROID_DEVICE_ID));
-    if (device.isNull()) {
-        // no device, means no sdk path
-        foreach (Kit *k, existingKits)
-            KitManager::deregisterKit(k);
-        return;
-    }
-#endif
-
     // create new kits
     QList<ProjectExplorer::Kit *> newKits;
     foreach (ClickToolChain *tc, toolchains) {

=== modified file 'src/ubuntu/ubuntumanifesteditorwidget.cpp'
--- src/ubuntu/ubuntumanifesteditorwidget.cpp	2014-11-19 10:28:30 +0000
+++ src/ubuntu/ubuntumanifesteditorwidget.cpp	2015-01-08 08:00:01 +0000
@@ -308,7 +308,7 @@
     /* Commented out for bug #1219948  - https://bugs.launchpad.net/qtcreator-plugin-ubuntu/+bug/1219948
     QString userName = bzr->launchpadId();
     if (userName.isEmpty()) userName = QLatin1String(Constants::USERNAME);
-    m_ui->lineEdit_maintainer->setText(QString(QLatin1String("com.ubuntu.developer.%0.%1")).arg(userName).arg(m_projectName));
+    m_ui->lineEdit_maintainer->setText(QString(QLatin1String("%0.%1")).arg(m_projectName).arg(userName));
     */
 
     if(activePage() != General)
@@ -432,7 +432,7 @@
 
 QString UbuntuManifestEditorWidget::createPackageName(const QString &userName, const QString &projectName)
 {
-    return QString(QLatin1String(Constants::UBUNTUPACKAGINGWIDGET_DEFAULT_NAME)).arg(userName).arg(projectName);
+    return QString(QLatin1String(Constants::UBUNTUPACKAGINGWIDGET_DEFAULT_NAME)).arg(projectName).arg(userName);
 }
 
 void UbuntuManifestEditorWidget::addMissingFieldsToManifest (QString fileName)

=== modified file 'src/ubuntu/ubuntuplugin.cpp'
--- src/ubuntu/ubuntuplugin.cpp	2014-12-05 10:08:58 +0000
+++ src/ubuntu/ubuntuplugin.cpp	2015-01-08 08:00:01 +0000
@@ -42,6 +42,7 @@
 #include "ubuntutestcontrol.h"
 #include "ubuntupackageoutputparser.h"
 #include "ubuntuprojecthelper.h"
+#include "ubuntuscopefinalizer.h"
 
 #include "wizards/ubuntuprojectapplicationwizard.h"
 #include "wizards/ubuntufirstrunwizard.h"
@@ -65,6 +66,7 @@
 #include <QtQml>
 #include <QFile>
 #include <QAction>
+#include <QProcess>
 
 #include <coreplugin/icore.h>
 #include <stdint.h>
@@ -74,12 +76,28 @@
 
 UbuntuPlugin::UbuntuPlugin()
 {
+    if(UbuntuClickTool::clickChrootSuffix() == QLatin1String(Constants::UBUNTU_CLICK_CHROOT_DEFAULT_NAME)) {
+#ifdef UBUNTU_BUILD_ROOT
+        Utils::FileName chrootAgent = Utils::FileName::fromString(QStringLiteral(UBUNTU_BUILD_ROOT));
+        chrootAgent.appendPath(QStringLiteral("chroot-agent"))  //append dir
+                .appendPath(QStringLiteral("click-chroot-agent")); //append binary
 
+        bool started = false;
+        if(chrootAgent.toFileInfo().isExecutable()) {
+            started = QProcess::startDetached(chrootAgent.toFileInfo().absoluteFilePath());
+        }
+        if(!started) {
+            QProcess::startDetached(QStringLiteral("click-chroot-agent"));
+        }
+#else
+        //start the chroot-agent
+        QProcess::startDetached(QStringLiteral("click-chroot-agent"));
+#endif
+    }
 }
 
 UbuntuPlugin::~UbuntuPlugin()
 {
-
 }
 
 bool UbuntuPlugin::initialize(const QStringList &arguments, QString *errorString)
@@ -272,8 +290,8 @@
             mproject->addAction(comm, ProjectExplorer::Constants::G_PROJECT_BUILD);
 
         comm = Core::ActionManager::command("Ubuntu.Build.CreateManifest");
-                if(comm)
-                    mproject->addAction(comm, ProjectExplorer::Constants::G_PROJECT_BUILD);
+        if(comm)
+            mproject->addAction(comm, ProjectExplorer::Constants::G_PROJECT_BUILD);
     }
 
     //add ubuntu testcontrol to the object tree

=== modified file 'src/ubuntu/ubuntuplugin.h'
--- src/ubuntu/ubuntuplugin.h	2014-11-27 16:23:51 +0000
+++ src/ubuntu/ubuntuplugin.h	2015-01-08 08:00:01 +0000
@@ -37,7 +37,6 @@
 #include "ubuntusettingsclickpage.h"
 
 #include <extensionsystem/iplugin.h>
-#include <QProcess>
 #include <coreplugin/mimedatabase.h>
 
 namespace Ubuntu {

=== modified file 'src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp'
--- src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp	2014-12-02 14:20:35 +0000
+++ src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp	2015-01-08 08:00:01 +0000
@@ -83,7 +83,7 @@
     }
 
     projectDialog->setField(QStringLiteral("ClickMaintainer"),whoami);
-    projectDialog->setField(QStringLiteral("ClickDomain"),QString(QStringLiteral("com.ubuntu.developer.")+maintainer));
+    projectDialog->setField(QStringLiteral("ClickDomain"),maintainer);
 
     QList<QComboBox*> boxes = projectDialog->findChildren<QComboBox*>();
     foreach(QComboBox* box, boxes){

=== modified file 'src/ubuntu/wizards/ubuntuprojectmigrationwizard.cpp'
--- src/ubuntu/wizards/ubuntuprojectmigrationwizard.cpp	2014-12-02 14:43:15 +0000
+++ src/ubuntu/wizards/ubuntuprojectmigrationwizard.cpp	2015-01-08 08:00:01 +0000
@@ -569,7 +569,7 @@
             whoami     = bzr->whoami();
         }
 
-        wizard()->setField(QStringLiteral("domain"),QString(QStringLiteral("com.ubuntu.developer.")+maintainer));
+        wizard()->setField(QStringLiteral("domain"),maintainer);
         wizard()->setField(QStringLiteral("maintainer"),whoami);
     }
 

=== modified file 'tests/manifest/manifest.json.template'
--- tests/manifest/manifest.json.template	2014-06-25 11:33:20 +0000
+++ tests/manifest/manifest.json.template	2015-01-08 08:00:01 +0000
@@ -1,5 +1,5 @@
 {
-    "name": "com.ubuntu.developer.username.myapp",
+    "name": "myapp.username",
     "description": "description of myapp",
     "framework": "myFramework",
     "architecture": "all",

=== modified file 'tests/manifest/tst_manifest.cpp'
--- tests/manifest/tst_manifest.cpp	2014-08-18 12:29:43 +0000
+++ tests/manifest/tst_manifest.cpp	2015-01-08 08:00:01 +0000
@@ -68,7 +68,7 @@
 void UbuntuManifestTest::testWriteName()
 {
     testWriteStringValue(
-                QString("com.ubuntu.developer.name"),
+                QString("name"),
                 &UbuntuClickManifest::setName,
                 &UbuntuClickManifest::name);
 }