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/12/29 04:56:13 UTC

[karaf] branch master updated (d6e7d8c -> 745f2e3)

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 d6e7d8c  Merge pull request #707 from coheigea/httpclient
     add 049f0db  [KARAF-5901] Add Aries JAXRS Whiteboard example
     new 745f2e3  Merge pull request #697 from jbonofre/KARAF-5901

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:
 .../src/main/feature/feature.xml                   |  9 +++++
 .../pom.xml                                        | 14 +++++--
 .../rest/whiteboard}/BookingServiceRest.java       | 17 +++++----
 examples/karaf-rest-example/pom.xml                |  1 +
 .../apache/karaf/itests/{features => }/XATest.java |  2 +-
 .../karaf/itests/examples/RestExampleTest.java     | 43 +++++++++++++++++++++-
 6 files changed, 73 insertions(+), 13 deletions(-)
 copy examples/karaf-rest-example/{karaf-rest-example-provider => karaf-rest-example-whiteboard}/pom.xml (82%)
 copy examples/karaf-rest-example/{karaf-rest-example-provider/src/main/java/org/apache/karaf/examples/rest/provider => karaf-rest-example-whiteboard/src/main/java/org/apache/karaf/examples/rest/whiteboard}/BookingServiceRest.java (90%)
 rename itests/test/src/test/java/org/apache/karaf/itests/{features => }/XATest.java (99%)


[karaf] 01/01: Merge pull request #697 from jbonofre/KARAF-5901

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 745f2e37282cad5c2a3de5dacafd79b73778a08f
Merge: d6e7d8c 049f0db
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sat Dec 29 05:56:08 2018 +0100

    Merge pull request #697 from jbonofre/KARAF-5901
    
    [KARAF-5901] Add Aries JAXRS Whiteboard example

 .../src/main/feature/feature.xml                   |  9 +++
 .../karaf-rest-example-whiteboard/pom.xml          | 73 ++++++++++++++++++++
 .../rest/whiteboard/BookingServiceRest.java        | 80 ++++++++++++++++++++++
 examples/karaf-rest-example/pom.xml                |  1 +
 .../apache/karaf/itests/{features => }/XATest.java |  2 +-
 .../karaf/itests/examples/RestExampleTest.java     | 43 +++++++++++-
 6 files changed, 206 insertions(+), 2 deletions(-)