홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
12c1d51c 1 parent a8854826

Buckify remaining providers 

Change-Id: Ide265b68d809ccea2ea8900993999bf8ae3184fc
Inline Side-by-side
Showing 7 changed files with 30 additions and 78 deletions
...@@ -21,8 +21,8 @@ CORE = [ ...@@ -21,8 +21,8 @@ CORE = [
21 21
22 '//cli:onos-cli', 22 '//cli:onos-cli',
23 23
24 - '//protocols/rest/api:onos-restsb-api', 24 + '//protocols/rest/api:onos-protocols-rest-api',
25 - '//protocols/rest/ctl:onos-restsb-ctl', 25 + '//protocols/rest/ctl:onos-protocols-rest-ctl',
26 '//protocols/bgp/bgpio:onos-bgpio', 26 '//protocols/bgp/bgpio:onos-bgpio',
27 '//protocols/bgp/api:onos-bgp-api', 27 '//protocols/bgp/api:onos-bgp-api',
28 '//protocols/bgp/ctl:onos-bgp-ctl', 28 '//protocols/bgp/ctl:onos-bgp-ctl',
...@@ -62,8 +62,8 @@ CORE = [ ...@@ -62,8 +62,8 @@ CORE = [
62 '//providers/openflow/meter:onos-providers-openflow-meter', 62 '//providers/openflow/meter:onos-providers-openflow-meter',
63 '//providers/ovsdb/device:onos-ovsdb-provider-device', 63 '//providers/ovsdb/device:onos-ovsdb-provider-device',
64 '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel', 64 '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel',
65 - '//providers/rest/device:onos-restsb-provider-device', 65 + '//providers/rest/device:onos-providers-rest-device',
66 - '//providers/snmp/device:onos-snmp-provider-device', 66 + '//providers/snmp/device:onos-providers-snmp-device',
67 67
68 '//web/api:onos-rest', 68 '//web/api:onos-rest',
69 '//web/gui:onos-gui', 69 '//web/gui:onos-gui',
...@@ -82,6 +82,7 @@ APPS = [ ...@@ -82,6 +82,7 @@ APPS = [
82 '//providers/pcep:onos-providers-pcep-oar', 82 '//providers/pcep:onos-providers-pcep-oar',
83 '//providers/null:onos-providers-null-oar', 83 '//providers/null:onos-providers-null-oar',
84 '//providers/openflow/base:onos-providers-openflow-base-oar', 84 '//providers/openflow/base:onos-providers-openflow-base-oar',
85 + '//providers/rest:onos-providers-rest-oar',
85 86
86 # Apps 87 # Apps
87 '//apps/dhcp:onos-apps-dhcp-oar', 88 '//apps/dhcp:onos-apps-dhcp-oar',
......
...@@ -8,7 +8,7 @@ COMPILE_DEPS = [ ...@@ -8,7 +8,7 @@ COMPILE_DEPS = [
8 '//incubator/api:onos-incubator-api', 8 '//incubator/api:onos-incubator-api',
9 '//utils/rest:onlab-rest', 9 '//utils/rest:onlab-rest',
10 '//drivers/utilities:onos-drivers-utilities', 10 '//drivers/utilities:onos-drivers-utilities',
11 - '//protocols/rest/api:onos-restsb-api', 11 + '//protocols/rest/api:onos-protocols-rest-api',
12 ] 12 ]
13 13
14 osgi_jar( 14 osgi_jar(
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -
3 -CURRENT_NAME = 'onos-restsb-api'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//incubator/api:onos-incubator-api', 3 '//incubator/api:onos-incubator-api',
9 '//utils/rest:onlab-rest', 4 '//utils/rest:onlab-rest',
10 ] 5 ]
11 6
12 -osgi_jar( 7 +osgi_jar_with_tests (
13 - name = CURRENT_NAME,
14 - srcs = glob([SRC + '/*.java']),
15 deps = COMPILE_DEPS, 8 deps = COMPILE_DEPS,
16 - visibility = ['PUBLIC'],
17 ) 9 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-restsb-ctl'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//lib:jersey-client', 3 '//lib:jersey-client',
...@@ -14,25 +9,14 @@ COMPILE_DEPS = [ ...@@ -14,25 +9,14 @@ COMPILE_DEPS = [
14 '//lib:jersey-guava', 9 '//lib:jersey-guava',
15 '//lib:aopalliance-repackaged', 10 '//lib:aopalliance-repackaged',
16 '//lib:javax.inject', 11 '//lib:javax.inject',
17 - '//protocols/rest/api:onos-restsb-api', 12 + '//protocols/rest/api:onos-protocols-rest-api',
18 ] 13 ]
19 14
20 TEST_DEPS = [ 15 TEST_DEPS = [
21 '//lib:TEST', 16 '//lib:TEST',
22 ] 17 ]
23 18
24 -osgi_jar( 19 +osgi_jar_with_tests (
25 - name = CURRENT_NAME,
26 - srcs = glob([SRC + '/*.java']),
27 deps = COMPILE_DEPS, 20 deps = COMPILE_DEPS,
28 - visibility = ['PUBLIC'],
29 ) 21 )
30 22
31 -java_test(
32 - name = 'tests',
33 - srcs = glob([TEST + '/*.java']),
34 - deps = COMPILE_DEPS +
35 - TEST_DEPS +
36 - [CURRENT_TARGET],
37 - source_under_test = [CURRENT_TARGET],
38 -)
......
1 +BUNDLES = [
2 + '//providers/rest/device:onos-providers-rest-device',
3 + '//protocols/rest/api:onos-protocols-rest-api',
4 + '//protocols/rest/ctl:onos-protocols-rest-ctl',
5 + '//lib:jersey-client',
6 + '//lib:commons-io',
7 + '//lib:httpclient-osgi',
8 + '//lib:httpcore-osgi',
9 +]
10 +
11 +onos_app (
12 + title = 'PCEP Provider',
13 + category = 'Provider',
14 + url = 'http://onosproject.org',
15 + included_bundles = BUNDLES,
16 + description = 'REST protocol southbound providers.',
17 +)
18 +
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-restsb-provider-device'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//protocols/ovsdb/api:onos-ovsdb-api', 3 '//protocols/ovsdb/api:onos-ovsdb-api',
10 '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 4 '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
11 '//apps/pcep-api:onos-apps-pcep-api', 5 '//apps/pcep-api:onos-apps-pcep-api',
12 '//incubator/api:onos-incubator-api', 6 '//incubator/api:onos-incubator-api',
13 - '//protocols/rest/api:onos-restsb-api', 7 + '//protocols/rest/api:onos-protocols-rest-api',
14 '//lib:javax.ws.rs-api', 8 '//lib:javax.ws.rs-api',
15 ] 9 ]
16 10
17 -TEST_DEPS = [ 11 +osgi_jar_with_tests (
18 - '//lib:TEST',
19 -]
20 -
21 -osgi_jar(
22 - name = CURRENT_NAME,
23 - srcs = glob([SRC + '/*.java']),
24 deps = COMPILE_DEPS, 12 deps = COMPILE_DEPS,
25 - visibility = ['PUBLIC'],
26 -)
27 -
28 -java_test(
29 - name = 'tests',
30 - srcs = glob([TEST + '/*.java']),
31 - deps = COMPILE_DEPS +
32 - TEST_DEPS +
33 - [CURRENT_TARGET],
34 - source_under_test = [CURRENT_TARGET],
35 ) 13 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-snmp-provider-device'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:org.apache.servicemix.bundles.snmp4j', 3 '//lib:org.apache.servicemix.bundles.snmp4j',
...@@ -16,22 +10,7 @@ COMPILE_DEPS = [ ...@@ -16,22 +10,7 @@ COMPILE_DEPS = [
16 '//protocols/snmp/ctl:onos-snmp-ctl', 10 '//protocols/snmp/ctl:onos-snmp-ctl',
17 ] 11 ]
18 12
19 -TEST_DEPS = [ 13 +osgi_jar_with_tests (
20 - '//lib:TEST',
21 -]
22 -
23 -osgi_jar(
24 - name = CURRENT_NAME,
25 - srcs = glob([SRC + '/*.java']),
26 deps = COMPILE_DEPS, 14 deps = COMPILE_DEPS,
27 - visibility = ['PUBLIC'],
28 ) 15 )
29 16
30 -java_test(
31 - name = 'tests',
32 - srcs = glob([TEST + '/*.java']),
33 - deps = COMPILE_DEPS +
34 - TEST_DEPS +
35 - [CURRENT_TARGET],
36 - source_under_test = [CURRENT_TARGET],
37 -)
......