You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2019/07/03 09:17:11 UTC

[cxf] branch 3.2.x-fixes updated (d4f104d -> 1dabef2)

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from d4f104d  Recording .gitmergeinfo Changes
     new 54866e0  Recording .gitmergeinfo Changes
     new 1dabef2  Setting property logMultipart and logBinary from org.apache.cxf.features.logging.cfg

The 2 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:
 .gitmergeinfo                                                  |  1 +
 .../main/java/org/apache/cxf/ext/logging/osgi/Activator.java   | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)


[cxf] 02/02: Setting property logMultipart and logBinary from org.apache.cxf.features.logging.cfg

Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 1dabef2e21bb18ac14334e0e1d42456a63f58a90
Author: Tamburella Luca <lu...@firenze.eng.it>
AuthorDate: Tue Jul 2 14:02:31 2019 +0200

    Setting property logMultipart and logBinary from org.apache.cxf.features.logging.cfg
    
    (cherry picked from commit 8add945e8ee648b67b281524efe88c9bd72ed43d)
---
 .../main/java/org/apache/cxf/ext/logging/osgi/Activator.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java
index 88f1db3..5845180 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java
@@ -69,7 +69,9 @@ public class Activator implements BundleActivator {
             Boolean pretty = Boolean.valueOf(getValue(config, "pretty", "false"));
             Boolean verbose = Boolean.valueOf(getValue(config, "verbose", "true"));
             Long inMemThreshold = Long.valueOf(getValue(config, "inMemThresHold", "-1"));
-
+            Boolean logMultipart = Boolean.valueOf(getValue(config, "logMultipart", "true"));
+            Boolean logBinary = Boolean.valueOf(getValue(config, "logBinary", "false"));
+            
             if (limit != null) {
                 logging.setLimit(limit);
             }
@@ -83,6 +85,12 @@ public class Activator implements BundleActivator {
             if (verbose != null) {
                 logging.setVerbose(verbose);
             }
+            if (logMultipart != null) {                       
+                logging.setLogMultipart(logMultipart);
+            }
+            if (logBinary != null) {
+                logging.setLogBinary(logBinary);
+            }
 
             if (intentReg == null) {
                 Dictionary<String, Object> properties = new Hashtable<>();


[cxf] 01/02: Recording .gitmergeinfo Changes

Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 54866e049dde6357af55cadbad05af439912a044
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jul 3 10:12:15 2019 +0100

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 93b9797..e7a93a5 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -63,6 +63,7 @@ B 1e3f132d74bf032be991995a587b7d107424ff05
 B 1f431e2f8063793e84af56bc645484a9f0da58e7
 B 1f8fec397203db2e0b046d8239e31860d0e4b444
 B 1f973f3a5aa8f2c919a1d3852f1eb0eccb949bee
+B 1fad5125f0c5cdab906846857528a32cc5de6fd5
 B 2071cddbaa5d6e795e293207325e6396ab9e7916
 B 208b581837430a97d9e13318603af679674b8092
 B 21138b4ce300510f442475f1a59b2fac03f366dd