Merge lp:~mir-team/platform-api/remove-mirserver into lp:platform-api

[Alberto Aguirre]

Remove the unused mirserver component

Remove the unused mirserver component

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:266
http://jenkins.qa.ubuntu.com/job/platform-api-ci/388/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/388/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:266
http://jenkins.qa.ubuntu.com/job/platform-api-ci/389/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/389/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Lots of red, nice :)

armhf CI fail appears unrelated:
1/1 Test #1: test_ua_sensors_mock .............***Failed 2.01 sec
unsure how this change impacted it.

Since you're removing a feature from the library, think we'd better bump the version numbers.

review: Needs Fixing

[Alberto Aguirre (albaguirre)]

@Gerry,

Oh true, it merits a version bump.

CI now passed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:267
http://jenkins.qa.ubuntu.com/job/platform-api-ci/390/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/390/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Please update the lib versions in CMakeLists.txt to match the debian version. Also these should match:
src/ubuntu/application/base_module.h
src/ubuntu/application/desktop/module_version.h
src/ubuntu/application/testbackend/module_version.h
src/ubuntu/application/touch/module_version.h

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:268
http://jenkins.qa.ubuntu.com/job/platform-api-ci/391/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/391/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:268
http://jenkins.qa.ubuntu.com/job/platform-api-ci/392/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/392/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Yes!

review: Approve

[Kevin DuBois (kdub)]

I had a branch of similar nature, this one looks good by me.

review: Approve

[Alberto Aguirre (albaguirre)]

@Kevin, IT IS your branch :) (see r265)

[Gerry Boland (gerboland)]

Delayed, but finally getting to test this.
First off, I'm having to rebuild qtubuntu to have it work with this. I wasn't expecting an ABI change due to this MR. Expected?

Now I'm getting
Ubuntu Platform API: Unable to load selected module. -- Aborting
and adding dlerror() I get:
libubuntu_platform_hardware_api.so.2: cannot open shared object file: No such file or directory

Not sure where that version 2 is coming from, as you building v3.

Just bumping the so versions isn't enough sadly, as the debian packaging specifies version 2 everywhere. You either need to bump all the packaging to version 3 (and hit everything that depends on version 2) or else just make this a minor version bump.

review: Needs Fixing

[Alberto Aguirre (albaguirre)]

@Gerry,

Yes, after talking to ricmm, we would need to build all 14-15 rev deps on a major rev bump, so we'll stash this for now until an actual api change warrants a 3.0 bump.

Instead, we'll just stub out the mirserver backend so we can do a minor rev bump:
https://code.launchpad.net/~mir-team/platform-api/stub-mirserver/+merge/241820

[lp:~mir-team/platform-api/remove-mirserver]

284. By Alberto Aguirre on 2014-11-24

No-change rebuild against mir 0.9.0
Approved by: Cemil Azizoglu, PS Jenkins bot

285. By PS Jenkins bot on 2014-11-24

Releasing 2.5.0+15.04.20141124-0ubuntu1

286. By Alberto Aguirre on 2014-11-26

Stub out mirserver backend
Approved by: Gerry Boland, PS Jenkins bot

287. By PS Jenkins bot on 2014-11-26

Releasing 2.6.0+15.04.20141126-0ubuntu1

288. By Ricardo Mendoza on 2015-01-23

* Allow for module-override of specific providers of the Platform API
* Implement support for named pipe event reader on sensors test plugin

Approved by: Jim Hodapp, Daniel d'Andrada, PS Jenkins bot

289. By CI Train Bot Account on 2015-01-23

Releasing 2.7.0+15.04.20150123-0ubuntu1

290. By You-Sheng Yang on 2015-01-28

* Check array boundary for KeyedVector
Approved by: Ricardo Salveti

291. By CI Train Bot Account on 2015-01-28

Releasing 2.7.0+15.04.20150128-0ubuntu1

292. By Ricardo Mendoza on 2015-02-03

Do not load the test backend unless a specific override list is provided. Also, add the test backend as dependency of the main module, now that it is directly usable without other modules.
Approved by: PS Jenkins bot

293. By CI Train Bot Account on 2015-02-03

Releasing 2.8.0+15.04.20150203-0ubuntu1

294. By Ricardo Mendoza on 2015-03-06

Dont abort on soft errors, instead fall back to dummy provider if possible.
Approved by: PS Jenkins bot

295. By CI Train Bot Account on 2015-03-06

Releasing 2.8.1+15.04.20150306-0ubuntu1

296. By Robert Carr on 2015-03-18

Expose MirConnection form UApplicationIntance and deprecate the ua_ui namespace.
Approved by: Alberto Aguirre, PS Jenkins bot, Gerry Boland

297. By CI Train Bot Account on 2015-03-18

Releasing 2.9.0+15.04.20150318-0ubuntu1

298. By Michał Sawicz on 2015-03-20

Fix u_application_instance_get_mir_connection symbol version Fixes: #1433936
Approved by: PS Jenkins bot

299. By Ricardo Mendoza on 2015-03-20

Disable building the Android backends we no longer use.
Approved by: PS Jenkins bot

300. By CI Train Bot Account on 2015-03-20

Releasing 2.9.0+15.04.20150320-0ubuntu1

301. By Robert Carr on 2015-03-25

Remove deprecated ua_ui_* functions

302. By Robert Carr on 2015-03-25

Remove dead examples

303. By Robert Carr on 2015-03-25

Update module loader version numbers

304. By Robert Carr on 2015-03-25

Remove unnused examples from install

305. By Robert Carr on 2015-04-21

Debian cleanup

306. By Robert Carr on 2015-04-21

Merge trunk

307. By Robert Carr on 2015-05-26

Delete more

308. By Robert Carr on 2015-05-26

More deletions

309. By Robert Carr on 2015-06-15

Cleanup

310. By Robert Carr on 2015-06-15

More cleanup

311. By Robert Carr on 2015-06-15

