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/03/22 20:20:12 UTC
[1/7] cxf git commit: [CXF-6423] PrettyLoggingFilter tests and
improvements with thanks to Thomas Skjolberg. Closes #75
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes da4846fee -> 4fbb05ce3
[CXF-6423] PrettyLoggingFilter tests and improvements with thanks to Thomas Skjolberg. Closes #75
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/61c78008
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/61c78008
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/61c78008
Branch: refs/heads/3.1.x-fixes
Commit: 61c7800897989ce49b4347ae3487b55220bff699
Parents: da4846f
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Mar 16 14:20:42 2017 +0100
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Mar 22 15:20:43 2017 -0400
----------------------------------------------------------------------
.../ext/logging/event/PrettyLoggingFilter.java | 94 +++++++++++++-------
.../ext/logging/TestPrettyLoggingFilter.java | 90 +++++++++++++++++++
2 files changed, 154 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/61c78008/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
index db42fd4..a3bc909 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
@@ -18,14 +18,12 @@
*/
package org.apache.cxf.ext.logging.event;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.StringReader;
import java.io.StringWriter;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.stream.StreamSource;
import org.apache.cxf.staxutils.PrettyPrintXMLStreamWriter;
import org.apache.cxf.staxutils.StaxUtils;
@@ -45,7 +43,7 @@ public class PrettyLoggingFilter implements LogEventSender {
@Override
public void send(LogEvent event) {
if (shouldPrettyPrint(event)) {
- event.setPayload(getPrettyMessage(event.getPayload(), event.getEncoding()));
+ event.setPayload(getPrettyMessage(event));
}
next.send(event);
}
@@ -59,33 +57,69 @@ public class PrettyLoggingFilter implements LogEventSender {
&& event.getPayload().length() > 0;
}
- public String getPrettyMessage(String message, String encoding) {
- StringWriter swriter = new StringWriter();
+ /**
+ * Pretty-print {@linkplain LogEvent} XML payload.
+ *
+ * @param event the log event containing an XML payload which is to be pretty-printed.
+ * @return pretty-printed XML or original payload in case of an unexpected exception.
+ */
+
+ private String getPrettyMessage(LogEvent event) {
+ String payload = event.getPayload();
+ StringWriter swriter = new StringWriter(estimatePrettySize(payload));
+
+ XMLStreamWriter xwriter = new PrettyPrintXMLStreamWriter(StaxUtils.createXMLStreamWriter(swriter), 2);
+ XMLStreamReader xreader = StaxUtils.createXMLStreamReader(new StringReader(payload));
try {
- // Using XMLStreamWriter instead of Transformer as it works with non well formed xml
- // that can occur when we set a limit and cur the rest off
- XMLStreamWriter xwriter = StaxUtils.createXMLStreamWriter(swriter);
- xwriter = new PrettyPrintXMLStreamWriter(xwriter, 2);
- encoding = encoding == null ? "UTF-8" : encoding;
- InputStream in = new ByteArrayInputStream(message.getBytes(encoding));
- try {
- StaxUtils.copy(new StreamSource(in), xwriter);
- } catch (XMLStreamException xse) {
- //ignore
- } finally {
- try {
- xwriter.flush();
- xwriter.close();
- } catch (XMLStreamException xse2) {
- //ignore
- }
- in.close();
- }
- } catch (IOException e) {
- LOG.debug("Error while pretty printing cxf message, returning what we got till now.", e);
- }
+ StaxUtils.copy(xreader, xwriter);
+ xwriter.flush();
+ } catch (XMLStreamException xse) {
+ if (!event.isTruncated()) {
+ LOG.debug("Error while pretty printing cxf message, returning raw message.", xse);
+ return payload;
+ }
+
+ // Expected behavior for truncated payloads - keep what is already written.
+ // This might effectively result in additional truncation,
+ // as the truncated XML document might result in partially parsed XML nodes,
+ // for example an open start tag. As long as a truncated payload is not
+ // mistaken for a non-truncated payload, we're good.
+ flush(xwriter);
+ return swriter.toString();
+ } finally {
+ close(xwriter);
+ close(xreader);
+ }
return swriter.toString();
}
+
+ private void flush(XMLStreamWriter xwriter) {
+ try {
+ xwriter.flush();
+ } catch (XMLStreamException xse2) {
+ //ignore
+ }
+ }
+
+ private void close(XMLStreamWriter xwriter) {
+ try {
+ xwriter.close();
+ } catch (XMLStreamException xse2) {
+ //ignore
+ }
+ }
+
+ private void close(XMLStreamReader xreader) {
+ try {
+ xreader.close();
+ } catch (XMLStreamException xse2) {
+ //ignore
+ }
+ }
+
+ private int estimatePrettySize(String payload) {
+ return payload.length() * 2;
+ }
public void setNext(LogEventSender next) {
this.next = next;
@@ -95,4 +129,4 @@ public class PrettyLoggingFilter implements LogEventSender {
this.prettyLogging = prettyLogging;
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/61c78008/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestPrettyLoggingFilter.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestPrettyLoggingFilter.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestPrettyLoggingFilter.java
new file mode 100644
index 0000000..9cc6179
--- /dev/null
+++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestPrettyLoggingFilter.java
@@ -0,0 +1,90 @@
+/**
+ * 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;
+
+import org.apache.cxf.ext.logging.event.LogEvent;
+import org.apache.cxf.ext.logging.event.LogEventSender;
+import org.apache.cxf.ext.logging.event.PrettyLoggingFilter;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ *
+ * Test {@linkplain PrettyLoggingFilter}} with well-formed and non-well-formed XML payloads.
+ *
+ */
+
+public class TestPrettyLoggingFilter {
+
+ @Test
+ public void testWellformedXMLMessage() {
+ String message = "<parent><child>text</child></parent>";
+ String expected = "<parent>\n <child>text</child>\n</parent>\n";
+ filter(message, expected, false);
+ }
+
+ @Test
+ public void testInvalidXMLMessageUnexpectedEndTag() {
+ String message = "<parentA><child>text</child></parentB>";
+ filter(message, message, false);
+ }
+
+ @Test
+ public void testInvalidXMLMessageMissingEndTag() {
+ String message = "<parentA><child>text</child>";
+ filter(message, message, false);
+ }
+
+ @Test
+ public void testInvalidXMLMessageGarbageStartTag() {
+ String message = "<a b c><child>text</child>";
+ filter(message, message, false);
+ }
+
+ /**
+ * In case of a truncated message we do not want the pretty print to auto close the tags
+ * giving a false impression of how to message looks like.
+ */
+ @Test
+ public void testInvalidButTruncatedXMLMessageWithMissingEndTag() {
+ String message = "<parent><child>text</child>";
+ String expected = "<parent>\n <child>text</child>";
+ filter(message, expected, true);
+ }
+
+ private void filter(String payload, String expected, boolean truncated) {
+ LogEvent logEvent = new LogEvent();
+ logEvent.setPayload(payload);
+ logEvent.setContentType("text/xml");
+ logEvent.setTruncated(truncated);
+
+ LogEventSender dummy = new LogEventSender() {
+ public void send(LogEvent event) {
+ }
+ };
+
+ PrettyLoggingFilter prettyFilter = new PrettyLoggingFilter(dummy);
+ prettyFilter.setPrettyLogging(true);
+ prettyFilter.send(logEvent);
+
+ assertEquals(expected, logEvent.getPayload());
+ }
+
+}
\ No newline at end of file
[6/7] cxf git commit: [CXF-5782] Move logged class names to FINE
Posted by dk...@apache.org.
[CXF-5782] Move logged class names to FINE
# Conflicts:
# core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/12e3611a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/12e3611a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/12e3611a
Branch: refs/heads/3.1.x-fixes
Commit: 12e3611ad50deb4df9f6b5e820d20e63c710ac84
Parents: 4cae317
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Mar 22 15:39:28 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Mar 22 16:15:30 2017 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/12e3611a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index 9ff8800..be86175 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -740,7 +740,7 @@ public final class JAXBUtils {
}
public static void logGeneratedClassNames(Logger logger, JCodeModel codeModel) {
- if (!logger.isLoggable(Level.INFO)) {
+ if (!logger.isLoggable(Level.FINE)) {
return;
}
@@ -759,7 +759,7 @@ public final class JAXBUtils {
}
}
- logger.log(Level.INFO, "Created classes: " + sb.toString());
+ logger.log(Level.FINE, "Created classes: " + sb.toString());
}
public static List<String> getGeneratedClassNames(JCodeModel codeModel) {
[2/7] cxf git commit: Add documentation,
remove unused LogEventMapper interface
Posted by dk...@apache.org.
Add documentation, remove unused LogEventMapper interface
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b1227d6a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b1227d6a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b1227d6a
Branch: refs/heads/3.1.x-fixes
Commit: b1227d6ae33cc3e33a6685933f4c7ec51da3bd95
Parents: 61c7800
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Mar 21 15:25:16 2017 +0100
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Mar 22 15:20:56 2017 -0400
----------------------------------------------------------------------
.../logging/event/DefaultLogEventMapper.java | 2 +-
.../cxf/ext/logging/event/LogEventMapper.java | 25 --------------------
.../ext/logging/event/LogMessageFormatter.java | 2 +-
.../ext/logging/event/PrettyLoggingFilter.java | 4 ++++
4 files changed, 6 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b1227d6a/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 78bbc7b..0934c2c 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
@@ -45,7 +45,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.ContextUtils;
-public class DefaultLogEventMapper implements LogEventMapper {
+public class DefaultLogEventMapper {
private static final Set<String> BINARY_CONTENT_MEDIA_TYPES;
static {
BINARY_CONTENT_MEDIA_TYPES = new HashSet<String>();
http://git-wip-us.apache.org/repos/asf/cxf/blob/b1227d6a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogEventMapper.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogEventMapper.java
deleted file mode 100644
index c187e3c..0000000
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogEventMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 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 org.apache.cxf.message.Message;
-
-public interface LogEventMapper {
- LogEvent map(Message message);
-}
http://git-wip-us.apache.org/repos/asf/cxf/blob/b1227d6a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogMessageFormatter.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogMessageFormatter.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogMessageFormatter.java
index 0c628f7..fe872d2 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogMessageFormatter.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogMessageFormatter.java
@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.common.util.StringUtils;
/**
- *
+ * Formats a log message showing the most important meta data
*/
public final class LogMessageFormatter {
http://git-wip-us.apache.org/repos/asf/cxf/blob/b1227d6a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
index a3bc909..ccadc2f 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
@@ -30,6 +30,10 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * Formats the log message with indents.
+ * If the log message was truncated then this filter might additionally cut incomplete tags
+ */
public class PrettyLoggingFilter implements LogEventSender {
private static final Logger LOG = LoggerFactory.getLogger(PrettyLoggingFilter.class);
private LogEventSender next;
[4/7] cxf git commit: [CXF-6852] Some work on auto-cleanup of
classloader for dynamic client
Posted by dk...@apache.org.
[CXF-6852] Some work on auto-cleanup of classloader for dynamic client
# Conflicts:
# rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a4fad996
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a4fad996
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a4fad996
Branch: refs/heads/3.1.x-fixes
Commit: a4fad996752b933f0926a46dd0664c10bd1cfed2
Parents: b1227d6
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Mar 22 14:32:31 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Mar 22 15:21:56 2017 -0400
----------------------------------------------------------------------
.../endpoint/dynamic/DynamicClientFactory.java | 27 +++++++++++++++++---
1 file changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a4fad996/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
index 2def391..d770095 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
@@ -283,6 +283,25 @@ public class DynamicClientFactory {
List<String> bindingFiles) {
return createClient(wsdlUrl.toString(), service, classLoader, port, bindingFiles);
}
+
+ static class DynamicClientImpl extends ClientImpl implements AutoCloseable {
+ final ClassLoader cl;
+ final ClassLoader orig;
+ DynamicClientImpl(Bus bus, Service svc, QName port,
+ EndpointImplFactory endpointImplFactory,
+ ClassLoader l) {
+ super(bus, svc, port, endpointImplFactory);
+ cl = l;
+ orig = Thread.currentThread().getContextClassLoader();
+ }
+ @Override
+ public void close() throws Exception {
+ destroy();
+ if (Thread.currentThread().getContextClassLoader() == cl) {
+ Thread.currentThread().setContextClassLoader(orig);
+ }
+ }
+ }
public Client createClient(String wsdlUrl, QName service,
ClassLoader classLoader, QName port,
@@ -298,9 +317,6 @@ public class DynamicClientFactory {
sf.setAllowElementRefs(allowRefs);
Service svc = sf.create();
- ClientImpl client = new ClientImpl(bus, svc, port,
- getEndpointImplFactory());
-
//all SI's should have the same schemas
SchemaCollection schemas = svc.getServiceInfos().get(0).getXmlSchemaCollection();
@@ -378,7 +394,7 @@ public class DynamicClientFactory {
throw new IllegalStateException("Internal error; a directory returns a malformed URL: "
+ mue.getMessage(), mue);
}
- ClassLoader cl = ClassLoaderUtils.getURLClassLoader(urls, classLoader);
+ final ClassLoader cl = ClassLoaderUtils.getURLClassLoader(urls, classLoader);
JAXBContext context;
Map<String, Object> contextProperties = jaxbContextProperties;
@@ -402,6 +418,9 @@ public class DynamicClientFactory {
databinding.setContext(context);
svc.setDataBinding(databinding);
+ ClientImpl client = new DynamicClientImpl(bus, svc, port,
+ getEndpointImplFactory(), cl);
+
ServiceInfo svcfo = client.getEndpoint().getEndpointInfo().getService();
// Setup the new classloader!
[7/7] 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/4fbb05ce
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4fbb05ce
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4fbb05ce
Branch: refs/heads/3.1.x-fixes
Commit: 4fbb05ce31ccfee730d144f328b90f300a64693b
Parents: 12e3611
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Mar 22 16:15:30 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Mar 22 16:15:30 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4fbb05ce/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1277369..978df9d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -335,6 +335,7 @@ M 11e18bf5622cafdb10723cee895885d676b35a7b
M 13d33c9ed261e06e44706cffa1671d67d31096a7
M 146b00d1947058705c873dffe2ba78ad35c8b03c
M 156b166b093aa92c1fc400e0f1f7440ded701169
+M 1622823593e1a9a836e0e354ad37ea1cc56c3fb8
M 177579cad9c1a41b9b7c68ad69ed84de9fa08561
M 19a4d72a32f1e18bec621af403ecdf21d97453af
M 19c72e2049bf4cd98bd9e3e09a21e555226f1e60
[3/7] 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/21a7f538
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/21a7f538
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/21a7f538
Branch: refs/heads/3.1.x-fixes
Commit: 21a7f538c3e91d2f5b0c1250c866ea43405bcb42
Parents: a4fad99
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Mar 22 15:21:56 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Mar 22 15:21:56 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/21a7f538/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 244809a..1277369 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -20,6 +20,7 @@ B 0af65a4ab3ef2c31b9e88d34ddfbb05c79f0f50c
B 0d4cd0bbcaa6a4f80552d6b38f2a5e721ab20de9
B 0d5577ab87f324205565c4534b59e69049505356
B 0dfaf8d72574511ad9027c663707f9e30b945fbc
+B 0e1d4826cab2975b437219f740381574536d4ff3
B 0f74af5ed7561838e1950c758a7a05e588badd10
B 101e9a0a43f2d819057d995adbb6e6776d5c7f40
B 1116dff4ec9f06e2e69b040f5aa03779c0424c23
@@ -72,8 +73,10 @@ B 3ce7f00461d9c868301003b5c16138c491a9ac0b
B 3f259221fa1dd9227397400ed9653374cb4fdc39
B 3fbedf1397714824b9700cd4d49569087936fe1a
B 3fc02937bd8ba0bb500a2cdfd8afa863b9cf6aec
+B 3fe8e92229ba50dbc6758e6420b44ac16751281e
B 40380d8e57cdea0d909f3a9ee207628831c202fa
B 40dd6d61c5e6e276df9437e5f000e103ee6101d6
+B 41262ee0264445ad7fe288c0f0bf640c8b9dbbc5
B 4149e50e39a8d4ffb71924d42def376b634ef64a
B 428bbe90e4189e70df9a6a450a10320c8be6d42f
B 4301392fae084db72886290091ea5745144d97f5
@@ -192,6 +195,7 @@ B a2c912b418831967b49f59b2c8bf33a9eb53e281
B a38da9e8f15fb158bf0982c61750ef48e5814792
B a4167fb84baa1834bbe86be8a749c385f1af8c82
B a4b794b55b1ea258e9168a58f05794f37aeeb049
+B a4b98454d147437ff71b92355d60e8bd48d56448
B a7362dfaf2141cb4f303f81bbb94c6df81be75cb
B a81534d6655e046e7d316e6de38095fe3f4949cb
B a93cbfd994c34000f27911c5aab6638b60d61ff7
@@ -333,7 +337,9 @@ M 146b00d1947058705c873dffe2ba78ad35c8b03c
M 156b166b093aa92c1fc400e0f1f7440ded701169
M 177579cad9c1a41b9b7c68ad69ed84de9fa08561
M 19a4d72a32f1e18bec621af403ecdf21d97453af
+M 19c72e2049bf4cd98bd9e3e09a21e555226f1e60
M 19d8da7f0672b86dbf88a08b54a72297d0ca2d20
+M 1a7411c270810507626a15d4a4cdc574d6ff62c3
M 1afeea8bdc0ef96df1d52ea343957dc396723f8c
M 1e57d379863d01b9330fff797c14d81a56b0b0f2
M 20d0a2811c15cb65a402eb063e1359236d7014ea
@@ -348,9 +354,11 @@ M 3088952a6e3385ee628cf8c91340908ed3a67aa3
M 315a6dc119f7bf0ad1f8f8ee74093327852dc365
M 34fd320f91d933233aeb364120456f4fa0f220ac
M 366a556210a1a7b047c4b4dd8da4fc74af6bd301
+M 3833280c67c489a7e83b8540361df4154f4aeccf
M 386805560479b35276d88605c5acf805e3004aa5
M 39c772a0764b323f98ab58e00345f4fca924c425
M 3a1fa0b23f1778594b6339dfcfbc90dcc43a87d4
+M 3bbfc22e182ffea8c98ba8f84b4f55abfce353e7
M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
M 3e30d8892a723adcf04268efd7d407e164607065
M 437c7daa3345c8482deab4a4da9b164e68fd417a
@@ -371,6 +379,7 @@ M 5cff82c735c7543ce6dfb6c52ac72f583dbb5d22
M 6242c682dfce4a2ba4869978c28b14f1472484c1
M 63a1088a9253da0452497440e900d35a5415c3c9
M 65c1204abcef8720d4eb985d58e3f865e39a1da3
+M 6613e46662317ea151f72e26e5deb4f50148a148
M 66e97c77eaa43ab3a2cd95f0edc6a27e7445e8ce
M 6becb31c62ef0845a5078f4ec2124fe7bc264e58
M 6d7985f39b83d28b0ca3e485be8de8f986d6f6c1
@@ -411,6 +420,7 @@ M 9b2bda583c09861c693122ab631c4bffa2187ddd
M 9b6666816a21d8b85cc051be59a8ab6e968c5d0d
M 9cd3116cbdbbfb139f40ad2d9e49cec1adf08a08
M 9d3c46e0cfe87700d7105ee131c3e3e33f228e06
+M 9d64bcedb508732cdc377312f0fb433ee1dc630e
M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
M a034e5853484a7ef0a9f0ad1ae6582178f622f31
M a1710bdd783afcd667d9e72ccb031480d3806850
@@ -423,6 +433,7 @@ M a9fe8470ce9522f08c298e58f76636c48d57b7a4
M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
M ad18f5aef28eb82d613b3f4226b2ddae19b6415f
M ad200706d0ea914987930a64d2f5c14336a0c641
+M ae3ae2a25109375cc82114d15078f04e8c5353c5
M b0a79aa7b48da6acdc6da1169abd690ecf914ca8
M b1c6125f50b294b0e2ebc927671e2ff53b5001bf
M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
@@ -444,11 +455,13 @@ M cf806d5cba74e47c6e5ba3231df4228cbaad3e90
M cf8ac102e728b8745da265ec969f7b5160829fdb
M d0821bce5faa119c882a9000dbe03a124df5b033
M d187ef6f3906d867a8c30a991d9074d170bca487
+M d3bf494ef4987debad986cae87cfe5f095b79090
M d46818bd3043d211774de9bc531849f54bb2989f
M db1e5146e6312a4be35b0ca2644a691cb1d41a0f
M dba09f00804cc05d943fd95d34882d6368c28edb
M ded06c40ba057981e003903faa93beb94cbe11fa
M df3854cefae5d2da71f8d222a86218e81df7bd05
+M e4cb2ea437185caa28b95a2344ffa8aa0ba516b7
M e578ea946aa13177adef98727e3e4606652ffc76
M e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa
M e92e57c1f14de911cd2315a907443c79e91a94de
[5/7] cxf git commit: [CXF-5096] Fix onerror call. Patch from Florian
Vielhauer applied
Posted by dk...@apache.org.
[CXF-5096] Fix onerror call.
Patch from Florian Vielhauer applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4cae317e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4cae317e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4cae317e
Branch: refs/heads/3.1.x-fixes
Commit: 4cae317ee165144f4f3cc1ce41bc6ab261f59c7e
Parents: 21a7f53
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Mar 22 15:25:47 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Mar 22 16:14:13 2017 -0400
----------------------------------------------------------------------
.../src/main/resources/org/apache/cxf/javascript/cxf-utils.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4cae317e/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js b/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
index 8c9f451..00b0c41 100644
--- a/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
+++ b/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
@@ -914,7 +914,7 @@ function org_apache_cxf_client_onReadyState() {
this.utils
.trace("onreadystatechange DONE ERROR retrieving status (connection error?)");
if (this.onerror != null) {
- this.onerror(e);
+ this.onerror(this);
}
return;