Ray Milkey
Committed by Gerrit Code Review

Start refactoring of app BUCK files

- Brian added maven coordinates to the maven JAR short path
- refactored segment routing and ganglia metrics apps

Change-Id: I7b8110e07a474d256d4821c1a9d083c9c8c11e2e
......@@ -89,6 +89,8 @@ APPS = [
'//apps/acl:onos-apps-acl-oar',
'//apps/bgprouter:onos-apps-bgprouter-oar',
'//apps/proxyarp:onos-apps-proxyarp-oar',
'//apps/segmentrouting:onos-apps-segmentrouting-oar',
'//apps/gangliametrics:onos-apps-gangliametrics-oar',
]
APP_JARS = [
......@@ -111,7 +113,6 @@ APP_JARS = [
'//apps/olt:onos-app-olt-app',
'//apps/iptopology-api:onos-app-iptopology-api',
'//apps/metrics:onos-app-metrics',
'//apps/gangliametrics:onos-app-ganglia',
'//apps/graphitemetrics:onos-app-graphite',
'//apps/mfwd:onos-app-mfwd',
'//apps/mlb:onos-app-mlb',
......@@ -125,7 +126,6 @@ APP_JARS = [
'//apps/pim:onos-app-pim',
'//apps/routing:onos-apps-routing',
'//apps/sdnip:onos-app-sdnip',
'//apps/segmentrouting:onos-app-segmentrouting',
'//apps/test:onos-app-test',
'//apps/vtn:onos-app-vtn',
'//apps/virtualbng:onos-app-virtualbng',
......
SRC = 'src/main/java/org/onosproject/**/'
TEST = 'src/test/java/org/onosproject/**/'
CURRENT_NAME = 'onos-app-ganglia'
CURRENT_TARGET = ':' + CURRENT_NAME
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:gmetric4j',
'//lib:metrics-ganglia',
'//lib:remotetea-oncrpc',
]
TEST_DEPS = [
'//lib:TEST',
EXCLUDED_BUNDLES = [
'//lib:gmetric4j',
'//lib:metrics-ganglia',
'//lib:remotetea-oncrpc',
]
java_library(
name = CURRENT_NAME,
srcs = glob([SRC + '/*.java']),
osgi_jar_with_tests (
deps = COMPILE_DEPS,
visibility = ['PUBLIC'],
)
java_test(
name = 'tests',
srcs = glob([TEST + '/*.java']),
deps = COMPILE_DEPS +
TEST_DEPS +
[CURRENT_TARGET],
source_under_test = [CURRENT_TARGET],
onos_app (
title = 'Ganglia Report and Query App',
category = 'Monitoring',
url = 'http://onosproject.org',
description = 'Performance metric service reporter',
excluded_bundles = EXCLUDED_BUNDLES,
)
......
SRC = 'src/main/java/org/onosproject/**/'
TEST = 'src/test/java/org/onosproject/**/'
CURRENT_NAME = 'onos-app-segmentrouting'
CURRENT_TARGET = ':' + CURRENT_NAME
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:org.apache.karaf.shell.console',
......@@ -18,22 +12,14 @@ TEST_DEPS = [
'//lib:TEST_ADAPTERS',
]
java_library(
name = CURRENT_NAME,
srcs = glob([SRC + '/*.java']),
osgi_jar_with_tests (
deps = COMPILE_DEPS,
visibility = ['PUBLIC'],
resources_root = 'src/main/resources',
resources = glob(['src/main/resources/**']),
test_deps = TEST_DEPS,
)
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/**']),
onos_app (
title = 'Proxy ARP/NDP App',
category = 'Traffic Steering',
url = 'http://onosproject.org',
description = 'Proxy ARP/NDP application.',
)
......
......@@ -49,6 +49,7 @@ def maven_jar(
prebuilt_jar(
name = name,
binary_jar = ':%s-jar' % name,
maven_coords = id,
visibility = [ 'PUBLIC' ]
)
......
......@@ -943,3 +943,10 @@ remote_file(
url = 'http://onlab.vicci.org/onos/third-party/checkstyle-6.11.2-all.jar',
sha1 = 'f504187b1743e73ffe72c2eede0ff57d45536b7d'
)
maven_jar(
name = 'remotetea-oncrpc',
id = 'org.acplt.remotetea:remotetea-oncrpc:1.1.3',
sha1 = '2f7d94c5179b0267a882259a03a83eaa320cbcce',
license = 'Apache2.0',
)
......