Correct symbols file

312. By Robert Carr on 2015-06-17

Update desktop module version

313. By Alberto Aguirre on 2015-06-18

Remove mirserver module

314. By Alberto Aguirre on 2015-06-18

Fold mircommon into mirclient

315. By Alberto Aguirre on 2015-06-23

Update changelog

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-13 10:11:24 +0000
+++ CMakeLists.txt	2014-11-08 22:26:49 +0000
@@ -2,8 +2,8 @@
 
 project(ubuntu-platform-api)
 
-set(UBUNTU_PLATFORM_API_VERSION_MAJOR 2)
-set(UBUNTU_PLATFORM_API_VERSION_MINOR 5)
+set(UBUNTU_PLATFORM_API_VERSION_MAJOR 3)
+set(UBUNTU_PLATFORM_API_VERSION_MINOR 0)
 set(UBUNTU_PLATFORM_API_VERSION_PATCH 0)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
@@ -58,7 +58,6 @@
 )
 
 find_package(PkgConfig)
-pkg_check_modules(MIRSERVER REQUIRED mirserver)
 pkg_check_modules(MIRCLIENT REQUIRED mirclient)
 
 # Try to find hybris, and disable hybris from build if not found

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-27 20:05:27 +0000
+++ debian/changelog	2014-11-08 22:26:49 +0000
@@ -1,3 +1,9 @@
+platform-api (3.0.0) UNRELEASED; urgency=medium
+
+  * Remove mirserver backend
+
+ -- Alberto Aguirre <[e-mail]>  Thu, 06 Nov 2014 14:39:00 -0600
+
 platform-api (2.5.0+15.04.20141027-0ubuntu1) vivid; urgency=low
 
   [ Alexandros Frantzis ]

=== modified file 'debian/control'
--- debian/control	2014-09-22 18:04:53 +0000
+++ debian/control	2014-11-08 22:26:49 +0000
@@ -15,7 +15,6 @@
                libhybris-common-dev,
                pkg-config,
                libmirclient-dev (>= 0.6.0),
-               libmirserver-dev (>= 0.6.0),
                liburl-dispatcher1-dev,
                libdbus-1-dev,
                libdbus-cpp-dev (>= 4.0.0),

=== modified file 'debian/ubuntu-application-api2-desktop.install'
--- debian/ubuntu-application-api2-desktop.install	2014-05-15 15:46:30 +0000
+++ debian/ubuntu-application-api2-desktop.install	2014-11-08 22:26:49 +0000
@@ -1,2 +1,1 @@
 usr/lib/*/libubuntu_application_api_desktop_mirclient.so.*
-usr/lib/*/libubuntu_application_api_desktop_mirserver.so.*

=== modified file 'debian/ubuntu-application-api2-touch.install'
--- debian/ubuntu-application-api2-touch.install	2014-05-15 15:46:30 +0000
+++ debian/ubuntu-application-api2-touch.install	2014-11-08 22:26:49 +0000
@@ -1,2 +1,1 @@
-usr/lib/*/libubuntu_application_api_touch_mirserver.so.*
 usr/lib/*/libubuntu_application_api_touch_mirclient.so.*

=== modified file 'src/ubuntu/application/base_module.h'
--- src/ubuntu/application/base_module.h	2014-09-30 01:35:35 +0000
+++ src/ubuntu/application/base_module.h	2014-11-08 22:26:49 +0000
@@ -27,8 +27,8 @@
  * This is the base backend loader for the Platform API
  */
 
-#define API_VERSION_MAJOR   "2"
-#define API_VERSION_MINOR   "5"
+#define API_VERSION_MAJOR   "3"
+#define API_VERSION_MINOR   "0"
 #define API_VERSION_PATCH   "0"
 #define SO_SUFFIX ".so." API_VERSION_MAJOR "." API_VERSION_MINOR "." API_VERSION_PATCH
 

=== modified file 'src/ubuntu/application/common/CMakeLists.txt'
--- src/ubuntu/application/common/CMakeLists.txt	2014-05-15 14:56:16 +0000
+++ src/ubuntu/application/common/CMakeLists.txt	2014-11-08 22:26:49 +0000
@@ -3,6 +3,4 @@
 )
 
 add_subdirectory(application)
-add_subdirectory(mircommon)
 add_subdirectory(mirclient)
-add_subdirectory(mirserver)

=== modified file 'src/ubuntu/application/common/mirclient/CMakeLists.txt'
--- src/ubuntu/application/common/mirclient/CMakeLists.txt	2014-09-22 18:04:53 +0000
+++ src/ubuntu/application/common/mirclient/CMakeLists.txt	2014-11-08 22:26:49 +0000
@@ -3,6 +3,12 @@
   application_instance_mirclient.cpp
   window_properties_mirclient.cpp
   window_mirclient.cpp
+  event_helpers_mir.cpp
+  application_id_mir.cpp
+  application_options_mir.cpp
+  application_description_mir.cpp
+  session_mir.cpp
+  lifecycle_delegate_mir.cpp
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")

