홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
Committed by Gerrit Code Review
b86c9205 1 parent efbc0389

Updating Buck files to build OSGi jars 

- Using osgi_jar for all modules except apps
- Adding target for installation of core modules to .m2 repo

Change-Id: I65d9e3a9567918e275191724842d7d9b1f485128
Inline Side-by-side
Showing 76 changed files with 223 additions and 92 deletions
...@@ -3,15 +3,22 @@ DEPS = [ ...@@ -3,15 +3,22 @@ DEPS = [
3 '//utils/junit:onlab-junit', 3 '//utils/junit:onlab-junit',
4 '//utils/misc:onlab-misc', 4 '//utils/misc:onlab-misc',
5 '//utils/rest:onlab-rest', 5 '//utils/rest:onlab-rest',
6 +
6 '//core/api:onos-api', 7 '//core/api:onos-api',
7 - '//incubator/api:onos-incubator-api',
8 - '//incubator/net:onos-incubator-net',
9 '//core/net:onos-core-net', 8 '//core/net:onos-core-net',
9 + '//core/common:onos-core-common',
10 '//core/store/primitives:onos-core-primitives', 10 '//core/store/primitives:onos-core-primitives',
11 '//core/store/serializers:onos-core-serializers', 11 '//core/store/serializers:onos-core-serializers',
12 '//core/store/dist:onos-core-dist', 12 '//core/store/dist:onos-core-dist',
13 '//core/security:onos-security', 13 '//core/security:onos-security',
14 '//core/store/persistence:onos-core-persistence', 14 '//core/store/persistence:onos-core-persistence',
15 +
16 + '//incubator/api:onos-incubator-api',
17 + '//incubator/net:onos-incubator-net',
18 + '//incubator/core:onos-incubator-core',
19 + '//incubator/store:onos-incubator-store',
20 + '//incubator/rpc:onos-incubator-rpc',
21 +
15 '//cli:onos-cli', 22 '//cli:onos-cli',
16 23
17 '//protocols/rest/api:onos-restsb-api', 24 '//protocols/rest/api:onos-restsb-api',
...@@ -122,3 +129,35 @@ java_library( ...@@ -122,3 +129,35 @@ java_library(
122 visibility = ['PUBLIC'], 129 visibility = ['PUBLIC'],
123 deps = DEPS 130 deps = DEPS
124 ) 131 )
132 +
133 +INSTALL = [
134 + '//utils/misc:onlab-misc-install',
135 + '//utils/osgi:onlab-osgi-install',
136 + '//utils/rest:onlab-rest-install',
137 +
138 + '//core/api:onos-api-install',
139 + '//incubator/api:onos-incubator-api-install',
140 +
141 + '//core/net:onos-core-net-install',
142 + '//core/common:onos-core-common-install',
143 + '//core/store/dist:onos-core-dist-install',
144 + '//core/store/primitives:onos-core-primitives-install',
145 + '//core/store/persistence:onos-core-persistence-install',
146 + '//core/store/serializers:onos-core-serializers-install',
147 +
148 + '//incubator/net:onos-incubator-net-install',
149 + '//incubator/core:onos-incubator-core-install',
150 + '//incubator/store:onos-incubator-store-install',
151 + '//incubator/rpc:onos-incubator-rpc-install',
152 +
153 + '//core/security:onos-security-install',
154 +
155 + '//web/api:onos-rest-install',
156 + '//web/gui:onos-gui-install',
157 + '//cli:onos-cli-install',
158 +]
159 +java_library(
160 + name = 'install',
161 + visibility = ['PUBLIC'],
162 + deps = INSTALL
163 +)
...\ No newline at end of file ...\ No newline at end of file
......
1 +import random
1 2
2 DEBUG_ARG='JAVA_TOOL_OPTIONS="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=5005,suspend=y"' 3 DEBUG_ARG='JAVA_TOOL_OPTIONS="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=5005,suspend=y"'
3 4
...@@ -82,16 +83,18 @@ def osgi_jar( ...@@ -82,16 +83,18 @@ def osgi_jar(
82 ) 83 )
83 84
84 ### .m2 Install 85 ### .m2 Install
85 - mvn_cmd = ' '.join(('mvn install:install-file', 86 + mvn_cmd = ' '.join(( 'mvn install:install-file',
86 - '-Dfile=$(location :%s)' % name, 87 + '-Dfile=$(location :%s)' % name,
87 - '-DgroupId=%s' % group_id, 88 + '-DgroupId=%s' % group_id,
88 - '-DartifactId=%s' % name, 89 + '-DartifactId=%s' % name,
89 - '-Dversion=%s' % version, 90 + '-Dversion=%s' % version,
90 - '-Dpackaging=jar' 91 + '-Dpackaging=jar' ))
91 - )) 92 + # TODO This rule must be run every time, adding random number as rule input.
93 + # We should make this configurable, perhaps with a flag.
94 + cmd = 'FOO=%s ' % random.random() + mvn_cmd + ' > $OUT'
92 genrule( 95 genrule(
93 name = name + '-install', 96 name = name + '-install',
94 - bash = mvn_cmd + ' > $OUT', 97 + bash = cmd,
95 out = 'install.log', 98 out = 'install.log',
96 visibility = visibility, 99 visibility = visibility,
97 ) 100 )
......
...@@ -11,7 +11,7 @@ COMPILE_DEPS = [ ...@@ -11,7 +11,7 @@ COMPILE_DEPS = [
11 '//core/common:onos-core-common', 11 '//core/common:onos-core-common',
12 ] 12 ]
13 13
14 -java_library( 14 +osgi_jar(
15 name = CURRENT_NAME, 15 name = CURRENT_NAME,
16 srcs = glob([SRC + '/*.java']), 16 srcs = glob([SRC + '/*.java']),
17 deps = COMPILE_DEPS, 17 deps = COMPILE_DEPS,
......
...@@ -14,7 +14,7 @@ TEST_DEPS = [ ...@@ -14,7 +14,7 @@ TEST_DEPS = [
14 '//lib:TEST', 14 '//lib:TEST',
15 ] 15 ]
16 16
17 -java_library( 17 +osgi_jar(
18 name = CURRENT_NAME, 18 name = CURRENT_NAME,
19 srcs = glob([SRC + '/*.java']), 19 srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 20 deps = COMPILE_DEPS,
......
...@@ -13,7 +13,7 @@ TEST_DEPS = [ ...@@ -13,7 +13,7 @@ TEST_DEPS = [
13 '//core/api:onos-api-tests', 13 '//core/api:onos-api-tests',
14 ] 14 ]
15 15
16 -java_library( 16 +osgi_jar(
17 name = CURRENT_NAME, 17 name = CURRENT_NAME,
18 srcs = glob([SRC + '/*.java']), 18 srcs = glob([SRC + '/*.java']),
19 deps = SRC_DEPS, 19 deps = SRC_DEPS,
......
...@@ -12,7 +12,7 @@ TEST_DEPS = [ ...@@ -12,7 +12,7 @@ TEST_DEPS = [
12 '//lib:TEST', 12 '//lib:TEST',
13 ] 13 ]
14 14
15 -java_library( 15 +osgi_jar(
16 name = CURRENT_NAME, 16 name = CURRENT_NAME,
17 srcs = glob([SRC + '/*.java']), 17 srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 18 deps = COMPILE_DEPS,
......
...@@ -12,7 +12,7 @@ TEST_DEPS = [ ...@@ -12,7 +12,7 @@ TEST_DEPS = [
12 '//lib:TEST', 12 '//lib:TEST',
13 ] 13 ]
14 14
15 -java_library( 15 +osgi_jar(
16 name = CURRENT_NAME, 16 name = CURRENT_NAME,
17 srcs = glob([SRC + '/*.java']), 17 srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 18 deps = COMPILE_DEPS,
......
...@@ -22,7 +22,7 @@ TEST_DEPS = [ ...@@ -22,7 +22,7 @@ TEST_DEPS = [
22 '//core/common:onos-core-common-tests', 22 '//core/common:onos-core-common-tests',
23 ] 23 ]
24 24
25 -java_library( 25 +osgi_jar(
26 name = CURRENT_NAME, 26 name = CURRENT_NAME,
27 srcs = glob([SRC + '/*.java']), 27 srcs = glob([SRC + '/*.java']),
28 deps = COMPILE_DEPS, 28 deps = COMPILE_DEPS,
......
...@@ -13,7 +13,7 @@ TEST_DEPS = [ ...@@ -13,7 +13,7 @@ TEST_DEPS = [
13 '//lib:TEST', 13 '//lib:TEST',
14 ] 14 ]
15 15
16 -java_library( 16 +osgi_jar(
17 name = CURRENT_NAME, 17 name = CURRENT_NAME,
18 srcs = glob([SRC + '/*.java']), 18 srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 19 deps = COMPILE_DEPS,
......
...@@ -32,7 +32,7 @@ TEST_DEPS = [ ...@@ -32,7 +32,7 @@ TEST_DEPS = [
32 '//core/api:onos-api-tests', 32 '//core/api:onos-api-tests',
33 ] 33 ]
34 34
35 -java_library( 35 +osgi_jar(
36 name = CURRENT_NAME, 36 name = CURRENT_NAME,
37 srcs = glob([SRC + '/*.java']), 37 srcs = glob([SRC + '/*.java']),
38 deps = COMPILE_DEPS, 38 deps = COMPILE_DEPS,
......
...@@ -12,7 +12,7 @@ TEST_DEPS = [ ...@@ -12,7 +12,7 @@ TEST_DEPS = [
12 '//lib:TEST', 12 '//lib:TEST',
13 ] 13 ]
14 14
15 -java_library( 15 +osgi_jar(
16 name = CURRENT_NAME, 16 name = CURRENT_NAME,
17 srcs = glob([SRC + '/*.java']), 17 srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 18 deps = COMPILE_DEPS,
......
...@@ -9,7 +9,7 @@ COMPILE_DEPS = [ ...@@ -9,7 +9,7 @@ COMPILE_DEPS = [
9 '//incubator/api:onos-incubator-api' 9 '//incubator/api:onos-incubator-api'
10 ] 10 ]
11 11
12 -java_library( 12 +osgi_jar(
13 name = CURRENT_NAME, 13 name = CURRENT_NAME,
14 srcs = glob([SRC + '/*.java']), 14 srcs = glob([SRC + '/*.java']),
15 deps = COMPILE_DEPS, 15 deps = COMPILE_DEPS,
......
...@@ -11,7 +11,7 @@ COMPILE_DEPS = [ ...@@ -11,7 +11,7 @@ COMPILE_DEPS = [
11 '//protocols/rest/api:onos-restsb-api', 11 '//protocols/rest/api:onos-restsb-api',
12 ] 12 ]
13 13
14 -java_library( 14 +osgi_jar(
15 name = CURRENT_NAME, 15 name = CURRENT_NAME,
16 srcs = glob([SRC + '/*.java']), 16 srcs = glob([SRC + '/*.java']),
17 deps = COMPILE_DEPS, 17 deps = COMPILE_DEPS,
......
...@@ -9,7 +9,7 @@ COMPILE_DEPS = [ ...@@ -9,7 +9,7 @@ COMPILE_DEPS = [
9 '//protocols/netconf/api:onos-netconf-api', 9 '//protocols/netconf/api:onos-netconf-api',
10 ] 10 ]
11 11
12 -java_library( 12 +osgi_jar(
13 name = CURRENT_NAME, 13 name = CURRENT_NAME,
14 srcs = glob([SRC + '/*.java']), 14 srcs = glob([SRC + '/*.java']),
15 deps = COMPILE_DEPS, 15 deps = COMPILE_DEPS,
......
...@@ -16,7 +16,7 @@ TEST_DEPS = [ ...@@ -16,7 +16,7 @@ TEST_DEPS = [
16 '//lib:TEST', 16 '//lib:TEST',
17 ] 17 ]
18 18
19 -java_library( 19 +osgi_jar(
20 name = CURRENT_NAME, 20 name = CURRENT_NAME,
21 srcs = glob([SRC + '/*.java']), 21 srcs = glob([SRC + '/*.java']),
22 deps = COMPILE_DEPS, 22 deps = COMPILE_DEPS,
......
...@@ -9,7 +9,7 @@ COMPILE_DEPS = [ ...@@ -9,7 +9,7 @@ COMPILE_DEPS = [
9 '//protocols/netconf/api:onos-netconf-api', 9 '//protocols/netconf/api:onos-netconf-api',
10 ] 10 ]
11 11
12 -java_library( 12 +osgi_jar(
13 name = CURRENT_NAME, 13 name = CURRENT_NAME,
14 srcs = glob([SRC + '/*.java']), 14 srcs = glob([SRC + '/*.java']),
15 deps = COMPILE_DEPS, 15 deps = COMPILE_DEPS,
......
...@@ -9,7 +9,7 @@ COMPILE_DEPS = [ ...@@ -9,7 +9,7 @@ COMPILE_DEPS = [
9 '//drivers/utilities:onos-drivers-utilities', 9 '//drivers/utilities:onos-drivers-utilities',
10 ] 10 ]
11 11
12 -java_library( 12 +osgi_jar(
13 name = CURRENT_NAME, 13 name = CURRENT_NAME,
14 srcs = glob([SRC + '/*.java']), 14 srcs = glob([SRC + '/*.java']),
15 deps = COMPILE_DEPS, 15 deps = COMPILE_DEPS,
......
...@@ -9,7 +9,7 @@ COMPILE_DEPS = [ ...@@ -9,7 +9,7 @@ COMPILE_DEPS = [
9 '//protocols/netconf/api:onos-netconf-api', 9 '//protocols/netconf/api:onos-netconf-api',
10 ] 10 ]
11 11
12 -java_library( 12 +osgi_jar(
13 name = CURRENT_NAME, 13 name = CURRENT_NAME,
14 srcs = glob([SRC + '/*.java']), 14 srcs = glob([SRC + '/*.java']),
15 deps = COMPILE_DEPS, 15 deps = COMPILE_DEPS,
......
...@@ -10,7 +10,7 @@ COMPILE_DEPS = [ ...@@ -10,7 +10,7 @@ COMPILE_DEPS = [
10 '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 10 '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
11 ] 11 ]
12 12
13 -java_library( 13 +osgi_jar(
14 name = CURRENT_NAME, 14 name = CURRENT_NAME,
15 srcs = glob([SRC + '/*.java']), 15 srcs = glob([SRC + '/*.java']),
16 deps = COMPILE_DEPS, 16 deps = COMPILE_DEPS,
......
...@@ -12,7 +12,7 @@ TEST_DEPS = [ ...@@ -12,7 +12,7 @@ TEST_DEPS = [
12 '//lib:TEST', 12 '//lib:TEST',
13 ] 13 ]
14 14
15 -java_library( 15 +osgi_jar(
16 name = CURRENT_NAME, 16 name = CURRENT_NAME,
17 srcs = glob([SRC + '/*.java']), 17 srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 18 deps = COMPILE_DEPS,
......
...@@ -11,7 +11,7 @@ TEST_DEPS = [ ...@@ -11,7 +11,7 @@ TEST_DEPS = [
11 '//lib:TEST', 11 '//lib:TEST',
12 ] 12 ]
13 13
14 -java_library( 14 +osgi_jar(
15 name = CURRENT_NAME, 15 name = CURRENT_NAME,
16 srcs = glob([SRC + '/*.java']), 16 srcs = glob([SRC + '/*.java']),
17 deps = COMPILE_DEPS, 17 deps = COMPILE_DEPS,
......
1 +SRC = 'src/main/java/org/onosproject/incubator/**/'
2 +TEST = 'src/test/java/org/onosproject/incubator/**/'
3 +CURRENT_NAME = 'onos-incubator-core'
4 +CURRENT_TARGET = ':' + CURRENT_NAME
5 +
6 +COMPILE_DEPS = [
7 + '//lib:CORE_DEPS',
8 + '//incubator/api:onos-incubator-api',
9 +]
10 +
11 +TEST_DEPS = [
12 + '//lib:TEST',
13 +]
14 +
15 +osgi_jar(
16 + name = CURRENT_NAME,
17 + srcs = glob([SRC + '/*.java']),
18 + deps = COMPILE_DEPS,
19 + visibility = ['PUBLIC'],
20 +)
21 +
22 +java_test(
23 + name = 'tests',
24 + srcs = glob([TEST + '/*.java']),
25 + deps = COMPILE_DEPS +
26 + TEST_DEPS +
27 + [CURRENT_TARGET],
28 + source_under_test = [CURRENT_TARGET],
29 +)
...@@ -12,7 +12,7 @@ TEST_DEPS = [ ...@@ -12,7 +12,7 @@ TEST_DEPS = [
12 '//lib:TEST', 12 '//lib:TEST',
13 ] 13 ]
14 14
15 -java_library( 15 +osgi_jar(
16 name = CURRENT_NAME, 16 name = CURRENT_NAME,
17 srcs = glob([SRC + '/*.java']), 17 srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 18 deps = COMPILE_DEPS,
......
1 +SRC = 'src/main/java/org/onosproject/incubator/**/'
2 +TEST = 'src/test/java/org/onosproject/incubator/**/'
3 +CURRENT_NAME = 'onos-incubator-rpc'
4 +CURRENT_TARGET = ':' + CURRENT_NAME
5 +
6 +COMPILE_DEPS = [
7 + '//lib:CORE_DEPS',
8 + '//incubator/api:onos-incubator-api',
9 +]
10 +
11 +TEST_DEPS = [
12 + '//lib:TEST',
13 +]
14 +
15 +osgi_jar(
16 + name = CURRENT_NAME,
17 + srcs = glob([SRC + '/*.java']),
18 + deps = COMPILE_DEPS,
19 + visibility = ['PUBLIC'],
20 +)
21 +
22 +java_test(
23 + name = 'tests',
24 + srcs = glob([TEST + '/*.java']),
25 + deps = COMPILE_DEPS +
26 + TEST_DEPS +
27 + [CURRENT_TARGET],
28 + source_under_test = [CURRENT_TARGET],
29 +)
1 +SRC = 'src/main/java/org/onosproject/incubator/**/'
2 +TEST = 'src/test/java/org/onosproject/incubator/**/'
3 +CURRENT_NAME = 'onos-incubator-store'
4 +CURRENT_TARGET = ':' + CURRENT_NAME
5 +
6 +COMPILE_DEPS = [
7 + '//lib:CORE_DEPS',
8 + '//incubator/api:onos-incubator-api',
9 + '//core/store/dist:onos-core-dist',
10 + '//core/store/serializers:onos-core-serializers',
11 +]
12 +
13 +TEST_DEPS = [
14 + '//lib:TEST',
15 +]
16 +
17 +osgi_jar(
18 + name = CURRENT_NAME,
19 + srcs = glob([SRC + '/*.java']),
20 + deps = COMPILE_DEPS,
21 + visibility = ['PUBLIC'],
22 +)
23 +
24 +java_test(
25 + name = 'tests',
26 + srcs = glob([TEST + '/*.java']),
27 + deps = COMPILE_DEPS +
28 + TEST_DEPS +
29 + [CURRENT_TARGET],
30 + source_under_test = [CURRENT_TARGET],
31 +)
...@@ -8,7 +8,7 @@ COMPILE_DEPS = [ ...@@ -8,7 +8,7 @@ COMPILE_DEPS = [
8 '//protocols/bgp/bgpio:onos-bgpio', 8 '//protocols/bgp/bgpio:onos-bgpio',
9 ] 9 ]
10 10
11 -java_library( 11 +osgi_jar(
12 name = CURRENT_NAME, 12 name = CURRENT_NAME,
13 srcs = glob([SRC + '/*.java']), 13 srcs = glob([SRC + '/*.java']),
14 deps = COMPILE_DEPS, 14 deps = COMPILE_DEPS,
......
...@@ -11,7 +11,7 @@ TEST_DEPS = [ ...@@ -11,7 +11,7 @@ TEST_DEPS = [
11 '//lib:TEST', 11 '//lib:TEST',
12 ] 12 ]
13 13
14 -java_library( 14 +osgi_jar(
15 name = CURRENT_NAME, 15 name = CURRENT_NAME,
16 srcs = glob([SRC + '/*.java']), 16 srcs = glob([SRC + '/*.java']),
17 deps = COMPILE_DEPS, 17 deps = COMPILE_DEPS,
......
...@@ -17,7 +17,7 @@ TEST_DEPS = [ ...@@ -17,7 +17,7 @@ TEST_DEPS = [
17 '//lib:TEST', 17 '//lib:TEST',
18 ] 18 ]
19 19
20 -java_library( 20 +osgi_jar(
21 name = CURRENT_NAME, 21 name = CURRENT_NAME,
22 srcs = glob([SRC + '/*.java']), 22 srcs = glob([SRC + '/*.java']),
23 deps = COMPILE_DEPS, 23 deps = COMPILE_DEPS,
......
...@@ -4,13 +4,6 @@ TEST = 'src/test/java/org/onosproject/**/' ...@@ -4,13 +4,6 @@ TEST = 'src/test/java/org/onosproject/**/'
4 COMPILE_DEPS = [ 4 COMPILE_DEPS = [
5 '//lib:CORE_DEPS', 5 '//lib:CORE_DEPS',
6 '//lib:netty-buffer', 6 '//lib:netty-buffer',
7 - #'//lib:netty-'
8 - #'//lib:org.apache.karaf.shell.console',
9 - #'//cli:onos-cli',
10 - #'//utils/rest:onlab-rest',
11 - #'//lib:javax.ws.rs-api',
12 - #'//core/store/serializers:onos-core-serializers',
13 - #'//incubator/api:onos-incubator-api',
14 ] 7 ]
15 8
16 TEST_DEPS = [ 9 TEST_DEPS = [
...@@ -27,7 +20,7 @@ java_library( ...@@ -27,7 +20,7 @@ java_library(
27 20
28 # onos-isis-api 21 # onos-isis-api
29 22
30 -java_library( 23 +osgi_jar(
31 name = 'onos-isis-api', 24 name = 'onos-isis-api',
32 srcs = glob(['api/' + SRC + '*.java']), 25 srcs = glob(['api/' + SRC + '*.java']),
33 deps = COMPILE_DEPS, 26 deps = COMPILE_DEPS,
...@@ -45,7 +38,7 @@ java_test( ...@@ -45,7 +38,7 @@ java_test(
45 38
46 # onos-isis-isisio 39 # onos-isis-isisio
47 40
48 -java_library( 41 +osgi_jar(
49 name = 'onos-isis-isisio', 42 name = 'onos-isis-isisio',
50 srcs = glob(['isisio/' + SRC + '*.java']), 43 srcs = glob(['isisio/' + SRC + '*.java']),
51 deps = COMPILE_DEPS + [':onos-isis-api'], 44 deps = COMPILE_DEPS + [':onos-isis-api'],
......
...@@ -7,7 +7,7 @@ COMPILE_DEPS = [ ...@@ -7,7 +7,7 @@ COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 7 '//lib:CORE_DEPS',
8 ] 8 ]
9 9
10 -java_library( 10 +osgi_jar(
11 name = CURRENT_NAME, 11 name = CURRENT_NAME,
12 srcs = glob([SRC + '/*.java']), 12 srcs = glob([SRC + '/*.java']),
13 deps = COMPILE_DEPS, 13 deps = COMPILE_DEPS,
......
...@@ -13,7 +13,7 @@ TEST_DEPS = [ ...@@ -13,7 +13,7 @@ TEST_DEPS = [
13 '//lib:TEST', 13 '//lib:TEST',
14 ] 14 ]
15 15
16 -java_library( 16 +osgi_jar(
17 name = CURRENT_NAME, 17 name = CURRENT_NAME,
18 srcs = glob([SRC + '/*.java']), 18 srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 19 deps = COMPILE_DEPS,
......
...@@ -13,7 +13,7 @@ TEST_DEPS = [ ...@@ -13,7 +13,7 @@ TEST_DEPS = [
13 '//core/api:onos-api-tests', 13 '//core/api:onos-api-tests',
14 ] 14 ]
15 15
16 -java_library( 16 +osgi_jar(
17 name = CURRENT_NAME, 17 name = CURRENT_NAME,
18 srcs = glob([SRC + '/*.java']), 18 srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 19 deps = COMPILE_DEPS,
......
...@@ -14,7 +14,7 @@ TEST_DEPS = [ ...@@ -14,7 +14,7 @@ TEST_DEPS = [
14 '//core/api:onos-api-tests', 14 '//core/api:onos-api-tests',
15 ] 15 ]
16 16
17 -java_library( 17 +osgi_jar(
18 name = CURRENT_NAME, 18 name = CURRENT_NAME,
19 srcs = glob([SRC + '/*.java']), 19 srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 20 deps = COMPILE_DEPS,
......
...@@ -11,7 +11,7 @@ TEST_DEPS = [ ...@@ -11,7 +11,7 @@ TEST_DEPS = [
11 '//lib:TEST', 11 '//lib:TEST',
12 ] 12 ]
13 13
14 -java_library( 14 +osgi_jar(
15 name = CURRENT_NAME, 15 name = CURRENT_NAME,
16 srcs = glob([SRC + '/*.java']), 16 srcs = glob([SRC + '/*.java']),
17 deps = COMPILE_DEPS, 17 deps = COMPILE_DEPS,
......
...@@ -13,7 +13,7 @@ TEST_DEPS = [ ...@@ -13,7 +13,7 @@ TEST_DEPS = [
13 '//lib:TEST', 13 '//lib:TEST',
14 ] 14 ]
15 15
16 -java_library( 16 +osgi_jar(
17 name = CURRENT_NAME, 17 name = CURRENT_NAME,
18 srcs = glob([SRC + '/*.java']), 18 srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 19 deps = COMPILE_DEPS,
......
...@@ -12,7 +12,7 @@ TEST_DEPS = [ ...@@ -12,7 +12,7 @@ TEST_DEPS = [
12 '//lib:TEST', 12 '//lib:TEST',
13 ] 13 ]
14 14
15 -java_library( 15 +osgi_jar(
16 name = CURRENT_NAME, 16 name = CURRENT_NAME,
17 srcs = glob([SRC + '/*.java']), 17 srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 18 deps = COMPILE_DEPS,
......
...@@ -13,7 +13,7 @@ TEST_DEPS = [ ...@@ -13,7 +13,7 @@ TEST_DEPS = [
13 '//lib:TEST', 13 '//lib:TEST',
14 ] 14 ]
15 15
16 -java_library( 16 +osgi_jar(
17 name = CURRENT_NAME, 17 name = CURRENT_NAME,
18 srcs = glob([SRC + '/*.java']), 18 srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 19 deps = COMPILE_DEPS,
......
...@@ -17,7 +17,7 @@ TEST_DEPS = [ ...@@ -17,7 +17,7 @@ TEST_DEPS = [
17 '//lib:TEST', 17 '//lib:TEST',
18 ] 18 ]
19 19
20 -java_library( 20 +osgi_jar(
21 name = CURRENT_NAME, 21 name = CURRENT_NAME,
22 srcs = glob([SRC + '/*.java']), 22 srcs = glob([SRC + '/*.java']),
23 deps = COMPILE_DEPS, 23 deps = COMPILE_DEPS,
......
...@@ -9,7 +9,7 @@ COMPILE_DEPS = [ ...@@ -9,7 +9,7 @@ COMPILE_DEPS = [
9 '//lib:netty-codec', 9 '//lib:netty-codec',
10 ] 10 ]
11 11
12 -java_library( 12 +osgi_jar(
13 name = CURRENT_NAME, 13 name = CURRENT_NAME,
14 srcs = glob([SRC + '/*.java']), 14 srcs = glob([SRC + '/*.java']),
15 deps = COMPILE_DEPS, 15 deps = COMPILE_DEPS,
......
...@@ -8,7 +8,7 @@ COMPILE_DEPS = [ ...@@ -8,7 +8,7 @@ COMPILE_DEPS = [
8 '//protocols/pcep/pcepio:onos-pcep-pcepio', 8 '//protocols/pcep/pcepio:onos-pcep-pcepio',
9 ] 9 ]
10 10
11 -java_library( 11 +osgi_jar(
12 name = CURRENT_NAME, 12 name = CURRENT_NAME,
13 srcs = glob([SRC + '/*.java']), 13 srcs = glob([SRC + '/*.java']),
14 deps = COMPILE_DEPS, 14 deps = COMPILE_DEPS,
......
...@@ -9,7 +9,7 @@ COMPILE_DEPS = [ ...@@ -9,7 +9,7 @@ COMPILE_DEPS = [
9 '//protocols/pcep/api:onos-pcep-controller-api', 9 '//protocols/pcep/api:onos-pcep-controller-api',
10 ] 10 ]
11 11
12 -java_library( 12 +osgi_jar(
13 name = CURRENT_NAME, 13 name = CURRENT_NAME,
14 srcs = glob([SRC + '/*.java']), 14 srcs = glob([SRC + '/*.java']),
15 deps = COMPILE_DEPS, 15 deps = COMPILE_DEPS,
......
...@@ -11,7 +11,7 @@ TEST_DEPS = [ ...@@ -11,7 +11,7 @@ TEST_DEPS = [
11 '//lib:TEST', 11 '//lib:TEST',
12 ] 12 ]
13 13
14 -java_library( 14 +osgi_jar(
15 name = CURRENT_NAME, 15 name = CURRENT_NAME,
16 srcs = glob([SRC + '/*.java']), 16 srcs = glob([SRC + '/*.java']),
17 deps = COMPILE_DEPS, 17 deps = COMPILE_DEPS,
......
...@@ -9,7 +9,7 @@ COMPILE_DEPS = [ ...@@ -9,7 +9,7 @@ COMPILE_DEPS = [
9 '//utils/rest:onlab-rest', 9 '//utils/rest:onlab-rest',
10 ] 10 ]
11 11
12 -java_library( 12 +osgi_jar(
13 name = CURRENT_NAME, 13 name = CURRENT_NAME,
14 srcs = glob([SRC + '/*.java']), 14 srcs = glob([SRC + '/*.java']),
15 deps = COMPILE_DEPS, 15 deps = COMPILE_DEPS,
......
...@@ -21,7 +21,7 @@ TEST_DEPS = [ ...@@ -21,7 +21,7 @@ TEST_DEPS = [
21 '//lib:TEST', 21 '//lib:TEST',
22 ] 22 ]
23 23
24 -java_library( 24 +osgi_jar(
25 name = CURRENT_NAME, 25 name = CURRENT_NAME,
26 srcs = glob([SRC + '/*.java']), 26 srcs = glob([SRC + '/*.java']),
27 deps = COMPILE_DEPS, 27 deps = COMPILE_DEPS,
......
...@@ -13,7 +13,7 @@ COMPILE_DEPS = [ ...@@ -13,7 +13,7 @@ COMPILE_DEPS = [
13 '//lib:mibs-rfc', 13 '//lib:mibs-rfc',
14 ] 14 ]
15 15
16 -java_library( 16 +osgi_jar(
17 name = CURRENT_NAME, 17 name = CURRENT_NAME,
18 srcs = glob([SRC + '/*.java']), 18 srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 19 deps = COMPILE_DEPS,
......
...@@ -18,7 +18,7 @@ TEST_DEPS = [ ...@@ -18,7 +18,7 @@ TEST_DEPS = [
18 '//lib:TEST', 18 '//lib:TEST',
19 ] 19 ]
20 20
21 -java_library( 21 +osgi_jar(
22 name = CURRENT_NAME, 22 name = CURRENT_NAME,
23 srcs = glob([SRC + '/*.java']), 23 srcs = glob([SRC + '/*.java']),
24 deps = COMPILE_DEPS, 24 deps = COMPILE_DEPS,
......
...@@ -8,7 +8,7 @@ COMPILE_DEPS = [ ...@@ -8,7 +8,7 @@ COMPILE_DEPS = [
8 '//protocols/bgp/api:onos-bgp-api', 8 '//protocols/bgp/api:onos-bgp-api',
9 ] 9 ]
10 10
11 -java_library( 11 +osgi_jar(
12 name = CURRENT_NAME, 12 name = CURRENT_NAME,
13 srcs = glob([SRC + '/*.java']), 13 srcs = glob([SRC + '/*.java']),
14 deps = COMPILE_DEPS, 14 deps = COMPILE_DEPS,
......
...@@ -8,7 +8,7 @@ COMPILE_DEPS = [ ...@@ -8,7 +8,7 @@ COMPILE_DEPS = [
8 '//protocols/bgp/api:onos-bgp-api', 8 '//protocols/bgp/api:onos-bgp-api',
9 ] 9 ]
10 10
11 -java_library( 11 +osgi_jar(
12 name = CURRENT_NAME, 12 name = CURRENT_NAME,
13 srcs = glob([SRC + '/*.java']), 13 srcs = glob([SRC + '/*.java']),
14 deps = COMPILE_DEPS, 14 deps = COMPILE_DEPS,
......
...@@ -14,7 +14,7 @@ TEST_DEPS = [ ...@@ -14,7 +14,7 @@ TEST_DEPS = [
14 '//lib:TEST', 14 '//lib:TEST',
15 ] 15 ]
16 16
17 -java_library( 17 +osgi_jar(
18 name = CURRENT_NAME, 18 name = CURRENT_NAME,
19 srcs = glob([SRC + '/*.java']), 19 srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 20 deps = COMPILE_DEPS,
......
...@@ -7,7 +7,7 @@ COMPILE_DEPS = [ ...@@ -7,7 +7,7 @@ COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 7 '//lib:CORE_DEPS',
8 ] 8 ]
9 9
10 -java_library( 10 +osgi_jar(
11 name = CURRENT_NAME, 11 name = CURRENT_NAME,
12 srcs = glob([SRC + '/*.java']), 12 srcs = glob([SRC + '/*.java']),
13 deps = COMPILE_DEPS, 13 deps = COMPILE_DEPS,
......
...@@ -13,7 +13,7 @@ TEST_DEPS = [ ...@@ -13,7 +13,7 @@ TEST_DEPS = [
13 '//lib:TEST', 13 '//lib:TEST',
14 ] 14 ]
15 15
16 -java_library( 16 +osgi_jar(
17 name = CURRENT_NAME, 17 name = CURRENT_NAME,
18 srcs = glob([SRC + '/*.java']), 18 srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 19 deps = COMPILE_DEPS,
......
...@@ -12,7 +12,7 @@ TEST_DEPS = [ ...@@ -12,7 +12,7 @@ TEST_DEPS = [
12 '//lib:TEST', 12 '//lib:TEST',
13 ] 13 ]
14 14
15 -java_library( 15 +osgi_jar(
16 name = CURRENT_NAME, 16 name = CURRENT_NAME,
17 srcs = glob([SRC + '/*.java']), 17 srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 18 deps = COMPILE_DEPS,
......
...@@ -12,7 +12,7 @@ TEST_DEPS = [ ...@@ -12,7 +12,7 @@ TEST_DEPS = [
12 '//lib:TEST', 12 '//lib:TEST',
13 ] 13 ]
14 14
15 -java_library( 15 +osgi_jar(
16 name = CURRENT_NAME, 16 name = CURRENT_NAME,
17 srcs = glob([SRC + '/*.java']), 17 srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 18 deps = COMPILE_DEPS,
......
...@@ -13,7 +13,7 @@ TEST_DEPS = [ ...@@ -13,7 +13,7 @@ TEST_DEPS = [
13 '//lib:TEST', 13 '//lib:TEST',
14 ] 14 ]
15 15
16 -java_library( 16 +osgi_jar(
17 name = CURRENT_NAME, 17 name = CURRENT_NAME,
18 srcs = glob([SRC + '/*.java']), 18 srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 19 deps = COMPILE_DEPS,
......
...@@ -9,7 +9,7 @@ COMPILE_DEPS = [ ...@@ -9,7 +9,7 @@ COMPILE_DEPS = [
9 '//protocols/netconf/api:onos-netconf-api', 9 '//protocols/netconf/api:onos-netconf-api',
10 ] 10 ]
11 11
12 -java_library( 12 +osgi_jar(
13 name = CURRENT_NAME, 13 name = CURRENT_NAME,
14 srcs = glob([SRC + '/*.java']), 14 srcs = glob([SRC + '/*.java']),
15 deps = COMPILE_DEPS, 15 deps = COMPILE_DEPS,
......
...@@ -14,7 +14,7 @@ TEST_DEPS = [ ...@@ -14,7 +14,7 @@ TEST_DEPS = [
14 '//lib:TEST', 14 '//lib:TEST',
15 ] 15 ]
16 16
17 -java_library( 17 +osgi_jar(
18 name = CURRENT_NAME, 18 name = CURRENT_NAME,
19 srcs = glob([SRC + '/*.java']), 19 srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 20 deps = COMPILE_DEPS,
......
...@@ -14,7 +14,7 @@ TEST_DEPS = [ ...@@ -14,7 +14,7 @@ TEST_DEPS = [
14 '//lib:TEST', 14 '//lib:TEST',
15 ] 15 ]
16 16
17 -java_library( 17 +osgi_jar(
18 name = CURRENT_NAME, 18 name = CURRENT_NAME,
19 srcs = glob([SRC + '/*.java']), 19 srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 20 deps = COMPILE_DEPS,
......
...@@ -14,7 +14,7 @@ TEST_DEPS = [ ...@@ -14,7 +14,7 @@ TEST_DEPS = [
14 '//lib:TEST', 14 '//lib:TEST',
15 ] 15 ]
16 16
17 -java_library( 17 +osgi_jar(
18 name = CURRENT_NAME, 18 name = CURRENT_NAME,
19 srcs = glob([SRC + '/*.java']), 19 srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 20 deps = COMPILE_DEPS,
......
...@@ -15,7 +15,7 @@ TEST_DEPS = [ ...@@ -15,7 +15,7 @@ TEST_DEPS = [
15 '//lib:TEST', 15 '//lib:TEST',
16 ] 16 ]
17 17
18 -java_library( 18 +osgi_jar(
19 name = CURRENT_NAME, 19 name = CURRENT_NAME,
20 srcs = glob([SRC + '/*.java']), 20 srcs = glob([SRC + '/*.java']),
21 deps = COMPILE_DEPS, 21 deps = COMPILE_DEPS,
......
...@@ -15,7 +15,7 @@ TEST_DEPS = [ ...@@ -15,7 +15,7 @@ TEST_DEPS = [
15 '//lib:TEST', 15 '//lib:TEST',
16 ] 16 ]
17 17
18 -java_library( 18 +osgi_jar(
19 name = CURRENT_NAME, 19 name = CURRENT_NAME,
20 srcs = glob([SRC + '/*.java']), 20 srcs = glob([SRC + '/*.java']),
21 deps = COMPILE_DEPS, 21 deps = COMPILE_DEPS,
......
...@@ -14,7 +14,7 @@ TEST_DEPS = [ ...@@ -14,7 +14,7 @@ TEST_DEPS = [
14 '//lib:TEST', 14 '//lib:TEST',
15 ] 15 ]
16 16
17 -java_library( 17 +osgi_jar(
18 name = CURRENT_NAME, 18 name = CURRENT_NAME,
19 srcs = glob([SRC + '/*.java']), 19 srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 20 deps = COMPILE_DEPS,
......
...@@ -14,7 +14,7 @@ TEST_DEPS = [ ...@@ -14,7 +14,7 @@ TEST_DEPS = [
14 '//lib:TEST', 14 '//lib:TEST',
15 ] 15 ]
16 16
17 -java_library( 17 +osgi_jar(
18 name = CURRENT_NAME, 18 name = CURRENT_NAME,
19 srcs = glob([SRC + '/*.java']), 19 srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 20 deps = COMPILE_DEPS,
......
...@@ -14,7 +14,7 @@ TEST_DEPS = [ ...@@ -14,7 +14,7 @@ TEST_DEPS = [
14 '//lib:TEST', 14 '//lib:TEST',
15 ] 15 ]
16 16
17 -java_library( 17 +osgi_jar(
18 name = CURRENT_NAME, 18 name = CURRENT_NAME,
19 srcs = glob([SRC + '/*.java']), 19 srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 20 deps = COMPILE_DEPS,
......
...@@ -14,7 +14,7 @@ TEST_DEPS = [ ...@@ -14,7 +14,7 @@ TEST_DEPS = [
14 '//lib:TEST', 14 '//lib:TEST',
15 ] 15 ]
16 16
17 -java_library( 17 +osgi_jar(
18 name = CURRENT_NAME, 18 name = CURRENT_NAME,
19 srcs = glob([SRC + '/*.java']), 19 srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 20 deps = COMPILE_DEPS,
......
...@@ -15,7 +15,7 @@ TEST_DEPS = [ ...@@ -15,7 +15,7 @@ TEST_DEPS = [
15 '//lib:TEST', 15 '//lib:TEST',
16 ] 16 ]
17 17
18 -java_library( 18 +osgi_jar(
19 name = CURRENT_NAME, 19 name = CURRENT_NAME,
20 srcs = glob([SRC + '/*.java']), 20 srcs = glob([SRC + '/*.java']),
21 deps = COMPILE_DEPS, 21 deps = COMPILE_DEPS,
......
...@@ -15,7 +15,7 @@ TEST_DEPS = [ ...@@ -15,7 +15,7 @@ TEST_DEPS = [
15 '//lib:TEST', 15 '//lib:TEST',
16 ] 16 ]
17 17
18 -java_library( 18 +osgi_jar(
19 name = CURRENT_NAME, 19 name = CURRENT_NAME,
20 srcs = glob([SRC + '/*.java']), 20 srcs = glob([SRC + '/*.java']),
21 deps = COMPILE_DEPS, 21 deps = COMPILE_DEPS,
......
...@@ -18,7 +18,7 @@ TEST_DEPS = [ ...@@ -18,7 +18,7 @@ TEST_DEPS = [
18 '//lib:TEST', 18 '//lib:TEST',
19 ] 19 ]
20 20
21 -java_library( 21 +osgi_jar(
22 name = CURRENT_NAME, 22 name = CURRENT_NAME,
23 srcs = glob([SRC + '/*.java']), 23 srcs = glob([SRC + '/*.java']),
24 deps = COMPILE_DEPS, 24 deps = COMPILE_DEPS,
......
...@@ -18,7 +18,7 @@ TEST_DEPS = [ ...@@ -18,7 +18,7 @@ TEST_DEPS = [
18 '//lib:TEST', 18 '//lib:TEST',
19 ] 19 ]
20 20
21 -java_library( 21 +osgi_jar(
22 name = CURRENT_NAME, 22 name = CURRENT_NAME,
23 srcs = glob([SRC + '/*.java']), 23 srcs = glob([SRC + '/*.java']),
24 deps = COMPILE_DEPS, 24 deps = COMPILE_DEPS,
......
...@@ -19,7 +19,7 @@ TEST_DEPS = [ ...@@ -19,7 +19,7 @@ TEST_DEPS = [
19 '//lib:TEST', 19 '//lib:TEST',
20 ] 20 ]
21 21
22 -java_library( 22 +osgi_jar(
23 name = CURRENT_NAME, 23 name = CURRENT_NAME,
24 srcs = glob([SRC + '/*.java']), 24 srcs = glob([SRC + '/*.java']),
25 deps = COMPILE_DEPS, 25 deps = COMPILE_DEPS,
......
...@@ -20,7 +20,7 @@ TEST_DEPS = [ ...@@ -20,7 +20,7 @@ TEST_DEPS = [
20 '//lib:TEST', 20 '//lib:TEST',
21 ] 21 ]
22 22
23 -java_library( 23 +osgi_jar(
24 name = CURRENT_NAME, 24 name = CURRENT_NAME,
25 srcs = glob([SRC + '/*.java']), 25 srcs = glob([SRC + '/*.java']),
26 deps = COMPILE_DEPS, 26 deps = COMPILE_DEPS,
......
...@@ -13,7 +13,7 @@ TEST_DEPS = [ ...@@ -13,7 +13,7 @@ TEST_DEPS = [
13 '//lib:guava-testlib', 13 '//lib:guava-testlib',
14 ] 14 ]
15 15
16 -java_library( 16 +osgi_jar(
17 name = CURRENT_NAME, 17 name = CURRENT_NAME,
18 srcs = glob([SRC + '/*.java']), 18 srcs = glob([SRC + '/*.java']),
19 deps = SRC_DEPS, 19 deps = SRC_DEPS,
......
...@@ -11,7 +11,7 @@ TEST_DEPS = [ ...@@ -11,7 +11,7 @@ TEST_DEPS = [
11 '//lib:TEST', 11 '//lib:TEST',
12 ] 12 ]
13 13
14 -java_library( 14 +osgi_jar(
15 name = CURRENT_NAME, 15 name = CURRENT_NAME,
16 srcs = glob([SRC + '/*.java']), 16 srcs = glob([SRC + '/*.java']),
17 deps = COMPILE_DEPS, 17 deps = COMPILE_DEPS,
...@@ -26,3 +26,4 @@ java_test( ...@@ -26,3 +26,4 @@ java_test(
26 [CURRENT_TARGET], 26 [CURRENT_TARGET],
27 source_under_test = [CURRENT_TARGET], 27 source_under_test = [CURRENT_TARGET],
28 ) 28 )
29 +
......
...@@ -11,7 +11,7 @@ TEST_DEPS = [ ...@@ -11,7 +11,7 @@ TEST_DEPS = [
11 '//lib:TEST', 11 '//lib:TEST',
12 ] 12 ]
13 13
14 -java_library( 14 +osgi_jar(
15 name = CURRENT_NAME, 15 name = CURRENT_NAME,
16 srcs = glob([SRC + '/*.java']), 16 srcs = glob([SRC + '/*.java']),
17 deps = COMPILE_DEPS, 17 deps = COMPILE_DEPS,
......
...@@ -15,7 +15,7 @@ TEST_DEPS = [ ...@@ -15,7 +15,7 @@ TEST_DEPS = [
15 '//lib:TEST', 15 '//lib:TEST',
16 ] 16 ]
17 17
18 -java_library( 18 +osgi_jar(
19 name = CURRENT_NAME, 19 name = CURRENT_NAME,
20 srcs = glob([SRC + '/*.java']), 20 srcs = glob([SRC + '/*.java']),
21 deps = COMPILE_DEPS, 21 deps = COMPILE_DEPS,
......
1 SRC = 'src/main/java/org/onosproject/**/' 1 SRC = 'src/main/java/org/onosproject/**/'
2 TEST = 'src/test/java/org/onosproject/**/' 2 TEST = 'src/test/java/org/onosproject/**/'
3 +RESOURCES_ROOT = 'src/main/resources/'
3 4
4 CURRENT_NAME = 'onos-rest' 5 CURRENT_NAME = 'onos-rest'
5 CURRENT_TARGET = ':' + CURRENT_NAME 6 CURRENT_TARGET = ':' + CURRENT_NAME
6 7
7 COMPILE_DEPS = [ 8 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 9 '//lib:CORE_DEPS',
10 + '//incubator/api:onos-incubator-api',
9 '//lib:javax.ws.rs-api', 11 '//lib:javax.ws.rs-api',
10 '//utils/rest:onlab-rest', 12 '//utils/rest:onlab-rest',
11 - '//incubator/api:onos-incubator-api',
12 ] 13 ]
13 14
14 TEST_DEPS = [ 15 TEST_DEPS = [
15 '//lib:TEST', 16 '//lib:TEST',
16 ] 17 ]
17 18
18 -java_library( 19 +osgi_jar(
19 name = CURRENT_NAME, 20 name = CURRENT_NAME,
20 srcs = glob([SRC + '/*.java']), 21 srcs = glob([SRC + '/*.java']),
22 + resources = glob([RESOURCES_ROOT + '**']),
23 + resources_root = RESOURCES_ROOT,
21 deps = COMPILE_DEPS, 24 deps = COMPILE_DEPS,
22 visibility = ['PUBLIC'], 25 visibility = ['PUBLIC'],
26 + debug = False,
27 + web_context = '/onos/v1'
23 ) 28 )
24 29
25 java_test( 30 java_test(
......
1 SRC = 'src/main/java/org/onosproject/**/' 1 SRC = 'src/main/java/org/onosproject/**/'
2 TEST = 'src/test/java/org/onosproject/**/' 2 TEST = 'src/test/java/org/onosproject/**/'
3 +RESOURCES_ROOT = 'src/main/resources/'
3 4
4 CURRENT_NAME = 'onos-gui' 5 CURRENT_NAME = 'onos-gui'
5 CURRENT_TARGET = ':' + CURRENT_NAME 6 CURRENT_TARGET = ':' + CURRENT_NAME
...@@ -21,13 +22,13 @@ TEST_DEPS = [ ...@@ -21,13 +22,13 @@ TEST_DEPS = [
21 '//lib:TEST', 22 '//lib:TEST',
22 ] 23 ]
23 24
24 -java_library( 25 +osgi_jar(
25 name = CURRENT_NAME, 26 name = CURRENT_NAME,
26 srcs = glob([SRC + '/*.java']), 27 srcs = glob([SRC + '/*.java']),
28 + resources = glob([RESOURCES_ROOT + '**']),
29 + resources_root = RESOURCES_ROOT,
27 deps = COMPILE_DEPS, 30 deps = COMPILE_DEPS,
28 visibility = ['PUBLIC'], 31 visibility = ['PUBLIC'],
29 - resources_root = 'src/main/resources',
30 - resources = glob(['src/main/resources/**']),
31 ) 32 )
32 33
33 java_test( 34 java_test(
......