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/09/07 07:00:15 UTC

[karaf-decanter] branch master updated (147dbad -> c03a9e5)

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-decanter.git.


    from 147dbad  Merge pull request #48 from jbonofre/KARAF-5801
     add cc3d1af  KARAF-5888 Be able to define a line parser service in the file collector
     new c03a9e5  Merge pull request #49 from fpapon/KARAF-5888

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:
 api/pom.xml                                        |  3 +-
 .../Unmarshaller.java => parser/Parser.java}       | 10 ++--
 .../karaf/decanter/api/{ => parser}/packageinfo    |  0
 .../karaf/decanter/impl/parser/IdentityParser.java | 33 ++++++++---
 .../decanter/impl/parser/TestIdentityParser.java   | 67 ++++++++++++++++++++++
 collector/file/pom.xml                             |  4 ++
 .../collector/file/DecanterTailerListener.java     |  9 ++-
 .../src/main/asciidoc/user-guide/collectors.adoc   | 10 ++++
 8 files changed, 121 insertions(+), 15 deletions(-)
 copy api/src/main/java/org/apache/karaf/decanter/api/{marshaller/Unmarshaller.java => parser/Parser.java} (83%)
 copy api/src/main/java/org/apache/karaf/decanter/api/{ => parser}/packageinfo (100%)
 copy collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterCamelEventExtender.java => api/src/main/java/org/apache/karaf/decanter/impl/parser/IdentityParser.java (50%)
 create mode 100644 api/src/test/java/org/apache/karaf/decanter/impl/parser/TestIdentityParser.java


[karaf-decanter] 01/01: Merge pull request #49 from fpapon/KARAF-5888

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-decanter.git

commit c03a9e5db903e451fde3a516cb8dd23e39447ae3
Merge: 147dbad cc3d1af
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Fri Sep 7 09:00:12 2018 +0200

    Merge pull request #49 from fpapon/KARAF-5888
    
    [KARAF-5888] Be able to define a line parser service in the file collector

 api/pom.xml                                        |  3 +-
 .../apache/karaf/decanter/api/parser/Parser.java   | 26 +++++++++
 .../apache/karaf/decanter/api/parser/packageinfo   | 19 ++++++
 .../karaf/decanter/impl/parser/IdentityParser.java | 49 ++++++++++++++++
 .../decanter/impl/parser/TestIdentityParser.java   | 67 ++++++++++++++++++++++
 collector/file/pom.xml                             |  4 ++
 .../collector/file/DecanterTailerListener.java     |  9 ++-
 .../src/main/asciidoc/user-guide/collectors.adoc   | 10 ++++
 8 files changed, 183 insertions(+), 4 deletions(-)