=== renamed file 'src/ubuntu/application/common/mircommon/application_description_mir.cpp' => 'src/ubuntu/application/common/mirclient/application_description_mir.cpp'
=== renamed file 'src/ubuntu/application/common/mircommon/application_description_mir_priv.h' => 'src/ubuntu/application/common/mirclient/application_description_mir_priv.h'
=== renamed file 'src/ubuntu/application/common/mircommon/application_id_mir.cpp' => 'src/ubuntu/application/common/mirclient/application_id_mir.cpp'
=== renamed file 'src/ubuntu/application/common/mircommon/application_id_mir_priv.h' => 'src/ubuntu/application/common/mirclient/application_id_mir_priv.h'
=== renamed file 'src/ubuntu/application/common/mircommon/application_options_mir.cpp' => 'src/ubuntu/application/common/mirclient/application_options_mir.cpp'
=== renamed file 'src/ubuntu/application/common/mircommon/application_options_mir_priv.h' => 'src/ubuntu/application/common/mirclient/application_options_mir_priv.h'
=== renamed file 'src/ubuntu/application/common/mircommon/event_helpers_mir.cpp' => 'src/ubuntu/application/common/mirclient/event_helpers_mir.cpp'
=== renamed file 'src/ubuntu/application/common/mircommon/event_helpers_mir.h' => 'src/ubuntu/application/common/mirclient/event_helpers_mir.h'
=== renamed file 'src/ubuntu/application/common/mircommon/lifecycle_delegate_mir.cpp' => 'src/ubuntu/application/common/mirclient/lifecycle_delegate_mir.cpp'
=== renamed file 'src/ubuntu/application/common/mircommon/lifecycle_delegate_mir_priv.h' => 'src/ubuntu/application/common/mirclient/lifecycle_delegate_mir_priv.h'
=== renamed file 'src/ubuntu/application/common/mircommon/session_mir.cpp' => 'src/ubuntu/application/common/mirclient/session_mir.cpp'
=== modified file 'src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp'
--- src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp	2014-10-15 13:29:15 +0000
+++ src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp	2014-11-08 22:26:49 +0000
@@ -19,9 +19,9 @@
 #include "application_instance_mirclient_priv.h"
 #include "window_properties_mirclient_priv.h"
 #include "window_mirclient_priv.h"
-#include "mircommon/lifecycle_delegate_mir_priv.h"
+#include "lifecycle_delegate_mir_priv.h"
 
-#include "mircommon/application_id_mir_priv.h"
+#include "application_id_mir_priv.h"
 
 #include <ubuntu/application/lifecycle_delegate.h>
 #include <ubuntu/application/ui/window.h>

=== modified file 'src/ubuntu/application/common/mirclient/window_mirclient.cpp'
--- src/ubuntu/application/common/mirclient/window_mirclient.cpp	2014-09-29 19:56:49 +0000
+++ src/ubuntu/application/common/mirclient/window_mirclient.cpp	2014-11-08 22:26:49 +0000
@@ -21,7 +21,7 @@
 #include "window_properties_mirclient_priv.h"
 #include "window_mirclient_priv.h"
 
-#include "mircommon/event_helpers_mir.h"
+#include "event_helpers_mir.h"
 
 namespace uamc = ubuntu::application::mir::client;
 namespace uaum = ubuntu::application::ui::mir;

=== removed directory 'src/ubuntu/application/common/mircommon'
=== removed file 'src/ubuntu/application/common/mircommon/CMakeLists.txt'
--- src/ubuntu/application/common/mircommon/CMakeLists.txt	2014-08-06 08:33:54 +0000
+++ src/ubuntu/application/common/mircommon/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-set(SOURCES
-  event_helpers_mir.cpp
-  application_id_mir.cpp
-  application_options_mir.cpp
-  application_description_mir.cpp
-  session_mir.cpp
-  lifecycle_delegate_mir.cpp
-  )
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC --std=c++11")
-
-include_directories(
-  ${MIRCLIENT_INCLUDE_DIRS}
-  )
-
-add_library(
-  ubuntu_application_api_mircommon STATIC
-  ${SOURCES}
-  )
-
-target_link_libraries(
-  ubuntu_application_api_mircommon
-
-  ${LINK_LIBRARIES}
-  )

=== removed directory 'src/ubuntu/application/common/mirserver'
=== removed file 'src/ubuntu/application/common/mirserver/CMakeLists.txt'
--- src/ubuntu/application/common/mirserver/CMakeLists.txt	2014-05-29 14:14:31 +0000
+++ src/ubuntu/application/common/mirserver/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-set(SOURCES
-  ubuntu_application_api_mirserver.cpp
-  application_instance_mirserver.cpp
-  window_properties_mirserver.cpp
-  window_mirserver.cpp
-)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
-
-include_directories(
-    ${CMAKE_BINARY_DIR}/include
-    ${MIRSERVER_INCLUDE_DIRS}
-)
-
-add_library(
-	ubuntu_application_api_mirserver STATIC
-	${SOURCES}
-)
-
-target_link_libraries(
-	ubuntu_application_api_mirserver
-
-    ${MIRSERVER_LDFLAGS} ${MIRSERVER_LIBRARIES}
-)

