Simplifying rules and providing sensible defaults
Updated cordvtn, dhcp, fwd, onos-api, of-api, onlab-rest, onos-rest, onos-gui
Also, fixed checkstyle error print
Change-Id: I9d6ab76791e8603678079067a3b4e007ca7c4667
diff --git a/web/gui/BUCK b/web/gui/BUCK
index b1a9a7c..7230898 100644
--- a/web/gui/BUCK
+++ b/web/gui/BUCK
@@ -1,10 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-RESOURCES_ROOT = 'src/main/resources/'
-
-CURRENT_NAME = 'onos-gui'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:javax.ws.rs-api',
@@ -33,23 +26,10 @@
'WEB-INF/classes/raw=src/main/webapp/raw',
]
-osgi_jar(
- name = CURRENT_NAME,
- srcs = glob([SRC + '/*.java']),
- resources = glob([RESOURCES_ROOT + '**']),
- resources_root = RESOURCES_ROOT,
+osgi_jar_with_tests (
+ name = 'onos-gui',
deps = COMPILE_DEPS,
- visibility = ['PUBLIC'],
+ test_deps = TEST_DEPS,
include_resources = ','.join(RESOURCES),
web_context = '/onos/ui',
- debug = False,
-)
-
-java_test(
- name = 'tests',
- srcs = glob([TEST + '/*.java']),
- deps = COMPILE_DEPS +
- TEST_DEPS +
- [CURRENT_TARGET],
- source_under_test = [CURRENT_TARGET],
)