You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/02/14 21:26:00 UTC
[01/10] cxf git commit: Remove some plugins that aren't needed and
cause issues
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 759310223 -> c5069325b
Remove some plugins that aren't needed and cause issues
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6669f844
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6669f844
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6669f844
Branch: refs/heads/3.1.x-fixes
Commit: 6669f84431bc34f2664d3a7f0e7b7cc972ab0971
Parents: 7593102
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jan 30 10:28:22 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 14 09:49:04 2017 -0500
----------------------------------------------------------------------
rt/rs/security/oauth-parent/oauth2/pom.xml | 14 --------------
rt/rs/security/sso/oidc/pom.xml | 14 --------------
2 files changed, 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6669f844/rt/rs/security/oauth-parent/oauth2/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 2bfdbac..bf7cb6b 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -236,20 +236,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>3.0.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<!-- this configures the surefire plugin to run your tests with the javaagent enabled -->
<!-- (openJPA loadtime weaving) -->
<plugin>
http://git-wip-us.apache.org/repos/asf/cxf/blob/6669f844/rt/rs/security/sso/oidc/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml
index b7e35ce..ac4400c 100644
--- a/rt/rs/security/sso/oidc/pom.xml
+++ b/rt/rs/security/sso/oidc/pom.xml
@@ -179,20 +179,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>3.0.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<!-- this configures the surefire plugin to run your tests with the javaagent enabled -->
<!-- (openJPA loadtime weaving) -->
<plugin>
[05/10] cxf git commit: Fix problem of new logging with JMS based
JAXRS services
Posted by dk...@apache.org.
Fix problem of new logging with JMS based JAXRS services
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/02ed4018
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/02ed4018
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/02ed4018
Branch: refs/heads/3.1.x-fixes
Commit: 02ed4018428aff46d46b384aff1ea4571dc551e3
Parents: f56aa14
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Feb 9 11:04:52 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 14 09:53:24 2017 -0500
----------------------------------------------------------------------
.../org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/02ed4018/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index f48629f..66082bc 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -258,8 +258,9 @@ public class DefaultLogEventMapper implements LogEventMapper {
String requestUri = safeGet(message, Message.REQUEST_URI);
if (requestUri != null) {
String basePath = safeGet(message, Message.BASE_PATH);
- int baseUriLength = (basePath != null) ? basePath.length() : 0;
- path = requestUri.substring(baseUriLength);
+ if (basePath != null && requestUri.startsWith(basePath)) {
+ path = requestUri.substring(basePath.length());
+ }
if (path.isEmpty()) {
path = "/";
}
[08/10] cxf git commit: Use updated abdera-parser bundle
Posted by dk...@apache.org.
Use updated abdera-parser bundle
# Conflicts:
# parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1875a1c2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1875a1c2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1875a1c2
Branch: refs/heads/3.1.x-fixes
Commit: 1875a1c2f8c3290e5f3d92d9eab266bb106d6cea
Parents: f092b80
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Feb 14 09:24:20 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 14 09:55:10 2017 -0500
----------------------------------------------------------------------
osgi/karaf/features/src/main/resources/features.xml | 2 +-
parent/pom.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1875a1c2/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index a70a9a7..87f611a 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -45,7 +45,7 @@
<bundle start-level="35">mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}</bundle>
<bundle start-level="35">mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}</bundle>
<bundle start-level="35">mvn:org.apache.james/apache-mime4j-core/${cxf.james.mim4j.version}</bundle>
- <bundle start-level="35">mvn:org.apache.abdera/abdera-parser/${cxf.abdera.version}</bundle>
+ <bundle start-level="35">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera-parser/${cxf.abdera.osgi.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${cxf.jdom.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${cxf.dom4j.bundle.version}</bundle>
<!--bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-html/${cxf.abdera.version}</bundle>
http://git-wip-us.apache.org/repos/asf/cxf/blob/1875a1c2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0e26050..7ddab8f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -66,7 +66,8 @@
<cxf.osgi.javax.xml.ws.version>[0.0,3)</cxf.osgi.javax.xml.ws.version>
<!-- please maintain alphabetical order here -->
<cxf.abdera.version>1.1.3</cxf.abdera.version>
- <cxf.activemq.version>5.12.2</cxf.activemq.version>
+ <cxf.abdera.osgi.version>1.1.3_2</cxf.abdera.osgi.version>
+ <cxf.activemq.version>5.14.2</cxf.activemq.version>
<cxf.ahc.version>1.9.8</cxf.ahc.version>
<cxf.apacheds.version>2.0.0-M23</cxf.apacheds.version>
<cxf.atmosphere.version>2.3.7</cxf.atmosphere.version>
[10/10] cxf git commit: Fix compile failures on java7
Posted by dk...@apache.org.
Fix compile failures on java7
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c5069325
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c5069325
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c5069325
Branch: refs/heads/3.1.x-fixes
Commit: c5069325bd0492aba57a7a3fdbc663fa867964c7
Parents: fcb6141
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Feb 14 11:00:04 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 14 16:25:48 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/cxf/ext/logging/LoggingInInterceptor.java | 6 ++++--
.../apache/cxf/ext/logging/event/PrintWriterEventSender.java | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c5069325/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
index 6c19109..0643bc2 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
@@ -23,7 +23,6 @@ import java.io.PrintWriter;
import java.io.Reader;
import java.io.SequenceInputStream;
import java.util.Collection;
-import java.util.Collections;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.common.util.StringUtils;
@@ -75,7 +74,10 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
super(Phase.RECEIVE, sender);
}
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
- return Collections.singleton(new SendLogEventInterceptor());
+ PhaseInterceptor<Message> intc = new SendLogEventInterceptor();
+ java.util.Set<PhaseInterceptor<? extends Message>> ret = new java.util.HashSet<>();
+ ret.add(intc);
+ return ret;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/c5069325/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
index b34133d..24fae7c 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
@@ -20,7 +20,7 @@
package org.apache.cxf.ext.logging.event;
import java.io.PrintWriter;
-import java.time.Instant;
+import java.util.Date;
import javax.xml.namespace.QName;
@@ -44,7 +44,7 @@ public class PrintWriterEventSender implements LogEventSender {
public void send(LogEvent event) {
StringBuilder b = new StringBuilder();
- b.append(Instant.now().toString()).append(" - PrintWriterEventSender\n");
+ b.append(new Date().toString()).append(" - PrintWriterEventSender\n");
put(b, "type", event.getType().toString());
put(b, "address", event.getAddress());
put(b, "content-type", event.getContentType());
[09/10] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fcb61410
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fcb61410
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fcb61410
Branch: refs/heads/3.1.x-fixes
Commit: fcb6141014e9c66fcdf404f49776cbd853a18c71
Parents: 1875a1c
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Feb 14 09:55:11 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 14 09:55:11 2017 -0500
----------------------------------------------------------------------
.gitmergeinfo | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/fcb61410/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index afb1c46..96315ac 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -50,6 +50,7 @@ B 304c62a11b8dbe000cdfb5de857619703bca79f7
B 30a0754ebe160d75867bc2558612d555b88c8595
B 30fab03d70e5655130e6a1ab3081f3563c40cd48
B 32d044afbe9c6bf4fd4ef829a71af3d1d949315e
+B 333632ee013b26b6ed15d05818971d83927bd43d
B 337742ff1215b34643c8c35d8a1a9c4d5238d743
B 343d06d94838cd26f682f7afbcea0e422aa1597d
B 38919f57bfb2b880691950fc5f992b5649ea579e
@@ -73,6 +74,7 @@ B 45bc2219b761e671973acf297e0f37a1b8934c6c
B 46438c487115889c4cadd86f70fd4109a0daa2b8
B 4786e832573f1fcc07ed190ab21fdb2820348e4d
B 47a431412dbd7669d89a70d6fed49053e70dfed1
+B 4a72362668b14f92f1a0252b723436fc86b681bf
B 4b37844e9c15812d1855d0babded79880d2cd6fb
B 4bf780105271e91451446a2d96032249486b32de
B 4dd4e1cf0d517021fd65ffe219a9be6c9f75c84a
@@ -99,15 +101,18 @@ B 5e068d215b750e3211aaaf3d0b7b366d6a220fc2
B 604167d9f0cfc67e01219a19a95353176ce38f79
B 62060f8bc1f4d85b77ff136cb0576049312b8541
B 629af817f4762a12623e76fb7f7baefe98482719
+B 63daada33c83c7900d5678ad495a0e764b3506de
B 65e1e07fdb810ec9de135530ca3e3d23821836a3
B 66447a377f0b2cafc2f337456b5fd41f832556e0
B 671b1cfce0c423a1e9e8392fdd1750697fa968df
B 68f110e5bcfe26d050bd05988ecd9c863e6e8742
B 6918eba1a3229cece97dd90127804b094d82a345
+B 6926072b962759e4ba3c9704512a1db8076128e1
B 6958418ec4989c4391389ee6bfd1d9055ec127a5
B 69826a090e5f7868b9633e69b76f051fa15b65ef
B 69891e8bdb65fda1caa03810cdc3853a3f357cd1
B 699f4c03de1acb1cf9eb95ad2db792dba5a56ead
+B 69c7b4c1ce4a9d131802c9a198706581eb4a3e91
B 6c324421a358919b4ecb3cfdd8a2e0e16ff81724
B 6d82b75eb982f13f5f071178aeef66e55b0e3fd4
B 6df5deab24016d07e4099712b07535688d164d94
@@ -115,7 +120,9 @@ B 6e7b79f6a8b6523b2248937275d92918e5682aa2
B 6fcdc7e9eec2414a40bd3161cf237ef182e313a6
B 707fa4f3c3f3aa40979e57468a9ac3eb3102a71f
B 73d1f886ae5265131e8664ee952ffd1cdc82f71a
+B 741c9e349e7e48d3fe278ba8d8f17dd6bf4c4370
B 746cd3c0b850702e5b3601d18ce81652a1f3441f
+B 76d165c9f7d76de1e333eded6106fa0cc186131b
B 76edf9350e7640860b66196ad40396d54bbcb2b2
B 77c3f51dcb1f02c8799f4e09676c0697e76a0756
B 7a5e2690c36914ba481570c811f23d6e6b80bc07
@@ -123,6 +130,7 @@ B 7b7629682d15345518e66d46e575bf1ac334cf00
B 7c191d4d590a5ef621a0dd5adfff59512c91daf3
B 7d344ae7ed882a4347d0f8775744646e0013aca5
B 7e2b6f21b7c9d3e922bf93c31af3c5be896509bb
+B 7eb2d58faacb2dd57c1eddea99c59a8b17807faf
B 7f4a24d037c06f76770e969ad7e2a47f4687a33a
B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26
B 7fcd84b1f82a203917a5269a2c0c10a0d5b6f877
@@ -150,6 +158,7 @@ B 9f39272a5f92c8bc27a8d3adc4da89f0eb30a54b
B a05d75086453fa18ca4f4733f7cc8819693c786b
B a219766354d6aee53c7f7a4da91f434af552b437
B a261507ebd3104b1a00298801ec9815ed1e7a728
+B a4167fb84baa1834bbe86be8a749c385f1af8c82
B a4b794b55b1ea258e9168a58f05794f37aeeb049
B a7362dfaf2141cb4f303f81bbb94c6df81be75cb
B a81534d6655e046e7d316e6de38095fe3f4949cb
@@ -197,6 +206,7 @@ B d226c07d4db15fa9244a2f011df801839a880f68
B d26570e26de80d0e0c6870ae5d959bfc8c0d19e4
B d3900dd8431e50e544896cf0ce019595984384bb
B d3d65670d697fc2a32d72ea305fdc49e693a8fc0
+B d62b480a16b9361d63a99a620b0006a425ebc73f
B d8a0a04d9b8b5206c2e24e976a94f328c73a49bf
B da321593b597711af7307a0fc2c11de070653356
B dbe536f782701cab466c850b3c24bef564b2f9d1
@@ -219,6 +229,7 @@ B e7e75c58c283d0178c6929cf298a68f41f6a8459
B e824784db1bda81c68aaa407f471588acea38865
B e9b997e808857cda15f428aed8a78ea8d1856db7
B ea458d27bdbd30b0b3ef785d18e45ddf2a75b74a
+B ea8b6e270c3a4a62061c4269174b6326a57ea2b5
B ebce4a65b15a1a99f18c1ea0111affafc447ce7e
B ec293bde4f937ba6b28907b228649e61d612a528
B ec3103f88b20fc05e92994b6a06b65b4a91dd75a
@@ -265,6 +276,7 @@ M 2b1607831ccf97909122eae9247116d9a075c7cf
M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6
M 2f8a1f7645c30cb40d4f080ce4b4099964028751
M 2f981e098ea265ab504496fbf9ce4564c894bc19
+M 315a6dc119f7bf0ad1f8f8ee74093327852dc365
M 366a556210a1a7b047c4b4dd8da4fc74af6bd301
M 386805560479b35276d88605c5acf805e3004aa5
M 39c772a0764b323f98ab58e00345f4fca924c425
[04/10] cxf git commit: [CXF-7242] Update new LoggingInInterceptor to
actually log payloads Also update new logging to take a PrintStream to make
it more compatible with old interceptors
Posted by dk...@apache.org.
[CXF-7242] Update new LoggingInInterceptor to actually log payloads
Also update new logging to take a PrintStream to make it more compatible with old interceptors
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f56aa148
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f56aa148
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f56aa148
Branch: refs/heads/3.1.x-fixes
Commit: f56aa148e9e54d6f9a2642d7c2160cff13e0231e
Parents: 4c76926
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Feb 3 14:47:09 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 14 09:53:17 2017 -0500
----------------------------------------------------------------------
.../cxf/ext/logging/LoggingInInterceptor.java | 171 ++++++++++++++-----
.../cxf/ext/logging/LoggingOutInterceptor.java | 6 +-
.../logging/event/DefaultLogEventMapper.java | 4 +-
.../logging/event/PrintWriterEventSender.java | 77 +++++++++
4 files changed, 213 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f56aa148/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
index 940603f..6c19109 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
@@ -18,84 +18,171 @@
*/
package org.apache.cxf.ext.logging;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.SequenceInputStream;
+import java.util.Collection;
+import java.util.Collections;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.ext.logging.event.DefaultLogEventMapper;
+import org.apache.cxf.ext.logging.event.EventType;
import org.apache.cxf.ext.logging.event.LogEvent;
import org.apache.cxf.ext.logging.event.LogEventSender;
+import org.apache.cxf.ext.logging.event.PrintWriterEventSender;
import org.apache.cxf.ext.logging.slf4j.Slf4jEventSender;
+import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.io.CachedWriter;
+import org.apache.cxf.io.DelegatingInputStream;
import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
+import org.apache.cxf.phase.PhaseInterceptor;
/**
*
*/
@NoJSR250Annotations
public class LoggingInInterceptor extends AbstractLoggingInterceptor {
-
+ class SendLogEventInterceptor extends AbstractPhaseInterceptor<Message> {
+ SendLogEventInterceptor() {
+ super(Phase.PRE_INVOKE);
+ }
+ @Override
+ public void handleMessage(Message message) throws Fault {
+ LogEvent event = message.get(LogEvent.class);
+ if (event != null) {
+ DefaultLogEventMapper mapper = new DefaultLogEventMapper();
+ mapper.setEpInfo(message, event);
+ event.setType(mapper.getEventType(message));
+ message.remove(LogEvent.class);
+ sender.send(event);
+ }
+ }
+ }
+
public LoggingInInterceptor() {
this(new Slf4jEventSender());
}
-
+ public LoggingInInterceptor(PrintWriter writer) {
+ this(new PrintWriterEventSender(writer));
+ }
public LoggingInInterceptor(LogEventSender sender) {
- super(Phase.PRE_INVOKE, sender);
+ super(Phase.RECEIVE, sender);
+ }
+ public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
+ return Collections.singleton(new SendLogEventInterceptor());
+ }
+
+
+ public void handleFault(Message message) {
+ LogEvent event = message.get(LogEvent.class);
+ if (event != null) {
+ DefaultLogEventMapper mapper = new DefaultLogEventMapper();
+ mapper.setEpInfo(message, event);
+ event.setType(EventType.FAULT_IN);
+ message.remove(LogEvent.class);
+ sender.send(event);
+ }
}
-
public void handleMessage(Message message) throws Fault {
- createExchangeId(message);
- final LogEvent event = new DefaultLogEventMapper().map(message);
- if (shouldLogContent(event)) {
- addContent(message, event);
- } else {
- event.setPayload(AbstractLoggingInterceptor.CONTENT_SUPPRESSED);
+ LogEvent event = message.get(LogEvent.class);
+ if (event == null) {
+ createExchangeId(message);
+ event = new DefaultLogEventMapper().map(message);
+ if (shouldLogContent(event)) {
+ addContent(message, event);
+ } else {
+ event.setPayload(AbstractLoggingInterceptor.CONTENT_SUPPRESSED);
+ }
+ // at this point, we have the payload. However, we may not have the endpoint yet. Delay sending
+ // the event till a little bit later
+ message.put(LogEvent.class, event);
}
- sender.send(event);
}
private void addContent(Message message, final LogEvent event) {
+ InputStream is = message.getContent(InputStream.class);
+ if (is != null) {
+ logInputStream(message, is, event);
+ } else {
+ Reader reader = message.getContent(Reader.class);
+ if (reader != null) {
+ logReader(message, reader, event);
+ }
+ }
+ }
+
+ protected void logInputStream(Message message, InputStream is, LogEvent event) {
+ CachedOutputStream bos = new CachedOutputStream();
+ if (threshold > 0) {
+ bos.setThreshold(threshold);
+ }
+ String encoding = event.getEncoding();
try {
- CachedOutputStream cos = message.getContent(CachedOutputStream.class);
- if (cos != null) {
- handleOutputStream(event, message, cos);
+ // use the appropriate input stream and restore it later
+ InputStream bis = is instanceof DelegatingInputStream
+ ? ((DelegatingInputStream)is).getInputStream() : is;
+
+
+ //only copy up to the limit since that's all we need to log
+ //we can stream the rest
+ IOUtils.copyAtLeast(bis, bos, limit == -1 ? Integer.MAX_VALUE : limit);
+ bos.flush();
+ bis = new SequenceInputStream(bos.getInputStream(), bis);
+
+ // restore the delegating input stream or the input stream
+ if (is instanceof DelegatingInputStream) {
+ ((DelegatingInputStream)is).setInputStream(bis);
} else {
- CachedWriter writer = message.getContent(CachedWriter.class);
- if (writer != null) {
- handleWriter(event, writer);
- }
+ message.setContent(InputStream.class, bis);
}
- } catch (IOException e) {
+
+ if (bos.getTempFile() != null) {
+ //large thing on disk...
+ event.setFullContentFile(bos.getTempFile());
+ }
+ if (bos.size() > limit && limit != -1) {
+ event.setTruncated(true);
+ }
+
+ StringBuilder builder = new StringBuilder(limit);
+ if (StringUtils.isEmpty(encoding)) {
+ bos.writeCacheTo(builder, limit);
+ } else {
+ bos.writeCacheTo(builder, encoding, limit);
+ }
+ bos.close();
+ event.setPayload(builder.toString());
+ } catch (Exception e) {
throw new Fault(e);
}
}
- private void handleOutputStream(final LogEvent event, Message message, CachedOutputStream cos) throws IOException {
- String encoding = (String)message.get(Message.ENCODING);
- if (StringUtils.isEmpty(encoding)) {
- encoding = StandardCharsets.UTF_8.name();
+ protected void logReader(Message message, Reader reader, LogEvent event) {
+ try {
+ CachedWriter writer = new CachedWriter();
+ IOUtils.copyAndCloseInput(reader, writer);
+ message.setContent(Reader.class, writer.getReader());
+
+ if (writer.getTempFile() != null) {
+ //large thing on disk...
+ event.setFullContentFile(writer.getTempFile());
+ }
+ if (writer.size() > limit && limit != -1) {
+ event.setTruncated(true);
+ }
+ int max = writer.size() > limit ? (int)limit : (int)writer.size();
+ StringBuilder b = new StringBuilder(max);
+ writer.writeCacheTo(b);
+ event.setPayload(b.toString());
+ } catch (Exception e) {
+ throw new Fault(e);
}
- StringBuilder payload = new StringBuilder();
- cos.writeCacheTo(payload, encoding, limit);
- cos.close();
- event.setPayload(payload.toString());
- boolean isTruncated = cos.size() > limit && limit != -1;
- event.setTruncated(isTruncated);
- event.setFullContentFile(cos.getTempFile());
- }
-
- private void handleWriter(final LogEvent event, CachedWriter writer) throws IOException {
- boolean isTruncated = writer.size() > limit && limit != -1;
- StringBuilder payload = new StringBuilder();
- writer.writeCacheTo(payload, limit);
- event.setPayload(payload.toString());
- event.setTruncated(isTruncated);
- event.setFullContentFile(writer.getTempFile());
}
-
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/f56aa148/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
index 8620021..2885f6e 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
@@ -21,6 +21,7 @@ package org.apache.cxf.ext.logging;
import java.io.FilterWriter;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
@@ -29,6 +30,7 @@ import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.ext.logging.event.DefaultLogEventMapper;
import org.apache.cxf.ext.logging.event.LogEvent;
import org.apache.cxf.ext.logging.event.LogEventSender;
+import org.apache.cxf.ext.logging.event.PrintWriterEventSender;
import org.apache.cxf.ext.logging.slf4j.Slf4jEventSender;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.StaxOutInterceptor;
@@ -47,7 +49,9 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
public LoggingOutInterceptor() {
this(new Slf4jEventSender());
}
-
+ public LoggingOutInterceptor(PrintWriter w) {
+ this(new PrintWriterEventSender(w));
+ }
public LoggingOutInterceptor(LogEventSender sender) {
super(Phase.PRE_STREAM, sender);
addBefore(StaxOutInterceptor.class.getName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/f56aa148/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index 0123a1b..f48629f 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -281,7 +281,7 @@ public class DefaultLogEventMapper implements LogEventMapper {
* @param message the message
* @return the event type
*/
- private EventType getEventType(Message message) {
+ public EventType getEventType(Message message) {
boolean isRequestor = MessageUtils.isRequestor(message);
boolean isFault = MessageUtils.isFault(message);
if (!isFault) {
@@ -320,7 +320,7 @@ public class DefaultLogEventMapper implements LogEventMapper {
}
}
- private void setEpInfo(Message message, final LogEvent event) {
+ public void setEpInfo(Message message, final LogEvent event) {
EndpointInfo endpoint = getEPInfo(message);
event.setPortName(endpoint.getName());
event.setPortTypeName(endpoint.getName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/f56aa148/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
new file mode 100644
index 0000000..b34133d
--- /dev/null
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
@@ -0,0 +1,77 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.ext.logging.event;
+
+import java.io.PrintWriter;
+import java.time.Instant;
+
+import javax.xml.namespace.QName;
+
+/**
+ *
+ */
+public class PrintWriterEventSender implements LogEventSender {
+ PrintWriter writer;
+
+ public PrintWriterEventSender(PrintWriter writer) {
+ this.writer = writer;
+ }
+
+ void setPrintWriter(PrintWriter w) {
+ writer = w;
+ }
+
+
+ /** {@inheritDoc}*/
+ @Override
+ public void send(LogEvent event) {
+ StringBuilder b = new StringBuilder();
+
+ b.append(Instant.now().toString()).append(" - PrintWriterEventSender\n");
+ put(b, "type", event.getType().toString());
+ put(b, "address", event.getAddress());
+ put(b, "content-type", event.getContentType());
+ put(b, "encoding", event.getEncoding());
+ put(b, "exchangeId", event.getExchangeId());
+ put(b, "httpMethod", event.getHttpMethod());
+ put(b, "messageId", event.getMessageId());
+ put(b, "responseCode", event.getResponseCode());
+ put(b, "serviceName", localPart(event.getServiceName()));
+ put(b, "portName", localPart(event.getPortName()));
+ put(b, "portTypeName", localPart(event.getPortTypeName()));
+ if (event.getFullContentFile() != null) {
+ put(b, "fullContentFile", event.getFullContentFile().getAbsolutePath());
+ }
+ put(b, "headers", event.getHeaders().toString());
+ synchronized (writer) {
+ writer.print(b.toString());
+ writer.println(event.getPayload());
+ }
+ }
+ protected String localPart(QName name) {
+ return name == null ? null : name.getLocalPart();
+ }
+
+ protected void put(StringBuilder b, String key, String value) {
+ if (value != null) {
+ b.append(" ").append(key).append(": ").append(value).append("\n");
+ }
+ }
+}
[02/10] cxf git commit: Use version range for osgi imports in sts-core
Posted by dk...@apache.org.
Use version range for osgi imports in sts-core
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1e2b5fe5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1e2b5fe5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1e2b5fe5
Branch: refs/heads/3.1.x-fixes
Commit: 1e2b5fe5683887eb9ad99eda595d867d3d7115a0
Parents: 6669f84
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Jan 30 18:11:35 2017 +0100
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 14 09:49:30 2017 -0500
----------------------------------------------------------------------
services/sts/sts-core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1e2b5fe5/services/sts/sts-core/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index d92029c..9bd65ca 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -170,7 +170,7 @@
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
org.apache.cxf.sts.provider.*;version=${project.version},
!org.apache.cxf.sts.*,
- org.apache.cxf.*;version=${project.version},
+ org.apache.cxf.*,
javax.xml.ws*;version="[0.0,3)",
org.springframework.ldap*;resolution:=optional,
net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)",
[03/10] cxf git commit: [CXF-7235] Support messageSelector This
closes #231
Posted by dk...@apache.org.
[CXF-7235] Support messageSelector
This closes #231
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4c769260
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4c769260
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4c769260
Branch: refs/heads/3.1.x-fixes
Commit: 4c769260474cb714becb851abe91c2ea4504efb9
Parents: 1e2b5fe
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Feb 2 17:55:44 2017 +0100
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 14 09:51:43 2017 -0500
----------------------------------------------------------------------
.../org/apache/cxf/transport/jms/JMSConfigFactory.java | 1 +
.../org/apache/cxf/transport/jms/uri/JMSEndpoint.java | 11 +++++++++++
.../apache/cxf/transport/jms/JMSConfigFactoryTest.java | 7 +++++++
rt/transports/jms/src/test/resources/jms_test.wsdl | 5 +++++
4 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4c769260/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFactory.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFactory.java
index 464fc7a..5c4c15b 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFactory.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFactory.java
@@ -129,6 +129,7 @@ public final class JMSConfigFactory {
String targetService = endpoint.getTargetService();
jmsConfig.setTargetService(targetService);
+ jmsConfig.setMessageSelector(endpoint.getMessageSelector());
return jmsConfig;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4c769260/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
index 64a77dd..5887fd9 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
@@ -86,6 +86,7 @@ public class JMSEndpoint {
private boolean useConduitIdSelector = true;
private String username;
private int concurrentConsumers = 1;
+ private String messageSelector;
/**
* @param uri
@@ -476,5 +477,15 @@ public class JMSEndpoint {
throw new IllegalArgumentException(v);
}
}
+
+ public String getMessageSelector() {
+ return messageSelector;
+ }
+
+ public void setMessageSelector(String messageSelector) {
+ this.messageSelector = messageSelector;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4c769260/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java
index 9008732..dee65ef 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java
@@ -87,4 +87,11 @@ public class JMSConfigFactoryTest extends AbstractJMSTester {
Assert.assertEquals(4, jmsConfig.getConcurrentConsumers());
}
+
+ @Test
+ public void testMessageSelectorIsSet() {
+ EndpointInfo ei = setupServiceInfo("HelloWorldSelectorService", "HelloWorldPort");
+ JMSConfiguration config = JMSConfigFactory.createFromEndpointInfo(bus, ei, target);
+ Assert.assertEquals("customJMSAttribute=helloWorld", config.getMessageSelector());
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4c769260/rt/transports/jms/src/test/resources/jms_test.wsdl
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/test/resources/jms_test.wsdl b/rt/transports/jms/src/test/resources/jms_test.wsdl
index 5c4d26f..2c05636 100644
--- a/rt/transports/jms/src/test/resources/jms_test.wsdl
+++ b/rt/transports/jms/src/test/resources/jms_test.wsdl
@@ -249,4 +249,9 @@
<soap:address location="jms:topic:test.jmstransport.oneway.topic" />
</port>
</service>
+ <service name="HelloWorldSelectorService">
+ <port binding="tns:HelloWorldPortBinding" name="HelloWorldPort">
+ <soap:address location="jms:queue:test.jmstransport.text?username=testUser&password=testPassword&messageSelector=customJMSAttribute=helloWorld" />
+ </port>
+ </service>
</definitions>
[06/10] cxf git commit: Fix NPE if message is null
Posted by dk...@apache.org.
Fix NPE if message is null
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/18f06322
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/18f06322
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/18f06322
Branch: refs/heads/3.1.x-fixes
Commit: 18f06322f8e14ca7e7ffed682851c8448181cd2c
Parents: 02ed401
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Feb 9 12:05:39 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 14 09:53:27 2017 -0500
----------------------------------------------------------------------
.../org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/18f06322/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index 66082bc..8324dae 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -269,7 +269,7 @@ public class DefaultLogEventMapper implements LogEventMapper {
}
private static String safeGet(Message message, String key) {
- if (!message.containsKey(key)) {
+ if (message == null || !message.containsKey(key)) {
return null;
}
Object value = message.get(key);
[07/10] cxf git commit: Fix unit test
Posted by dk...@apache.org.
Fix unit test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f092b809
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f092b809
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f092b809
Branch: refs/heads/3.1.x-fixes
Commit: f092b809c7ba8604d72830729d8f05c0e7604417
Parents: 18f0632
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Feb 9 14:08:06 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 14 09:53:46 2017 -0500
----------------------------------------------------------------------
.../logging/event/DefaultLogEventMapper.java | 30 +++-----------------
1 file changed, 4 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f092b809/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index 8324dae..abf3a06 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -29,7 +29,6 @@ import java.util.Set;
import java.util.UUID;
import javax.security.auth.Subject;
-import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.binding.Binding;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
@@ -42,7 +41,6 @@ import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.service.model.ServiceModelUtil;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.ContextUtils;
@@ -156,7 +154,7 @@ public class DefaultLogEventMapper implements LogEventMapper {
}
uri = address + uri;
}
- } else {
+ } else if (address != null) {
uri = address;
}
}
@@ -207,19 +205,6 @@ public class DefaultLogEventMapper implements LogEventMapper {
BindingOperationInfo boi = null;
boi = message.getExchange().getBindingOperationInfo();
- if (null == boi) {
- boi = getOperationFromContent(message);
- }
-
- if (null == boi) {
- Message inMsg = message.getExchange().getInMessage();
- if (null != inMsg) {
- Message reqMsg = inMsg.getExchange().getInMessage();
- if (null != reqMsg) {
- boi = getOperationFromContent(reqMsg);
- }
- }
- }
if (null != boi) {
operationName = boi.getName().toString();
@@ -228,15 +213,6 @@ public class DefaultLogEventMapper implements LogEventMapper {
return operationName;
}
- private BindingOperationInfo getOperationFromContent(Message message) {
- XMLStreamReader xmlReader = message.getContent(XMLStreamReader.class);
- if (xmlReader != null) {
- return ServiceModelUtil.getOperation(message.getExchange(), xmlReader.getName());
- } else {
- return null;
- }
- }
-
private Message getEffectiveMessage(Message message) {
boolean isRequestor = MessageUtils.isRequestor(message);
boolean isOutbound = MessageUtils.isOutbound(message);
@@ -258,7 +234,9 @@ public class DefaultLogEventMapper implements LogEventMapper {
String requestUri = safeGet(message, Message.REQUEST_URI);
if (requestUri != null) {
String basePath = safeGet(message, Message.BASE_PATH);
- if (basePath != null && requestUri.startsWith(basePath)) {
+ if (basePath == null) {
+ path = requestUri;
+ } else if (requestUri.startsWith(basePath)) {
path = requestUri.substring(basePath.length());
}
if (path.isEmpty()) {