JENA-1164: Merge 'refs/pull/134/head' of github.com:apache/jena This closes #134.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/92a5e6cd Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/92a5e6cd Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/92a5e6cd Branch: refs/heads/master Commit: 92a5e6cddf2c03557bb7fb7896cce46dc2ecb42d Parents: b4de37d 18cddf6 Author: Andy Seaborne <[email protected]> Authored: Fri Apr 15 17:09:21 2016 +0100 Committer: Andy Seaborne <[email protected]> Committed: Fri Apr 15 17:09:21 2016 +0100 ---------------------------------------------------------------------- apache-jena-osgi/jena-osgi-features/pom.xml | 102 +++++++ .../src/main/resources/features.xml | 46 +++ apache-jena-osgi/jena-osgi-test/pom.xml | 300 +++++++------------ .../org/apache/jena/osgi/test/JenaOSGITest.java | 111 +++---- apache-jena-osgi/jena-osgi/pom.xml | 19 +- .../java/org/apache/jena/osgi/Activator.java | 47 +++ apache-jena-osgi/pom.xml | 2 + .../jena/system/JenaSubsystemRegistryBasic.java | 2 +- 8 files changed, 355 insertions(+), 274 deletions(-) ----------------------------------------------------------------------
