Fix up apps that require jar file wrapping

Change-Id: I5a04cfa7b97c51cdedd65bbcaeaec1cb500fd2de

+# app builds but is currently non functional. It needs transitive runtime
+# dependencies.
+
 COMPILE_DEPS = [
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:CORE_DEPS',
     '//lib:org.apache.karaf.shell.console',
     '//lib:org.apache.karaf.shell.console',
@@ -19,10 +22,13 @@ COMPILE_DEPS = [
 BUNDLES = [
 BUNDLES = [
     '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
     '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
     '//apps/cordvtn:onos-apps-cordvtn',
     '//apps/cordvtn:onos-apps-cordvtn',
+    '//lib:openstack4j-core',
+    '//lib:openstack4j-http-connector',
+    '//lib:openstack4j-httpclient',
 ]
 ]
 
 
 EXCLUDED_BUNDLES = [
 EXCLUDED_BUNDLES = [
-    '//lib:jsch', # TODO - needs wrap
+    '//lib:jsch',
 ]
 ]
 
 
 osgi_jar_with_tests (
 osgi_jar_with_tests (
@@ -37,5 +43,5 @@ onos_app (
     included_bundles = BUNDLES,
     included_bundles = BUNDLES,
     excluded_bundles = EXCLUDED_BUNDLES,
     excluded_bundles = EXCLUDED_BUNDLES,
     description = 'APIs for interacting with the CORD VTN application.',
     description = 'APIs for interacting with the CORD VTN application.',
-    required_apps = [ 'org.onosproject.xosclient' ],
+    required_apps = [ 'org.onosproject.xosclient', 'org.onosproject.dhcp', 'org.onosproject.ovsdb', 'org.onosproject.openstackinterface' ],
 )
 )

@@ -19,7 +19,7 @@ BUNDLES = [
 ]
 ]
 
 
 EXCLUDED_BUNDLES = [
 EXCLUDED_BUNDLES = [
-    '//lib:rrd4j', # FIXME - needs wrap
+    '//lib:rrd4j',
 ]
 ]
 
 
 osgi_jar_with_tests (
 osgi_jar_with_tests (

@@ -11,6 +11,10 @@ EXCLUDED_BUNDLES = [
     '//lib:influxdb-java',
     '//lib:influxdb-java',
 ]
 ]
 
 
+BUNDLES = [
+    '//lib:commons-codec',
+]
+
 TEST_DEPS = [
 TEST_DEPS = [
     '//lib:TEST_ADAPTERS',
     '//lib:TEST_ADAPTERS',
 ]
 ]
@@ -20,12 +24,11 @@ osgi_jar_with_tests (
     test_deps = TEST_DEPS,
     test_deps = TEST_DEPS,
 )
 )
 
 
-# TODO : Currently non-functional, needs the ability to wrap a non-OSGI jar
-
 onos_app (
 onos_app (
     title = 'InfluxDB Report and Query App',
     title = 'InfluxDB Report and Query App',
     category = 'Monitoring',
     category = 'Monitoring',
     url = 'http://onosproject.org',
     url = 'http://onosproject.org',
     description = 'Performance metric service reporter and retriever for influxDB.',
     description = 'Performance metric service reporter and retriever for influxDB.',
+    included_bundles = BUNDLES,
     excluded_bundles = EXCLUDED_BUNDLES,
     excluded_bundles = EXCLUDED_BUNDLES,
 )
 )

@@ -1727,3 +1727,19 @@ remote_file(
   sha1 = 'd050e21295959a4ce2c07ca193ccbe28d8bfa3c1',
   sha1 = 'd050e21295959a4ce2c07ca193ccbe28d8bfa3c1',
 )
 )
 
 
+prebuilt_jar(
+  name = 'commons-codec',
+  binary_jar = ':commons-codec-1.10.jar',
+  maven_coords = 'commons-codec:commons-codec:1.10',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_file(
+  name = 'commons-codec-1.10.jar',
+  out = 'commons-codec-1.10.jar',
+  url = 'mvn:commons-codec:commons-codec:jar:1.10',
+  sha1 = '4b95f4897fa13f2cd904aee711aeafc0c5295cd8',
+)
+
+
+

@@ -97,6 +97,7 @@
     "catalyst-local": "mvn:io.atomix.catalyst:catalyst-local:1.0.4",
     "catalyst-local": "mvn:io.atomix.catalyst:catalyst-local:1.0.4",
     "catalyst-serializer": "mvn:io.atomix.catalyst:catalyst-serializer:1.0.4",
     "catalyst-serializer": "mvn:io.atomix.catalyst:catalyst-serializer:1.0.4",
     "catalyst-transport": "mvn:io.atomix.catalyst:catalyst-transport:1.0.4",
     "catalyst-transport": "mvn:io.atomix.catalyst:catalyst-transport:1.0.4",
+    "commons-codec": "mvn:commons-codec:commons-codec:1.10",
     "commons-collections": "mvn:commons-collections:commons-collections:3.2.2",
     "commons-collections": "mvn:commons-collections:commons-collections:3.2.2",
     "commons-configuration": "mvn:commons-configuration:commons-configuration:1.10",
     "commons-configuration": "mvn:commons-configuration:commons-configuration:1.10",
     "commons-io": "mvn:commons-io:commons-io:2.4",
     "commons-io": "mvn:commons-io:commons-io:2.4",

@@ -5,7 +5,7 @@ BUNDLES = [
 ]
 ]
 
 
 EXCLUDED_BUNDLES = [
 EXCLUDED_BUNDLES = [
-    '//lib:ganymed-ssh2', # FIXME - Needs wrap
+    '//lib:ganymed-ssh2',
 ]
 ]
 
 
 onos_app (
 onos_app (