=== removed file 'src/ubuntu/application/common/mirserver/application_instance_mirserver.cpp'
--- src/ubuntu/application/common/mirserver/application_instance_mirserver.cpp	2014-06-17 14:37:23 +0000
+++ src/ubuntu/application/common/mirserver/application_instance_mirserver.cpp	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "application_instance_mirserver_priv.h"
-
-#include "mircommon/application_description_mir_priv.h"
-#include "mircommon/application_options_mir_priv.h"
-#include "mircommon/application_id_mir_priv.h"
-
-#include <mir/scene/surface.h>
-#include <mir/scene/surface_coordinator.h>
-#include <mir/scene/session.h>
-#include <mir/scene/session_listener.h>
-#include <mir/scene/surface_creation_parameters.h>
-#include <mir/scene/snapshot.h>
-
-namespace uam = ubuntu::application::mir;
-namespace uams = uam::server;
-
-namespace mf = mir::frontend;
-namespace ms = mir::scene;
-
-namespace
-{
-/* A Mir in-process client does not have an associated Session by default. However it is
- * useful for the shell to be able to position and identify its own surface, so need to
- * create a mock implementation of Session for that respective Surface.
- */
-class InProcessClientSession : public ms::Session
-{
-public:
-    virtual void force_requests_to_complete() override {}
-    virtual pid_t process_id() const override { return 0; }
-    virtual void take_snapshot(ms::SnapshotCallback const&) override {}
-    virtual std::shared_ptr<ms::Surface> default_surface() const override { return surface; }
-    virtual void set_lifecycle_state(MirLifecycleState) override {}
-
-    virtual mf::SurfaceId create_surface(ms::SurfaceCreationParameters const& ) override { return mf::SurfaceId(0); }
-    virtual void destroy_surface(mf::SurfaceId) override {}
-    virtual std::shared_ptr<mf::Surface> get_surface(mf::SurfaceId) const override { return surface; }
-    virtual std::string name() const override { return "Shell"; }
-    virtual void hide() override {}
-    virtual void show() override {}
-    virtual void send_display_config(mir::graphics::DisplayConfiguration const&) override {}
-
-    virtual void start_prompt_session() override {}
-    virtual void stop_prompt_session() override {}
-private:
-    std::shared_ptr<ms::Surface> const surface;
-};
-
-InProcessClientSession& global_session()
-{
-    static InProcessClientSession session;
-    return session;
-}
-}
-
-uams::Instance::Instance(std::shared_ptr<ms::SurfaceCoordinator> const &surface_coordinator,
-                         std::shared_ptr<ms::SessionListener> const &session_listener,
-                         uam::Description* description_,
-                         uam::Options *options_)
-    : surface_coordinator(surface_coordinator),
-      session_listener(session_listener),
-      ref_count(1)
-{
-    description = DescriptionPtr(description_,
-        [] (uam::Description* p)
-        {
-            delete p;
-        });
-    options = OptionsPtr(options_,
-        [] (uam::Options* p)
-        {
-            delete p;
-        });
-}
-
-UApplicationInstance* uams::Instance::as_u_application_instance()
-{
-    return static_cast<UApplicationInstance*>(this);
-}
-
-uams::Instance* uams::Instance::from_u_application_instance(UApplicationInstance *u_instance)
-{
-    return static_cast<uams::Instance*>(u_instance);
-}
-
-void uams::Instance::ref()
-{
-    ref_count++;
-}
-
-void uams::Instance::unref()
-{
-    ref_count--;
-    if (ref_count == 0)
-        delete this;
-}
-
-std::shared_ptr<ms::Surface> uams::Instance::create_surface(ms::SurfaceCreationParameters const& parameters)
-{
-    ms::Session& session = global_session();
-    auto surface = surface_coordinator->add_surface(parameters, &session);
-    // Need to call the SessionListener ourselves, else shell not notified of this surface creation
-    session_listener->surface_created(session, surface);
-    return surface;
-}

=== removed file 'src/ubuntu/application/common/mirserver/application_instance_mirserver_priv.h'
--- src/ubuntu/application/common/mirserver/application_instance_mirserver_priv.h	2014-04-15 20:23:07 +0000
+++ src/ubuntu/application/common/mirserver/application_instance_mirserver_priv.h	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef UBUNTU_APPLICATION_INSTANCE_MIRSERVER_PRIV_H_
-#define UBUNTU_APPLICATION_INSTANCE_MIRSERVER_PRIV_H_
-
-#include <ubuntu/application/instance.h>
-
-#include <memory>
-#include <functional>
-
-namespace mir
-{
-namespace scene
-{
-class Surface;
-class SurfaceCoordinator;
-class SessionListener;
-class SurfaceCreationParameters;
-}
-}
-
-namespace ubuntu
-{
-namespace application
-{
-namespace mir
-{
-class Description;
-class Options;
-
-namespace server
-{
-
-class Instance
-{
-public:
-    Instance(std::shared_ptr< ::mir::scene::SurfaceCoordinator> const& surface_coordinator,
-             std::shared_ptr< ::mir::scene::SessionListener> const& session_listener,
-             ubuntu::application::mir::Description* description, 
-             ubuntu::application::mir::Options *options);
-    ~Instance() = default;
-    
-    UApplicationInstance* as_u_application_instance();
-    static Instance* from_u_application_instance(UApplicationInstance* u_instance);
-    
-    void ref();
-    void unref();
-    
-    std::shared_ptr< ::mir::scene::Surface> create_surface( ::mir::scene::SurfaceCreationParameters const& parameters);
-    
-protected:
-    Instance(Instance const&) = delete;
-    Instance& operator=(Instance const&) = delete;
-
-private:
-    typedef std::unique_ptr<Description, std::function<void(Description*)>> DescriptionPtr;
-    typedef std::unique_ptr<Options, std::function<void(Options*)>> OptionsPtr;
-    
-    OptionsPtr options;
-    DescriptionPtr description;
-
-    std::shared_ptr< ::mir::scene::SurfaceCoordinator> const surface_coordinator;
-    std::shared_ptr< ::mir::scene::SessionListener> const session_listener;
-
-    int ref_count;
-};
-
-}
-}
-}
-} // namespace ubuntu
-
-#endif // UBUNTU_APPLICATION_INSTANCE_MIRSERVER_PRIV_H_

