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 2014/07/14 17:08:38 UTC
[1/4] git commit: [CXF-5733] Use standard way of generating SAX
events with StaxSource
Repository: cxf
Updated Branches:
refs/heads/2.6.x-fixes ce7a84f5d -> 8a39c8515
[CXF-5733] Use standard way of generating SAX events with StaxSource
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/12e653ea
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/12e653ea
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/12e653ea
Branch: refs/heads/2.6.x-fixes
Commit: 12e653ead331ffa48960d68fca19e01fe6ee6b98
Parents: ce7a84f
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Wed May 7 12:47:04 2014 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 14 11:02:37 2014 -0400
----------------------------------------------------------------------
api/pom.xml | 5 ++
.../org/apache/cxf/staxutils/StaxSource.java | 43 ++++++------
.../org/apache/cxf/staxutils/StaxUtilsTest.java | 71 +++++++++++++++++++-
.../org/apache/cxf/staxutils/resources/copy.xsl | 30 +++++++++
4 files changed, 124 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/12e653ea/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index e5589bc..c3077d1 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -126,6 +126,11 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<scope>provided</scope>
http://git-wip-us.apache.org/repos/asf/cxf/blob/12e653ea/api/src/main/java/org/apache/cxf/staxutils/StaxSource.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/staxutils/StaxSource.java b/api/src/main/java/org/apache/cxf/staxutils/StaxSource.java
index 06f28e5..ca024fe 100644
--- a/api/src/main/java/org/apache/cxf/staxutils/StaxSource.java
+++ b/api/src/main/java/org/apache/cxf/staxutils/StaxSource.java
@@ -117,6 +117,15 @@ public class StaxSource extends SAXSource implements XMLReader {
String qname = prefix != null && prefix.length() > 0
? prefix + ":" + localName : localName;
contentHandler.endElement(uri, localName, qname);
+ // namespaces
+ for (int i = 0; i < streamReader.getNamespaceCount(); i++) {
+ String nsPrefix = streamReader.getNamespacePrefix(i);
+ String nsUri = streamReader.getNamespaceURI(i);
+ if (nsUri == null) {
+ nsUri = "";
+ }
+ contentHandler.endPrefixMapping(nsPrefix);
+ }
break;
}
case XMLStreamConstants.ENTITY_DECLARATION:
@@ -135,6 +144,15 @@ public class StaxSource extends SAXSource implements XMLReader {
String prefix = streamReader.getPrefix();
String qname = prefix != null && prefix.length() > 0
? prefix + ":" + localName : localName;
+ // namespaces
+ for (int i = 0; i < streamReader.getNamespaceCount(); i++) {
+ String nsPrefix = streamReader.getNamespacePrefix(i);
+ String nsUri = streamReader.getNamespaceURI(i);
+ if (nsUri == null) {
+ nsUri = "";
+ }
+ contentHandler.startPrefixMapping(nsPrefix, nsUri);
+ }
contentHandler.startElement(uri == null ? "" : uri, localName, qname, getAttributes());
break;
}
@@ -171,30 +189,7 @@ public class StaxSource extends SAXSource implements XMLReader {
protected Attributes getAttributes() {
AttributesImpl attrs = new AttributesImpl();
- // Adding namespace declaration as attributes is necessary because
- // the xalan implementation that ships with SUN JDK 1.4 is bugged
- // and does not handle the startPrefixMapping method
- for (int i = 0; i < streamReader.getNamespaceCount(); i++) {
- String prefix = streamReader.getNamespacePrefix(i);
- String uri = streamReader.getNamespaceURI(i);
- if (uri == null) {
- uri = "";
- }
- // Default namespace
- if (prefix == null || prefix.length() == 0) {
- attrs.addAttribute("",
- "",
- XMLConstants.XMLNS_ATTRIBUTE,
- "CDATA",
- uri);
- } else {
- attrs.addAttribute(XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
- prefix,
- XMLConstants.XMLNS_ATTRIBUTE + ":" + prefix,
- "CDATA",
- uri);
- }
- }
+
for (int i = 0; i < streamReader.getAttributeCount(); i++) {
String uri = streamReader.getAttributeNamespace(i);
String localName = streamReader.getAttributeLocalName(i);
http://git-wip-us.apache.org/repos/asf/cxf/blob/12e653ea/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java b/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
index 8b02be7..ca06a43 100644
--- a/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
+++ b/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
@@ -32,8 +32,13 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.stream.events.XMLEvent;
+import javax.xml.transform.OutputKeys;
import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -46,6 +51,8 @@ import org.apache.cxf.helpers.XMLUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.core.IsEqual.equalTo;
+
public class StaxUtilsTest extends Assert {
@Test
@@ -297,7 +304,69 @@ public class StaxUtilsTest extends Assert {
writer.flush();
baos.flush();
}
-
+
+ @Test
+ public void testDefaultPrefixInRootElementWithIdentityTransformer() throws Exception {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ String xml = "<root xmlns=\"urn:org.apache.cxf:test\">Text</root>";
+ StringReader stringReader = new StringReader(xml);
+ StreamSource source = new StreamSource(stringReader);
+ XMLStreamReader reader = StaxUtils.createXMLStreamReader(source);
+ XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(baos);
+ StaxSource staxSource = new StaxSource(reader);
+ TransformerFactory trf = TransformerFactory.newInstance();
+ Transformer transformer = trf.newTransformer();
+ transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+ transformer.transform(staxSource, new StreamResult(baos));
+ writer.flush();
+ baos.flush();
+ assertThat(new String(baos.toByteArray()), equalTo(xml));
+ }
+
+ @Test
+ public void testDefaultPrefixInRootElementWithXalanCopyTransformer() throws Exception {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ String xml = "<root xmlns=\"urn:org.apache.cxf:test\">Text</root>";
+ StringReader stringReader = new StringReader(xml);
+ StreamSource source = new StreamSource(stringReader);
+ XMLStreamReader reader = StaxUtils.createXMLStreamReader(source);
+ XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(baos);
+ StaxSource staxSource = new StaxSource(reader);
+ TransformerFactory trf = TransformerFactory.newInstance();
+ Transformer transformer = trf.newTransformer(new StreamSource(getTestStream("./resources/copy.xsl")));
+ System.out.println("Used transformer: " + transformer.getClass().getName());
+ transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+ transformer.transform(staxSource, new StreamResult(baos));
+ writer.flush();
+ baos.flush();
+ assertThat(new String(baos.toByteArray()), equalTo(xml));
+ }
+
+ @Test
+ public void testDefaultPrefixInRootElementWithJDKInternalCopyTransformer() throws Exception {
+ TransformerFactory trf = null;
+ try {
+ trf = TransformerFactory.newInstance("com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl", null);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ String xml = "<root xmlns=\"urn:org.apache.cxf:test\">Text</root>";
+ StringReader stringReader = new StringReader(xml);
+ StreamSource source = new StreamSource(stringReader);
+ XMLStreamReader reader = StaxUtils.createXMLStreamReader(source);
+ XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(baos);
+ StaxSource staxSource = new StaxSource(reader);
+ Transformer transformer = trf.newTransformer(new StreamSource(getTestStream("./resources/copy.xsl")));
+ System.out.println("Used transformer: " + transformer.getClass().getName());
+ transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+ transformer.transform(staxSource, new StreamResult(baos));
+ writer.flush();
+ baos.flush();
+ assertThat(new String(baos.toByteArray()), equalTo(xml));
+ } catch (Throwable throwable) {
+ // ignore on non Sun/Oracle JDK
+ return;
+ }
+ }
+
@Test
public void testCXF3193() throws Exception {
String testString = "<a:elem1 xmlns:a=\"test\" xmlns:b=\"test\" a:attr1=\"value\"/>";
http://git-wip-us.apache.org/repos/asf/cxf/blob/12e653ea/api/src/test/java/org/apache/cxf/staxutils/resources/copy.xsl
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/cxf/staxutils/resources/copy.xsl b/api/src/test/java/org/apache/cxf/staxutils/resources/copy.xsl
new file mode 100644
index 0000000..a9223e8
--- /dev/null
+++ b/api/src/test/java/org/apache/cxf/staxutils/resources/copy.xsl
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+ <!-- Idiomatic Copy Transformation -->
+ <xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()" />
+ </xsl:copy>
+ </xsl:template>
+
+</xsl:stylesheet>
[3/4] git commit: Fix checkstyle issue
Posted by dk...@apache.org.
Fix checkstyle issue
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/053ef5a2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/053ef5a2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/053ef5a2
Branch: refs/heads/2.6.x-fixes
Commit: 053ef5a200b6491bce296131fcb93b992f19bc2b
Parents: 40359e5
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jul 14 10:43:06 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 14 11:06:39 2014 -0400
----------------------------------------------------------------------
api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/053ef5a2/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java b/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index 238d493..3332acb 100644
--- a/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
-import java.net.URI;
import java.net.URL;
import java.net.URLDecoder;
import java.net.URLEncoder;
[4/4] 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/8a39c851
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8a39c851
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8a39c851
Branch: refs/heads/2.6.x-fixes
Commit: 8a39c85156b444e38d19fb8032916e71380e1357
Parents: 053ef5a
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jul 14 11:06:39 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 14 11:07:01 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8a39c851/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 98d199e..aaa9fad 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -35,6 +35,7 @@ B 06d80f1dca536c6bcd41b5fc9e6a0c65c3fd146d
B 06df2de6ef6b8d15a71a17332b4cf68587f88475
B 07a43aad25058da38ae0cb1e182da6ca55e057e0
B 07d96dbfab18562ddb340e17c69601dee9b5cb0c
+B 07e0e9c45604fde9d4f6eafa8a384151304683c8
B 07f4353f87f31fed5fe38c4d55c43ed04cfd4457
B 08265c0bcf01da38eca447ce6b9cb014afc066e4
B 08b041f314afabaee732e7810f1cde79f0cd2ee9
@@ -47,8 +48,10 @@ B 0940e78556f0090f516b5d96b1a41f14bd3c81fb
B 094aab46fb968eaedbf25e72a009080c1f25d0b5
B 096c114091aa0a3f4c33c19d77ed54fd2b5495b8
B 09815dc32aaa55bd05eeb93d17b9afe9a396ed96
+B 09c619e1faa82c8fe71840722f6009129bebd6e2
B 09c7b2f670b62b3a4e4d8a700a8b44494bbdd662
B 0a0b9deec75db92a58ed6743b91efc4d3870fea7
+B 0a54ffd4d7672c11bbe96fbca182dbb6feb8abd6
B 0a9e2782d0f038e993b592f6f861d1ae9ecc3182
B 0aaa864df1e906d467cfd616fb61be44857d6ad2
B 0acc1a1ac6e61630c270e2be14241861e6621fce
@@ -99,6 +102,7 @@ B 1375b906a67824c91acaed011ac0e68f603d0ee7
B 138e935aae5dd3e89b19400376f073c42f5b806e
B 13f044a33f95b183ee34c2abd91633602c671fef
B 13fe3fc46548701f43e01bcdad026495aa864641
+B 141e88e6072fe8a85c4d6204719eca1b9d7eb04a
B 142cb4494ff62a0ddcef3cf113209a37600b3256
B 1431b0287c9144c0904f0998ebff0ea0bbc314a8
B 14472f9184165efaa1f1da8a2d2b68eb69d6d808
@@ -175,6 +179,7 @@ B 26d0beb06f9cb1348a941ba38d89883e3a0b181b
B 26ebbfa535dabb2f36ef244ca6b6b47507024a03
B 275cb69483cfb87f8ebbee206e240f241f76b531
B 275ecda83e2ecf2d208b28069b4e4ee6466f6d28
+B 2772bb77a7ff264dba7970be171e3cade75a25f1
B 277bfdeab6a18078423427ea55fff74e78c783aa
B 2812a16c16dc549d0ccd5887a9524cf227a1a7cd
B 290f2a7d8625edbb013853c2fe0bc0796e97f6ac
@@ -187,6 +192,7 @@ B 2a25cd21f1c339c3f5e546986104e5dc2261f60b
B 2a548e8c23ac00d2698e93aa1b7435439b329b0e
B 2a743ebbd824eb4c84fe7dc747851097628bd472
B 2a8f8f5ba4e57c6c487d59b7121689c60d7fa091
+B 2ac108e576444cfe3cd2516e5c5497ddc341ba3a
B 2b74eea72a3c163edc9614cd7db7c83c5884a4d0
B 2be20f00d61bdab039af20ae2e8fec66774f8425
B 2be3af700bcd3b956297dfe925546faccb60ef0b
@@ -325,6 +331,7 @@ B 454497ab9982c83df701947722f1e3517bb7ccc0
B 454f9f6474f65a104d595f31cab82443d810b84b
B 456a272838adbc1b5d49c52dd245de1102faeaf1
B 4599dd5c361d70a46b615abf7a2babba87b0c344
+B 45a3613af7ff2b5aa9e478d4520ed1d9e180d80a
B 45eb558a898cc8db3f200f0ce8063eae8736b509
B 4645e4c2353cfafda34efe3b2d1baf91cb3e367d
B 4649faa2b868cf72ab785159a95955a42c2b2228
@@ -334,6 +341,7 @@ B 46f03d423f22dfa8533d7b08cc1356a7fa31504f
B 47aaa2087037c945b04ca46f94bd909082084478
B 47b65bfdb351696ee9f30847cd380c2a3a7ec886
B 47f524504a0d11f6183811848d24762d98ee6849
+B 48a8a1511294da9ff8d0e7827be40cd442b66a82
B 48c7f6523425dcbef35312cdcafa5408d39cc02a
B 48ece1f5e64aeb60882175888d3c951c3f06f009
B 48f3aea57bafaa70abfa94411e81a374e58b5abe
@@ -357,6 +365,7 @@ B 4b8bbe90e5a7629709b027da711e0a82b87e9f70
B 4ba78268ef7a6424bec9a8733fb4fd886b833271
B 4bf1ec021bdae5d3df9acf3e7241750569e060e4
B 4d02e15acdd651acd16874afea8dc9459469cb0e
+B 4d25dac911bb6a0e20838a2c134efc37217d7c8f
B 4ddb76c33e9f46f042645edbeac95a016aa415f0
B 4de31b6f878b52bb5b5a3a5f80509927fcb5a0e5
B 4df9abc38ce4fb6f96f39c7665bf8fa9193e06df
@@ -364,6 +373,7 @@ B 4e7f300c82231e0e809c577d22e84356fad593fb
B 4ef80fa4b976418c79dc7f888ce0da99315baa4b
B 4f13fedb889f9d965d744bc29d77e336c4151754
B 4f25c908f4060c322f793aec75d195d2f73a69d0
+B 4f3d9d8b8420dea525fbe533b3afdbd993fdd461
B 4fa150005b1fa9015a967fd79ea4b6081eb5fd7b
B 4faeb62fdcf7f0d9fd7f03af2c427d1ba6632d16
B 4fb857da8bfa6656bb3430708126c7aab54670bb
@@ -440,8 +450,10 @@ B 5dcb82b132f73959142ee2c5ce25d59fe412c5d4
B 5dd93963384a9b6d20bb13ab18bf47254932dfc4
B 5e83949b37684d64f823e38c803c32b41150cd08
B 5e8836c429086c61b3fdf13408807c3992335594
+B 5ee12626b7a35cbdaeab31f4dc87226e4fcef1dc
B 5eea93321f5e6041df90ebf8f11ef055c112a31d
B 5f5159ecf2b4c5ae3a70b04247fa1beebb93d3f5
+B 5f76a53165b4136e70a72065105b872ea5719177
B 5f80dd9c9a47470f8e01c741de5beb97995d312b
B 5f8e29289710f6356fce6ce7d9ce44ba14561f3f
B 5f942c330b1eafca3f5bc1be5d6a0a6e77610154
@@ -452,6 +464,7 @@ B 60262166d5b883140d96c0509f96e325a6bfb7ab
B 60293bdc27cd0e5d8d583fc1098775152af3f27d
B 60495f745c7105990ae902d0af7109b3a881c031
B 6072169c69a8afade4d74b455412de7f18fb8cd6
+B 60859f04223d5236f5d46d921710ce281cd7604d
B 60874ad0a431cc8be8e37904a9246c3a4275512b
B 60f696e40b9d2aca38c6efa6519b730a30998717
B 6120e9bced102b712d8487fffe9778cea59248cf
@@ -544,6 +557,7 @@ B 76731c9763173735bb4faa63776783fa091eb7e5
B 769c5746b221dfb1931a00e80fb7964799d10847
B 76c8ab51e66a2caa0b20d30e84984e490eb48c50
B 76e5171e238435ea03e05ab9bc8ad3221f07cebe
+B 76efa97ccd729b875e8bda6301608c7481c35677
B 7724906d0d2b067b37cc6e02c0e327d27e882e8b
B 772e376aba9fe5c76f60211d8b0c415102f3111d
B 77513ae3d6657d0adddd5515f194049562a39588
@@ -605,6 +619,7 @@ B 823c4fb2cfd0a686758ce7bf88bf10e107853f13
B 8254c29c201ab8431061c70068f758953c855e51
B 827cf6bef453cdeae1433fb8c69956ee164388c2
B 82cc52c324701e52b9cd98e2774a6eb56e332582
+B 8328d99da1e19c262faf665de0a471e5b7177f15
B 837683b3d8e224426e91aed00a58bc338b12ca9b
B 83a9b3fe77c8f216a21153824a837e3e3030c9a2
B 83ffeeb71c107d1f0377b27e2d0ac6cb0b009e3f
@@ -613,6 +628,7 @@ B 842d13a68325300b07fbe6903f02a9e4e0b6fb7e
B 843a762d86a986d978aa64fb0aac70797e5f09bc
B 8459bc9b4de588f0c854eba39efd04aeb566ebf7
B 8459f1af9650461fc11f27a57e813a29cd54aabd
+B 849272170debf5f4c1466e52a685dfc5d3add2ed
B 84c6bac409d08b4b3b4e4e3d040d9382f59216e8
B 85677e055e5e0bb5a77f7724c86df3205852a9c6
B 85d68d1482d82b30682ecb60b3c50b2c74da2229
@@ -638,6 +654,7 @@ B 88f22b6c58766a5dc2ee9abd2c7dda188228a22f
B 890389dd26ba329159841e18236e757929704b84
B 897b73a9c9a2d1fcc6978ddac79845341b79d4c9
B 8980b441150fc808f59ab1b55c3537c9f3094bb8
+B 89cbc3b62f24c85052e370e4cd3b532c998a866d
B 89e89f07770c7ced22b30ac52d4881deadc21b78
B 8a41e9cfe3ea384783f044b6a5141e7c72dbddc7
B 8a71d5274036f0db33825e14485edccd7db1bbcc
@@ -673,11 +690,13 @@ B 8f82a3e23cc6374c8c0f0b9f14f7f92c0ae4d92c
B 8f9ebaffa881ed01697362d7bbc48fb1b39bcaa7
B 900e9ad9ace305bfa939b63e7a10c436e2e0cd9b
B 9082d0400b5ce5d1b30b51eeec96e0df8ba70454
+B 9132cb69d0fa73637eec3b9e0bad17033e132660
B 91756acf166ded54deb94d90ef2a019f37efd652
B 9194763e3d1ffd6e8465e6afee8a15cb51a7d900
B 91f47fce8131e774850a44a69dfd3ca05b80f4cd
B 92012100d841d4c34a105a7837402a3e6f113a92
B 9209bf633d6ba51bec2282a35b5d2f938cb5ab58
+B 921883b26f13fcfbbabceea3af760505c2471c86
B 921d443a00757cb94265633692e4f6af74a2c714
B 922a3f7514b9f114aee3d6c2d79bdf8c1999a93c
B 92ebf486c4a92949fe586cbb7d0d8341707960ca
@@ -692,6 +711,7 @@ B 94bce804163fa41f38f7e5f405110ec4e357b4e6
B 94c6412a78f6c305f622ee8fce86ff1d99cc1482
B 951cf567cfc4728349e8cf65dc8e52506ea3c2cc
B 953a19f30b03a28c2d9f3fe103e8cbfe86b1c10b
+B 95743fcfceee9838a86b4b5324124256198fd4e5
B 95808e949c94fb93acac68bc920fe0cf7a5914b3
B 9586069428922afc4fcad88f1454022f0a23e6df
B 95a4363b138a9e90e667b4ac60fdff9f064ad7e2
@@ -722,6 +742,7 @@ B 9a8a73d6aadf05f2be44841c06701807e6283911
B 9ab6680aabecc499b87b153a1f27f47c5d966c0a
B 9b1e8d18ffed22e5bb0430cacdc0adda0aabfd61
B 9b2360a1a1144913b263817daaa43c8a9ba672d0
+B 9b5b62e1dc8048cfd36c3d8621de80da55df562f
B 9b8a31ea49a7bd07960fbac62a7742f866d5fb02
B 9b9ae9947f5035c0d2b26f8dccfd2a5bc5968509
B 9ba60073a0e9defecc6a7c92132be9c671cb760d
@@ -730,6 +751,7 @@ B 9bb2439c4a4b7d0d95e12d189d50a5d205f17f79
B 9c48927cc5109c85d913a0b1f21c9abaa9f9b66d
B 9c608f6cc6676f0a4cb8b58ea0b63c1033bdce34
B 9c68a29bcdd5ad254a10b537315b0eb9277c4a4f
+B 9cba7b8f14ad22c2483ff86b12eb0245bd1b0d74
B 9d387a1e4ba26857d94ba1d381c1e778851f22ca
B 9d4f600f061f30915ad12458943c7ce0059cb454
B 9d6204e8d1e01d24944be5b6db518155b3f87892
@@ -760,8 +782,10 @@ B a19c6daa35c016d91c5a9aa37f3168e08e087bf7
B a1a4a855b37403159e90ec7c371a316f939d47b8
B a22756c5d0d85106d89e3255dd1a939130fc6c1c
B a2429232674ae059005b8d6bdc93bc1e3b25239c
+B a270ae2f92a650934d130db34238de36f550160a
B a27c27effa1fcb5b2bd218cd4b12cb5800b9972d
B a2882db28acff0aa5f5bfe6d552e3dc8fb4ffc4c
+B a2cfbf0cb1d5e9f7a71204a504db847d1b2b1def
B a390021cba3d9235bd0be34ee8dc954b6dbd99da
B a3d5ad37d1ad089b6342bdc946cbacabf36ec47e
B a3e3b776cc31ff2b50fdfcbf3a5574291f1be2de
@@ -788,6 +812,7 @@ B a809e1193b8df4eb4d57ccf49379554ab5b137ed
B a80b1f5852b156fc2956cbab9ba97af87888e64c
B a82725cdfdafef00bac0348d2d06c33db4e1790c
B a8397b7959da85cc1f0356cbfc50b20ca74d684b
+B a84a73b9b743fa229aa7ec4b3c22c185b7c6fe2c
B a8897484fcf3b77b079b9b7ac6f7050824245185
B a946e7080722020c49d41bc43821d6bba36f64e7
B a9b0745e5c5401cc58d4181d751d76460a82c258
@@ -852,11 +877,13 @@ B b5d74e98b4635a3feb3092e460babd496dd63dea
B b5fa6478c64f0c50361408f99dd7b02a71004e0c
B b612282510ceb074afef6094ac2a1467980dac16
B b6436430930ef11460538270836fe6cd5aa1fabb
+B b819dbbb2e1923881523cf89f4faa8489d725a61
B b85c6a1c3418796e5c142956c4f2662e1ad9502a
B b8669c9a39b4d6c8e178fe0303afbaff92323735
B b86d56a10d41f3e470db2105775aec2b16178628
B b8700e9305c0e201ab694aecd0e1dcceb0cdc9a6
B b8d1d726c9dfa128b8227d66f157b14fe697da6f
+B b8e446921d5476bb59b19c7a47a7608fe88df64e
B b8eb4c0667056920e700d90c421beb0d0fdde6e3
B b90489c9093ea83daa95401ed4f04301af17b9f0
B b911f54c3cc32038777174331acba3154afd4ea7
@@ -903,8 +930,10 @@ B c1116be5d11ef7324d04df924124c98322f8658f
B c179b02226f3d51363fd31df4f0401d9169fabf9
B c199bc9d47cd128fda414f54fda108e173c5f176
B c220e2da5fe3716849e795be2ab4f4e591e8cc0b
+B c23e47661c4cde048558a8e4e52fca20910e4e64
B c255690ed45da94e31bbd19ece972f0080c2d84c
B c28ea344009825fec39d2c006d59b5f6966ac444
+B c296f50698fef48bd3fc5bc52e4114325cb71384
B c2c50191caf5a7e892bee26d9597652390618221
B c2c9ced19b5acab856e4ef81a2c9e62ca9e14c2d
B c31a0c29f07eb66734cc0457130e655faf5248ec
@@ -912,6 +941,7 @@ B c34f8d5737d77fc1f2e3926217799bbb499d4a0a
B c394bd1dbab8fbef94db1365db77feb486450513
B c3d45a7f2a13c0916cb3ae990dcb7aea8934944d
B c3e4c694dce24504edf6a3a22650a0e162e163a3
+B c428da81fe3d998ec734c235cfa2768933831949
B c448592ef62960ed158fb7b52d39bd8aeb150801
B c4b1360e01b689eb588b36e7cfaccb8b4ea86919
B c4c2b7a1088c5d18a41b0814191e6a4aa55ff573
@@ -925,6 +955,7 @@ B c5ede8a9f93bf96d056b6ec34462a8e8c42c1a89
B c5ff01a14b9396336c4fe1b939bda7efdd896547
B c6060bf6efecffa40e462b24a99ce1f92a7780bc
B c61bff324caed93317bdd07cbb0849456e049c63
+B c651e2671edeace288e555316d136a7113f0127e
B c6878bb4ca69aa4cec4282133926ba6434d3d6be
B c6c6ebfbedbd245c69a889a9547761070a28fc65
B c729193dd87698c7e499281ab7e33654f9f8c8f4
@@ -941,6 +972,7 @@ B ca073fed5c302bbb562a49d2c20fac90e6e78200
B ca1b494188c00a9053dd68913161de143e8e62e2
B ca38df201a2d716e038887cb6f781797328066e8
B ca3bb54fb7ad6fd5832b88c16efad959d24cafcc
+B ca5058af10c2cb3f35dbb47dce87d0509706da78
B cac4498e290beec6a4e9d643533ff25c97eb7a0d
B cac7cc2d1d164a1e3ddebe8f7161d872354e2e7c
B cafcf06d77f90ac3a80de1dfda9a4301dad7bbc5
@@ -982,6 +1014,7 @@ B d3200b1a766e7e65ca61cff70827f785dbab3925
B d32a83895a9d5d643c2953f2d7e002113d57c459
B d3962f78c52bcee36bb14ca97bbe03f111367637
B d3aa4f3a09a8643d69cf7c1406e0d726e67e51c9
+B d41a1a123350c34521db9134615da20fe11cab5b
B d479c1b40f1f5d39d018cf808ebbdf7331c8f816
B d4d674cb26679597760e6275a43c53a702ba0ab9
B d501a7707fe3b013c5a6d7e66d1c6f3fa6a59264
@@ -989,6 +1022,7 @@ B d504ce8a300ab15d4dc768a12a2cb73d8e7507b7
B d524ecdc529792413504392dad4ab366352c6f2b
B d52cb6d88f009238f99c6599ab072e4f56eafb92
B d53e7d6d1fc9091d8a552b537fd7a230a60e1ba2
+B d5621a999d519226b04616b0459703426515d6c5
B d5a2e4924637f56a519ddf8606309111a6523521
B d5b1958457786b85799ca0b7b6d721608ad2f3d5
B d604b4fcf1ce4236cde113a60490c5e2b08acf79
@@ -1057,15 +1091,18 @@ B e24fef56395195f75eff1e2076a0e5131f088cc9
B e2e88fd9141c6b6388c186a9b0e0d53032ddd8d7
B e2f04b39628e38c0b8bbe1c87371c9b008aab79e
B e2fed9f289e92b0674858d6652adb05c846cfb05
+B e33448ad1086c86fb510e9b2d3a24c60b35de677
B e34d368d968d0b0ead3e59d07cfc733d808683c1
B e35d6f58c19c1299be3519aca498895d73d9477d
B e381ecf5be337336fe53f0824b0ef68c1a638629
+B e38d311fe3ae584f6860c915ea894f9fb215fc86
B e395689b5d391ed304316066a5d950d9eb0afe3c
B e3ba10fe917ba42a23007171d1e19e502dd0e0ee
B e40c8e25f447f6a8cec76d3814913d62721abe72
B e42376884aa2d0041a02734e5bf7d4a901baa401
B e43c0580f853ec6f082a2158a8ec72bf37835750
B e4fdf3c606799ca2fea34de15458fe1eb1d18674
+B e5014f1beab3a430b6c9b88adb179e0fede7625b
B e541fe75e9f1bddea016c82ea38b86d21f8e7ca5
B e57048934c8d235a354a0290feace8f6983b98f3
B e6621b2939fa6b639198ae9b62ed052567f6c5f1
@@ -1104,6 +1141,7 @@ B edb511d80d8d2da5dbc7cbac11b163220af7159e
B edf7fa420cc93a4eb076f5e88fdaffbf54a71032
B ee2b03d12f4ff1f8561c8f5c6f0b32b5ffa89367
B ee43b2eafd017f46ce5d6a9321ef542db9f7f5a1
+B ee86e43a482378d76ceeb629d72f496b27869149
B ee8f8ad0a794d0cde8de016ebccd43a2c79f404c
B ee945ff2ea8baa33a24e498b93e46f46b6bb163a
B eea391ab15742c2eb26cace2034554a77508287e
@@ -1163,6 +1201,7 @@ B fc97f90c306db66b88b1055cc4407a52243e5561
B fd02dad09d7f6bc6aeab653c100f802d909dff7e
B fd4954169cda9f3df5f0200f8f892c40c6c9ac98
B fd543c398a25cc0babd0ff0799fbb757cde39dee
+B fd7d6ef8a24a1e527d2796d6940a97dec4d59cef
B fdd9c970719cb73084dc442068658d53641d05b2
B fe3049201ca1271ae6d7f0e5a54bb0836a719f62
B fe6e0e04c0d883a3480f4d5c7d24339e6b2dbf6b
@@ -1255,11 +1294,13 @@ M 2f9206f16fd208d4dc53a92b8fa6221332969d78
M 2f9bf7eabb2a8aa2a6902874aecf5fa6bbb0abc8
M 2fd918fa09661bde8b2115dab40f3e2316937f4b
M 2feb3b1903bddd76fe3a258620931cd2acca4c8f
+M 3248da800fdf25f5bd962b962b7ff2d9d98cd225
M 3297929347a65f25bd94a129b1ad17a1c944eda6
M 32d96f051dad120a70fd628f43753426eff6aa2f
M 33471ad43675421745effe83cc43c9304d9117b8
M 33e0f164e0c2221ad03ac24f1e4963751846d890
M 34e11ae3abe5c95c27cfdb2c089cc9d48936edf7
+M 34f2ec94fb8c8d514ad97c77e0a7e7a161253276
M 353771670f917714c8370a5bf45c298649622c69
M 355c4d8b1ddad74fd209f31630e6e93e15168870
M 35a4abda4b235632b75b40879f71d8a1d27f4fcc
@@ -1267,9 +1308,11 @@ M 364fba1ae623619c537ecaca1b9de8013b1c0d68
M 36b1517adb23005f30407aa45320c3956786198d
M 379524376276a740503afdf96aa1fd8ce6b56d0f
M 38b67b00134f227561f9185a28d105e055e7a0f0
+M 3997e7ad2ab3a696cef8b1d13cf3af0066604e91
M 39e481039d93d9d875cc4bfead535ee277901f4a
M 3a2660a17966786c443872c9b5a1b1d62d1353b2
M 3a42178d780ad7c48384ced0299fe8d601f7f903
+M 3a6daf70abc2b1fbddc009183bf2e794a4f869d0
M 3ad2d30a334b337a0695bf3ffce6b570c3cc7b84
M 3b894ea383ae2a221122235e3381dfdd91e25115
M 3bd07a2c94541fa4265a98bfc3899d1b0be1974e
@@ -1308,6 +1351,7 @@ M 4e139f8a4d38dd63180c73065f9294f1e69c82f0
M 4f35d441a6a3d6ccf8238ed51c65388517393a46
M 4f7efd00a11c35153c035ac8d272ffd349b3bead
M 502b44aadfa60afef12d8c2a5c109e2d8421b661
+M 528cde38c42370b9647e1aef0543399e48a4e9f2
M 52b3090eae2e45a69d92866eead604d29ba63511
M 52f02faeec2a116c8eb3a4b62ebc79a10a7e11b6
M 5359a1be087463f9cdfff20191238974ba0b2089
@@ -1320,6 +1364,7 @@ M 57f407c3376e34af477dc6ca1210410c7f63c3de
M 58fb6f9f734d085dc6b8640b12123186eb128205
M 5b2b4e1616c25b0b5e61e36839cd6feac6e36cc0
M 5bdafd37b745f2adb257b26fc8df736c6e53275a
+M 5c3be52b14609cae3548f5f0cb24dac391b7de86
M 5d2d5ec98c1174d6a978591f0cd6e1596b5e1025
M 5f744f1afd16cbbbf4a2c876d0a2930b6a2a977d
M 5fc64329d888c7da6e40ddf4fff6b7ed3801082c
@@ -1378,6 +1423,7 @@ M 7af7c3336a662baa896c0547578dd01401eabb40
M 7b0f1fe34c9c01955c9cdb04ea8b60f23fdafb60
M 7b7a90790acfbb8817d76c713c5edd791c398ece
M 7bac6395aabbff3fbb4bd083ef8c8be7574bc5e4
+M 7c44ccddb359442b47d327bf8e65d2bac1cd1832
M 7cfc024a9df4ab3e3f21e1093ce77fecb5e38399
M 7da56cb443821b87c931e8bd67c9f4c07356d6c5
M 7df996104d1bc00853ffdee0caae03e7012655e0
@@ -1583,6 +1629,7 @@ M f02ee6bef0c5a2ec22c9b6834784dca78e07c7f0
M f03092295a836f5013561174224da38bbbb1dad3
M f1267fb4de853180748dcbe7dde684e1bcbe0bf3
M f273114cce5ff108ea3297881bea086e4cf60448
+M f27ee049a8ec6941650955ab4ebe3525ea59522a
M f2848323c0b395ca801fafac5988ac1823a161dc
M f2d4e70dd965fae72ba4d6f24bd20a1e1372a30e
M f34673c2db0b27bb33b6ffe770a3e3c52ba334b2
[2/4] git commit: Avoid going though URL creationg from String when
computing MTOM/XOP multipart messages' CID
Posted by dk...@apache.org.
Avoid going though URL creationg from String when computing MTOM/XOP multipart messages' CID
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/40359e56
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/40359e56
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/40359e56
Branch: refs/heads/2.6.x-fixes
Commit: 40359e56376f60e63b2cfa4930cb187c11e5e54d
Parents: 12e653e
Author: Alessio Soldano <as...@redhat.com>
Authored: Mon Jul 14 15:42:24 2014 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 14 11:06:35 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/cxf/attachment/AttachmentUtil.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/40359e56/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java b/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index bfbbf70..238d493 100644
--- a/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -202,13 +202,7 @@ public final class AttachmentUtil {
String name = ATT_UUID + "-" + String.valueOf(++counter);
if (ns != null && (ns.length() > 0)) {
- try {
- URI uri = new URI(ns);
- String host = uri.toURL().getHost();
- cid = host;
- } catch (Exception e) {
- cid = ns;
- }
+ cid = ns;
}
return URLEncoder.encode(name, "UTF-8") + "@" + URLEncoder.encode(cid, "UTF-8");
}