Author: dkulp
Date: Fri Jul 29 13:17:30 2011
New Revision: 1152208
URL: http://svn.apache.org/viewvc?rev=1152208&view=rev
Log:
Merged revisions 1152000 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1152000 | ay | 2011-07-28 16:55:55 -0400 (Thu, 28 Jul 2011) | 1 line
reparing uninteded errors from previos commit for CXF-3692
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java?rev=1152208&r1=1152207&r2=1152208&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java
(original)
+++
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java
Fri Jul 29 13:17:30 2011
@@ -1,58 +1,58 @@
-/**
- * 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.staxutils.transform;
-
-import javax.xml.namespace.QName;
-
-/**
- *
- */
-class ElementProperty {
- private QName name;
- private String text;
- private boolean child;
-
- public ElementProperty(QName name, String text, boolean child) {
- this.name = name;
- this.text = text;
- this.child = child;
- }
-
- /**
- * @return Returns the name.
- */
- public QName getName() {
- return name;
- }
-
- /**
- * @return Returns the text.
- */
- public String getText() {
- return text;
- }
-
- /**
- * @return Returns the child.
- */
- public boolean isChild() {
- return child;
- }
-}
+/**
+ * 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.staxutils.transform;
+
+import javax.xml.namespace.QName;
+
+/**
+ *
+ */
+class ElementProperty {
+ private QName name;
+ private String text;
+ private boolean child;
+
+ public ElementProperty(QName name, String text, boolean child) {
+ this.name = name;
+ this.text = text;
+ this.child = child;
+ }
+
+ /**
+ * @return Returns the name.
+ */
+ public QName getName() {
+ return name;
+ }
+
+ /**
+ * @return Returns the text.
+ */
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * @return Returns the child.
+ */
+ public boolean isChild() {
+ return child;
+ }
+}
Modified:
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java?rev=1152208&r1=1152207&r2=1152208&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
(original)
+++
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
Fri Jul 29 13:17:30 2011
@@ -58,6 +58,14 @@ public class InTransformReader extends D
private DelegatingNamespaceContext namespaceContext;
public InTransformReader(XMLStreamReader reader,
+ Map<String, String> inMap,
+ Map<String, String> appendMap,
+ boolean blockOriginalReader) {
+
+ this(reader, inMap, appendMap, null, null, blockOriginalReader);
+ }
+
+ public InTransformReader(XMLStreamReader reader,
Map<String, String> inEMap,
Map<String, String> appendMap,
List<String> dropESet,
Modified:
cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java?rev=1152208&r1=1152207&r2=1152208&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
(original)
+++
cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
Fri Jul 29 13:17:30 2011
@@ -209,29 +209,6 @@ public class InTransformReaderTest exten
verifyReaders(filteredReader, reader2, false);
}
- @Test
- public void testReadPartial() throws Exception {
- XMLStreamReader reader =
- StaxUtils.createXMLStreamReader(
-
InTransformReader.class.getResourceAsStream("../resources/complexReqIn4.xml"));
-
- Map<String, String> inMap = new HashMap<String, String>();
- inMap.put("{http://cxf.apache.org/transform/header/element}*";,
- "{http://cxf.apache.org/transform/header/element}*";);
-
- // set the block original reader flag to true
- reader = new InTransformReader(reader,
- inMap, null, null,
- null, true);
-
- QName bodyTag = new QName("http://schemas.xmlsoap.org/soap/envelope/";,
"Body");
- PartialXMLStreamReader filteredReader = new
PartialXMLStreamReader(reader, bodyTag);
-
- XMLStreamReader reader2 =
- StaxUtils.createXMLStreamReader(
-
InTransformReader.class.getResourceAsStream("../resources/complexReq4partial.xml"));
- verifyReaders(filteredReader, reader2, false);
- }
@Test
public void testReadWithRepaceAppend() throws Exception {
@@ -356,7 +333,7 @@ public class InTransformReaderTest exten
}
@Test
- public void testReadWithAppendPostWrap() throws Exception {
+ public void testReadWithAppendPostWrap1() throws Exception {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://www.w3.org/2003/05/soap-envelope}Body/";,
"{http://apache.org/cxf/calculator/types}add";);
@@ -410,14 +387,6 @@ public class InTransformReaderTest exten
*/
private void verifyReaders(XMLStreamReader reader, XMLStreamReader
teacher,
boolean eec) throws XMLStreamException {
- /*
- if (true) {
- System.out.println(">>>>>>>>>");
- StaxUtils.copy(reader, System.out);
- System.out.println("<<<<<<<<<");
- return;
- }
- */
// compare the elements and attributes while ignoring comments, line
breaks, etc
for (;;) {
int revent = getNextEvent(reader);
