Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 900177666 for ; Thu, 28 Jul 2011 15:23:10 +0000 (UTC) Received: (qmail 50991 invoked by uid 500); 28 Jul 2011 15:23:10 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 50903 invoked by uid 500); 28 Jul 2011 15:23:10 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 50894 invoked by uid 99); 28 Jul 2011 15:23:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jul 2011 15:23:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jul 2011 15:23:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8DA6423889B3 for ; Thu, 28 Jul 2011 15:22:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1151894 [1/2] - in /cxf/trunk/common/common/src: main/java/org/apache/cxf/staxutils/transform/ test/java/org/apache/cxf/staxutils/resources/ test/java/org/apache/cxf/staxutils/transform/ Date: Thu, 28 Jul 2011 15:22:45 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110728152245.8DA6423889B3@eris.apache.org> Author: ay Date: Thu Jul 28 15:22:40 2011 New Revision: 1151894 URL: http://svn.apache.org/viewvc?rev=1151894&view=rev Log: [CXF-3692] enhacing inTransformReader's element features Added: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1nospace.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2nospace.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1nospace.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1partial.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2partial.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3partial.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq4partial.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn1.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn2.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn3.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn4.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReq.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn1.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn2.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn3.xml (with props) cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn4.xml (with props) Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java Added: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java (added) +++ cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java Thu Jul 28 15:22:40 2011 @@ -0,0 +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; + } +} Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java ------------------------------------------------------------------------------ svn:executable = * Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java?rev=1151894&r1=1151893&r2=1151894&view=diff ============================================================================== --- cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java (original) +++ cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java Thu Jul 28 15:22:40 2011 @@ -18,9 +18,15 @@ */ package org.apache.cxf.staxutils.transform; +import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; +import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.Stack; +import javax.xml.XMLConstants; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamConstants; @@ -34,25 +40,38 @@ public class InTransformReader extends D private static final String INTERN_NAMES = "org.codehaus.stax2.internNames"; private static final String INTERN_NS = "org.codehaus.stax2.internNsUris"; + private Stack elementStack = new Stack(); private QNamesMap inElementsMap; - private Map inAppendMap = new HashMap(5); + private QNamesMap inAttributesMap; + private Map inAppendMap = new HashMap(5); + private Set inDropSet = new HashSet(5); private Map nsMap = new HashMap(5); private QName currentQName; - private QName previousQName; + private QName pushBackQName; + private QName pushAheadQName; + private String currentText; + private String pushAheadText; + private List attributesIndexes = new ArrayList(); private int previousDepth = -1; private boolean blockOriginalReader = true; + private boolean attributesIndexed; private DelegatingNamespaceContext namespaceContext; - private boolean appendInProgress; - + public InTransformReader(XMLStreamReader reader, - Map inMap, + Map inEMap, Map appendMap, + List dropESet, + Map inAMap, boolean blockOriginalReader) { super(reader); - inElementsMap = new QNamesMap(inMap == null ? 0 : inMap.size()); + inElementsMap = new QNamesMap(inEMap == null ? 0 : inEMap.size()); + inAttributesMap = new QNamesMap(inAMap == null ? 0 : inAMap.size()); this.blockOriginalReader = blockOriginalReader; - TransformUtils.convertToQNamesMap(inMap, inElementsMap, nsMap); - TransformUtils.convertToMapOfQNames(appendMap, inAppendMap); + TransformUtils.convertToQNamesMap(inEMap, inElementsMap, nsMap); + TransformUtils.convertToQNamesMap(inAMap, inAttributesMap, null); + + TransformUtils.convertToMapOfElementProperties(appendMap, inAppendMap); + TransformUtils.convertToSetOfQNames(dropESet, inDropSet); namespaceContext = new DelegatingNamespaceContext( reader.getNamespaceContext(), nsMap); } @@ -65,19 +84,112 @@ public class InTransformReader extends D } public int next() throws XMLStreamException { - if (currentQName != null && appendInProgress) { - appendInProgress = false; + if (isAtText()) { + resetCurrentText(); + return currentText != null + ? XMLStreamConstants.CHARACTERS : XMLStreamConstants.END_ELEMENT; + } else if (isAtPushedQName()) { + resetCurrentQName(); + pushElement(); return XMLStreamConstants.START_ELEMENT; - } else if (previousDepth != -1 && previousDepth == getDepth() + 1) { + } else if (isAtMarkedDepth()) { previousDepth = -1; + popElement(); return XMLStreamConstants.END_ELEMENT; } else { - return super.next(); + final int event = super.next(); + if (event == XMLStreamConstants.START_ELEMENT) { + attributesIndexed = false; + final QName theName = super.getName(); + final ElementProperty appendProp = inAppendMap.remove(theName); + final boolean dropped = inDropSet.contains(theName); + if (appendProp != null) { + if (appendProp.isChild()) { + // append-post-* + pushAheadQName = appendProp.getName(); + } else { + // append-pre-* + currentQName = appendProp.getName(); + } + if (appendProp.getText() != null) { + // append-*-include + pushAheadText = appendProp.getText(); + } else { + // append-*-wrap + previousDepth = getDepth(); + pushElement(); + } + } else if (dropped) { + // unwrap the current element (shallow drop) + previousDepth = getDepth(); + return super.next(); + } + + QName expected = inElementsMap.get(theName); + if (expected == null) { + expected = theName; + } else if (isEmpty(expected)) { + // drop the current element (deep drop) + final int depth = getDepth(); + while (depth != getDepth() || super.next() != XMLStreamConstants.END_ELEMENT) { + // get to the matching end element event + } + popElement(); + return XMLStreamConstants.END_ELEMENT; + } + + if (appendProp != null && appendProp.isChild()) { + // append-post-* + currentQName = expected; + } else if (appendProp != null && !appendProp.isChild()) { + // append-pre-* + pushBackQName = expected; + } else { + // no append + currentQName = expected; + pushElement(); + } + } else if (event == XMLStreamConstants.END_ELEMENT) { + QName theName = super.getName(); + boolean dropped = inDropSet.contains(theName); + if (dropped) { + super.next(); + } + popElement(); + } else { + // reset the element context and content + currentQName = null; + currentText = null; + } + return event; } } + + private boolean isAtText() { + return pushAheadQName == null && (pushAheadText != null || currentText != null); + } + + private boolean isAtPushedQName() { + return pushBackQName != null || pushAheadQName != null; + } - public Object getProperty(String name) throws IllegalArgumentException { + private boolean isAtMarkedDepth() { + return previousDepth != -1 && previousDepth == getDepth() + 1; + } + + private boolean isEmpty(QName qname) { + return XMLConstants.NULL_NS_URI.equals(qname.getNamespaceURI()) && "".equals(qname.getLocalPart()); + } + + private void popElement() { + currentQName = elementStack.empty() ? null : elementStack.pop(); + } + + private void pushElement() { + elementStack.push(currentQName); + } + public Object getProperty(String name) throws IllegalArgumentException { if (INTERN_NAMES.equals(name) || INTERN_NS.equals(name)) { return Boolean.FALSE; } @@ -85,25 +197,24 @@ public class InTransformReader extends D } public String getLocalName() { - QName cQName = getCurrentName(); - if (cQName != null) { - String name = cQName.getLocalPart(); - resetCurrentQName(); - return name; + if (currentQName != null) { + return currentQName.getLocalPart(); + } else { + return super.getLocalName(); } - return super.getLocalName(); } - private QName getCurrentName() { - return currentQName != null ? currentQName - : previousQName != null ? previousQName : null; - } - private void resetCurrentQName() { - currentQName = previousQName; - previousQName = null; + currentQName = pushBackQName != null ? pushBackQName : pushAheadQName; + pushBackQName = null; + pushAheadQName = null; } + private void resetCurrentText() { + currentText = pushAheadText; + pushAheadText = null; + } + public NamespaceContext getNamespaceContext() { return namespaceContext; } @@ -138,24 +249,13 @@ public class InTransformReader extends D } public String getNamespaceURI() { - - QName theName = readCurrentElement(); - QName appendQName = inAppendMap.remove(theName); - if (appendQName != null) { - appendInProgress = true; - previousDepth = getDepth(); - previousQName = theName; - currentQName = appendQName; + if (currentQName != null) { return currentQName.getNamespaceURI(); + } else { + return super.getNamespaceURI(); } - QName expected = inElementsMap.get(theName); - if (expected == null) { - return theName.getNamespaceURI(); - } - currentQName = expected; - return currentQName.getNamespaceURI(); } - + private QName readCurrentElement() { if (currentQName != null) { return currentQName; @@ -169,4 +269,149 @@ public class InTransformReader extends D public QName getName() { return new QName(getNamespaceURI(), getLocalName()); } + + public int getAttributeCount() { + if (pushBackQName != null) { + return 0; + } + checkAttributeIndexRange(-1); + return attributesIndexes.size(); + } + + public String getAttributeLocalName(int arg0) { + if (pushBackQName != null) { + throwIndexException(arg0, 0); + } + checkAttributeIndexRange(arg0); + + return getAttributeName(arg0).getLocalPart(); + } + + public QName getAttributeName(int arg0) { + if (pushBackQName != null) { + throwIndexException(arg0, 0); + } + checkAttributeIndexRange(arg0); + QName aname = super.getAttributeName(attributesIndexes.get(arg0)); + QName expected = inAttributesMap.get(aname); + + return expected == null ? aname : expected; + } + + public String getAttributeNamespace(int arg0) { + if (pushBackQName != null) { + throwIndexException(arg0, 0); + } + checkAttributeIndexRange(arg0); + + return getAttributeName(arg0).getNamespaceURI(); + } + + public String getAttributePrefix(int arg0) { + if (pushBackQName != null) { + throwIndexException(arg0, 0); + } + checkAttributeIndexRange(arg0); + + QName aname = getAttributeName(arg0); + if (XMLConstants.NULL_NS_URI.equals(aname.getNamespaceURI())) { + return ""; + } else { + String actualNs = nsMap.get(aname.getNamespaceURI()); + if (actualNs != null) { + return namespaceContext.findUniquePrefix(actualNs); + } else { + return namespaceContext.getPrefix(aname.getNamespaceURI()); + } + } + } + + public String getAttributeType(int arg0) { + if (pushBackQName != null) { + throwIndexException(arg0, 0); + } + checkAttributeIndexRange(arg0); + return super.getAttributeType(attributesIndexes.get(arg0)); + } + + public String getAttributeValue(int arg0) { + if (pushBackQName != null) { + throwIndexException(arg0, 0); + } + checkAttributeIndexRange(arg0); + return super.getAttributeValue(attributesIndexes.get(arg0)); + } + + public String getAttributeValue(String namespace, String localName) { + if (pushBackQName != null) { + return null; + } + checkAttributeIndexRange(-1); + //TODO need reverse lookup + return super.getAttributeValue(namespace, localName); + } + + public String getText() { + if (currentText != null) { + return currentText; + } + return super.getText(); + } + + public char[] getTextCharacters() { + if (currentText != null) { + return currentText.toCharArray(); + } + return super.getTextCharacters(); + } + + public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length) + throws XMLStreamException { + if (currentText != null) { + int len = currentText.length() - sourceStart; + if (len > length) { + len = length; + } + currentText.getChars(sourceStart, sourceStart + len, target, targetStart); + return len; + } + + return super.getTextCharacters(sourceStart, target, targetStart, length); + } + + public int getTextLength() { + if (currentText != null) { + return currentText.length(); + } + return super.getTextLength(); + } + + /** + * Checks the index range for the current attributes set. + * If the attributes are not indexed for the current element context, they + * will be indexed. + * @param index + */ + private void checkAttributeIndexRange(int index) { + if (!attributesIndexed) { + attributesIndexes.clear(); + final int c = super.getAttributeCount(); + for (int i = 0; i < c; i++) { + QName aname = super.getAttributeName(i); + QName expected = inAttributesMap.get(aname); + if (expected == null || !isEmpty(expected)) { + attributesIndexes.add(i); + } + } + attributesIndexed = true; + } + if (index >= attributesIndexes.size()) { + throwIndexException(index, attributesIndexes.size()); + } + } + + private void throwIndexException(int index, int size) { + throw new IllegalArgumentException("Invalid index " + index + + "; current element has only " + size + " attributes"); + } } Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java?rev=1151894&r1=1151893&r2=1151894&view=diff ============================================================================== --- cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java (original) +++ cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java Thu Jul 28 15:22:40 2011 @@ -51,4 +51,8 @@ class QNamesMap { } return null; } + + public int size() { + return index; + } } Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java?rev=1151894&r1=1151893&r2=1151894&view=diff ============================================================================== --- cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java (original) +++ cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java Thu Jul 28 15:22:40 2011 @@ -29,7 +29,6 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import org.apache.cxf.helpers.XMLUtils; -import org.apache.cxf.staxutils.StaxStreamFilter; import org.apache.cxf.staxutils.StaxUtils; public final class TransformUtils { @@ -66,15 +65,24 @@ public final class TransformUtils { Map inElementsMap, Map inAppendMap, boolean blockOriginalReader) { - if (inDropElements != null) { - Set dropElements = XMLUtils.convertStringsToQNames(inDropElements); - reader = StaxUtils.createFilteredReader(createNewReaderIfNeeded(reader, is), - new StaxStreamFilter(dropElements.toArray(new QName[]{}))); - } - if (inElementsMap != null || inAppendMap != null) { + return createTransformReaderIfNeeded(reader, is, + inDropElements, inElementsMap, inAppendMap, null, blockOriginalReader); + } + + public static XMLStreamReader createTransformReaderIfNeeded(XMLStreamReader reader, + InputStream is, + List inDropElements, + Map inElementsMap, + Map inAppendMap, + Map inAttributesMap, + boolean blockOriginalReader) { + if (inElementsMap != null || inAppendMap != null || inDropElements != null + || inAttributesMap != null) { reader = new InTransformReader(createNewReaderIfNeeded(reader, is), - inElementsMap, inAppendMap, blockOriginalReader); + inElementsMap, inAppendMap, inDropElements, + inAttributesMap, blockOriginalReader); } + return reader; } @@ -93,6 +101,9 @@ public final class TransformUtils { } } + /* + * @deprecated + */ protected static void convertToMapOfQNames(Map map, Map elementsMap) { if (map != null) { @@ -104,4 +115,44 @@ public final class TransformUtils { } } + static void convertToMapOfElementProperties(Map map, + Map elementsMap) { + if (map != null) { + for (Map.Entry entry : map.entrySet()) { + String key = entry.getKey(); + String value = entry.getValue(); + String text = null; + boolean child = false; + + // if the content delimiter is present in the value, extract the content + int d = value.indexOf('}'); + d = value.indexOf(':', d < 0 ? 0 : d); + if (d > 0) { + text = value.substring(d + 1); + value = value.substring(0, d); + } + + // if the trailer delimiter is present in the key, remove it + if (key.endsWith("/")) { + key = key.substring(0, key.length() - 1); + child = true; + } + QName lname = XMLUtils.convertStringToQName(key); + QName rname = XMLUtils.convertStringToQName(value); + + ElementProperty desc = new ElementProperty(rname, text, child); + elementsMap.put(lname, desc); + } + } + } + + protected static void convertToSetOfQNames(List set, + Set elementsSet) { + if (set != null) { + for (String entry : set) { + QName name = XMLUtils.convertStringToQName(entry); + elementsSet.add(name); + } + } + } } Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,25 @@ + + + + + 1 + 2 + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1nospace.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1nospace.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1nospace.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1nospace.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,20 @@ + + +12 Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1nospace.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,25 @@ + + + + + 1 + 2 + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2nospace.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2nospace.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2nospace.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2nospace.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,20 @@ + + +12 Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2nospace.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,26 @@ + + + + 1E5AY4ZG53H4AMC8QH82 + dandiephosblo-20 + + 0486411214 + + \ No newline at end of file Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1nospace.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1nospace.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1nospace.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1nospace.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,20 @@ + + +1E5AY4ZG53H4AMC8QH82dandiephosblo-200486411214 Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1nospace.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,38 @@ + + + + + + SIMULATION1 + + SomeComplexValue + + + + + + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1partial.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1partial.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1partial.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1partial.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,33 @@ + + + + + + SIMULATION1 + + SomeComplexValue + + + + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1partial.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,38 @@ + + + + + + SIMULATION1 + + SomeComplexValue + + + + + + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2partial.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2partial.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2partial.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2partial.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,33 @@ + + + + + + SIMULATION1 + + SomeComplexValue + + + + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2partial.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,38 @@ + + + + + + SIMULATION1 + + SomeComplexValue + + + + + + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3partial.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3partial.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3partial.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3partial.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,33 @@ + + + + + + SIMULATION1 + + SomeComplexValue + + + + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3partial.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq4partial.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq4partial.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq4partial.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq4partial.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,33 @@ + + + + + + SIMULATION1 + + SomeComplexValue + + + + + \ No newline at end of file Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq4partial.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn1.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn1.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn1.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn1.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,38 @@ + + + + + + SIMULATION1 + + SomeComplexValue + + + + + + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn1.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn2.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn2.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn2.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn2.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,38 @@ + + + + + + SIMULATION1 + + SomeComplexValue + + + + + + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn2.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn3.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn3.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn3.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn3.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,38 @@ + + + + + + SIMULATION1 + + SomeComplexValue + + + + + + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn3.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn4.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn4.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn4.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn4.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,38 @@ + + + + + + SIMULATION1 + + SomeComplexValue + + + + + + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn4.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReq.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReq.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReq.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReq.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,26 @@ + + + + + + one + + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReq.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn1.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn1.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn1.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn1.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,24 @@ + + + + + one + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn1.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn2.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn2.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn2.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn2.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,25 @@ + + + + + one + 2011-06-25 + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn2.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn3.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn3.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn3.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn3.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,26 @@ + + + + + + one + + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn3.xml ------------------------------------------------------------------------------ svn:executable = * Added: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn4.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn4.xml?rev=1151894&view=auto ============================================================================== --- cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn4.xml (added) +++ cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn4.xml Thu Jul 28 15:22:40 2011 @@ -0,0 +1,26 @@ + + + + + + one + + + Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn4.xml ------------------------------------------------------------------------------ svn:executable = *