=== removed file 'src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp'
--- src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp	2014-07-15 12:41:35 +0000
+++ src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp	1970-01-01 00:00:00 +0000
@@ -1,351 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "application_instance_mirserver_priv.h"
-#include "window_properties_mirserver_priv.h"
-#include "window_mirserver_priv.h"
-
-#include "mircommon/application_id_mir_priv.h"
-#include "mircommon/application_description_mir_priv.h"
-#include "mircommon/application_options_mir_priv.h"
-#include "mircommon/mir/geometry/rectangles.h"
-
-// C APIs
-#include <ubuntu/application/init.h>
-#include <ubuntu/application/lifecycle_delegate.h>
-#include <ubuntu/application/ui/window.h>
-#include <ubuntu/application/ui/options.h>
-#include <ubuntu/application/ui/session.h>
-#include <ubuntu/application/ui/clipboard.h>
-#include <ubuntu/application/ui/display.h>
-#include <ubuntu/application/sensors/accelerometer.h>
-#include <ubuntu/application/sensors/proximity.h>
-#include <ubuntu/application/sensors/light.h>
-
-#include <mir/default_server_configuration.h>
-
-#include <mir/graphics/display.h>
-#include <mir/graphics/display_buffer.h>
-#include <mir/graphics/platform.h>
-#include <mir/graphics/graphic_buffer_allocator.h>
-#include <mir/graphics/internal_client.h>
-#include <mir/input/input_platform.h>
-
-#include <assert.h>
-
-#include <memory>
-#include <functional>
-
-namespace uam = ubuntu::application::mir;
-namespace uams = ubuntu::application::mir::server;
-
-namespace
-{
-
-struct MirServerContext
-{
-    std::shared_ptr<mir::graphics::Display> display;
-    std::shared_ptr<mir::graphics::GraphicBufferAllocator> buffer_allocator;
-    std::shared_ptr<mir::scene::SurfaceCoordinator> surface_coordinator;
-    std::shared_ptr<mir::scene::SessionListener> session_listener;
-    std::shared_ptr<mir::input::receiver::InputPlatform> input_platform;
-    std::shared_ptr<mir::graphics::InternalClient> egl_client;
-};
-
-MirServerContext *
-global_mirserver_context()
-{
-    static MirServerContext context;
-    return &context;
-}
-}
-
-extern "C"
-{
-void u_application_init(void *args)
-{
-    auto context = global_mirserver_context();
-    mir::DefaultServerConfiguration* config = reinterpret_cast<mir::DefaultServerConfiguration*>(args);
-
-    context->surface_coordinator = config->the_surface_coordinator();
-    context->buffer_allocator = config->the_buffer_allocator();
-    context->display = config->the_display();
-    context->session_listener = config->the_session_listener();
-    context->input_platform = mir::input::receiver::InputPlatform::create();
-    context->egl_client = config->the_graphics_platform()->create_internal_client();
-}
-
-void u_application_finish()
-{
-    auto context = global_mirserver_context();
-
-    context->display.reset();
-    context->surface_coordinator.reset();
-    context->session_listener.reset();
-    context->input_platform.reset();
-    context->egl_client.reset();
-}
-
-UApplicationInstance* u_application_instance_new_from_description_with_options(UApplicationDescription* u_description, UApplicationOptions* u_options)
-{
-    auto surface_coordinator = global_mirserver_context()->surface_coordinator;
-    assert(surface_coordinator);
-    auto session_listener = global_mirserver_context()->session_listener;
-    assert(session_listener);
-
-    auto description = uam::Description::from_u_application_description(u_description);
-    auto options = uam::Options::from_u_application_options(u_options);
-
-    auto instance = new uams::Instance(surface_coordinator, session_listener, description, options);
-
-    return instance->as_u_application_instance();
-}
-
-void
-u_application_instance_ref(UApplicationInstance *u_instance)
-{
-    auto instance = uams::Instance::from_u_application_instance(u_instance);
-    instance->ref();
-}
-    
-void
-u_application_instance_unref(UApplicationInstance *u_instance)
-{
-    auto instance = uams::Instance::from_u_application_instance(u_instance);
-    instance->unref();
-}
-    
-void
-u_application_instance_destroy(UApplicationInstance *instance)
-{
-    // TODO<papi>: What are the proper semantics here.
-    u_application_instance_unref(instance);
-}
-    
-void
-u_application_instance_run(UApplicationInstance *instance)
-{
-    // TODO<papi>: What is this supposed to do? Seems to be no-op on hybris.
-    (void) instance;
-}
-
-void ua_ui_set_clipboard_content(void* content, size_t content_size)
-{
-    // TODO<mir,papi>: Implement. Probably need more arguments?
-    (void) content;
-    (void) content_size;
-}
-
-void ua_ui_get_clipboard_content(void** out_content, size_t* out_content_size)
-{
-    // TODO<mir,papi>: Implement
-    *out_content = NULL;
-    *out_content_size = 0;
-}
-
-UAUiDisplay* ua_ui_display_new_with_index(size_t index)
-{
-    // TODO<mir>: Make use of index. This is kind of strangely done...
-    return reinterpret_cast<UAUiDisplay*>(index);
-}
-
-void ua_ui_display_destroy(UAUiDisplay* display)
-{
-    // TODO: Implement. Or is this a noop for mirserver?
-    (void) display;
-}
-
-uint32_t ua_ui_display_query_horizontal_res(UAUiDisplay* display)
-{
-    (void) display; // TODO<mir>: Multiple displays
-
-    auto mir_display = global_mirserver_context()->display;
-    assert(mir_display);
-
-    /* TODO: Get proper configuration */
-    mir::geometry::Rectangles view_area;
-    mir_display->for_each_display_buffer([&view_area](mir::graphics::DisplayBuffer const& db)
-    {
-        view_area.add(db.view_area());
-    });
-    mir::geometry::Size const display_size{view_area.bounding_rectangle().size};
-    
-    return display_size.width.as_uint32_t();
-}
-
-uint32_t ua_ui_display_query_vertical_res(UAUiDisplay* display)
-{
-    (void) display; // TODO<mir>: Multiple displays
-
-    auto mir_display = global_mirserver_context()->display;
-    assert(mir_display);
-
-    /* TODO: Get proper configuration */
-    mir::geometry::Rectangles view_area;
-    mir_display->for_each_display_buffer([&view_area](mir::graphics::DisplayBuffer const& db)
-    {
-        view_area.add(db.view_area());
-    });
-    mir::geometry::Size const display_size{view_area.bounding_rectangle().size};
-    
-    return display_size.height.as_uint32_t();
-}
-
-EGLNativeDisplayType ua_ui_display_get_native_type(UAUiDisplay* display)
-{
-    auto internal_client = global_mirserver_context()->egl_client;
-    assert(internal_client);
-    
-    return internal_client->egl_native_display();
-}
-
-namespace
-{
-static MirPixelFormat choose_pixel_format(std::shared_ptr<mir::graphics::GraphicBufferAllocator> const& allocator)
-{
-    auto formats = allocator->supported_pixel_formats();
-    return formats[0];
-}
-}
-
-UAUiWindowProperties* ua_ui_window_properties_new_for_normal_window()
-{
-    auto properties = new uams::WindowProperties();
-
-    return properties->as_u_window_properties();
-}
-
-void ua_ui_window_properties_destroy(UAUiWindowProperties* u_properties)
-{
-    auto properties = uams::WindowProperties::from_u_window_properties(u_properties);
-    delete properties;
-}
-
-void ua_ui_window_properties_set_titlen(UAUiWindowProperties* u_properties, const char* title, size_t title_length)
-{
-    auto properties = uams::WindowProperties::from_u_window_properties(u_properties);
-    properties->set_title(title, title_length);
-}
-
-const char* ua_ui_window_properties_get_title(UAUiWindowProperties* u_properties)
-{
-    auto properties = uams::WindowProperties::from_u_window_properties(u_properties);
-    return properties->surface_parameters().name.c_str();
-}
-
-void ua_ui_window_properties_set_role(UAUiWindowProperties* properties, UAUiWindowRole role)
-{
-    // TODO<papi>: Implement. Or is this a noop for us?
-    (void) properties;
-    (void) role;
-}
-
-void ua_ui_window_properties_set_event_cb_and_ctx(UAUiWindowProperties*, UAUiWindowEventCb, void*)
-{
-}
-
-void ua_ui_window_properties_set_input_cb_and_ctx(UAUiWindowProperties* u_properties, UAUiWindowInputEventCb cb, void* ctx)
-{
-    auto properties = uams::WindowProperties::from_u_window_properties(u_properties);
-    properties->set_input_cb_and_ctx(cb, ctx);
-}
-
-void ua_ui_window_properties_set_dimensions(UAUiWindowProperties *u_properties, uint32_t width, uint32_t height)
-{
-    auto properties = uams::WindowProperties::from_u_window_properties(u_properties);
-    properties->set_dimensions(width, height);
-}
-
-UAUiWindow* ua_ui_window_new_for_application_with_properties(UApplicationInstance* u_instance, UAUiWindowProperties* u_properties)
-{
-    auto input_platform = global_mirserver_context()->input_platform;
-    assert(input_platform);
-    auto internal_client = global_mirserver_context()->egl_client;
-    assert(internal_client);
-
-    auto instance = uams::Instance::from_u_application_instance(u_instance);
-    auto properties = uams::WindowProperties::from_u_window_properties(u_properties);
-    
-    // A bit of a wart.
-    properties->set_pixel_format(choose_pixel_format(global_mirserver_context()->buffer_allocator));
-    
-    auto window = new uams::Window(*instance, properties, input_platform, internal_client);
-
-    return window->as_u_window();
-}
-
-void ua_ui_window_destroy(UAUiWindow* u_window)
-{
-    auto window = uams::Window::from_u_window(u_window);
-    delete window;
-}
-
-void ua_ui_window_get_size(UAUiWindow* u_window, uint32_t *width, uint32_t *height)
-{
-    (void) u_window;
-    (void) width;
-    (void) height;
-}
-
-UStatus ua_ui_window_move(UAUiWindow* window, uint32_t x, uint32_t y)
-{
-    // TODO<mir,papi>: Implement. But should this exist?
-    (void) window;
-    (void) x;
-    (void) y;
-    return (UStatus) 0;
-}
-
-UStatus ua_ui_window_resize(UAUiWindow* window, uint32_t width, uint32_t height)
-{
-    // TODO<mir>: Implement
-    (void) window;
-    (void) width;
-    (void) height;
-    return (UStatus) 0;
-}
-
-UStatus ua_ui_window_hide(UAUiWindow* window)
-{
-    // TODO<mir>: Implement
-    (void) window;
-    return (UStatus) 0;
-}
-
-UStatus ua_ui_window_show(UAUiWindow* window)
-{
-    // TODO<mir>: Implement
-    (void) window;
-    return (UStatus) 0;
-}
-
-void ua_ui_window_request_fullscreen(UAUiWindow* window)
-{
-    // TODO<mir>: Implement
-    (void) window;
-}
-
-EGLNativeWindowType ua_ui_window_get_native_type(UAUiWindow* u_window)
-{
-    auto window = uams::Window::from_u_window(u_window);
-
-    return window->get_native_type();
-}
-
-// TODO: Sensors
-}

