odlmicro.git
3 years agointroduce TestHttpClient
Michael Vorburger [Thu, 11 Oct 2018 00:55:25 +0000 (02:55 +0200)]
introduce TestHttpClient

used in DiagStatusServletTest, also upcoming restconf support

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoAdd ClassPathScanner tests
Stephen Kitt [Wed, 10 Oct 2018 11:38:10 +0000 (13:38 +0200)]
Add ClassPathScanner tests

Signed-off-by: Stephen Kitt <skitt@redhat.com>
3 years agoadd <mirror> for ODL Nexus to settings.xml (#37)
Michael Vorburger [Wed, 10 Oct 2018 18:27:06 +0000 (20:27 +0200)]
add <mirror> for ODL Nexus to settings.xml (#37)

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agocatch and log Exception from SystemReadyListener
Michael Vorburger [Wed, 10 Oct 2018 17:16:36 +0000 (19:16 +0200)]
catch and log Exception from SystemReadyListener

due to today's I4f16674ba65f499944e4582fb900d90e873d14e2 (INFRAUTILS-51)

This is about to be replaced by
https://github.com/vorburger/opendaylight-simple/pull/19 anyway,
beecause that is not ready, because
https://git.opendaylight.org/gerrit/#/c/76532 is taking forever to go
in, let's do this for the short term.

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agodeploy using releases instead of pages provider after all (#42)
Michael Vorburger [Wed, 10 Oct 2018 15:48:08 +0000 (17:48 +0200)]
deploy using releases instead of pages provider after all (#42)

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoRevert "move TAR to target/deploy"
Michael Vorburger [Wed, 10 Oct 2018 15:48:42 +0000 (17:48 +0200)]
Revert "move TAR to target/deploy"

This reverts commit 4aa336d3e0f1cc99bc79a1e2916693b13e5c8fb5.

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd /diagstatus web support
Michael Vorburger [Tue, 9 Oct 2018 22:16:31 +0000 (00:16 +0200)]
add /diagstatus web support

This foundation will also be useful when adding REST web wiring.

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agofix hanging JVM in case of Guice wiring problems
Michael Vorburger [Tue, 9 Oct 2018 21:14:40 +0000 (23:14 +0200)]
fix hanging JVM in case of Guice wiring problems

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agotweak Travis YAML to see if this and/or new token help
Michael Vorburger [Tue, 9 Oct 2018 23:23:47 +0000 (01:23 +0200)]
tweak Travis YAML to see if this and/or new token help

Couldn't push the build to github.com/vorburger/opendaylight-simple-binaries.git:gh-pages

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd things to TODO
Michael Vorburger [Tue, 9 Oct 2018 21:21:54 +0000 (23:21 +0200)]
add things to TODO

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoenable verbose logging for deploy pages provider
Michael Vorburger [Tue, 9 Oct 2018 20:25:47 +0000 (22:25 +0200)]
enable verbose logging for deploy pages provider

to figure out why it fails with:
Couldn't push the build to github.com/vorburger/opendaylight-simple-binaries.git:gh-pages

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agodeploy using pages provider
Michael Vorburger [Tue, 9 Oct 2018 19:24:05 +0000 (21:24 +0200)]
deploy using pages provider

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agomove TAR to target/deploy
Michael Vorburger [Tue, 9 Oct 2018 19:16:32 +0000 (21:16 +0200)]
move TAR to target/deploy

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agodeploy using releases provider (#27)
Sam Hague [Tue, 9 Oct 2018 18:51:51 +0000 (20:51 +0200)]
deploy using releases provider (#27)

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agofix POC version to 1.0.0-SNAPSHOT instead of inheriting infrautils'
Michael Vorburger [Tue, 9 Oct 2018 18:21:40 +0000 (20:21 +0200)]
fix POC version to 1.0.0-SNAPSHOT instead of inheriting infrautils'

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoUpdate TODO.md
Michael Vorburger [Mon, 8 Oct 2018 15:08:31 +0000 (17:08 +0200)]
Update TODO.md

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoUpdate TODO.md
Michael Vorburger [Sun, 7 Oct 2018 00:58:00 +0000 (02:58 +0200)]
Update TODO.md

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoUpdate README.md
Michael Vorburger [Thu, 4 Oct 2018 19:07:14 +0000 (21:07 +0200)]
Update README.md

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoAdd travis builds
Sam Hague [Thu, 4 Oct 2018 18:24:17 +0000 (14:24 -0400)]
Add travis builds

Signed-off-by: Sam Hague <shague@redhat.com>
3 years agoUpdate README.md
Michael Vorburger [Thu, 4 Oct 2018 18:11:33 +0000 (20:11 +0200)]
Update README.md

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoFix System.exit() handling
Stephen Kitt [Thu, 4 Oct 2018 09:46:51 +0000 (11:46 +0200)]
Fix System.exit() handling

Directly invoking System.exit() from Main.close() causes two problems:
* FindBugs doesn’t like it ;-)
* MainTest fails because the JVM exits from under Surefire’s feet

This patch adds an override for FindBugs, and separates closing the
injector from exiting the JVM for test purposes.

Signed-off-by: Stephen Kitt <skitt@redhat.com>
3 years agoadd TODO re. ClassPathScanner using ClassGraph
Michael Vorburger [Thu, 4 Oct 2018 01:59:10 +0000 (03:59 +0200)]
add TODO re. ClassPathScanner using ClassGraph

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agomake ClassPathScanner log "declared multiple times" debug instead warn
Michael Vorburger [Tue, 2 Oct 2018 23:47:59 +0000 (01:47 +0200)]
make ClassPathScanner log "declared multiple times" debug instead warn

This avoids seeing this, which is confusing and doesn't add much value:

2018-10-03T01:37:19,363 | WARN  | main             | ClassPathScanner                 | interface org.opendaylight.serviceutils.srm.ServiceRecoveryInterface is declared multiple times, ignoring it
2018-10-03T01:37:19,363 | WARN  | main             | ClassPathScanner                 | interface java.lang.AutoCloseable is declared multiple times, ignoring it
2018-10-03T01:37:19,364 | WARN  | main             | ClassPathScanner                 | interface org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingListener is declared multiple times, ignoring it
2018-10-03T01:37:19,364 | WARN  | main             | ClassPathScanner                 | interface org.opendaylight.serviceutils.srm.RecoverableListener is declared multiple times, ignoring it
2018-10-03T01:37:19,364 | WARN  | main             | ClassPathScanner                 | interface org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener is declared multiple times, ignoring it
2018-10-03T01:37:19,364 | WARN  | main             | ClassPathScanner                 | interface org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowListener is declared multiple times, ignoring it
2018-10-03T01:37:19,364 | WARN  | main             | ClassPathScanner                 | interface org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListener is declared multiple times, ignoring it
2018-10-03T01:37:19,365 | WARN  | main             | ClassPathScanner                 | interface org.opendaylight.netvirt.fibmanager.IVrfEntryHandler is declared multiple times, ignoring it
2018-10-03T01:37:19,365 | WARN  | main             | ClassPathScanner                 | interface org.opendaylight.infrautils.diagstatus.ServiceStatusProvider is declared multiple times, ignoring it
2018-10-03T01:37:19,365 | WARN  | main             | ClassPathScanner                 | interface org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.AlivenessMonitorListener is declared multiple times, ignoring it
2018-10-03T01:37:19,365 | WARN  | main             | ClassPathScanner                 | interface org.opendaylight.yang.gen.v1.urn.opendaylight.genius.arputil.rev160406.OdlArputilListener is declared multiple times, ignoring it
2018-10-03T01:37:19,365 | WARN  | main             | ClassPathScanner                 | interface java.lang.Runnable is declared multiple times, ignoring it
Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd TODO re. DataStoreAppConfigDefaultXMLReader
Michael Vorburger [Wed, 3 Oct 2018 01:11:10 +0000 (03:11 +0200)]
add TODO re. DataStoreAppConfigDefaultXMLReader

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoCtrl-D in Console now works
Michael Vorburger [Wed, 3 Oct 2018 00:02:52 +0000 (02:02 +0200)]
Ctrl-D in Console now works

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoexclude controller:blueprint
Michael Vorburger [Tue, 2 Oct 2018 23:30:48 +0000 (01:30 +0200)]
exclude controller:blueprint

This avoids:

2018-10-03T01:07:15,706 | WARN  | main             | Reflections
| could not get type for name
org.osgi.service.blueprint.reflect.ServiceReferenceMetadata from any
class loader
org.reflections.ReflectionsException: could not get type for name
org.osgi.service.blueprint.reflect.ServiceReferenceMetadata
at org.reflections.ReflectionUtils.forName(ReflectionUtils.java:390)
[org.reflections.reflections-0.9.11.jar:?]
at org.reflections.Reflections.expandSuperTypes(Reflections.java:381)
[org.reflections.reflections-0.9.11.jar:?]
at org.reflections.Reflections.<init>(Reflections.java:126)
[org.reflections.reflections-0.9.11.jar:?]
at org.reflections.Reflections.<init>(Reflections.java:168)
[org.reflections.reflections-0.9.11.jar:?]
at org.reflections.Reflections.<init>(Reflections.java:141)
[org.reflections.reflections-0.9.11.jar:?]
at org.opendaylight.infrautils.inject.ClassPathScanner.<init>(ClassPathScanner.java:44)
[ch.vorburger.opendaylight.simple.poc-1.5.0-SNAPSHOT.jar:?]
at org.opendaylight.genius.simple.GeniusMain.main(GeniusMain.java:18)
[ch.vorburger.opendaylight.simple.poc-1.5.0-SNAPSHOT.jar:?]
Caused by: java.lang.ClassNotFoundException:
org.osgi.service.blueprint.reflect.ServiceReferenceMetadata
at java.net.URLClassLoader.findClass(URLClassLoader.java:381)
~[?:1.8.0_181]
at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_181]
at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:349)
~[?:1.8.0_181]
at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_181]
at org.reflections.ReflectionUtils.forName(ReflectionUtils.java:388)
~[org.reflections.reflections-0.9.11.jar:?]
... 6 more

and:

2018-10-03T01:07:15,717 | WARN  | main             | Reflections
| could not get type for name
org.osgi.service.blueprint.container.BlueprintListener from any class
loader
org.reflections.ReflectionsException: could not get type for name
org.osgi.service.blueprint.container.BlueprintListener
at org.reflections.ReflectionUtils.forName(ReflectionUtils.java:390)
[org.reflections.reflections-0.9.11.jar:?]
at org.reflections.Reflections.expandSuperTypes(Reflections.java:381)
[org.reflections.reflections-0.9.11.jar:?]
at org.reflections.Reflections.<init>(Reflections.java:126)
[org.reflections.reflections-0.9.11.jar:?]
at org.reflections.Reflections.<init>(Reflections.java:168)
[org.reflections.reflections-0.9.11.jar:?]
at org.reflections.Reflections.<init>(Reflections.java:141)
[org.reflections.reflections-0.9.11.jar:?]
at org.opendaylight.infrautils.inject.ClassPathScanner.<init>(ClassPathScanner.java:44)
[ch.vorburger.opendaylight.simple.poc-1.5.0-SNAPSHOT.jar:?]
at org.opendaylight.genius.simple.GeniusMain.main(GeniusMain.java:18)
[ch.vorburger.opendaylight.simple.poc-1.5.0-SNAPSHOT.jar:?]
Caused by: java.lang.ClassNotFoundException:
org.osgi.service.blueprint.container.BlueprintListener
at java.net.URLClassLoader.findClass(URLClassLoader.java:381)
~[?:1.8.0_181]
at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_181]
at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:349)
~[?:1.8.0_181]
at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_181]
at org.reflections.ReflectionUtils.forName(ReflectionUtils.java:388)
~[org.reflections.reflections-0.9.11.jar:?]
... 6 more

