cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r630381 [1/8] - in /incubator/cxf/trunk/rt: bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/ core/src/main/java/org/apache/cxf/databinding/source/mime/ core/src/main/java/org/apache/cxf/interceptor/ core/src/main/java/org/ap...
Date Sat, 23 Feb 2008 02:56:00 GMT
Author: dkulp
Date: Fri Feb 22 18:55:53 2008
New Revision: 630381

URL: http://svn.apache.org/viewvc?rev=630381&view=rev
Log:
svn properties for rt module

Modified:
    incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java   (props changed)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/CustomExtensionRegistry.java   (contents, props changed)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeAttribute.java   (contents, props changed)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java   (contents, props changed)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java   (contents, props changed)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java   (contents, props changed)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java   (contents, props changed)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java   (contents, props changed)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/UrlUtilities.java   (contents, props changed)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java   (props changed)
    incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java   (contents, props changed)
    incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/unqualified/UnqualifiedBean.java   (contents, props changed)
    incubator/cxf/trunk/rt/databinding/jaxb/src/test/resources/wsdl/jaxb/form_test.xsd   (contents, props changed)
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java   (contents, props changed)
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java   (contents, props changed)
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/util/ASMHelper.java   (contents, props changed)
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HelloWsa.java   (contents, props changed)
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java   (contents, props changed)
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java   (contents, props changed)
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbers.java   (contents, props changed)
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersImpl.java   (contents, props changed)
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/ProverImplTest.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/BasicNameManager.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptOptionsFeature.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptPrefix.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptPrefixes.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptQueryHandler.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptQueryHandlerRegistry.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/NameManager.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/XmlSchemaUtils.java   (props changed)
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/Messages.properties   (props changed)
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/types/Messages.properties   (props changed)
    incubator/cxf/trunk/rt/javascript/src/main/resources/META-INF/cxf/cxf-extension-javascript-client.xml   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsSimpleDomParser.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/BasicTypeFunctionReturnStringWrapper.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/BeanRequestWrapper.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitBare.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitBareImpl.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitWrapped.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/SimpleDocLitWrappedImpl.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/SimpleRPC.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/SimpleRPCImpl.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/StringWrapper.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java   (props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/TestBean2.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/TestBean3.java   (props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/package-info.html   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/package-info.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitBareClientTestBeans.xml   (props changed)
    incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml   (props changed)
    incubator/cxf/trunk/rt/javascript/src/test/resources/GreeterClientTestBeans.xml   (props changed)
    incubator/cxf/trunk/rt/javascript/src/test/resources/HelloWorldDocLitBeans.xml   (props changed)
    incubator/cxf/trunk/rt/javascript/src/test/resources/HelloWorldGreeterBeans.xml   (props changed)
    incubator/cxf/trunk/rt/javascript/src/test/resources/RPCClientTestBeans.xml   (props changed)
    incubator/cxf/trunk/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/XML_GreetMeDocLiteralReq.xml   (contents, props changed)
    incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/test.html   (props changed)
    incubator/cxf/trunk/rt/javascript/src/test/resources/serializationTestBeans.xml   (contents, props changed)
    incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/extensions.xml   (contents, props changed)
    incubator/cxf/trunk/rt/ws/addr/src/main/resources/schemas/ws-addr-wsdl.xjb   (contents, props changed)
    incubator/cxf/trunk/rt/ws/addr/src/main/resources/schemas/ws-addr-wsdl.xsd   (contents, props changed)

Propchange: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/CustomExtensionRegistry.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/CustomExtensionRegistry.java?rev=630381&r1=630380&r2=630381&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/CustomExtensionRegistry.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/CustomExtensionRegistry.java Fri Feb 22 18:55:53 2008
@@ -1,28 +1,28 @@
-/**
- * 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.databinding.source.mime;
-
-import org.apache.ws.commons.schema.extensions.ExtensionRegistry;
-
-public class CustomExtensionRegistry extends ExtensionRegistry {
-    public CustomExtensionRegistry() {
-        registerSerializer(MimeAttribute.class, new MimeSerializer());
-    }
-}
+/**
+ * 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.databinding.source.mime;
+
+import org.apache.ws.commons.schema.extensions.ExtensionRegistry;
+
+public class CustomExtensionRegistry extends ExtensionRegistry {
+    public CustomExtensionRegistry() {
+        registerSerializer(MimeAttribute.class, new MimeSerializer());
+    }
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/CustomExtensionRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/CustomExtensionRegistry.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeAttribute.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeAttribute.java?rev=630381&r1=630380&r2=630381&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeAttribute.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeAttribute.java Fri Feb 22 18:55:53 2008
@@ -1,37 +1,37 @@
-/**
- * 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.databinding.source.mime;
-
-import javax.xml.namespace.QName;
-
-public final class MimeAttribute {
-    public static final QName MIME_QNAME = new QName("http://www.w3.org/2005/05/xmlmime", 
-                                                     "expectedContentTypes");
-
-    private String value;
-    
-    public void setValue(String v) {
-        this.value = v;
-    }
-    
-    public String getValue() {
-        return this.value;
-    }
-
-}
+/**
+ * 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.databinding.source.mime;
+
+import javax.xml.namespace.QName;
+
+public final class MimeAttribute {
+    public static final QName MIME_QNAME = new QName("http://www.w3.org/2005/05/xmlmime", 
+                                                     "expectedContentTypes");
+
+    private String value;
+    
+    public void setValue(String v) {
+        this.value = v;
+    }
+    
+    public String getValue() {
+        return this.value;
+    }
+
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeAttribute.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeAttribute.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java?rev=630381&r1=630380&r2=630381&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java Fri Feb 22 18:55:53 2008
@@ -1,44 +1,44 @@
-/**
- * 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.databinding.source.mime;
-
-import java.util.Map;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.apache.ws.commons.schema.XmlSchemaObject;
-import org.apache.ws.commons.schema.extensions.ExtensionSerializer;
-
-public class MimeSerializer implements ExtensionSerializer {
-    
-    public void serialize(XmlSchemaObject schemaObject, Class classOfType, Node domNode) {
-        Map metaInfoMap = schemaObject.getMetaInfoMap();
-        MimeAttribute mimeType = (MimeAttribute)metaInfoMap.get(MimeAttribute.MIME_QNAME);
-
-        Element elt = (Element)domNode;
-        Attr att1 = elt.getOwnerDocument().createAttributeNS(MimeAttribute.MIME_QNAME.getNamespaceURI(),
-                                                             MimeAttribute.MIME_QNAME.getLocalPart());
-        att1.setValue(mimeType.getValue());
-        elt.setAttributeNodeNS(att1);
-    }
-
-}
+/**
+ * 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.databinding.source.mime;
+
+import java.util.Map;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import org.apache.ws.commons.schema.XmlSchemaObject;
+import org.apache.ws.commons.schema.extensions.ExtensionSerializer;
+
+public class MimeSerializer implements ExtensionSerializer {
+    
+    public void serialize(XmlSchemaObject schemaObject, Class classOfType, Node domNode) {
+        Map metaInfoMap = schemaObject.getMetaInfoMap();
+        MimeAttribute mimeType = (MimeAttribute)metaInfoMap.get(MimeAttribute.MIME_QNAME);
+
+        Element elt = (Element)domNode;
+        Attr att1 = elt.getOwnerDocument().createAttributeNS(MimeAttribute.MIME_QNAME.getNamespaceURI(),
+                                                             MimeAttribute.MIME_QNAME.getLocalPart());
+        att1.setValue(mimeType.getValue());
+        elt.setAttributeNodeNS(att1);
+    }
+
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java?rev=630381&r1=630380&r2=630381&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java Fri Feb 22 18:55:53 2008
@@ -1,69 +1,69 @@
-/**
- * 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.interceptor;
-
-public final class LoggingMessage {
-
-    private final String heading;
-
-    private final StringBuilder encoding;
-    private final StringBuilder header;
-    private final StringBuilder message;
-    private final StringBuilder payload;
-
-    public LoggingMessage(String h) {
-        heading = h;
-
-        encoding = new StringBuilder();
-        header = new StringBuilder();
-        message = new StringBuilder();
-        payload = new StringBuilder();
-    }
-
-    public StringBuilder getEncoding() {
-        return encoding;
-    }
-
-    public StringBuilder getHeader() {
-        return header;
-    }
-
-    public StringBuilder getMessage() {
-        return message;
-    }
-
-    public StringBuilder getPayload() {
-        return payload;
-    }
-
-    public String toString() {
-        StringBuilder buffer = new StringBuilder();
-        buffer.append(heading);
-        buffer.append("\nEncoding: ");
-        buffer.append(encoding);
-        buffer.append("\nHeaders: ");
-        buffer.append(header);
-        buffer.append("\nMessages: ");
-        buffer.append(message);
-        buffer.append("\nPayload: ");
-        buffer.append(payload);
-        buffer.append("\n--------------------------------------");
-        return buffer.toString();
-    }
+/**
+ * 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.interceptor;
+
+public final class LoggingMessage {
+
+    private final String heading;
+
+    private final StringBuilder encoding;
+    private final StringBuilder header;
+    private final StringBuilder message;
+    private final StringBuilder payload;
+
+    public LoggingMessage(String h) {
+        heading = h;
+
+        encoding = new StringBuilder();
+        header = new StringBuilder();
+        message = new StringBuilder();
+        payload = new StringBuilder();
+    }
+
+    public StringBuilder getEncoding() {
+        return encoding;
+    }
+
+    public StringBuilder getHeader() {
+        return header;
+    }
+
+    public StringBuilder getMessage() {
+        return message;
+    }
+
+    public StringBuilder getPayload() {
+        return payload;
+    }
+
+    public String toString() {
+        StringBuilder buffer = new StringBuilder();
+        buffer.append(heading);
+        buffer.append("\nEncoding: ");
+        buffer.append(encoding);
+        buffer.append("\nHeaders: ");
+        buffer.append(header);
+        buffer.append("\nMessages: ");
+        buffer.append(message);
+        buffer.append("\nPayload: ");
+        buffer.append(payload);
+        buffer.append("\n--------------------------------------");
+        return buffer.toString();
+    }
 }

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java?rev=630381&r1=630380&r2=630381&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java Fri Feb 22 18:55:53 2008
@@ -1,66 +1,66 @@
-/**
- * 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.service;
-
-import org.apache.cxf.common.xmlschema.InvalidXmlSchemaReferenceException;
-import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.service.model.MessagePartInfo;
-import org.apache.cxf.service.model.ServiceInfo;
-
-/**
- * 
- */
-public class ServiceModelSchemaValidator extends ServiceModelVisitor {
-    
-    private SchemaCollection schemaCollection;
-    private StringBuilder complaints;
-
-    public ServiceModelSchemaValidator(ServiceInfo serviceInfo) {
-        super(serviceInfo);
-        schemaCollection = serviceInfo.getXmlSchemaCollection();
-        complaints = new StringBuilder();
-    }
-    
-    public String getComplaints() {
-        return complaints.toString();
-    }
-
-    @Override
-    public void begin(MessagePartInfo part) {
-        // the unwrapped parts build for wrapped operations don't have real elements.
-        if (part.isElement() && !part.getMessageInfo().getOperation().isUnwrapped()) {
-            try {
-                schemaCollection.validateElementName(part.getName(), part.getElementQName());
-            } catch (InvalidXmlSchemaReferenceException ixsre) {
-                complaints.append(part.getName() + " part element name " + ixsre.getMessage() + "\n");
-            }
-        } else {
-            if (part.getTypeQName() == null) {
-                complaints.append(part.getName() + " part type QName null.\n");
-            } else {
-                try {
-                    schemaCollection.validateTypeName(part.getName(), part.getTypeQName());
-                } catch (InvalidXmlSchemaReferenceException ixsre) {
-                    complaints.append(part.getName() + " part type name " + ixsre.getMessage() + "\n");
-                }
-            }
-        }
-    }
-}
+/**
+ * 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.service;
+
+import org.apache.cxf.common.xmlschema.InvalidXmlSchemaReferenceException;
+import org.apache.cxf.common.xmlschema.SchemaCollection;
+import org.apache.cxf.service.model.MessagePartInfo;
+import org.apache.cxf.service.model.ServiceInfo;
+
+/**
+ * 
+ */
+public class ServiceModelSchemaValidator extends ServiceModelVisitor {
+    
+    private SchemaCollection schemaCollection;
+    private StringBuilder complaints;
+
+    public ServiceModelSchemaValidator(ServiceInfo serviceInfo) {
+        super(serviceInfo);
+        schemaCollection = serviceInfo.getXmlSchemaCollection();
+        complaints = new StringBuilder();
+    }
+    
+    public String getComplaints() {
+        return complaints.toString();
+    }
+
+    @Override
+    public void begin(MessagePartInfo part) {
+        // the unwrapped parts build for wrapped operations don't have real elements.
+        if (part.isElement() && !part.getMessageInfo().getOperation().isUnwrapped()) {
+            try {
+                schemaCollection.validateElementName(part.getName(), part.getElementQName());
+            } catch (InvalidXmlSchemaReferenceException ixsre) {
+                complaints.append(part.getName() + " part element name " + ixsre.getMessage() + "\n");
+            }
+        } else {
+            if (part.getTypeQName() == null) {
+                complaints.append(part.getName() + " part type QName null.\n");
+            } else {
+                try {
+                    schemaCollection.validateTypeName(part.getName(), part.getTypeQName());
+                } catch (InvalidXmlSchemaReferenceException ixsre) {
+                    complaints.append(part.getName() + " part type name " + ixsre.getMessage() + "\n");
+                }
+            }
+        }
+    }
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java?rev=630381&r1=630380&r2=630381&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java Fri Feb 22 18:55:53 2008
@@ -1,112 +1,112 @@
-/**
- * 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.test;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusException;
-import org.junit.After;
-import org.junit.Before;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-
-/**
- * Base class for tests that use a Spring bean specification to load up components for testing.
- * Unlike the classes that come with Spring, it doesn't drag in the JUnit 3 hierarchy, and it 
- * doesn't inject into the test itself from the beans.
- */
-public abstract class AbstractCXFSpringTest extends AbstractCXFTest {
-    // subvert JUnit. We want to set up the application context ONCE, since it
-    // is likely to include a Jetty or something else that we can't get rid of.
-    private static GenericApplicationContext applicationContext;
-    private DefaultResourceLoader resourceLoader;
-
-    /**
-     * Load up all the beans from the XML files returned by the getConfigLocations method.
-     * @throws Exception 
-     */
-    protected AbstractCXFSpringTest() throws Exception {
-    }
-    
-    @Before
-    public void setupBeans() throws Exception {
-        if (applicationContext != null) {
-            return;
-        }
-        applicationContext = new GenericApplicationContext();
-        resourceLoader = new DefaultResourceLoader(getClass().getClassLoader());
-        for (String beanDefinitionPath : getConfigLocations()) {
-            XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(applicationContext);
-            Resource resource = resourceLoader.getResource(beanDefinitionPath);
-            reader.loadBeanDefinitions(resource);
-        }
-        additionalSpringConfiguration(applicationContext);
-        applicationContext.refresh();
-        super.setUpBus();
-    }
-    
-    @Before
-    public void setUpBus() throws Exception {
-        // override the super before method
-    }
-    
-    public Bus createBus() throws BusException {        
-        return getBean(Bus.class, "cxf");
-    }
-    
-    @After
-    public void teardownBeans() {
-        applicationContext.close();
-        applicationContext.destroy();
-        applicationContext = null;
-    }
-    
-    /**
-     * Return an array of resource specifications. 
-     * @see org.springframework.core.io.DefaultResourceLoader for the syntax.
-     * @return array of resource specifications.
-     */
-    protected abstract String[] getConfigLocations();
-
-    protected ApplicationContext getApplicationContext() {
-        return applicationContext;
-    }
-    
-    /**
-     * subclasses may override this.
-     * @param context
-     * @throws Exception 
-     */
-    protected abstract void additionalSpringConfiguration(GenericApplicationContext context) throws Exception;
-
-    /**
-     * Convenience method for the common case of retrieving a bean from the context.
-     * One would expect Spring to have this. 
-     * @param <T> Type of the bean object.
-     * @param type Type of the bean object.
-     * @param beanName ID of the bean.
-     * @return The Bean.
-     */
-    protected <T> T getBean(Class<T> type, String beanName) {
-        return type.cast(applicationContext.getBean(beanName));
-    }
-}
+/**
+ * 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.test;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusException;
+import org.junit.After;
+import org.junit.Before;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.Resource;
+
+/**
+ * Base class for tests that use a Spring bean specification to load up components for testing.
+ * Unlike the classes that come with Spring, it doesn't drag in the JUnit 3 hierarchy, and it 
+ * doesn't inject into the test itself from the beans.
+ */
+public abstract class AbstractCXFSpringTest extends AbstractCXFTest {
+    // subvert JUnit. We want to set up the application context ONCE, since it
+    // is likely to include a Jetty or something else that we can't get rid of.
+    private static GenericApplicationContext applicationContext;
+    private DefaultResourceLoader resourceLoader;
+
+    /**
+     * Load up all the beans from the XML files returned by the getConfigLocations method.
+     * @throws Exception 
+     */
+    protected AbstractCXFSpringTest() throws Exception {
+    }
+    
+    @Before
+    public void setupBeans() throws Exception {
+        if (applicationContext != null) {
+            return;
+        }
+        applicationContext = new GenericApplicationContext();
+        resourceLoader = new DefaultResourceLoader(getClass().getClassLoader());
+        for (String beanDefinitionPath : getConfigLocations()) {
+            XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(applicationContext);
+            Resource resource = resourceLoader.getResource(beanDefinitionPath);
+            reader.loadBeanDefinitions(resource);
+        }
+        additionalSpringConfiguration(applicationContext);
+        applicationContext.refresh();
+        super.setUpBus();
+    }
+    
+    @Before
+    public void setUpBus() throws Exception {
+        // override the super before method
+    }
+    
+    public Bus createBus() throws BusException {        
+        return getBean(Bus.class, "cxf");
+    }
+    
+    @After
+    public void teardownBeans() {
+        applicationContext.close();
+        applicationContext.destroy();
+        applicationContext = null;
+    }
+    
+    /**
+     * Return an array of resource specifications. 
+     * @see org.springframework.core.io.DefaultResourceLoader for the syntax.
+     * @return array of resource specifications.
+     */
+    protected abstract String[] getConfigLocations();
+
+    protected ApplicationContext getApplicationContext() {
+        return applicationContext;
+    }
+    
+    /**
+     * subclasses may override this.
+     * @param context
+     * @throws Exception 
+     */
+    protected abstract void additionalSpringConfiguration(GenericApplicationContext context) throws Exception;
+
+    /**
+     * Convenience method for the common case of retrieving a bean from the context.
+     * One would expect Spring to have this. 
+     * @param <T> Type of the bean object.
+     * @param type Type of the bean object.
+     * @param beanName ID of the bean.
+     * @return The Bean.
+     */
+    protected <T> T getBean(Class<T> type, String beanName) {
+        return type.cast(applicationContext.getBean(beanName));
+    }
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java?rev=630381&r1=630380&r2=630381&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java Fri Feb 22 18:55:53 2008
@@ -1,423 +1,423 @@
-/**
- * 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.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.xml.sax.SAXParseException;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.endpoint.ServerRegistry;
-import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.service.Service;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.test.AbstractCXFTest.TestMessageObserver;
-import org.apache.cxf.transport.Conduit;
-import org.apache.cxf.transport.ConduitInitiator;
-import org.apache.cxf.transport.ConduitInitiatorManager;
-import org.apache.cxf.transport.MessageObserver;
-import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
-
-/**
- * This class provides unit test support for tests that look at generated WSDL
- * contents, as well as some test methods for invoking services.
- */
-public class TestUtilities {
-    
-    private static final Charset UTF8 = Charset.forName("utf-8");
-    private static String preKeepAlive;
-    private static String basedirPath;
-    protected Bus bus;
-    protected Class<?> classpathAnchor;
-    private XMLInputFactory xmlInputFactory;
-
-    /**
-     * Namespaces for the XPath expressions.
-     */
-    private Map<String, String> namespaces = new HashMap<String, String>();
-
-    /**
-     * This class provides utilities to several conflicting inheritance stacks
-     * of test support. Thus, it can't be a base class, and so can't use
-     * getClass() to find resources. Users should pass getClass() to this
-     * constructor instead.
-     * 
-     * @param classpathReference
-     */
-    public TestUtilities(Class<?> classpathReference) {
-        classpathAnchor = classpathReference;
-        xmlInputFactory = XMLInputFactory.newInstance();
-    }
-    
-    public static void setKeepAliveSystemProperty(boolean setAlive) {
-        preKeepAlive = System.getProperty("http.keepAlive");
-        System.setProperty("http.keepAlive", Boolean.toString(setAlive));
-    }
-    
-    public static void recoverKeepAliveSystemProperty() {
-        if (preKeepAlive != null) {
-            System.setProperty("http.keepAlive", preKeepAlive);
-        } else {
-            System.clearProperty("http.keepAlive");
-        }
-    }
-
-    public void addDefaultNamespaces() {
-        addNamespace("s", "http://schemas.xmlsoap.org/soap/envelope/");
-        addNamespace("xsd", "http://www.w3.org/2001/XMLSchema");
-        addNamespace("wsdl", "http://schemas.xmlsoap.org/wsdl/");
-        addNamespace("wsdlsoap", "http://schemas.xmlsoap.org/wsdl/soap/");
-        addNamespace("soap", "http://schemas.xmlsoap.org/soap/");
-        addNamespace("soap12env", "http://www.w3.org/2003/05/soap-envelope");
-        addNamespace("xml", "http://www.w3.org/XML/1998/namespace");
-    }
-    
-    /**
-     * Handy function for checking correctness of qualifies names in schema attribute values.
-     * @param prefix
-     * @param node
-     * @return
-     * @throws Exception
-     */
-    public String resolveNamespacePrefix(String prefix, Node node) throws Exception {
-        String url = null;
-        NodeList nodeNamespaces = this.assertValid("namespace::*", node);
-        for (int x = 0; x < nodeNamespaces.getLength(); x++) {
-            Attr nsAttr = (Attr)nodeNamespaces.item(x);
-            String localName = nsAttr.getLocalName();
-            if (localName.equals(prefix)) {
-                url = nsAttr.getValue();
-                break;
-            }
-        }
-        return url;
-    }
-
-    /**
-     * Assert that the following XPath query selects one or more nodes.
-     * 
-     * @param xpath
-     * @throws Exception
-     */
-    public NodeList assertValid(String xpath, Node node) throws Exception {
-        return XPathAssert.assertValid(xpath, node, namespaces);
-    }
-    
-    /**
-     * Assert that the following XPath query selects a boolean value.
-     * 
-     * @param xpath
-     * @throws Exception
-     */
-    public boolean assertValidBoolean(String xpath, Node node) throws Exception {
-        return XPathAssert.assertValidBoolean(xpath, node, namespaces);
-    }
-
-
-    /**
-     * Assert that the following XPath query selects no nodes.
-     * 
-     * @param xpath
-     */
-    public NodeList assertInvalid(String xpath, Node node) throws Exception {
-        return XPathAssert.assertInvalid(xpath, node, namespaces);
-    }
-
-    /**
-     * Assert that the text of the xpath node retrieved is equal to the value
-     * specified.
-     * 
-     * @param xpath
-     * @param value
-     * @param node
-     */
-    public void assertXPathEquals(String xpath, String value, Node node) throws Exception {
-        XPathAssert.assertXPathEquals(xpath, value, node, namespaces);
-    }
-
-    /**
-     * Assert that this node is not a Soap fault body.
-     * 
-     * @param node
-     * @throws Exception
-     */
-    public void assertNoFault(Node node) throws Exception {
-        XPathAssert.assertNoFault(node);
-    }
-
-    public byte[] invokeBytes(String address, String transport, String message) throws Exception {
-        EndpointInfo ei = new EndpointInfo(null, "http://schemas.xmlsoap.org/soap/http");
-        ei.setAddress(address);
-
-        ConduitInitiatorManager conduitMgr = getBus().getExtension(ConduitInitiatorManager.class);
-        ConduitInitiator conduitInit = conduitMgr.getConduitInitiator(transport);
-        Conduit conduit = conduitInit.getConduit(ei);
-
-        TestMessageObserver obs = new TestMessageObserver();
-        conduit.setMessageObserver(obs);
-
-        Message m = new MessageImpl();
-        conduit.prepare(m);
-
-        OutputStream os = m.getContent(OutputStream.class);
-        InputStream is = getResourceAsStream(message);
-        if (is == null) {
-            throw new RuntimeException("Could not find resource " + message);
-        }
-
-        IOUtils.copy(is, os);
-
-        // TODO: shouldn't have to do this. IO caching needs cleaning
-        // up or possibly removal...
-        os.flush();
-        is.close();
-        os.close();
-
-        byte[] bs = obs.getResponseStream().toByteArray();
-        
-        return bs;
-    }
-    public byte[] invokeBytes(String address, String transport, byte[] message) throws Exception {
-        EndpointInfo ei = new EndpointInfo(null, "http://schemas.xmlsoap.org/soap/http");
-        ei.setAddress(address);
-
-        ConduitInitiatorManager conduitMgr = getBus().getExtension(ConduitInitiatorManager.class);
-        ConduitInitiator conduitInit = conduitMgr.getConduitInitiator(transport);
-        Conduit conduit = conduitInit.getConduit(ei);
-
-        TestMessageObserver obs = new TestMessageObserver();
-        conduit.setMessageObserver(obs);
-
-        Message m = new MessageImpl();
-        conduit.prepare(m);
-
-        OutputStream os = m.getContent(OutputStream.class);
-        os.write(message);
-
-        // TODO: shouldn't have to do this. IO caching needs cleaning
-        // up or possibly removal...
-        os.flush();
-        os.close();
-
-        return obs.getResponseStream().toByteArray();
-    }
-
-    public Node invoke(String address, String transport, String message) throws Exception {
-        byte[] bs = invokeBytes(address, transport, message);
-
-        ByteArrayInputStream input = new ByteArrayInputStream(bs);
-        try {
-            return DOMUtils.readXml(input);
-        } catch (SAXParseException e) {
-            throw new IllegalStateException("Could not parse message:\n" + new String(bs), e);
-        }
-    }
-    public Node invoke(String address, String transport, byte[] message) throws Exception {
-        byte[] bs = invokeBytes(address, transport, message);
-
-        ByteArrayInputStream input = new ByteArrayInputStream(bs);
-        try {
-            return DOMUtils.readXml(input);
-        } catch (SAXParseException e) {
-            throw new IllegalStateException("Could not parse message:\n" + new String(bs), e);
-        }
-    }
-
-    public InputStream getResourceAsStream(String resource) {
-        return classpathAnchor.getResourceAsStream(resource);
-    }
-
-    public Reader getResourceAsReader(String resource) {
-        return new InputStreamReader(getResourceAsStream(resource), UTF8);
-    }
-    
-    public XMLStreamReader getResourceAsXMLStreamReader(String resource) throws XMLStreamException {
-        return xmlInputFactory.createXMLStreamReader(getResourceAsStream(resource));
-    }
-
-    public File getTestFile(String relativePath) {
-        return new File(getBasedir(), relativePath);
-    }
-
-    public static String getBasedir() {
-        if (basedirPath != null) {
-            return basedirPath;
-        }
-
-        basedirPath = System.getProperty("basedir");
-
-        if (basedirPath == null) {
-            basedirPath = new File("").getAbsolutePath();
-        }
-
-        return basedirPath;
-    }
-
-    /**
-     * Return a DOM tree for the WSDL for a server.
-     * 
-     * @param server the server.
-     * @return the DOM tree.
-     * @throws WSDLException
-     */
-    public Document getWSDLDocument(Server server) throws WSDLException {
-        Definition definition = getWSDLDefinition(server);
-        WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter();
-        return writer.getDocument(definition);
-    }
-
-    /**
-     * Return a WSDL definition model for a server.
-     * 
-     * @param server the server.
-     * @return the definition.
-     * @throws WSDLException
-     */
-    public Definition getWSDLDefinition(Server server) throws WSDLException {
-        Service service = server.getEndpoint().getService();
-
-        ServiceWSDLBuilder wsdlBuilder = new ServiceWSDLBuilder(bus, service.getServiceInfos().get(0));
-        wsdlBuilder.setUseSchemaImports(false);
-        return wsdlBuilder.build();
-    }
-
-    public Server getServerForService(QName serviceName) throws WSDLException {
-        ServerRegistry svrMan = bus.getExtension(ServerRegistry.class);
-        for (Server s : svrMan.getServers()) {
-            Service svc = s.getEndpoint().getService();
-            if (svc.getName().equals(serviceName)) {
-                return s;
-            }
-        }
-        return null;
-    }
-    
-    public Server getServerForAddress(String address) throws WSDLException {
-        ServerRegistry svrMan = bus.getExtension(ServerRegistry.class);
-        for (Server s : svrMan.getServers()) {
-            if (address.equals(s.getEndpoint().getEndpointInfo().getAddress())) {
-                return s;
-            }
-        }
-        return null;
-    }
-
-    public static class TestMessageObserver implements MessageObserver {
-        ByteArrayOutputStream response = new ByteArrayOutputStream();
-        boolean written;
-        String contentType;
-
-        public ByteArrayOutputStream getResponseStream() throws Exception {
-            synchronized (this) {
-                if (!written) {
-                    wait(1000000000);
-                }
-            }
-            return response;
-        }
-
-        public String getResponseContentType() {
-            return contentType;
-        }
-
-        public void onMessage(Message message) {
-            try {
-                contentType = (String)message.get(Message.CONTENT_TYPE);
-                InputStream is = message.getContent(InputStream.class);
-                try {
-                    IOUtils.copy(is, response);
-                    is.close();
-                    response.close();
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            } finally {
-                synchronized (this) {
-                    written = true;
-                    notifyAll();
-                }
-            }
-        }
-    }
-
-    /**
-     * Add a namespace that will be used for XPath expressions.
-     * 
-     * @param ns Namespace name.
-     * @param uri The namespace uri.
-     */
-    public void addNamespace(String ns, String uri) {
-        namespaces.put(ns, uri);
-    }
-
-    /**
-     * retrieve the entire namespace map.
-     * 
-     * @return
-     */
-    public Map<String, String> getNamespaces() {
-        return namespaces;
-    }
-
-    /**
-     * Return the CXF bus used.
-     * 
-     * @return
-     */
-    public Bus getBus() {
-        return bus;
-    }
-
-    /**
-     * Set the CXF bus.
-     * 
-     * @param bus
-     */
-    public void setBus(Bus bus) {
-        this.bus = bus;
-    }
-}
+/**
+ * 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.test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.wsdl.Definition;
+import javax.wsdl.WSDLException;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLWriter;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import org.xml.sax.SAXParseException;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.endpoint.ServerRegistry;
+import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.helpers.IOUtils;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.service.Service;
+import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.test.AbstractCXFTest.TestMessageObserver;
+import org.apache.cxf.transport.Conduit;
+import org.apache.cxf.transport.ConduitInitiator;
+import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
+
+/**
+ * This class provides unit test support for tests that look at generated WSDL
+ * contents, as well as some test methods for invoking services.
+ */
+public class TestUtilities {
+    
+    private static final Charset UTF8 = Charset.forName("utf-8");
+    private static String preKeepAlive;
+    private static String basedirPath;
+    protected Bus bus;
+    protected Class<?> classpathAnchor;
+    private XMLInputFactory xmlInputFactory;
+
+    /**
+     * Namespaces for the XPath expressions.
+     */
+    private Map<String, String> namespaces = new HashMap<String, String>();
+
+    /**
+     * This class provides utilities to several conflicting inheritance stacks
+     * of test support. Thus, it can't be a base class, and so can't use
+     * getClass() to find resources. Users should pass getClass() to this
+     * constructor instead.
+     * 
+     * @param classpathReference
+     */
+    public TestUtilities(Class<?> classpathReference) {
+        classpathAnchor = classpathReference;
+        xmlInputFactory = XMLInputFactory.newInstance();
+    }
+    
+    public static void setKeepAliveSystemProperty(boolean setAlive) {
+        preKeepAlive = System.getProperty("http.keepAlive");
+        System.setProperty("http.keepAlive", Boolean.toString(setAlive));
+    }
+    
+    public static void recoverKeepAliveSystemProperty() {
+        if (preKeepAlive != null) {
+            System.setProperty("http.keepAlive", preKeepAlive);
+        } else {
+            System.clearProperty("http.keepAlive");
+        }
+    }
+
+    public void addDefaultNamespaces() {
+        addNamespace("s", "http://schemas.xmlsoap.org/soap/envelope/");
+        addNamespace("xsd", "http://www.w3.org/2001/XMLSchema");
+        addNamespace("wsdl", "http://schemas.xmlsoap.org/wsdl/");
+        addNamespace("wsdlsoap", "http://schemas.xmlsoap.org/wsdl/soap/");
+        addNamespace("soap", "http://schemas.xmlsoap.org/soap/");
+        addNamespace("soap12env", "http://www.w3.org/2003/05/soap-envelope");
+        addNamespace("xml", "http://www.w3.org/XML/1998/namespace");
+    }
+    
+    /**
+     * Handy function for checking correctness of qualifies names in schema attribute values.
+     * @param prefix
+     * @param node
+     * @return
+     * @throws Exception
+     */
+    public String resolveNamespacePrefix(String prefix, Node node) throws Exception {
+        String url = null;
+        NodeList nodeNamespaces = this.assertValid("namespace::*", node);
+        for (int x = 0; x < nodeNamespaces.getLength(); x++) {
+            Attr nsAttr = (Attr)nodeNamespaces.item(x);
+            String localName = nsAttr.getLocalName();
+            if (localName.equals(prefix)) {
+                url = nsAttr.getValue();
+                break;
+            }
+        }
+        return url;
+    }
+
+    /**
+     * Assert that the following XPath query selects one or more nodes.
+     * 
+     * @param xpath
+     * @throws Exception
+     */
+    public NodeList assertValid(String xpath, Node node) throws Exception {
+        return XPathAssert.assertValid(xpath, node, namespaces);
+    }
+    
+    /**
+     * Assert that the following XPath query selects a boolean value.
+     * 
+     * @param xpath
+     * @throws Exception
+     */
+    public boolean assertValidBoolean(String xpath, Node node) throws Exception {
+        return XPathAssert.assertValidBoolean(xpath, node, namespaces);
+    }
+
+
+    /**
+     * Assert that the following XPath query selects no nodes.
+     * 
+     * @param xpath
+     */
+    public NodeList assertInvalid(String xpath, Node node) throws Exception {
+        return XPathAssert.assertInvalid(xpath, node, namespaces);
+    }
+
+    /**
+     * Assert that the text of the xpath node retrieved is equal to the value
+     * specified.
+     * 
+     * @param xpath
+     * @param value
+     * @param node
+     */
+    public void assertXPathEquals(String xpath, String value, Node node) throws Exception {
+        XPathAssert.assertXPathEquals(xpath, value, node, namespaces);
+    }
+
+    /**
+     * Assert that this node is not a Soap fault body.
+     * 
+     * @param node
+     * @throws Exception
+     */
+    public void assertNoFault(Node node) throws Exception {
+        XPathAssert.assertNoFault(node);
+    }
+
+    public byte[] invokeBytes(String address, String transport, String message) throws Exception {
+        EndpointInfo ei = new EndpointInfo(null, "http://schemas.xmlsoap.org/soap/http");
+        ei.setAddress(address);
+
+        ConduitInitiatorManager conduitMgr = getBus().getExtension(ConduitInitiatorManager.class);
+        ConduitInitiator conduitInit = conduitMgr.getConduitInitiator(transport);
+        Conduit conduit = conduitInit.getConduit(ei);
+
+        TestMessageObserver obs = new TestMessageObserver();
+        conduit.setMessageObserver(obs);
+
+        Message m = new MessageImpl();
+        conduit.prepare(m);
+
+        OutputStream os = m.getContent(OutputStream.class);
+        InputStream is = getResourceAsStream(message);
+        if (is == null) {
+            throw new RuntimeException("Could not find resource " + message);
+        }
+
+        IOUtils.copy(is, os);
+
+        // TODO: shouldn't have to do this. IO caching needs cleaning
+        // up or possibly removal...
+        os.flush();
+        is.close();
+        os.close();
+
+        byte[] bs = obs.getResponseStream().toByteArray();
+        
+        return bs;
+    }
+    public byte[] invokeBytes(String address, String transport, byte[] message) throws Exception {
+        EndpointInfo ei = new EndpointInfo(null, "http://schemas.xmlsoap.org/soap/http");
+        ei.setAddress(address);
+
+        ConduitInitiatorManager conduitMgr = getBus().getExtension(ConduitInitiatorManager.class);
+        ConduitInitiator conduitInit = conduitMgr.getConduitInitiator(transport);
+        Conduit conduit = conduitInit.getConduit(ei);
+
+        TestMessageObserver obs = new TestMessageObserver();
+        conduit.setMessageObserver(obs);
+
+        Message m = new MessageImpl();
+        conduit.prepare(m);
+
+        OutputStream os = m.getContent(OutputStream.class);
+        os.write(message);
+
+        // TODO: shouldn't have to do this. IO caching needs cleaning
+        // up or possibly removal...
+        os.flush();
+        os.close();
+
+        return obs.getResponseStream().toByteArray();
+    }
+
+    public Node invoke(String address, String transport, String message) throws Exception {
+        byte[] bs = invokeBytes(address, transport, message);
+
+        ByteArrayInputStream input = new ByteArrayInputStream(bs);
+        try {
+            return DOMUtils.readXml(input);
+        } catch (SAXParseException e) {
+            throw new IllegalStateException("Could not parse message:\n" + new String(bs), e);
+        }
+    }
+    public Node invoke(String address, String transport, byte[] message) throws Exception {
+        byte[] bs = invokeBytes(address, transport, message);
+
+        ByteArrayInputStream input = new ByteArrayInputStream(bs);
+        try {
+            return DOMUtils.readXml(input);
+        } catch (SAXParseException e) {
+            throw new IllegalStateException("Could not parse message:\n" + new String(bs), e);
+        }
+    }
+
+    public InputStream getResourceAsStream(String resource) {
+        return classpathAnchor.getResourceAsStream(resource);
+    }
+
+    public Reader getResourceAsReader(String resource) {
+        return new InputStreamReader(getResourceAsStream(resource), UTF8);
+    }
+    
+    public XMLStreamReader getResourceAsXMLStreamReader(String resource) throws XMLStreamException {
+        return xmlInputFactory.createXMLStreamReader(getResourceAsStream(resource));
+    }
+
+    public File getTestFile(String relativePath) {
+        return new File(getBasedir(), relativePath);
+    }
+
+    public static String getBasedir() {
+        if (basedirPath != null) {
+            return basedirPath;
+        }
+
+        basedirPath = System.getProperty("basedir");
+
+        if (basedirPath == null) {
+            basedirPath = new File("").getAbsolutePath();
+        }
+
+        return basedirPath;
+    }
+
+    /**
+     * Return a DOM tree for the WSDL for a server.
+     * 
+     * @param server the server.
+     * @return the DOM tree.
+     * @throws WSDLException
+     */
+    public Document getWSDLDocument(Server server) throws WSDLException {
+        Definition definition = getWSDLDefinition(server);
+        WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter();
+        return writer.getDocument(definition);
+    }
+
+    /**
+     * Return a WSDL definition model for a server.
+     * 
+     * @param server the server.
+     * @return the definition.
+     * @throws WSDLException
+     */
+    public Definition getWSDLDefinition(Server server) throws WSDLException {
+        Service service = server.getEndpoint().getService();
+
+        ServiceWSDLBuilder wsdlBuilder = new ServiceWSDLBuilder(bus, service.getServiceInfos().get(0));
+        wsdlBuilder.setUseSchemaImports(false);
+        return wsdlBuilder.build();
+    }
+
+    public Server getServerForService(QName serviceName) throws WSDLException {
+        ServerRegistry svrMan = bus.getExtension(ServerRegistry.class);
+        for (Server s : svrMan.getServers()) {
+            Service svc = s.getEndpoint().getService();
+            if (svc.getName().equals(serviceName)) {
+                return s;
+            }
+        }
+        return null;
+    }
+    
+    public Server getServerForAddress(String address) throws WSDLException {
+        ServerRegistry svrMan = bus.getExtension(ServerRegistry.class);
+        for (Server s : svrMan.getServers()) {
+            if (address.equals(s.getEndpoint().getEndpointInfo().getAddress())) {
+                return s;
+            }
+        }
+        return null;
+    }
+
+    public static class TestMessageObserver implements MessageObserver {
+        ByteArrayOutputStream response = new ByteArrayOutputStream();
+        boolean written;
+        String contentType;
+
+        public ByteArrayOutputStream getResponseStream() throws Exception {
+            synchronized (this) {
+                if (!written) {
+                    wait(1000000000);
+                }
+            }
+            return response;
+        }
+
+        public String getResponseContentType() {
+            return contentType;
+        }
+
+        public void onMessage(Message message) {
+            try {
+                contentType = (String)message.get(Message.CONTENT_TYPE);
+                InputStream is = message.getContent(InputStream.class);
+                try {
+                    IOUtils.copy(is, response);
+                    is.close();
+                    response.close();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            } finally {
+                synchronized (this) {
+                    written = true;
+                    notifyAll();
+                }
+            }
+        }
+    }
+
+    /**
+     * Add a namespace that will be used for XPath expressions.
+     * 
+     * @param ns Namespace name.
+     * @param uri The namespace uri.
+     */
+    public void addNamespace(String ns, String uri) {
+        namespaces.put(ns, uri);
+    }
+
+    /**
+     * retrieve the entire namespace map.
+     * 
+     * @return
+     */
+    public Map<String, String> getNamespaces() {
+        return namespaces;
+    }
+
+    /**
+     * Return the CXF bus used.
+     * 
+     * @return
+     */
+    public Bus getBus() {
+        return bus;
+    }
+
+    /**
+     * Set the CXF bus.
+     * 
+     * @param bus
+     */
+    public void setBus(Bus bus) {
+        this.bus = bus;
+    }
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/UrlUtilities.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/UrlUtilities.java?rev=630381&r1=630380&r2=630381&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/UrlUtilities.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/UrlUtilities.java Fri Feb 22 18:55:53 2008
@@ -1,71 +1,71 @@
-/**
- * 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.transport.http;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-/**
- * Functions used to work with URLs in HTTP-related code. 
- */
-public final class UrlUtilities {
-    
-    private UrlUtilities() {
-    }
-
-    /**
-     * Create a map from String to String that represents the contents of the query
-     * portion of a URL. For each x=y, x is the key and y is the value.
-     * @param s the query part of the URI.
-     * @return the map.
-     */
-    public static Map<String, String> parseQueryString(String s) {
-        Map<String, String> ht = new HashMap<String, String>();
-        StringTokenizer st = new StringTokenizer(s, "&");
-        while (st.hasMoreTokens()) {
-            String pair = (String)st.nextToken();
-            int pos = pair.indexOf('=');
-            if (pos == -1) {
-                ht.put(pair.toLowerCase(), "");
-            } else {
-                ht.put(pair.substring(0, pos).toLowerCase(),
-                       pair.substring(pos + 1));
-            }
-        }
-        return ht;
-    }
-    
-    /**
-     * Return everything in the path up to the last slash in a URI.
-     * @param baseURI
-     * @return the trailing 
-     */
-    public static String getStem(String baseURI) {
-        URI uri = URI.create(baseURI);
-        baseURI = uri.getPath();
-        int idx = baseURI.lastIndexOf('/');
-        if (idx != -1) {
-            baseURI = baseURI.substring(0, idx);
-        }
-        return baseURI;
-    }
-}
+/**
+ * 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.transport.http;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+/**
+ * Functions used to work with URLs in HTTP-related code. 
+ */
+public final class UrlUtilities {
+    
+    private UrlUtilities() {
+    }
+
+    /**
+     * Create a map from String to String that represents the contents of the query
+     * portion of a URL. For each x=y, x is the key and y is the value.
+     * @param s the query part of the URI.
+     * @return the map.
+     */
+    public static Map<String, String> parseQueryString(String s) {
+        Map<String, String> ht = new HashMap<String, String>();
+        StringTokenizer st = new StringTokenizer(s, "&");
+        while (st.hasMoreTokens()) {
+            String pair = (String)st.nextToken();
+            int pos = pair.indexOf('=');
+            if (pos == -1) {
+                ht.put(pair.toLowerCase(), "");
+            } else {
+                ht.put(pair.substring(0, pos).toLowerCase(),
+                       pair.substring(pos + 1));
+            }
+        }
+        return ht;
+    }
+    
+    /**
+     * Return everything in the path up to the last slash in a URI.
+     * @param baseURI
+     * @return the trailing 
+     */
+    public static String getStem(String baseURI) {
+        URI uri = URI.create(baseURI);
+        baseURI = uri.getPath();
+        int idx = baseURI.lastIndexOf('/');
+        if (idx != -1) {
+            baseURI = baseURI.substring(0, idx);
+        }
+        return baseURI;
+    }
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/UrlUtilities.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/UrlUtilities.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java?rev=630381&r1=630380&r2=630381&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java Fri Feb 22 18:55:53 2008
@@ -1,35 +1,35 @@
-/**
- * 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.jaxb.fortest;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(namespace = "uri:ultima:thule")
-public class QualifiedBean {
-    private String ariadne;
-
-    public String getAriadne() {
-        return ariadne;
-    }
-
-    public void setAriadne(String ariadne) {
-        this.ariadne = ariadne;
-    }
-}
+/**
+ * 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.jaxb.fortest;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(namespace = "uri:ultima:thule")
+public class QualifiedBean {
+    private String ariadne;
+
+    public String getAriadne() {
+        return ariadne;
+    }
+
+    public void setAriadne(String ariadne) {
+        this.ariadne = ariadne;
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/unqualified/UnqualifiedBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/unqualified/UnqualifiedBean.java?rev=630381&r1=630380&r2=630381&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/unqualified/UnqualifiedBean.java (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/unqualified/UnqualifiedBean.java Fri Feb 22 18:55:53 2008
@@ -1,39 +1,39 @@
-/**
- * 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.jaxb.fortest.unqualified;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * Test class that is not in any namespace, for testing JAXB context properties.
- */
-@XmlRootElement()
-public class UnqualifiedBean {
-    private String ariadne;
-
-    public String getAriadne() {
-        return ariadne;
-    }
-
-    public void setAriadne(String ariadne) {
-        this.ariadne = ariadne;
-    }
-
-}
+/**
+ * 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.jaxb.fortest.unqualified;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Test class that is not in any namespace, for testing JAXB context properties.
+ */
+@XmlRootElement()
+public class UnqualifiedBean {
+    private String ariadne;
+
+    public String getAriadne() {
+        return ariadne;
+    }
+
+    public void setAriadne(String ariadne) {
+        this.ariadne = ariadne;
+    }
+
+}

Propchange: incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/unqualified/UnqualifiedBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/unqualified/UnqualifiedBean.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/test/resources/wsdl/jaxb/form_test.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/test/resources/wsdl/jaxb/form_test.xsd?rev=630381&r1=630380&r2=630381&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/test/resources/wsdl/jaxb/form_test.xsd (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/test/resources/wsdl/jaxb/form_test.xsd Fri Feb 22 18:55:53 2008
@@ -1,31 +1,31 @@
-<?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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://cxf.apache.org/jaxb_form"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://cxf.apache.org/jaxb_form"
-    elementFormDefault='unqualified' >
-    <xs:element name="ObjectWithQualifiedElementElement" >
-      <xs:complexType>
-        <xs:sequence>
-            <xs:element name="string1" type="xs:string" />
-            <xs:element name="string2" type="xs:string" form='qualified' />
-        </xs:sequence>
-      </xs:complexType>
-    </xs:element>
+<?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.
+-->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://cxf.apache.org/jaxb_form"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://cxf.apache.org/jaxb_form"
+    elementFormDefault='unqualified' >
+    <xs:element name="ObjectWithQualifiedElementElement" >
+      <xs:complexType>
+        <xs:sequence>
+            <xs:element name="string1" type="xs:string" />
+            <xs:element name="string2" type="xs:string" form='qualified' />
+        </xs:sequence>
+      </xs:complexType>
+    </xs:element>
 </schema>



Mime
View raw message