=== removed file 'src/ubuntu/application/common/mirserver/window_mirserver.cpp'
--- src/ubuntu/application/common/mirserver/window_mirserver.cpp	2014-07-15 12:41:35 +0000
+++ src/ubuntu/application/common/mirserver/window_mirserver.cpp	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "mircommon/event_helpers_mir.h"
-
-#include "window_mirserver_priv.h"
-#include "application_instance_mirserver_priv.h"
-#include "window_properties_mirserver_priv.h"
-
-
-#include <mir/scene/surface.h>
-#include <mir/input/input_platform.h>
-#include <mir/input/input_receiver_thread.h>
-#include <mir/graphics/internal_client.h>
-#include <mir/graphics/internal_surface.h>
-
-namespace uams = ubuntu::application::mir::server;
-namespace uaum = ubuntu::application::ui::mir;
-
-namespace mf = mir::frontend;
-namespace mg = mir::graphics;
-namespace msh = mir::shell;
-namespace mircv = mir::input::receiver;
-
-namespace
-{
-
-static void ua_ui_window_handle_event(UAUiWindowInputEventCb cb, void* ctx, MirEvent* mir_event)
-{
-    Event ubuntu_ev;
-    auto translated_event = uaum::event_to_ubuntu_deprecated_event(mir_event, ubuntu_ev);
-    if (translated_event)
-        cb(ctx, &ubuntu_ev);
-}
-
-}
-
-uams::Window::Window(uams::Instance& instance, uams::WindowProperties* properties,
-                     std::shared_ptr<mircv::InputPlatform> const& input_platform,
-                     std::shared_ptr<mg::InternalClient> const& internal_client)
-    : window_properties(properties),
-      surface(instance.create_surface(properties->surface_parameters())),
-      internal_client(internal_client)
-{
-    input_thread = input_platform->create_input_thread(surface->client_input_fd(),
-        std::bind(ua_ui_window_handle_event, properties->input_cb(), properties->input_context(), std::placeholders::_1));
-    input_thread->start();
-}
-
-uams::Window::~Window()
-{
-    input_thread->stop();
-    input_thread->join();
-}
-
-UAUiWindow* uams::Window::as_u_window()
-{
-    return static_cast<UAUiWindow*>(this);
-}
-
-uams::Window* uams::Window::from_u_window(UAUiWindow *u_window)
-{
-    return static_cast<uams::Window*>(u_window);
-}
-
-EGLNativeWindowType uams::Window::get_native_type()
-{
-    auto mir_surface = mf::as_internal_surface(surface);
-    return internal_client->egl_native_window(mir_surface);
-}

