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/05/02 01:49:24 UTC
[1/2] git commit: [CXF-5679,
CXF-5724] Fix some usage of the "fragment" flag to staxutils.copy and
make it properly handle a fragment.
Repository: cxf
Updated Branches:
refs/heads/master e4801064a -> 021646df4
[CXF-5679, CXF-5724] Fix some usage of the "fragment" flag to staxutils.copy and make it properly handle a fragment.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/021646df
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/021646df
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/021646df
Branch: refs/heads/master
Commit: 021646df45517d2c06680e20da050f8ebe424a26
Parents: 8cae156
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu May 1 19:24:31 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu May 1 19:49:17 2014 -0400
----------------------------------------------------------------------
.../org/apache/cxf/staxutils/StaxUtils.java | 2 +-
.../org/apache/cxf/staxutils/StaxUtilsTest.java | 36 +++++++++++++++++++
.../cxf/binding/soap/saaj/ParseBodyTest.java | 37 +++-----------------
.../org/apache/cxf/xmlbeans/DataWriterImpl.java | 4 +--
.../handler/logical/LogicalMessageImpl.java | 2 +-
5 files changed, 45 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/021646df/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
index dae459b..624828a 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
@@ -736,7 +736,7 @@ public final class StaxUtils {
writer.writeEndElement();
}
read--;
- if (read <= 0 && !fragment) {
+ if (read <= 0 && fragment) {
return;
}
if (isThreshold && !countStack.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/021646df/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
index ff7a965..02e6503 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
@@ -364,4 +364,40 @@ public class StaxUtilsTest extends Assert {
// ignore
}
}
+
+ @Test
+ public void testCopyFromTheMiddle() throws Exception {
+ String innerXml =
+ "<inner>\n"
+ + "<body>body text here</body>\n"
+ + "</inner>";
+ String xml =
+ "<outer>\n"
+ + innerXml + "\n"
+ + "</outer>";
+
+ StringReader reader = new StringReader(xml);
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ dbf.setValidating(false);
+
+ Document doc = dbf.newDocumentBuilder().parse(new InputSource(reader));
+ Source source = new DOMSource(doc);
+
+ // Skip <outer>
+ XMLStreamReader sreader = StaxUtils.createXMLStreamReader(source);
+ while (!"inner".equals(sreader.getLocalName())) {
+ sreader.next();
+ }
+
+ StringWriter sw = new StringWriter();
+ XMLStreamWriter swriter = StaxUtils.createXMLStreamWriter(sw);
+
+ StaxUtils.copy(sreader, swriter, true, true);
+ swriter.flush();
+ swriter.close();
+
+ System.out.println(sw.toString());
+ assertEquals(innerXml, sw.toString());
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/021646df/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index b9d008a..4e8d5bc 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -48,29 +48,16 @@ public class ParseBodyTest extends Assert {
//System.out.println("Original[" + n + "]: " + data);
xmlReader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(data.getBytes("utf-8")));
- xmlReader.next();
- xmlReader.next();
-
+
+ //reader should be on the start element for the
+ assertEquals(XMLStreamReader.START_ELEMENT, xmlReader.next());
+ assertEquals("Body", xmlReader.getLocalName());
+
factory = MessageFactory.newInstance();
soapMessage = factory.createMessage();
}
@Test
- public void testUsingReadDocElementsData0() throws Exception {
- testUsingReadDocElements(0);
- }
-
- @Test
- public void testUsingReadDocElementsData1() throws Exception {
- testUsingReadDocElements(1);
- }
-
- @Test
- public void testUsingReadDocElementsData2() throws Exception {
- testUsingReadDocElements(2);
- }
-
- @Test
public void testUsingStaxUtilsCopyWithSAAJWriterData0() throws Exception {
testUsingStaxUtilsCopyWithSAAJWriter(0);
}
@@ -85,20 +72,6 @@ public class ParseBodyTest extends Assert {
testUsingStaxUtilsCopyWithSAAJWriter(2);
}
- private void testUsingReadDocElements(int n) throws Exception {
- prepare(n);
- StaxUtils.readDocElements(soapMessage.getSOAPPart().getEnvelope().getBody(), xmlReader, true, true);
-
- DOMSource bodySource = new DOMSource(soapMessage.getSOAPPart().getEnvelope().getBody());
- xmlReader = StaxUtils.createXMLStreamReader(bodySource);
-
- ByteArrayOutputStream buf = new ByteArrayOutputStream();
- StaxUtils.copy(xmlReader, buf);
- String result = buf.toString();
- //System.out.println("UsingReadDocElements: " + result);
- assertEquals(DATA[n], result);
- }
-
private void testUsingStaxUtilsCopyWithSAAJWriter(int n) throws Exception {
prepare(n);
StaxUtils.copy(xmlReader, new SAAJStreamWriter(soapMessage.getSOAPPart(), soapMessage.getSOAPPart()
http://git-wip-us.apache.org/repos/asf/cxf/blob/021646df/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java b/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java
index e3c7862..fdf2ed4 100755
--- a/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java
+++ b/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java
@@ -189,10 +189,10 @@ public class DataWriterImpl implements DataWriter<XMLStreamWriter> {
elementName.getNamespaceURI());
}
}
- StaxUtils.copy(reader, output, true);
+ StaxUtils.copy(reader, output, false);
output.writeEndElement();
} else {
- StaxUtils.copy(reader, output, true);
+ StaxUtils.copy(reader, output, false);
}
} else if (needToRender(part)) {
output.writeStartElement(part.getConcreteName().getNamespaceURI(),
http://git-wip-us.apache.org/repos/asf/cxf/blob/021646df/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
index be40829..f9895f7 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
@@ -102,7 +102,7 @@ public class LogicalMessageImpl implements LogicalMessage {
reader = message.getContent(XMLStreamReader.class);
//content must be an element thing, skip over any whitespace
StaxUtils.toNextTag(reader);
- StaxUtils.copy(reader, writer);
+ StaxUtils.copy(reader, writer, true);
source = new DOMSource(writer.getDocument().getDocumentElement());
reader = StaxUtils.createXMLStreamReader(writer.getDocument());
} catch (ParserConfigurationException e) {
[2/2] git commit: [CXF-5697] Minor updates to WHICH_JARS,
needs more updates for 3
Posted by dk...@apache.org.
[CXF-5697] Minor updates to WHICH_JARS, needs more updates for 3
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8cae156f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8cae156f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8cae156f
Branch: refs/heads/master
Commit: 8cae156f6297536f699ea64deac68e57d29acb14
Parents: e480106
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu May 1 14:26:54 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu May 1 19:49:17 2014 -0400
----------------------------------------------------------------------
distribution/src/main/release/lib/WHICH_JARS | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cae156f/distribution/src/main/release/lib/WHICH_JARS
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/lib/WHICH_JARS b/distribution/src/main/release/lib/WHICH_JARS
index a46b718..66197d9 100755
--- a/distribution/src/main/release/lib/WHICH_JARS
+++ b/distribution/src/main/release/lib/WHICH_JARS
@@ -20,16 +20,19 @@ The following jars are required for all CXF usage:
- geronimo-annotation.jar (Or the Sun equivalent) [6]
- geronimo-javamail.jar (Or the Sun equivalent) [6]
(MAY be able to remove javamail if you don't use any MTOM/SAAJ type things)
-- geronimo-stax-api.jar (Or the Sun equivalent) [6]
- neethi.jar
- jaxb-api.jar [6]
- jaxb-impl.jar (this is a [6] for normal runtime, but is required for
tooling and the dynamic clients)
-- XmlSchema.jar
-- woodstox-core-asl.jar [6] or another StAX implementation
-- stax2-api-3.0.1.jar [6] for woodstox above
+- xmlschema-core.jar
+- woodstox-core-asl.jar
+- stax2-api-3.0.1.jar
- wsdl4j.jar
+Note: woodstox and stax2-api can be removed if you set the
+"org.apache.cxf.stax.allowInsecureParser” system property to true. This
+is NOT recommended as it opens up various DOS attacks.
+
The following jars are required for XML catalog support:
- xml-resolver.jar
@@ -58,7 +61,7 @@ For XML Configuration support:
- FastInfoset.jar
For hosting web services within WARs while using Spring-based CXFServlet:
-- spring.web.jar
+- spring-web.jar
For standalone HTTP support:
- geronimo-servlet.jar
@@ -72,7 +75,7 @@ For XmlBeans databinding support:
- xmlbeans.jar
For WS-Security support:
-- bcprov-jdk15.jar
+- bcprov-jdk15.jar (optional depending on algorithms used)
- wss4j.jar
- xmlsec.jar
- ehcache-core.jar
@@ -89,7 +92,7 @@ For JAX-RS support:
- commons-codec.jar (Needed for Abdera)
- jaxen.jar (Needed for Abdera)
- axiom* (Needed for Abdera)
-- javax.ws.rs-apijar
+- javax.ws.rs-api.jar
- jettison.jar (Needed for JSON services only)
- oauth*.jar (Needed for OAuth support)
@@ -106,7 +109,7 @@ For the Async HTTP client transport
- httpasyncclient.jar
- httpcore.jar
- httpclient.jar
-- httpcore-nio-4.2.2.jar
+- httpcore-nio.jar
For CORBA support:
- antlr.jar
@@ -116,8 +119,8 @@ For JavaScript functionality:
For schema validation with the Aegis data binding.
- - msv-core.jar (version 2010.1)
- - xsdlib:jar (version 2010.1)
+ - msv-core.jar (version 2011.1)
+ - xsdlib.jar (version 2010.1)
- isorelax.jar (version 20030108)
- relaxngDatatype.jar (version 20020414)