refactor code and service separation for MOAS support

Change-Id: Id00a59a46a30d3a8c976611e637c28fe609c9842
diff --git a/apps/artemis/BUCK b/apps/artemis/BUCK
old mode 100644
new mode 100755
index 82c703a..e06097d
--- a/apps/artemis/BUCK
+++ b/apps/artemis/BUCK
@@ -1,24 +1,36 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
-    '//lib:NETTY',
     '//lib:JACKSON',
+    '//lib:NETTY',
+    '//lib:netty',
+    '//lib:netty-transport',
     '//lib:org.apache.karaf.shell.console',
     '//cli:onos-cli',
     '//apps/routing-api:onos-apps-routing-api',
     '//apps/routing/common:onos-apps-routing-common',
+    '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
+    '//apps/intentsync:onos-apps-intentsync',
+    '//apps/route-service/api:onos-apps-route-service-api',
+    '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
     '//lib:okhttp',
     '//lib:okio',
     ':commons-net',
     ':io.socket-client',
     ':json',
-    ':engine.io-client',
-    '//lib:netty',
+    ':engine.io-client'
  ]
 
 BUNDLES = [
     '//apps/artemis:onos-apps-artemis',
     '//apps/routing-api:onos-apps-routing-api',
     '//apps/routing/common:onos-apps-routing-common',
+    '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
+    '//apps/route-service/api:onos-apps-route-service-api',
+    '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc'
+]
+
+TEST_DEPS = [
+    '//lib:TEST_ADAPTERS'
 ]
 
 EXCLUDED_BUNDLES = [
@@ -30,8 +42,9 @@
     ':engine.io-client'
 ]
 
-osgi_jar (
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
 )
 
 onos_app (
@@ -42,7 +55,12 @@
     description = 'Artemis',
     included_bundles = BUNDLES,
     excluded_bundles = EXCLUDED_BUNDLES,
-    required_apps = [ 'org.onosproject.sdnip' ],
+    required_apps = [
+        'org.onosproject.sdnip',
+        'org.onosproject.openflow',
+        'org.onosproject.ovsdb',
+        'org.onosproject.drivers.ovsdb'
+    ],
 )
 
 remote_jar (
@@ -79,4 +97,4 @@
   sha1 = '854b49396e1e9f9bb0ab025062ddb49c4ed65ca1',
   maven_coords = 'io.socket:engine.io-client:jar:NON-OSGI:0.8.3',
   visibility = [ 'PUBLIC' ],
-)
+)
\ No newline at end of file