More app BUCK file refactoring
Change-Id: I97506033c4c0cf145c558df7d4f86f37c7fe8332
diff --git a/apps/influxdbmetrics/BUCK b/apps/influxdbmetrics/BUCK
index a7305c9..9df1a24 100644
--- a/apps/influxdbmetrics/BUCK
+++ b/apps/influxdbmetrics/BUCK
@@ -1,9 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-app-influxdb'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:org.apache.karaf.shell.console',
@@ -12,22 +6,26 @@
'//cli:onos-cli',
]
+EXCLUDED_BUNDLES = [
+ '//lib:metrics-influxdb',
+ '//lib:influxdb-java',
+]
+
TEST_DEPS = [
'//lib:TEST_ADAPTERS',
]
-java_library(
- name = CURRENT_NAME,
- srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
deps = COMPILE_DEPS,
- visibility = ['PUBLIC'],
+ test_deps = TEST_DEPS,
)
-java_test(
- name = 'tests',
- srcs = glob([TEST + '/*.java']),
- deps = COMPILE_DEPS +
- TEST_DEPS +
- [CURRENT_TARGET],
- source_under_test = [CURRENT_TARGET],
+# TODO : Currently non-functional, needs the ability to wrap a non-OSGI jar
+
+onos_app (
+ title = 'InfluxDB Report and Query App',
+ category = 'Monitoring',
+ url = 'http://onosproject.org',
+ description = 'Performance metric service reporter and retriever for influxDB.',
+ excluded_bundles = EXCLUDED_BUNDLES,
)