You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2018/11/10 18:16:47 UTC
[karaf] branch master updated (b72e912 -> ca5254d)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git.
from b72e912 Merge pull request #651 from jbonofre/KARAF-5935
add e13d89a [KARAF-5509] Add HTTP resource example
new ca5254d Merge pull request #653 from jbonofre/KARAF-5509
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/karaf-http-resource-example/README.md | 68 ++++++++++++++++++++++
.../karaf-http-resource-example-features}/pom.xml | 6 +-
.../src/main/feature/feature.xml | 9 +--
.../pom.xml | 6 +-
.../http/resource/whiteboard/ExampleResource.java | 11 ++--
.../src/main/resources/resources/index.html | 13 +++--
.../pom.xml | 9 ++-
examples/pom.xml | 31 +++++-----
...ampleTest.java => HttpResourceExampleTest.java} | 24 ++++----
9 files changed, 125 insertions(+), 52 deletions(-)
create mode 100644 examples/karaf-http-resource-example/README.md
copy examples/{karaf-command-example/karaf-command-example-features => karaf-http-resource-example/karaf-http-resource-example-features}/pom.xml (94%)
copy examples/{karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features => karaf-http-resource-example/karaf-http-resource-example-features}/src/main/feature/feature.xml (65%)
copy examples/{karaf-scheduler-example/karaf-scheduler-example-runnable => karaf-http-resource-example/karaf-http-resource-example-whiteboard}/pom.xml (89%)
copy system/src/main/java/org/apache/karaf/system/FrameworkType.java => examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/src/main/java/org/apache/karaf/examples/http/resource/whiteboard/ExampleResource.java (58%)
copy features/core/src/test/resources/org/apache/karaf/features/r1.xml => examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/src/main/resources/resources/index.html (84%)
copy examples/{karaf-war-example => karaf-http-resource-example}/pom.xml (85%)
copy itests/test/src/test/java/org/apache/karaf/itests/examples/{WarExampleTest.java => HttpResourceExampleTest.java} (76%)
[karaf] 01/01: Merge pull request #653 from jbonofre/KARAF-5509
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit ca5254d3e569fdcc8ee7b56d9273fa44992fc386
Merge: b72e912 e13d89a
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sat Nov 10 19:16:42 2018 +0100
Merge pull request #653 from jbonofre/KARAF-5509
[KARAF-5509] Add HTTP resource example
examples/karaf-http-resource-example/README.md | 68 +++++++++++++++
.../karaf-http-resource-example-features/pom.xml | 99 ++++++++++++++++++++++
.../src/main/feature/feature.xml | 27 ++++++
.../karaf-http-resource-example-whiteboard/pom.xml | 52 ++++++++++++
.../http/resource/whiteboard/ExampleResource.java | 20 +++++
.../src/main/resources/resources/index.html | 25 ++++++
examples/karaf-http-resource-example/pom.xml | 40 +++++++++
examples/pom.xml | 31 +++----
.../itests/examples/HttpResourceExampleTest.java | 62 ++++++++++++++
9 files changed, 409 insertions(+), 15 deletions(-)