and:

2018-10-03T01:07:15,850 | WARN  | main             | Reflections
| could not get type for name
org.apache.aries.blueprint.ext.ComponentFactoryMetadata from any class
loader
org.reflections.ReflectionsException: could not get type for name
org.apache.aries.blueprint.ext.ComponentFactoryMetadata
at org.reflections.ReflectionUtils.forName(ReflectionUtils.java:390)
[org.reflections.reflections-0.9.11.jar:?]
at org.reflections.Reflections.expandSuperTypes(Reflections.java:381)
[org.reflections.reflections-0.9.11.jar:?]
at org.reflections.Reflections.<init>(Reflections.java:126)
[org.reflections.reflections-0.9.11.jar:?]
at org.reflections.Reflections.<init>(Reflections.java:168)
[org.reflections.reflections-0.9.11.jar:?]
at org.reflections.Reflections.<init>(Reflections.java:141)
[org.reflections.reflections-0.9.11.jar:?]
at org.opendaylight.infrautils.inject.ClassPathScanner.<init>(ClassPathScanner.java:44)
[ch.vorburger.opendaylight.simple.poc-1.5.0-SNAPSHOT.jar:?]
at org.opendaylight.genius.simple.GeniusMain.main(GeniusMain.java:18)
[ch.vorburger.opendaylight.simple.poc-1.5.0-SNAPSHOT.jar:?]
Caused by: java.lang.ClassNotFoundException:
org.apache.aries.blueprint.ext.ComponentFactoryMetadata
at java.net.URLClassLoader.findClass(URLClassLoader.java:381)
~[?:1.8.0_181]
at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_181]
at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:349)
~[?:1.8.0_181]
at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_181]
at org.reflections.ReflectionUtils.forName(ReflectionUtils.java:388)
~[org.reflections.reflections-0.9.11.jar:?]
... 6 more

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agooptimize distribution build time via tar instead xz archive
Michael Vorburger [Tue, 2 Oct 2018 23:20:10 +0000 (01:20 +0200)]
optimize distribution build time via tar instead xz archive

