This is an automated email from the ASF dual-hosted git repository. fpapon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/karaf-cave.git
commit 3f30573d8b54017228069515e1e6ba49815e8f57 Merge: 47847ed fc69a94 Author: François Papon <[email protected]> AuthorDate: Tue Sep 4 20:12:55 2018 +0400 Merge pull request #12 from jbonofre/KARAF-5783 [KARAF-5783] Introduce the cave main feature and use an unique rest bundle assembly/src/main/resources/features.xml | 44 +++--- client/NOTICE | 29 ---- client/pom.xml | 56 ------- .../karaf/cave/client/RepositoryAdminProxy.java | 60 ------- deployer/pom.xml | 1 - .../src/main/resources/OSGI-INF/blueprint/rest.xml | 50 ------ manual/src/main/asciidoc/index.adoc | 2 + manual/src/main/asciidoc/overview.adoc | 20 +-- .../asciidoc/user-guide/administrate-cave.adoc | 7 +- .../main/asciidoc/user-guide/cave-repository.adoc | 2 +- manual/src/main/asciidoc/user-guide/deployer.adoc | 126 +++++++++++++++ .../src/main/asciidoc/user-guide/installation.adoc | 27 +--- .../main/asciidoc/user-guide/maven-wrapper.adoc | 6 +- pom.xml | 4 +- {deployer/rest => rest}/pom.xml | 51 +++++- .../java/org/apache/karaf/cave/rest/Activator.java | 67 ++++++++ .../apache/karaf/cave/rest/CaveRestServlet.java | 60 +++++++ .../org/apache/karaf/cave}/rest/DeployerRest.java | 46 +++++- .../org/apache/karaf/cave/rest/RepositoryRest.java | 175 +++++++++++++++++++++ .../karaf/cave/deployer/rest/DeployerRestTest.java | 7 +- .../rest => rest}/src/test/resources/test.kar | Bin server/pom.xml | 1 - server/rest/NOTICE | 29 ---- server/rest/pom.xml | 77 --------- .../apache/karaf/cave/server/rest/Activator.java | 90 ----------- .../karaf/cave/server/rest/CaveRestServlet.java | 27 ---- .../apache/karaf/cave/server/rest/Repository.java | 160 ------------------- .../apache/karaf/cave/server/rest/Resource.java | 71 --------- .../org/apache/karaf/cave/server/rest/Service.java | 165 ------------------- server/storage/pom.xml | 2 + 30 files changed, 564 insertions(+), 898 deletions(-)
