Updating BUCK files

Change-Id: I24f279b42a270e59cf4bf4564e2aa4d81459c8e2

@@ -73,6 +73,9 @@ CORE = [
 ]
 
 APPS = [
+    #Drivers
+    '//drivers/default:onos-drivers-default-oar',
+
     # Providers
     '//providers/bgp:onos-providers-bgp-oar',
     '//providers/host:onos-providers-host-oar',

 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
-    '//lib:org.apache.karaf.shell.console',
-    '//cli:onos-cli',
 ]
 
 osgi_jar_with_tests (
@@ -12,5 +10,5 @@ onos_app (
     title = 'Reactive Forwarding App',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
-    description = 'Reactive forwarding application using flow subsystem.',
+    description = 'Reactive forwarding application using flow objective subsystem.',
 )

-SRC = 'src/main/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-cli'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:org.apache.karaf.shell.console',
@@ -11,12 +6,8 @@ COMPILE_DEPS = [
     '//core/common:onos-core-common',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar (
     deps = COMPILE_DEPS,
     visibility = ['PUBLIC'],
-    resources_root = 'src/main/resources',
-    resources = glob(['src/main/resources/**']),
 )
 

-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-core-common'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 SRC_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
@@ -13,21 +8,9 @@ TEST_DEPS = [
     '//core/api:onos-api-tests',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-core-common',
     deps = SRC_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'onos-core-common-tests',
-    visibility = ['PUBLIC'],
-    srcs = glob([TEST + '/*.java']),
-    resources_root = 'src/test/resources',
-    resources = glob(['src/test/resources/**']),
-    deps = SRC_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)

-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-core-net'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
@@ -15,20 +10,9 @@ TEST_DEPS = [
     '//core/store/dist:onos-core-dist-tests',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-core-net',
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
-)
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-    resources_root = 'src/test/resources',
-    resources = glob(['src/test/resources/**']),
-)
+)
\ No newline at end of file

-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-core-dist'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//core/common:onos-core-common',
@@ -18,23 +13,13 @@ COMPILE_DEPS = [
 
 TEST_DEPS = [
     '//lib:TEST',
-     '//core/api:onos-api-tests',
-     '//core/common:onos-core-common-tests',
+    '//core/api:onos-api-tests',
+    '//core/common:onos-core-common-tests',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-core-dist',
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
-)
-
-java_test(
-    name= 'onos-core-dist-tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )

-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-core-persistence'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:catalyst-serializer',
@@ -13,18 +8,9 @@ TEST_DEPS = [
     '//lib:TEST',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-core-persistence',
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)

-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-core-primitives'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//core/common:onos-core-common',
@@ -32,18 +27,9 @@ TEST_DEPS = [
     '//core/api:onos-api-tests',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-core-primitives',
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)

-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-core-serializers'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
@@ -12,18 +7,9 @@ TEST_DEPS = [
     '//lib:TEST',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-core-serializers',
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)

@@ -18,4 +18,9 @@ onos_app (
     category = 'Drivers',
     url = 'http://onosproject.org',
     description = 'ONOS Default device drivers application.',
+    included_bundles = [
+        ':onos-drivers-default',
+        '//lib:openflowj',
+        '//protocols/openflow/api:onos-protocols-openflow-api',
+    ]
 )

-SRC = 'src/main/java/org/onosproject/incubator/**/'
-TEST = 'src/test/java/org/onosproject/incubator/**/'
-CURRENT_NAME = 'onos-incubator-api'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
 ]
@@ -11,21 +6,9 @@ TEST_DEPS = [
     '//lib:TEST_ADAPTERS',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-incubator-api',
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'onos-incubator-api-tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-    visibility = ['PUBLIC'],
-    resources_root = 'src/test/resources',
-    resources = glob(['src/test/resources/**']),
-)

-SRC = 'src/main/java/org/onosproject/incubator/**/'
-TEST = 'src/test/java/org/onosproject/incubator/**/'
-CURRENT_NAME = 'onos-incubator-core'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
@@ -12,18 +7,8 @@ TEST_DEPS = [
     '//lib:TEST',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)

-SRC = 'src/main/java/org/onosproject/incubator/**/'
-TEST = 'src/test/java/org/onosproject/incubator/**/'
-CURRENT_NAME = 'onos-incubator-rpc'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
@@ -12,18 +7,8 @@ TEST_DEPS = [
     '//lib:TEST',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)

-SRC = 'src/main/java/org/onosproject/incubator/store/**/'
-TEST = 'src/test/java/org/onosproject/incubator/store/**/'
-CURRENT_NAME = 'onos-incubator-store'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:concurrent-trees',
@@ -17,18 +12,8 @@ TEST_DEPS = [
     '//core/common:onos-core-common-tests',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)

@@ -4,6 +4,6 @@ COMPILE_DEPS = [
     '//protocols/netconf/api:onos-protocols-netconf-api',
 ]
 
-osgi_jar(
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
 )

@@ -10,6 +10,7 @@ BUNDLES = [
 ]
 
 onos_app (
+    app_name = 'org.onosproject.openflow-base',
     title = 'OpenFlow Provider',
     category = 'Provider',
     url = 'http://onosproject.org',