While the poc-1.5.0-SNAPSHOT-simple.tar.xz was only 99M, it took about
1:30 min (!) to build (not total, just to XZ). That's a steep price to
pay, when a simple tar is just 122M (because the JAR are already
compressed) is quasi instant.

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd (working, wow!) distribution assembly
Michael Vorburger [Tue, 2 Oct 2018 23:14:16 +0000 (01:14 +0200)]
add (working, wow!) distribution assembly

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agofix broken build
Michael Vorburger [Tue, 2 Oct 2018 21:09:17 +0000 (23:09 +0200)]
fix broken build

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agofix Checkstyle problem in ClassPathScanner JavaDoc
Michael Vorburger [Tue, 2 Oct 2018 21:00:59 +0000 (23:00 +0200)]
fix Checkstyle problem in ClassPathScanner JavaDoc

and @SuppressWarnings for Class

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoUpdate README.md
Michael Vorburger [Tue, 2 Oct 2018 18:18:29 +0000 (20:18 +0200)]
Update README.md

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoUpdate README.md
Michael Vorburger [Tue, 2 Oct 2018 13:48:18 +0000 (15:48 +0200)]
Update README.md

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd .apt_generated_tests/ (from Eclipse) to .gitignore
Michael Vorburger [Mon, 1 Oct 2018 12:35:09 +0000 (14:35 +0200)]
add .apt_generated_tests/ (from Eclipse) to .gitignore

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoImplement a classpath scanner
Stephen Kitt [Thu, 27 Sep 2018 09:08:57 +0000 (11:08 +0200)]
Implement a classpath scanner