=== removed file 'src/ubuntu/application/common/mirserver/window_mirserver_priv.h'
--- src/ubuntu/application/common/mirserver/window_mirserver_priv.h	2014-04-04 10:38:36 +0000
+++ src/ubuntu/application/common/mirserver/window_mirserver_priv.h	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef UBUNTU_APPLICATION_UI_WINDOW_MIRSERVER_PRIV_H_
-#define UBUNTU_APPLICATION_UI_WINDOW_MIRSERVER_PRIV_H_
-
-#include <ubuntu/application/ui/window.h>
-
-#include <EGL/egl.h>
-
-#include <stddef.h>
-
-#include <functional>
-#include <memory>
-#include <string>
-
-namespace mir
-{
-namespace scene
-{
-class Surface;
-}
-namespace input
-{
-namespace receiver
-{
-class InputReceiverThread;
-class InputPlatform;
-}
-}
-namespace graphics
-{
-class InternalClient;
-}
-}
-
-namespace ubuntu
-{
-namespace application
-{
-namespace mir
-{
-namespace server
-{
-class Instance;
-class WindowProperties;
-
-class Window
-{
-public:
-    Window(Instance& instance, WindowProperties* properties,
-           std::shared_ptr< ::mir::input::receiver::InputPlatform> const& platform,
-           std::shared_ptr< ::mir::graphics::InternalClient> const& internal_client);
-    ~Window();
-
-    UAUiWindow* as_u_window();
-    static Window* from_u_window(UAUiWindow* u_window);
-    
-    EGLNativeWindowType get_native_type();
-
-protected:
-    Window(Window const&) = delete;
-    Window& operator=(Window const&) = delete;
-
-private:
-    std::unique_ptr<WindowProperties> window_properties;
-    std::shared_ptr< ::mir::scene::Surface> surface;
-    std::shared_ptr< ::mir::input::receiver::InputReceiverThread> input_thread;
-    std::shared_ptr< ::mir::graphics::InternalClient> internal_client;
-};
-    
-}
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_UI_WINDOW_MIRSERVER_PRIV_H_

=== removed file 'src/ubuntu/application/common/mirserver/window_properties_mirserver.cpp'
--- src/ubuntu/application/common/mirserver/window_properties_mirserver.cpp	2014-07-15 12:41:35 +0000
+++ src/ubuntu/application/common/mirserver/window_properties_mirserver.cpp	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "window_properties_mirserver_priv.h"
-
-#include <string>
-
-namespace uams = ubuntu::application::mir::server;
-namespace ms = mir::scene;
-
-uams::WindowProperties::WindowProperties()
-    : parameters(ms::a_surface()),
-      cb(nullptr),
-      input_ctx(nullptr)
-{
-}
-
-UAUiWindowProperties* uams::WindowProperties::as_u_window_properties()
-{
-    return static_cast<UAUiWindowProperties*>(this);
-}
-
-uams::WindowProperties* uams::WindowProperties::from_u_window_properties(UAUiWindowProperties* u_properties)
-{
-    return static_cast<uams::WindowProperties*>(u_properties);
-}
-    
-void uams::WindowProperties::set_title(char const* title, size_t length)
-{
-    parameters = parameters.of_name(std::string(title, length));
-}
-
-void uams::WindowProperties::set_input_cb_and_ctx(UAUiWindowInputEventCb callback, void* ctx)
-{
-    cb = callback;
-    input_ctx = ctx;
-}
-
-void uams::WindowProperties::set_dimensions(uint32_t width, uint32_t height)
-{
-    parameters = parameters.of_size(width, height);
-}
-
-void uams::WindowProperties::set_pixel_format(MirPixelFormat const& format)
-{
-    parameters = parameters.of_pixel_format(format);
-}
-
-ms::SurfaceCreationParameters const& uams::WindowProperties::surface_parameters() const
-{
-    return parameters;
-}
-
-UAUiWindowInputEventCb uams::WindowProperties::input_cb() const
-{
-    return cb;
-}
-
-void* uams::WindowProperties::input_context() const
-{
-    return input_ctx;
-}

=== removed file 'src/ubuntu/application/common/mirserver/window_properties_mirserver_priv.h'
--- src/ubuntu/application/common/mirserver/window_properties_mirserver_priv.h	2014-07-15 12:41:35 +0000
+++ src/ubuntu/application/common/mirserver/window_properties_mirserver_priv.h	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_MIRSERVER_PRIV_H_
-#define UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_MIRSERVER_PRIV_H_
-
-#include <ubuntu/application/ui/window.h>
-
-#include <mir/scene/surface_creation_parameters.h>
-#include <mir_toolkit/common.h>
-
-namespace ubuntu
-{
-namespace application
-{
-namespace mir
-{
-namespace server
-{
-
-class WindowProperties
-{
-public:
-    WindowProperties();
-    ~WindowProperties() = default;
-
-    UAUiWindowProperties* as_u_window_properties();
-    static WindowProperties* from_u_window_properties(UAUiWindowProperties* u_properties);
-    
-    void set_title(char const* title, size_t length);
-    void set_input_cb_and_ctx(UAUiWindowInputEventCb cb, void* ctx);
-    void set_dimensions(uint32_t width, uint32_t height);
-    void set_pixel_format( MirPixelFormat const& format);
-    
-    ::mir::scene::SurfaceCreationParameters const& surface_parameters() const;
-    UAUiWindowInputEventCb input_cb() const;
-    void* input_context() const;
-    
-protected:
-    WindowProperties(WindowProperties const&) = delete;
-    WindowProperties& operator=(WindowProperties const&) = delete;
-
-private:
-    ::mir::scene::SurfaceCreationParameters parameters;
-
-    UAUiWindowInputEventCb cb;
-    void *input_ctx;
-};
-
-}
-}
-}
-}
-
-#endif

=== modified file 'src/ubuntu/application/desktop/CMakeLists.txt'
--- src/ubuntu/application/desktop/CMakeLists.txt	2014-06-24 19:59:46 +0000
+++ src/ubuntu/application/desktop/CMakeLists.txt	2014-11-08 22:26:49 +0000
@@ -8,31 +8,11 @@
   ubuntu_application_sensors_desktop.cpp
 )
 
-add_library(
-  ubuntu_application_api_desktop_mirserver MODULE
-
-  module.cpp
-  module_version.h
-  ubuntu_application_sensors_desktop.cpp
-)
-
 target_link_libraries(
   ubuntu_application_api_desktop_mirclient
 
   "-Wl,--whole-archive"
   ubuntu_application_api_mirclient
-  ubuntu_application_api_mircommon
-  ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
-  "-Wl,--no-whole-archive"
-  #TODO: Alarms
-)
-
-target_link_libraries(
-  ubuntu_application_api_desktop_mirserver
-
-  "-Wl,--whole-archive"
-  ubuntu_application_api_mirserver
-  ubuntu_application_api_mircommon
   ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
   "-Wl,--no-whole-archive"
   #TODO: Alarms
@@ -45,22 +25,9 @@
   SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
 )
 
-set_target_properties(
-  ubuntu_application_api_desktop_mirserver
-  PROPERTIES
-  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
-  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
-)
 install(
   TARGETS ubuntu_application_api_desktop_mirclient
   # this is not a development library to compile against, users should always
   # specify the SONAME; so don't build a *.so
   LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
 )
-
-install(
-  TARGETS ubuntu_application_api_desktop_mirserver
-  # this is not a development library to compile against, users should always
-  # specify the SONAME; so don't build a *.so
-  LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
-)

=== modified file 'src/ubuntu/application/desktop/module_version.h'
--- src/ubuntu/application/desktop/module_version.h	2014-09-24 20:24:09 +0000
+++ src/ubuntu/application/desktop/module_version.h	2014-11-08 22:26:49 +0000
@@ -1,3 +1,3 @@
-#define MODULE_VERSION_MAJOR  2
-#define MODULE_VERSION_MINOR  4
+#define MODULE_VERSION_MAJOR  3
+#define MODULE_VERSION_MINOR  0
 #define MODULE_VERSION_PATCH  0

=== modified file 'src/ubuntu/application/testbackend/module_version.h'
--- src/ubuntu/application/testbackend/module_version.h	2014-09-24 20:24:09 +0000
+++ src/ubuntu/application/testbackend/module_version.h	2014-11-08 22:26:49 +0000
@@ -1,3 +1,3 @@
-#define MODULE_VERSION_MAJOR  2
-#define MODULE_VERSION_MINOR  4
+#define MODULE_VERSION_MAJOR  3
+#define MODULE_VERSION_MINOR  0
 #define MODULE_VERSION_PATCH  0

=== modified file 'src/ubuntu/application/touch/CMakeLists.txt'
--- src/ubuntu/application/touch/CMakeLists.txt	2014-05-26 12:56:45 +0000
+++ src/ubuntu/application/touch/CMakeLists.txt	2014-11-08 22:26:49 +0000
@@ -9,31 +9,11 @@
   module_version.h
 )
 
-add_library(
-  ubuntu_application_api_touch_mirserver MODULE
-
-  module.cpp
-  module_version.h
-)
-
 target_link_libraries(
   ubuntu_application_api_touch_mirclient
 
   "-Wl,--whole-archive"
   ubuntu_application_api_mirclient
-  ubuntu_application_api_mircommon
-  ubuntu_application_api_hybris
-  ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
-  "-Wl,--no-whole-archive"
-  #TODO: Alarms
-)
-
-target_link_libraries(
-  ubuntu_application_api_touch_mirserver
-
-  "-Wl,--whole-archive"
-  ubuntu_application_api_mirserver
-  ubuntu_application_api_mircommon
   ubuntu_application_api_hybris
   ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
   "-Wl,--no-whole-archive"
@@ -47,22 +27,9 @@
   SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
 )
 
-set_target_properties(
-  ubuntu_application_api_touch_mirserver
-  PROPERTIES
-  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
-  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
-)
 install(
   TARGETS ubuntu_application_api_touch_mirclient
   # this is not a development library to compile against, users should always
   # specify the SONAME; so don't build a *.so
   LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
 )
-
-install(
-  TARGETS ubuntu_application_api_touch_mirserver
-  # this is not a development library to compile against, users should always
-  # specify the SONAME; so don't build a *.so
-  LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
-)

=== modified file 'src/ubuntu/application/touch/module_version.h'
--- src/ubuntu/application/touch/module_version.h	2014-09-24 20:24:09 +0000
+++ src/ubuntu/application/touch/module_version.h	2014-11-08 22:26:49 +0000
@@ -1,3 +1,3 @@
-#define MODULE_VERSION_MAJOR  2
-#define MODULE_VERSION_MINOR  4
+#define MODULE_VERSION_MAJOR  3
+#define MODULE_VERSION_MINOR  0
 #define MODULE_VERSION_PATCH  0