The approach used here is to allow modules to request bindings for
interfaces to implementations found by scanning the class path, as
long as only one such implementation is found. This allows modules to
bind by requesting bindings for the main interface(s) they want to
provide, and re-use the annotation-based information contained in
their implementations and their dependencies.

Signed-off-by: Stephen Kitt <skitt@redhat.com>
3 years agoupdate TODO
Michael Vorburger [Wed, 26 Sep 2018 12:41:50 +0000 (14:41 +0200)]
update TODO

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoBump log4j-slf4j-impl from 2.11.0 to 2.11.1
dependabot[bot] [Tue, 31 Jul 2018 04:23:29 +0000 (04:23 +0000)]
Bump log4j-slf4j-impl from 2.11.0 to 2.11.1

Bumps log4j-slf4j-impl from 2.11.0 to 2.11.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd link to https://jira.opendaylight.org/browse/OPNFLWPLUG-1037
Michael Vorburger [Tue, 25 Sep 2018 16:18:16 +0000 (18:18 +0200)]
add link to https://jira.opendaylight.org/browse/OPNFLWPLUG-1037

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoalso upgrade parent POM to Fluorine
Michael Vorburger [Tue, 25 Sep 2018 16:16:55 +0000 (18:16 +0200)]
also upgrade parent POM to Fluorine

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoEncapsulate infrautils wiring
Stephen Kitt [Tue, 25 Sep 2018 15:36:45 +0000 (17:36 +0200)]
Encapsulate infrautils wiring

Using the same model as other project representations, encapsulate all
of infrautils’ wiring in a InfraUtilsWiring class.

Signed-off-by: Stephen Kitt <skitt@redhat.com>
3 years agoUpgrade to Fluorine (#16)
Stephen Kitt [Tue, 25 Sep 2018 16:14:18 +0000 (18:14 +0200)]
Upgrade to Fluorine (#16)

This involves disabling the OpenFlowPlugin wiring for the time being
(it needs BundleContext).

Signed-off-by: Stephen Kitt <skitt@redhat.com>
3 years agoupdate README with project goal clarification
Michael Vorburger [Tue, 25 Sep 2018 13:10:58 +0000 (15:10 +0200)]
update README with project goal clarification

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd link to CONTROLLER-1831 to TODO
Michael Vorburger [Wed, 30 May 2018 10:00:08 +0000 (12:00 +0200)]
add link to CONTROLLER-1831 to TODO

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoorder TODO.md to prioritize next steps
Michael Vorburger [Thu, 24 May 2018 11:39:07 +0000 (13:39 +0200)]
order TODO.md to prioritize next steps

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd console appender and print WARN & ERROR logs to it and file
Michael Vorburger [Wed, 23 May 2018 23:28:17 +0000 (01:28 +0200)]
add console appender and print WARN & ERROR logs to it and file

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agochange log file name from karaf.log to opendaylight.log
Michael Vorburger [Wed, 23 May 2018 23:25:08 +0000 (01:25 +0200)]
change log file name from karaf.log to opendaylight.log

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd real log4j (V2) logging (to data/karaf.log)
Michael Vorburger [Wed, 23 May 2018 23:23:02 +0000 (01:23 +0200)]
add real log4j (V2) logging (to data/karaf.log)

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agofix Error Prone's & FindBugs errors
Michael Vorburger [Wed, 23 May 2018 22:52:25 +0000 (00:52 +0200)]
fix Error Prone's & FindBugs errors

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agocommands now dynamically registered, instead of hard-coded TepShowState
Michael Vorburger [Wed, 23 May 2018 22:47:09 +0000 (00:47 +0200)]
commands now dynamically registered, instead of hard-coded TepShowState

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd ShellTestWiring to find missing @Service and broken @Reference
Michael Vorburger [Wed, 23 May 2018 22:07:35 +0000 (00:07 +0200)]
add ShellTestWiring to find missing @Service and broken @Reference

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agouse slf4j-simple even for non-test initial demo, for now
Michael Vorburger [Wed, 23 May 2018 21:52:49 +0000 (23:52 +0200)]
use slf4j-simple even for non-test initial demo, for now

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoworking "tep:show-state" CLI command (but still hard-coded)
Michael Vorburger [Wed, 23 May 2018 21:52:10 +0000 (23:52 +0200)]
working "tep:show-state" CLI command (but still hard-coded)

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadjust to RPC method signature update (TSC-99)
Michael Vorburger [Wed, 23 May 2018 20:47:30 +0000 (22:47 +0200)]
adjust to RPC method signature update (TSC-99)

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd ItmWiring (still missing ITM CLI commands like tep:show-state)
Michael Vorburger [Wed, 23 May 2018 17:41:31 +0000 (19:41 +0200)]
add ItmWiring (still missing ITM CLI commands like tep:show-state)

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoprepare Karaf CLI shell command integration (just basis; no actual cmds)
Michael Vorburger [Wed, 23 May 2018 17:04:40 +0000 (19:04 +0200)]
prepare Karaf CLI shell command integration (just basis; no actual cmds)

see https://github.com/vorburger/ch.vorburger.karaf.simple

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agofix very minor typos in Main
Michael Vorburger [Wed, 23 May 2018 17:03:22 +0000 (19:03 +0200)]
fix very minor typos in Main

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoinstall MdsalWiring in GeniusWiring instead of passing it to GuiceRule2
Michael Vorburger [Wed, 23 May 2018 17:02:46 +0000 (19:02 +0200)]
install MdsalWiring in GeniusWiring instead of passing it to GuiceRule2

this fixes the currently broken GeniusMain

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd CachesWiring to get GeniusSimpleDistributionTest to pass again
Michael Vorburger [Wed, 23 May 2018 14:35:33 +0000 (16:35 +0200)]
add CachesWiring to get GeniusSimpleDistributionTest to pass again

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd README link to https://github.com/vorburger/ch.vorburger.karaf.simple
Michael Vorburger [Wed, 23 May 2018 13:13:28 +0000 (15:13 +0200)]
add README link to https://github.com/vorburger/ch.vorburger.karaf.simple

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd TODO.md
Michael Vorburger [Wed, 25 Apr 2018 16:59:49 +0000 (18:59 +0200)]
add TODO.md

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoremove all of my Web API stuff here which is now upstream (in AAA)
Michael Vorburger [Wed, 25 Apr 2018 16:42:21 +0000 (18:42 +0200)]
remove all of my Web API stuff here which is now upstream (in AAA)

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agomake GeniusSimpleDistributionTest pass!
Michael Vorburger [Wed, 25 Apr 2018 16:34:05 +0000 (18:34 +0200)]
make GeniusSimpleDistributionTest pass!

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agofix DiagStatusWiringTest, now requires ReadyWiring
Michael Vorburger [Wed, 25 Apr 2018 16:09:56 +0000 (18:09 +0200)]
fix DiagStatusWiringTest, now requires ReadyWiring

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agotemporarily deactivate Neutron test and comment out to pass build
Michael Vorburger [Wed, 25 Apr 2018 16:07:27 +0000 (18:07 +0200)]
temporarily deactivate Neutron test and comment out to pass build

remove NeutronE2ETest, because that has now been
moved into Neutron next to the existing ITNeutronE2E!

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agodeactivate AAA related test and comment out code to pass build
Michael Vorburger [Wed, 25 Apr 2018 15:09:48 +0000 (17:09 +0200)]
deactivate AAA related test and comment out code to pass build

I've now lost interest in AAA.  We don't need it, for now, for this.

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agobump ODL versions (still NOK)
Michael Vorburger [Wed, 25 Apr 2018 14:36:38 +0000 (16:36 +0200)]
bump ODL versions (still NOK)

Needs clean up, because a lot re. this has meanwhile gone in upstream!

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agolink to recent simple-dist_web
Michael Vorburger [Thu, 22 Mar 2018 18:17:20 +0000 (19:17 +0100)]
link to recent simple-dist_web

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoUpdate README.md
Michael Vorburger ⛑️ [Tue, 20 Feb 2018 03:39:42 +0000 (04:39 +0100)]
Update README.md

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd NeutronE2ETest {failing, WIP}
Michael Vorburger [Thu, 15 Feb 2018 21:52:48 +0000 (22:52 +0100)]
add NeutronE2ETest {failing, WIP}

at the time of committing this, it requires a series of not yet merged
changes proposed to the Neutron project to extract the test logic from
its Karaf IT.

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agofix minor issues found by error-prone
Michael Vorburger [Thu, 15 Feb 2018 21:51:18 +0000 (22:51 +0100)]
fix minor issues found by error-prone

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd getBaseURL() to WebContextProvider
Michael Vorburger [Thu, 15 Feb 2018 18:49:57 +0000 (19:49 +0100)]
add getBaseURL() to WebContextProvider

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd WebContextProviderOSGiImplTest {WIP}
Michael Vorburger [Thu, 15 Feb 2018 00:14:03 +0000 (01:14 +0100)]
add WebContextProviderOSGiImplTest {WIP}

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agosplit JettyLauncherTest extends WebContextTest
Michael Vorburger [Thu, 15 Feb 2018 00:08:13 +0000 (01:08 +0100)]
split JettyLauncherTest extends WebContextTest

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoWebContextProviderOSGiImpl using WebContainer instead of HttpService
Michael Vorburger [Wed, 14 Feb 2018 23:51:54 +0000 (00:51 +0100)]
WebContextProviderOSGiImpl using WebContainer instead of HttpService

This will later have to tested with an IT ..

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agocomment out WebContext getServletContext()
Michael Vorburger [Wed, 14 Feb 2018 23:16:16 +0000 (00:16 +0100)]
comment out WebContext getServletContext()

because it's probably never really needed, and it could not be
implemented when we delegate to OSGi HttpService / Pax Web Container.

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd TODO to WebContext re. re-writing it using Immutables.org Builder
Michael Vorburger [Wed, 14 Feb 2018 22:37:39 +0000 (23:37 +0100)]
add  TODO to WebContext re. re-writing it using Immutables.org Builder

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agominor tweak in WebWiringTest
Michael Vorburger [Wed, 14 Feb 2018 22:36:54 +0000 (23:36 +0100)]
minor tweak in WebWiringTest

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agofix registerListener(), with @Test testRegisterListener
Michael Vorburger [Wed, 14 Feb 2018 22:36:33 +0000 (23:36 +0100)]
fix registerListener(), with @Test testRegisterListener

similar to registerFilter() before

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agotest addContextParam() - it was right, but made it consistent
Michael Vorburger [Wed, 14 Feb 2018 20:45:28 +0000 (21:45 +0100)]
test addContextParam() - it was right, but made it consistent

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agofix registerFilter() and now use CrossOriginFilter in NeutronWiring
Michael Vorburger [Wed, 14 Feb 2018 20:36:06 +0000 (21:36 +0100)]
fix registerFilter() and now use CrossOriginFilter in NeutronWiring

It turns out that handler.getServletContext().addFilter() throws an
IllegalStateException once that we have start()'ed once, so that's no
good - it's best NOT to use the Servlet API but directly Jetty's native
API.

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agofixed registerFilter() incl. testAddFilter()
Michael Vorburger [Wed, 14 Feb 2018 19:22:04 +0000 (20:22 +0100)]
fixed registerFilter() incl. testAddFilter()

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoduh... we need @Singleton on *ALL* @Provides to avoid double starts!
Michael Vorburger [Wed, 14 Feb 2018 19:18:19 +0000 (20:18 +0100)]
duh... we need @Singleton on *ALL* @Provides to avoid double starts!

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agousing @Singleton @Provides avoids having to @Inject
Michael Vorburger [Wed, 14 Feb 2018 18:58:58 +0000 (19:58 +0100)]
using @Singleton @Provides avoids having to @Inject

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd NeutronSimpleDistributionTest
Michael Vorburger [Wed, 14 Feb 2018 16:02:51 +0000 (17:02 +0100)]
add NeutronSimpleDistributionTest

TODO: Get filter working (easy), get Neutron IT to pass this! (...)
Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agomade WebContext registerXYZ() methods return this for nice chaining
Michael Vorburger [Wed, 14 Feb 2018 15:52:23 +0000 (16:52 +0100)]
made WebContext registerXYZ() methods return this for nice chaining

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agorename package simple.jetty.test to simple.web.test
Michael Vorburger [Wed, 14 Feb 2018 15:17:36 +0000 (16:17 +0100)]
rename package simple.jetty.test to simple.web.test

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoJettyLauncher implements WebContextProvider
Michael Vorburger [Wed, 14 Feb 2018 15:07:04 +0000 (16:07 +0100)]
JettyLauncher implements WebContextProvider

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agomove JettyLauncher from simple.jetty to simple.web.impl
Michael Vorburger [Wed, 14 Feb 2018 13:59:31 +0000 (14:59 +0100)]
move JettyLauncher from simple.jetty to simple.web.impl

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadapt HttpServiceWebContextImpl (not sure if this will be useful)
Michael Vorburger [Wed, 14 Feb 2018 13:55:39 +0000 (14:55 +0100)]
adapt HttpServiceWebContextImpl (not sure if this will be useful)

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agomove simple.osgi.HttpServiceImpl to web.osgi.impl.*WebContextImpl
Michael Vorburger [Wed, 14 Feb 2018 11:59:47 +0000 (12:59 +0100)]
move simple.osgi.HttpServiceImpl to web.osgi.impl.*WebContextImpl

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd WebContextProviderOSGiImpl (not sure if this will be useful)
Michael Vorburger [Wed, 14 Feb 2018 11:57:50 +0000 (12:57 +0100)]
add WebContextProviderOSGiImpl (not sure if this will be useful)

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agooutline new WebContext API (without implementation, yet)
Michael Vorburger [Wed, 14 Feb 2018 11:55:56 +0000 (12:55 +0100)]
outline new WebContext API (without implementation, yet)

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoadd working WebWiringTest illustrating ServletContextProvider in Guice
Michael Vorburger [Wed, 14 Feb 2018 02:17:59 +0000 (03:17 +0100)]
add working WebWiringTest illustrating ServletContextProvider in Guice

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agofix JettyLauncher single handler problem, with new test
Michael Vorburger [Wed, 14 Feb 2018 01:42:04 +0000 (02:42 +0100)]
fix JettyLauncher single handler problem, with new test

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoServletContextProvider and JettyLauncher now with OPTIONAL web.xml
Michael Vorburger [Wed, 14 Feb 2018 01:18:37 +0000 (02:18 +0100)]
ServletContextProvider and JettyLauncher now with OPTIONAL web.xml

the JettyLauncher can now EITHER scan for web.xml on classpath, OR it
can be programmatically configured via the new ServletContextProvider
service API (similar to OSGi's HttpService)

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years ago{WIP} AAAWiring incl. Test
Michael Vorburger [Tue, 13 Feb 2018 21:51:18 +0000 (22:51 +0100)]
{WIP} AAAWiring incl. Test

but it gets stuck (dead locked) in
org.opendaylight.aaa.shiro.web.env.KarafIniWebEnvironment.init()

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoOsgiServicesWiring for HttpService (with throws TODO)
Michael Vorburger [Tue, 13 Feb 2018 21:50:51 +0000 (22:50 +0100)]
OsgiServicesWiring for HttpService (with throws TODO)

used in currently still broken AAA; may remove this again later

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agoWebWiring
Michael Vorburger [Tue, 13 Feb 2018 21:47:51 +0000 (22:47 +0100)]
WebWiring

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agomake JettyLauncher able to handle multiple web.xml and contexts
Michael Vorburger [Wed, 7 Feb 2018 21:12:14 +0000 (22:12 +0100)]
make JettyLauncher able to handle multiple web.xml and contexts

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agosimplify Jetty related code by removing web fragment content support
Michael Vorburger [Wed, 7 Feb 2018 20:32:29 +0000 (21:32 +0100)]
simplify Jetty related code by removing web fragment content support

the WEB_TAG_FILE thing for static web content in JARs which I
implemented many (many) moons ago is not required anymore for what I'm
after here, so remove that and simplify.

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
3 years agominor first clean up of Jetty related code
Michael Vorburger [Wed, 7 Feb 2018 20:17:39 +0000 (21:17 +0100)]
minor first clean up of Jetty related code

Signed-off-by: Michael Vorburger <mike@vorburger.ch>