You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bi...@apache.org on 2007/10/23 16:42:01 UTC
svn commit: r587523 - in /incubator/cxf/trunk:
common/common/src/main/java/org/apache/cxf/common/util/ rt/
rt/core/src/main/java/org/apache/cxf/test/ rt/databinding/aegis/
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/
rt/databind...
Author: bimargulies
Date: Tue Oct 23 07:41:56 2007
New Revision: 587523
URL: http://svn.apache.org/viewvc?rev=587523&view=rev
Log:
Some refactoring. Take a set of useful constants named 'XmlConstants'
from Aegis and rename them to SOAPConstants in
org.apache.cxf.common.util. Create a new project module for common
test case support code that has dependencies on the transports. This
allows other modules to share some of the useful test support code
currently sitting in AbstractAegisTest. It may seem like a lot of
plumbing for one class, but I hope to populate it with more things as
we go along. There is also a bit of refactoring in testutils to push a
little code into a package with 'cxf' in its name. A very small beginning.
Added:
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SOAPConstants.java
incubator/cxf/trunk/rt/testsupport/
incubator/cxf/trunk/rt/testsupport/pom.xml (with props)
incubator/cxf/trunk/rt/testsupport/src/
incubator/cxf/trunk/rt/testsupport/src/test/
incubator/cxf/trunk/rt/testsupport/src/test/java/
incubator/cxf/trunk/rt/testsupport/src/test/java/org/
incubator/cxf/trunk/rt/testsupport/src/test/java/org/apache/
incubator/cxf/trunk/rt/testsupport/src/test/java/org/apache/cxf/
incubator/cxf/trunk/rt/testsupport/src/test/java/org/apache/cxf/testsupport/
incubator/cxf/trunk/rt/testsupport/src/test/java/org/apache/cxf/testsupport/TestUtilitiesWithBasicBus.java (with props)
incubator/cxf/trunk/testutils/src/test/java/org/apache/cxf/
incubator/cxf/trunk/testutils/src/test/java/org/apache/cxf/testutils/
incubator/cxf/trunk/testutils/src/test/java/org/apache/cxf/testutils/header_test/
incubator/cxf/trunk/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/
- copied from r587274, incubator/cxf/trunk/testutils/src/test/java/org/apache/header_test/rpc/
Removed:
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/XmlConstants.java
incubator/cxf/trunk/testutils/src/test/java/org/apache/header_test/
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java
incubator/cxf/trunk/rt/databinding/aegis/pom.xml
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMappingRegistry.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/ByteArrayType.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/HeaderTest.java
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
incubator/cxf/trunk/rt/javascript/pom.xml
incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
incubator/cxf/trunk/rt/pom.xml
incubator/cxf/trunk/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java
Added: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SOAPConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SOAPConstants.java?rev=587523&view=auto
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SOAPConstants.java (added)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SOAPConstants.java Tue Oct 23 07:41:56 2007
@@ -0,0 +1,83 @@
+/**
+ * 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.common.util;
+
+/**
+ * SOAP constants from the specifications.
+ *
+ * @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
+ * @since Feb 18, 2004
+ */
+public class SOAPConstants {
+ /** Document styles. */
+
+ public static final String WSDL11_NS = "http://schemas.xmlsoap.org/wsdl/";
+
+ public static final String WSDL11_SOAP_NS = "http://schemas.xmlsoap.org/wsdl/soap/";
+
+ /**
+ * Constant used to specify a rpc binding style.
+ */
+ public static final String STYLE_RPC = "rpc";
+
+ /**
+ * Constant used to specify a document binding style.
+ */
+ public static final String STYLE_DOCUMENT = "document";
+
+ /**
+ * Constant used to specify a wrapped binding style.
+ */
+ public static final String STYLE_WRAPPED = "wrapped";
+
+ /**
+ * Constant used to specify a message binding style.
+ */
+ public static final String STYLE_MESSAGE = "message";
+
+ /**
+ * Constant used to specify a literal binding use.
+ */
+ public static final String USE_LITERAL = "literal";
+
+ /**
+ * Constant used to specify a encoded binding use.
+ */
+ public static final String USE_ENCODED = "encoded";
+
+ /**
+ * XML Schema Namespace.
+ */
+ public static final String XSD = "http://www.w3.org/2001/XMLSchema";
+ public static final String XSD_PREFIX = "xsd";
+
+ public static final String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
+ public static final String XSI_PREFIX = "xsi";
+
+ public static final String MEP_ROBUST_IN_OUT = "urn:xfire:mep:in-out";
+ public static final String MEP_IN = "urn:xfire:mep:in";
+
+ public static final String SOAP_ACTION = "SOAPAction";
+
+ /**
+ * Whether or not MTOM should be enabled for each service.
+ */
+ public static final String MTOM_ENABLED = "mtom-enabled";
+
+}
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=587523&r1=587522&r2=587523&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 Tue Oct 23 07:41:56 2007
@@ -58,10 +58,11 @@
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
/**
- * This class provides unit test support for tests that look at generated WSDL contents.
+ * This class provides unit test support for tests that look at generated WSDL
+ * contents.
*/
public class TestUtilities {
-
+
private static String basedirPath;
protected Bus bus;
protected Class<?> classpathAnchor;
@@ -70,32 +71,34 @@
* 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.
+ * 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;
}
-
+
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("soap12env", "http://www.w3.org/2003/05/soap-envelope");
addNamespace("xml", "http://www.w3.org/XML/1998/namespace");
}
-
+
/**
* Assert that the following XPath query selects one or more nodes.
*
* @param xpath
- * @throws Exception
+ * @throws Exception
*/
public NodeList assertValid(String xpath, Node node) throws Exception {
return XPathAssert.assertValid(xpath, node, namespaces);
@@ -109,7 +112,7 @@
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.
@@ -124,6 +127,7 @@
/**
* Assert that this node is not a Soap fault body.
+ *
* @param node
* @throws Exception
*/
@@ -131,9 +135,7 @@
XPathAssert.assertNoFault(node);
}
- public byte[] invokeBytes(String address,
- String transport,
- String message) throws Exception {
+ 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);
@@ -143,7 +145,7 @@
TestMessageObserver obs = new TestMessageObserver();
conduit.setMessageObserver(obs);
-
+
Message m = new MessageImpl();
conduit.prepare(m);
@@ -152,7 +154,7 @@
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
@@ -160,26 +162,23 @@
os.flush();
is.close();
os.close();
-
+
byte[] bs = obs.getResponseStream().toByteArray();
-
+
return bs;
}
-
- public Node invoke(String address,
- String transport,
- String message) throws Exception {
+
+ 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));
+ throw new IllegalStateException("Could not parse message:\n" + new String(bs));
}
}
-
+
public InputStream getResourceAsStream(String resource) {
return classpathAnchor.getResourceAsStream(resource);
}
@@ -207,7 +206,8 @@
}
/**
- * Return a DOM tree for the WSDL for a server.
+ * Return a DOM tree for the WSDL for a server.
+ *
* @param server the server.
* @return the DOM tree.
* @throws WSDLException
@@ -217,22 +217,22 @@
WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter();
return writer.getDocument(definition);
}
-
+
/**
* Return a WSDL definition model for a server.
- * @param server the 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));
+
+ 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()) {
@@ -248,7 +248,7 @@
ByteArrayOutputStream response = new ByteArrayOutputStream();
boolean written;
String contentType;
-
+
public ByteArrayOutputStream getResponseStream() throws Exception {
synchronized (this) {
if (!written) {
@@ -257,14 +257,14 @@
}
return response;
}
-
+
public String getResponseContentType() {
return contentType;
}
public void onMessage(Message message) {
try {
- contentType = (String) message.get(Message.CONTENT_TYPE);
+ contentType = (String)message.get(Message.CONTENT_TYPE);
InputStream is = message.getContent(InputStream.class);
try {
IOUtils.copy(is, response);
@@ -294,22 +294,25 @@
/**
* 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) {
Modified: incubator/cxf/trunk/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/pom.xml?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/pom.xml (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/pom.xml Tue Oct 23 07:41:56 2007
@@ -73,6 +73,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-testsupport</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java Tue Oct 23 07:41:56 2007
@@ -43,8 +43,8 @@
import org.apache.cxf.aegis.type.TypeMappingRegistry;
import org.apache.cxf.aegis.type.TypeUtil;
import org.apache.cxf.aegis.type.basic.BeanType;
-import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.databinding.DataReader;
import org.apache.cxf.databinding.DataWriter;
@@ -142,7 +142,7 @@
this.service = s;
QName serviceName = s.getServiceInfos().get(0).getName();
- TypeMapping serviceTM = typeMappingRegistry.createTypeMapping(XmlConstants.XSD, true);
+ TypeMapping serviceTM = typeMappingRegistry.createTypeMapping(SOAPConstants.XSD, true);
typeMappingRegistry.register(serviceName.getNamespaceURI(), serviceTM);
s.put(TypeMapping.class.getName(), serviceTM);
@@ -326,12 +326,12 @@
}
for (Map.Entry<String, Set<Type>> entry : tns2Type.entrySet()) {
- String xsdPrefix = XmlConstants.XSD_PREFIX;
- if (namespaceMap != null && namespaceMap.containsKey(XmlConstants.XSD)) {
- xsdPrefix = namespaceMap.get(XmlConstants.XSD);
+ String xsdPrefix = SOAPConstants.XSD_PREFIX;
+ if (namespaceMap != null && namespaceMap.containsKey(SOAPConstants.XSD)) {
+ xsdPrefix = namespaceMap.get(SOAPConstants.XSD);
}
- Element e = new Element("schema", xsdPrefix, XmlConstants.XSD);
+ Element e = new Element("schema", xsdPrefix, SOAPConstants.XSD);
e.setAttribute(new Attribute(WSDLConstants.ATTR_TNS, entry.getKey()));
@@ -363,7 +363,7 @@
try {
NamespaceMap nsMap = new NamespaceMap();
- nsMap.add(xsdPrefix, XmlConstants.XSD);
+ nsMap.add(xsdPrefix, SOAPConstants.XSD);
// We prefer explicit prefixes over those generated in the types.
// This loop may have intended to support prefixes from individual aegis files,
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMappingRegistry.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMappingRegistry.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMappingRegistry.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMappingRegistry.java Tue Oct 23 07:41:56 2007
@@ -67,9 +67,9 @@
import org.apache.cxf.aegis.type.xml.JDOMElementType;
import org.apache.cxf.aegis.type.xml.SourceType;
import org.apache.cxf.aegis.type.xml.XMLStreamReaderType;
-import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.binding.soap.Soap11;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.util.SOAPConstants;
import org.jdom.Element;
/**
@@ -80,36 +80,36 @@
*/
public final class DefaultTypeMappingRegistry extends AbstractTypeMappingRegistry
implements TypeMappingRegistry {
- static final QName XSD_STRING = new QName(XmlConstants.XSD, "string", XmlConstants.XSD_PREFIX);
- static final QName XSD_LONG = new QName(XmlConstants.XSD, "long", XmlConstants.XSD_PREFIX);
- static final QName XSD_FLOAT = new QName(XmlConstants.XSD, "float", XmlConstants.XSD_PREFIX);
- static final QName XSD_DOUBLE = new QName(XmlConstants.XSD, "double", XmlConstants.XSD_PREFIX);
- static final QName XSD_INT = new QName(XmlConstants.XSD, "int", XmlConstants.XSD_PREFIX);
- static final QName XSD_SHORT = new QName(XmlConstants.XSD, "short", XmlConstants.XSD_PREFIX);
- static final QName XSD_BOOLEAN = new QName(XmlConstants.XSD,
- "boolean", XmlConstants.XSD_PREFIX);
- static final QName XSD_DATETIME = new QName(XmlConstants.XSD, "dateTime",
- XmlConstants.XSD_PREFIX);
- static final QName XSD_TIME = new QName(XmlConstants.XSD, "dateTime", XmlConstants.XSD_PREFIX);
- static final QName XSD_BASE64 = new QName(XmlConstants.XSD, "base64Binary",
- XmlConstants.XSD_PREFIX);
- static final QName XSD_DECIMAL = new QName(XmlConstants.XSD,
- "decimal", XmlConstants.XSD_PREFIX);
- static final QName XSD_INTEGER = new QName(XmlConstants.XSD,
- "integer", XmlConstants.XSD_PREFIX);
- static final QName XSD_URI = new QName(XmlConstants.XSD, "anyURI", XmlConstants.XSD_PREFIX);
- static final QName XSD_ANY = new QName(XmlConstants.XSD, "anyType", XmlConstants.XSD_PREFIX);
-
- static final QName XSD_DATE = new QName(XmlConstants.XSD, "date", XmlConstants.XSD_PREFIX);
- static final QName XSD_DURATION = new QName(XmlConstants.XSD, "duration",
- XmlConstants.XSD_PREFIX);
- static final QName XSD_G_YEAR_MONTH = new QName(XmlConstants.XSD, "gYearMonth",
- XmlConstants.XSD_PREFIX);
- static final QName XSD_G_MONTH_DAY = new QName(XmlConstants.XSD, "gMonthDay",
- XmlConstants.XSD_PREFIX);
- static final QName XSD_G_YEAR = new QName(XmlConstants.XSD, "gYear", XmlConstants.XSD_PREFIX);
- static final QName XSD_G_MONTH = new QName(XmlConstants.XSD, "gMonth", XmlConstants.XSD_PREFIX);
- static final QName XSD_G_DAY = new QName(XmlConstants.XSD, "gDay", XmlConstants.XSD_PREFIX);
+ static final QName XSD_STRING = new QName(SOAPConstants.XSD, "string", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_LONG = new QName(SOAPConstants.XSD, "long", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_FLOAT = new QName(SOAPConstants.XSD, "float", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_DOUBLE = new QName(SOAPConstants.XSD, "double", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_INT = new QName(SOAPConstants.XSD, "int", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_SHORT = new QName(SOAPConstants.XSD, "short", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_BOOLEAN = new QName(SOAPConstants.XSD,
+ "boolean", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_DATETIME = new QName(SOAPConstants.XSD, "dateTime",
+ SOAPConstants.XSD_PREFIX);
+ static final QName XSD_TIME = new QName(SOAPConstants.XSD, "dateTime", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_BASE64 = new QName(SOAPConstants.XSD, "base64Binary",
+ SOAPConstants.XSD_PREFIX);
+ static final QName XSD_DECIMAL = new QName(SOAPConstants.XSD,
+ "decimal", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_INTEGER = new QName(SOAPConstants.XSD,
+ "integer", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_URI = new QName(SOAPConstants.XSD, "anyURI", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_ANY = new QName(SOAPConstants.XSD, "anyType", SOAPConstants.XSD_PREFIX);
+
+ static final QName XSD_DATE = new QName(SOAPConstants.XSD, "date", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_DURATION = new QName(SOAPConstants.XSD, "duration",
+ SOAPConstants.XSD_PREFIX);
+ static final QName XSD_G_YEAR_MONTH = new QName(SOAPConstants.XSD, "gYearMonth",
+ SOAPConstants.XSD_PREFIX);
+ static final QName XSD_G_MONTH_DAY = new QName(SOAPConstants.XSD, "gMonthDay",
+ SOAPConstants.XSD_PREFIX);
+ static final QName XSD_G_YEAR = new QName(SOAPConstants.XSD, "gYear", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_G_MONTH = new QName(SOAPConstants.XSD, "gMonth", SOAPConstants.XSD_PREFIX);
+ static final QName XSD_G_DAY = new QName(SOAPConstants.XSD, "gDay", SOAPConstants.XSD_PREFIX);
static final String ENCODED_NS = Soap11.getInstance().getSoapEncodingStyle();
static final QName ENCODED_STRING = new QName(ENCODED_NS, "string");
@@ -344,7 +344,7 @@
register(ENCODED_NS, soapTM);
- register(XmlConstants.XSD, tm);
+ register(SOAPConstants.XSD, tm);
registerDefault(tm);
return tm;
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java Tue Oct 23 07:41:56 2007
@@ -25,7 +25,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.cxf.aegis.Context;
import org.apache.cxf.aegis.util.NamespaceHelper;
-import org.apache.cxf.aegis.util.XmlConstants;
+import org.apache.cxf.common.util.SOAPConstants;
/**
* Static methods/constants for Aegis.
@@ -44,7 +44,7 @@
return type;
}
- String overrideType = xsr.getAttributeValue(XmlConstants.XSI_NS, "type");
+ String overrideType = xsr.getAttributeValue(SOAPConstants.XSI_NS, "type");
if (overrideType != null) {
QName overrideTypeName = NamespaceHelper.createQName(xsr.getNamespaceContext(), overrideType);
if (!overrideTypeName.equals(type.getSchemaType())) {
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java Tue Oct 23 07:41:56 2007
@@ -35,9 +35,9 @@
import org.apache.cxf.aegis.type.Type;
import org.apache.cxf.aegis.type.TypeUtil;
import org.apache.cxf.aegis.util.NamespaceHelper;
-import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.MessageWriter;
+import org.apache.cxf.common.util.SOAPConstants;
import org.jdom.Attribute;
import org.jdom.Element;
import org.jdom.Namespace;
@@ -265,14 +265,14 @@
return;
}
- Element complex = new Element("complexType", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element complex = new Element("complexType", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
complex.setAttribute(new Attribute("name", getSchemaType().getLocalPart()));
root.addContent(complex);
- Element seq = new Element("sequence", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element seq = new Element("sequence", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
complex.addContent(seq);
- Element element = new Element("element", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element element = new Element("element", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
seq.addContent(element);
Type componentType = getComponentType();
@@ -308,7 +308,7 @@
* @return
*/
private boolean hasDefinedArray(Element root) {
- List children = root.getChildren("complexType", Namespace.getNamespace(XmlConstants.XSD));
+ List children = root.getChildren("complexType", Namespace.getNamespace(SOAPConstants.XSD));
for (Iterator itr = children.iterator(); itr.hasNext();) {
Element e = (Element) itr.next();
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java Tue Oct 23 07:41:56 2007
@@ -29,11 +29,11 @@
import org.apache.cxf.aegis.type.Type;
import org.apache.cxf.aegis.type.mtom.AbstractXOPType;
import org.apache.cxf.aegis.type.mtom.ByteArrayType;
-import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.MessageWriter;
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64Utility;
+import org.apache.cxf.common.util.SOAPConstants;
/**
* Converts back and forth to byte[] objects.
@@ -49,7 +49,7 @@
@Override
public Object readObject(MessageReader mreader, Context context) throws DatabindingException {
- boolean mtomEnabled = Boolean.valueOf((String)context.get(XmlConstants.MTOM_ENABLED)).booleanValue();
+ boolean mtomEnabled = Boolean.valueOf((String)context.get(SOAPConstants.MTOM_ENABLED)).booleanValue();
XMLStreamReader reader = mreader.getXMLStreamReader();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -107,7 +107,7 @@
public void writeObject(Object object,
MessageWriter writer,
Context context) throws DatabindingException {
- boolean mtomEnabled = Boolean.valueOf((String)context.get(XmlConstants.MTOM_ENABLED)).booleanValue();
+ boolean mtomEnabled = Boolean.valueOf((String)context.get(SOAPConstants.MTOM_ENABLED)).booleanValue();
if (mtomEnabled) {
optimizedType.writeObject(object, writer, context);
return;
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java Tue Oct 23 07:41:56 2007
@@ -36,10 +36,10 @@
import org.apache.cxf.aegis.type.TypeMapping;
import org.apache.cxf.aegis.type.TypeUtil;
import org.apache.cxf.aegis.util.NamespaceHelper;
-import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.MessageWriter;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.interceptor.Fault;
import org.jdom.Attribute;
import org.jdom.Element;
@@ -387,7 +387,7 @@
@Override
public void writeSchema(Element root) {
BeanTypeInfo inf = getTypeInfo();
- Element complex = new Element("complexType", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element complex = new Element("complexType", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
complex.setAttribute(new Attribute("name", getSchemaType().getLocalPart()));
root.addContent(complex);
@@ -403,7 +403,9 @@
}
if (inf.isExtension() && sooperType != null) {
- Element complexContent = new Element("complexContent", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element complexContent = new Element("complexContent",
+ SOAPConstants.XSD_PREFIX,
+ SOAPConstants.XSD);
complex.addContent(complexContent);
complex = complexContent;
}
@@ -418,7 +420,7 @@
if (isExtension && sooperType != null) {
- Element extension = new Element("extension", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element extension = new Element("extension", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
complex.addContent(extension);
QName baseType = sooperType.getSchemaType();
extension.setAttribute(new Attribute("base", getNameWithPrefix2(root, baseType
@@ -444,11 +446,11 @@
}
if (seq == null) {
- seq = new Element("sequence", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ seq = new Element("sequence", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
dummy.addContent(seq);
}
- Element element = new Element("element", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element element = new Element("element", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
seq.addContent(element);
Type type = getType(inf, name);
@@ -466,7 +468,7 @@
*/
if (inf.isExtensibleElements()) {
if (seq == null) {
- seq = new Element("sequence", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ seq = new Element("sequence", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
dummy.addContent(seq);
}
seq.addContent(createAnyElement());
@@ -476,7 +478,7 @@
for (Iterator itr = inf.getAttributes(); itr.hasNext();) {
QName name = (QName)itr.next();
- Element element = new Element("attribute", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element element = new Element("attribute", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
dummy.addContent(element);
Type type = getType(inf, name);
@@ -664,7 +666,7 @@
* @return
*/
private Element createAnyElement() {
- Element result = new Element("any", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element result = new Element("any", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
result.setAttribute(new Attribute("minOccurs", "0"));
result.setAttribute(new Attribute("maxOccurs", "unbounded"));
return result;
@@ -693,7 +695,7 @@
* @return
*/
private Element createAnyAttribute() {
- return new Element("anyAttribute", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ return new Element("anyAttribute", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java Tue Oct 23 07:41:56 2007
@@ -31,10 +31,10 @@
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.type.Type;
import org.apache.cxf.aegis.type.TypeMapping;
-import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.MessageWriter;
import org.apache.cxf.common.util.Base64Utility;
+import org.apache.cxf.common.util.SOAPConstants;
import org.jdom.Attribute;
import org.jdom.Element;
@@ -50,8 +50,8 @@
* @author <a href="mailto:peter.royal@pobox.com">peter royal</a>
*/
public class ObjectType extends Type {
- private static final QName XSI_TYPE = new QName(XmlConstants.XSI_NS, "type");
- private static final QName XSI_NIL = new QName(XmlConstants.XSI_NS, "nil");
+ private static final QName XSI_TYPE = new QName(SOAPConstants.XSI_NS, "type");
+ private static final QName XSI_NIL = new QName(SOAPConstants.XSI_NS, "nil");
private Set<Type> dependencies;
private boolean serializedWhenUnknown;
@@ -295,12 +295,12 @@
@Override
public void writeSchema(Element root) {
if (serializedWhenUnknown) {
- Element simple = new Element("simpleType", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element simple = new Element("simpleType", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
simple.setAttribute(new Attribute("name", "serializedJavaObject"));
root.addContent(simple);
- Element restriction = new Element("restriction", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
- restriction.setAttribute(new Attribute("base", XmlConstants.XSD_PREFIX + ":base64Binary"));
+ Element restriction = new Element("restriction", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
+ restriction.setAttribute(new Attribute("base", SOAPConstants.XSD_PREFIX + ":base64Binary"));
simple.addContent(restriction);
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java Tue Oct 23 07:41:56 2007
@@ -32,9 +32,9 @@
import org.apache.cxf.aegis.type.Type;
import org.apache.cxf.aegis.type.TypeUtil;
import org.apache.cxf.aegis.util.NamespaceHelper;
-import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.MessageWriter;
+import org.apache.cxf.common.util.SOAPConstants;
import org.jdom.Attribute;
import org.jdom.Element;
@@ -176,27 +176,27 @@
@Override
public void writeSchema(Element root) {
- Element complex = new Element("complexType", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element complex = new Element("complexType", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
complex.setAttribute(new Attribute("name", getSchemaType().getLocalPart()));
root.addContent(complex);
- Element seq = new Element("sequence", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element seq = new Element("sequence", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
complex.addContent(seq);
Type kType = getKeyType();
Type vType = getValueType();
- Element element = new Element("element", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element element = new Element("element", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
seq.addContent(element);
element.setAttribute(new Attribute("name", getEntryName().getLocalPart()));
element.setAttribute(new Attribute("minOccurs", "0"));
element.setAttribute(new Attribute("maxOccurs", "unbounded"));
- Element evComplex = new Element("complexType", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element evComplex = new Element("complexType", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
element.addContent(evComplex);
- Element evseq = new Element("sequence", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element evseq = new Element("sequence", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
evComplex.addContent(evseq);
createElement(root, evseq, getKeyName(), kType);
@@ -207,7 +207,7 @@
* Creates a element in a sequence for the key type and the value type.
*/
private void createElement(Element root, Element seq, QName name, Type type) {
- Element element = new Element("element", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Element element = new Element("element", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
seq.addContent(element);
String prefix = NamespaceHelper.getUniquePrefix((Element)root, type.getSchemaType()
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java Tue Oct 23 07:41:56 2007
@@ -21,9 +21,9 @@
import org.apache.cxf.aegis.Context;
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.type.Type;
-import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.MessageWriter;
+import org.apache.cxf.common.util.SOAPConstants;
import org.jdom.Attribute;
import org.jdom.Element;
import org.jdom.Namespace;
@@ -53,14 +53,14 @@
@Override
public void writeSchema(Element root) {
- Namespace xsd = Namespace.getNamespace(XmlConstants.XSD_PREFIX, XmlConstants.XSD);
+ Namespace xsd = Namespace.getNamespace(SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
Element simple = new Element("simpleType", xsd);
simple.setAttribute(new Attribute("name", getSchemaType().getLocalPart()));
root.addContent(simple);
Element restriction = new Element("restriction", xsd);
- restriction.setAttribute(new Attribute("base", XmlConstants.XSD_PREFIX + ":string"));
+ restriction.setAttribute(new Attribute("base", SOAPConstants.XSD_PREFIX + ":string"));
simple.addContent(restriction);
Object[] constants = getTypeClass().getEnumConstants();
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/ByteArrayType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/ByteArrayType.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/ByteArrayType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/ByteArrayType.java Tue Oct 23 07:41:56 2007
@@ -27,9 +27,9 @@
import javax.xml.namespace.QName;
import org.apache.cxf.aegis.Context;
-import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.attachment.AttachmentImpl;
import org.apache.cxf.attachment.ByteDataSource;
+import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.message.Attachment;
/**
@@ -38,7 +38,7 @@
public class ByteArrayType extends AbstractXOPType {
public ByteArrayType() {
setTypeClass(byte[].class);
- setSchemaType(new QName(XmlConstants.XSD, "base64Binary"));
+ setSchemaType(new QName(SOAPConstants.XSD, "base64Binary"));
}
@Override
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java Tue Oct 23 07:41:56 2007
@@ -22,7 +22,7 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.aegis.DatabindingException;
-import org.apache.cxf.aegis.util.XmlConstants;
+import org.apache.cxf.common.util.SOAPConstants;
/**
* Basic type conversions for reading messages.
@@ -30,7 +30,7 @@
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
*/
public abstract class AbstractMessageReader implements MessageReader {
- private static final QName XSI_NIL = new QName(XmlConstants.XSI_NS, "nil", XmlConstants.XSI_PREFIX);
+ private static final QName XSI_NIL = new QName(SOAPConstants.XSI_NS, "nil", SOAPConstants.XSI_PREFIX);
public AbstractMessageReader() {
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java Tue Oct 23 07:41:56 2007
@@ -20,7 +20,7 @@
import javax.xml.namespace.QName;
-import org.apache.cxf.aegis.util.XmlConstants;
+import org.apache.cxf.common.util.SOAPConstants;
/**
* Basic type conversion functionality for writing messages.
@@ -53,11 +53,11 @@
} else {
value = type.getLocalPart();
}
- getAttributeWriter("type", XmlConstants.XSI_NS).writeValue(value);
+ getAttributeWriter("type", SOAPConstants.XSI_NS).writeValue(value);
}
public void writeXsiNil() {
- MessageWriter attWriter = getAttributeWriter("nil", XmlConstants.XSI_NS);
+ MessageWriter attWriter = getAttributeWriter("nil", SOAPConstants.XSI_NS);
attWriter.writeValue("true");
attWriter.close();
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java Tue Oct 23 07:41:56 2007
@@ -28,9 +28,9 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.aegis.DatabindingException;
-import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.aegis.xml.AbstractMessageReader;
import org.apache.cxf.aegis.xml.MessageReader;
+import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
@@ -106,7 +106,7 @@
/*
* We're making a conscious choice here -- garbage in == garbate out.
*/
- String xsiTypeQname = root.getAttributeValue(XmlConstants.XSI_NS, "type");
+ String xsiTypeQname = root.getAttributeValue(SOAPConstants.XSI_NS, "type");
if (xsiTypeQname != null) {
Matcher m = QNAME_PATTERN.matcher(xsiTypeQname);
if (m.matches()) {
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java Tue Oct 23 07:41:56 2007
@@ -36,11 +36,11 @@
import org.apache.cxf.BusFactory;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.aegis.databinding.AegisServiceConfiguration;
-import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.binding.soap.SoapBindingFactory;
import org.apache.cxf.binding.soap.SoapTransportFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
+import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.endpoint.ServerRegistry;
import org.apache.cxf.frontend.AbstractEndpointFactory;
@@ -92,9 +92,9 @@
bus.setExtension(new WSDLManagerImpl(), WSDLManager.class);
- addNamespace("wsdl", XmlConstants.WSDL11_NS);
- addNamespace("wsdlsoap", XmlConstants.WSDL11_SOAP_NS);
- addNamespace("xsd", XmlConstants.XSD);
+ addNamespace("wsdl", SOAPConstants.WSDL11_NS);
+ addNamespace("wsdlsoap", SOAPConstants.WSDL11_SOAP_NS);
+ addNamespace("xsd", SOAPConstants.XSD);
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/HeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/HeaderTest.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/HeaderTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/HeaderTest.java Tue Oct 23 07:41:56 2007
@@ -25,7 +25,7 @@
import org.w3c.dom.Document;
import org.apache.cxf.aegis.AbstractAegisTest;
-import org.apache.cxf.aegis.util.XmlConstants;
+import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
@@ -82,7 +82,7 @@
Document wsdl = getWSDLDocument("Echo");
- addNamespace("wsdlsoap", XmlConstants.WSDL11_NS);
+ addNamespace("wsdlsoap", SOAPConstants.WSDL11_NS);
assertValid("//wsdl:input/wsdlsoap:header[@message='tns:echoRequestHeaders'][@part='in0']", wsdl);
assertValid("//wsdl:output/wsdlsoap:header[@message='tns:echoResponseHeaders'][@part='out']", wsdl);
assertValid("//wsdl:output/wsdlsoap:header[@message='tns:echoResponseHeaders'][@part='out0']", wsdl);
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java Tue Oct 23 07:41:56 2007
@@ -30,7 +30,7 @@
import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
-import org.apache.cxf.aegis.util.XmlConstants;
+import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.junit.Before;
import org.junit.Test;
@@ -94,7 +94,7 @@
@Test
public void testLocalGetEmployee() throws Exception {
Node response = invoke("InheritanceService", "GetEmployee.xml");
- addNamespace("xsi", XmlConstants.XSI_NS);
+ addNamespace("xsi", SOAPConstants.XSI_NS);
addNamespace("w", "urn:xfire:inheritance");
addNamespace("p", "http://inheritance.aegis.cxf.apache.org");
assertValid("//s:Body/w:getEmployeeResponse/w:return/p:division", response);
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java Tue Oct 23 07:41:56 2007
@@ -32,12 +32,12 @@
import org.apache.cxf.aegis.type.DefaultTypeMappingRegistry;
import org.apache.cxf.aegis.type.Type;
import org.apache.cxf.aegis.type.TypeMapping;
-import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.aegis.util.jdom.StaxBuilder;
import org.apache.cxf.aegis.xml.jdom.JDOMReader;
import org.apache.cxf.aegis.xml.jdom.JDOMWriter;
import org.apache.cxf.aegis.xml.stax.ElementReader;
import org.apache.cxf.aegis.xml.stax.ElementWriter;
+import org.apache.cxf.common.util.SOAPConstants;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.output.DOMOutputter;
@@ -52,7 +52,7 @@
addNamespace("b", "urn:Bean");
addNamespace("a", "urn:anotherns");
- addNamespace("xsi", XmlConstants.XSI_NS);
+ addNamespace("xsi", SOAPConstants.XSI_NS);
reg = new DefaultTypeMappingRegistry(true);
mapping = reg.createTypeMapping(true);
@@ -199,8 +199,8 @@
assertValid("/b:root[@b:bleh='bleh']", element);
assertValid("/b:root[@b:howdy='howdy']", element);
- Element types = new Element("types", "xsd", XmlConstants.XSD);
- Element schema = new Element("schema", "xsd", XmlConstants.XSD);
+ Element types = new Element("types", "xsd", SOAPConstants.XSD);
+ Element schema = new Element("schema", "xsd", SOAPConstants.XSD);
types.addContent(schema);
new Document(types);
@@ -272,8 +272,8 @@
assertInvalid("/b:root[@b:howdy]", element);
assertValid("/b:root/b:bleh[@xsi:nil='true']", element);
- Element types = new Element("types", "xsd", XmlConstants.XSD);
- Element schema = new Element("schema", "xsd", XmlConstants.XSD);
+ Element types = new Element("types", "xsd", SOAPConstants.XSD);
+ Element schema = new Element("schema", "xsd", SOAPConstants.XSD);
types.addContent(schema);
new Document(types);
@@ -294,8 +294,8 @@
type.setTypeMapping(mapping);
type.setSchemaType(new QName("urn:Bean", "bean"));
- Element types = new Element("types", "xsd", XmlConstants.XSD);
- Element schema = new Element("schema", "xsd", XmlConstants.XSD);
+ Element types = new Element("types", "xsd", SOAPConstants.XSD);
+ Element schema = new Element("schema", "xsd", SOAPConstants.XSD);
types.addContent(schema);
new Document(types);
@@ -326,8 +326,8 @@
type.setTypeClass(IntBean.class);
type.setTypeMapping(mapping);
- Element types = new Element("types", "xsd", XmlConstants.XSD);
- Element schema = new Element("schema", "xsd", XmlConstants.XSD);
+ Element types = new Element("types", "xsd", SOAPConstants.XSD);
+ Element schema = new Element("schema", "xsd", SOAPConstants.XSD);
types.addContent(schema);
new Document(types);
@@ -413,7 +413,7 @@
// just
// shouldn't be there.
- addNamespace("xsi", XmlConstants.XSI_NS);
+ addNamespace("xsi", SOAPConstants.XSI_NS);
assertValid("/b:root/b:data[@xsi:nil='true']", element);
bean = (ByteBean)type.readObject(new JDOMReader(element), new Context());
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java Tue Oct 23 07:41:56 2007
@@ -23,7 +23,7 @@
import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.services.DataService;
-import org.apache.cxf.aegis.util.XmlConstants;
+import org.apache.cxf.common.util.SOAPConstants;
import org.junit.Test;
/**
@@ -51,9 +51,9 @@
public void testBeanServiceWSDL() throws Exception {
Document doc = getWSDLDocument("DataService");
- addNamespace("wsdl", XmlConstants.WSDL11_NS);
- addNamespace("wsdlsoap", XmlConstants.WSDL11_SOAP_NS);
- addNamespace("xsd", XmlConstants.XSD);
+ addNamespace("wsdl", SOAPConstants.WSDL11_NS);
+ addNamespace("wsdlsoap", SOAPConstants.WSDL11_SOAP_NS);
+ addNamespace("xsd", SOAPConstants.XSD);
assertValid("//xsd:element[@name='data'][@type='xsd:base64Binary']", doc);
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java Tue Oct 23 07:41:56 2007
@@ -30,7 +30,7 @@
import org.apache.cxf.aegis.type.XMLTypeCreator;
import org.apache.cxf.aegis.type.basic.BeanType;
import org.apache.cxf.aegis.type.basic.StringType;
-import org.apache.cxf.aegis.util.XmlConstants;
+import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.service.Service;
import org.junit.Before;
@@ -143,7 +143,7 @@
public void testWSDL() throws Exception {
Document wsdl = getWSDLDocument("AnnotatedService");
- addNamespace("xsd", XmlConstants.XSD);
+ addNamespace("xsd", SOAPConstants.XSD);
assertValid(
"//xsd:complexType[@name='AnnotatedBean1']/xsd:sequence/xsd:"
+ "element[@name='elementProperty']",
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java Tue Oct 23 07:41:56 2007
@@ -23,7 +23,7 @@
import org.w3c.dom.Document;
import org.apache.cxf.aegis.AbstractAegisTest;
-import org.apache.cxf.aegis.util.XmlConstants;
+import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.junit.Test;
@@ -40,7 +40,7 @@
Document wsdl = getWSDLDocument("DualOutService");
assertNotNull(wsdl);
- addNamespace("xsd", XmlConstants.XSD);
+ addNamespace("xsd", SOAPConstants.XSD);
assertValid(
"//xsd:complexType[@name='getValuesResponse']//xsd:element"
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java Tue Oct 23 07:41:56 2007
@@ -28,9 +28,9 @@
import org.apache.cxf.aegis.type.CustomTypeMapping;
import org.apache.cxf.aegis.type.Type;
import org.apache.cxf.aegis.type.java5.CurrencyService.Currency;
-import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.aegis.xml.jdom.JDOMReader;
import org.apache.cxf.aegis.xml.jdom.JDOMWriter;
+import org.apache.cxf.common.util.SOAPConstants;
import org.jdom.Element;
import org.jdom.output.DOMOutputter;
import org.junit.Before;
@@ -101,7 +101,7 @@
type.writeSchema(root);
Document doc = new DOMOutputter().output(wsdl);
- addNamespace("xsd", XmlConstants.XSD);
+ addNamespace("xsd", SOAPConstants.XSD);
assertValid("//xsd:simpleType[@name='test']/xsd:restriction[@base='xsd:string']", doc);
assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='VALUE1']", doc);
assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='VALUE2']", doc);
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java Tue Oct 23 07:41:56 2007
@@ -32,7 +32,7 @@
import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
-import org.apache.cxf.aegis.util.XmlConstants;
+import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.helpers.XPathUtils;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.junit.Before;
@@ -57,7 +57,7 @@
public void testWSDL() throws Exception {
Collection<Document> wsdls = getWSDLDocuments("NotificationService");
- addNamespace("xsd", XmlConstants.XSD);
+ addNamespace("xsd", SOAPConstants.XSD);
//assertValid("//xsd:element[@name='Notify']", wsdl);
assertTrue(isExist(wsdls, "//xsd:element[@name='Notify']", getNamespaces()));
}
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java Tue Oct 23 07:41:56 2007
@@ -54,7 +54,7 @@
public JaxWsImplementorInfo(Class<?> ic) {
implementorClass = ic;
- initialise();
+ initialize();
}
public Class<?> getSEIClass() {
@@ -253,7 +253,7 @@
}
return null;
}
- private void initialise() {
+ private void initialize() {
Class<?> cls = implementorClass;
while (cls != null) {
WebService annotation = cls.getAnnotation(WebService.class);
Modified: incubator/cxf/trunk/rt/javascript/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/pom.xml?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/pom.xml (original)
+++ incubator/cxf/trunk/rt/javascript/pom.xml Tue Oct 23 07:41:56 2007
@@ -120,7 +120,12 @@
</exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -151,4 +156,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java (original)
+++ incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java Tue Oct 23 07:41:56 2007
@@ -116,7 +116,7 @@
}
// nillable and optional would be very strange together.
- // and nillable in the array case can't be right, can it?
+ // and nillable in the array case applies to the elements.
if (nillable && !isParticleArray(elChild)) {
utils.startIf(elementName + " == null");
utils.appendAppend("<" + elementXmlRef + " " + NIL_ATTRIBUTES + "/>");
Modified: incubator/cxf/trunk/rt/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?rev=587523&r1=587522&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/pom.xml (original)
+++ incubator/cxf/trunk/rt/pom.xml Tue Oct 23 07:41:56 2007
@@ -34,6 +34,7 @@
<modules>
<module>core</module>
<module>transports/local</module>
+ <module>testsupport</module>
<module>databinding/jaxb</module>
<module>databinding/aegis</module>
<module>bindings</module>
Added: incubator/cxf/trunk/rt/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/testsupport/pom.xml?rev=587523&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/testsupport/pom.xml (added)
+++ incubator/cxf/trunk/rt/testsupport/pom.xml Tue Oct 23 07:41:56 2007
@@ -0,0 +1,108 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-testsupport</artifactId>
+ <packaging>jar</packaging>
+ <version>2.1-incubator-SNAPSHOT</version>
+ <name>Apache CXF Test Case Support</name>
+ <url>http://cwiki.apache.org/CXF</url>
+
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-parent</artifactId>
+ <version>2.1-incubator-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-core</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jra</groupId>
+ <artifactId>jra</artifactId>
+ <version>1.0-alpha-3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: incubator/cxf/trunk/rt/testsupport/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/testsupport/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/cxf/trunk/rt/testsupport/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/testsupport/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/testsupport/src/test/java/org/apache/cxf/testsupport/TestUtilitiesWithBasicBus.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/testsupport/src/test/java/org/apache/cxf/testsupport/TestUtilitiesWithBasicBus.java?rev=587523&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/testsupport/src/test/java/org/apache/cxf/testsupport/TestUtilitiesWithBasicBus.java (added)
+++ incubator/cxf/trunk/rt/testsupport/src/test/java/org/apache/cxf/testsupport/TestUtilitiesWithBasicBus.java Tue Oct 23 07:41:56 2007
@@ -0,0 +1,79 @@
+/**
+ * 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.testsupport;
+
+import org.apache.cxf.BusException;
+import org.apache.cxf.binding.BindingFactoryManager;
+import org.apache.cxf.binding.soap.SoapBindingFactory;
+import org.apache.cxf.binding.soap.SoapTransportFactory;
+import org.apache.cxf.common.util.SOAPConstants;
+import org.apache.cxf.test.TestUtilities;
+import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.cxf.wsdl.WSDLManager;
+import org.apache.cxf.wsdl11.WSDLManagerImpl;
+
+public class TestUtilitiesWithBasicBus extends TestUtilities {
+
+ private LocalTransportFactory localTransport;
+
+ public TestUtilitiesWithBasicBus(Class<?> classpathReference) {
+ super(classpathReference);
+ }
+
+ /**
+ * Add objects to the bus to set up the local transport, soap transport, soap bindings, and WSDL manager.
+ * All you need to test databindings and other type-related operations.
+ * @throws BusException
+ */
+ public void setUp() throws BusException {
+ SoapBindingFactory bindingFactory = new SoapBindingFactory();
+
+ bus.getExtension(BindingFactoryManager.class)
+ .registerBindingFactory("http://schemas.xmlsoap.org/wsdl/soap/", bindingFactory);
+
+ DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
+
+ SoapTransportFactory soapDF = new SoapTransportFactory();
+ soapDF.setBus(bus);
+ dfm.registerDestinationFactory("http://schemas.xmlsoap.org/wsdl/soap/", soapDF);
+ dfm.registerDestinationFactory("http://schemas.xmlsoap.org/soap/", soapDF);
+ dfm.registerDestinationFactory("http://cxf.apache.org/transports/local", soapDF);
+
+ localTransport = new LocalTransportFactory();
+ dfm.registerDestinationFactory("http://schemas.xmlsoap.org/soap/http", localTransport);
+ dfm.registerDestinationFactory("http://schemas.xmlsoap.org/wsdl/soap/http", localTransport);
+ dfm.registerDestinationFactory("http://cxf.apache.org/bindings/xformat", localTransport);
+ dfm.registerDestinationFactory("http://cxf.apache.org/transports/local", localTransport);
+
+ ConduitInitiatorManager extension = bus.getExtension(ConduitInitiatorManager.class);
+ extension.registerConduitInitiator(LocalTransportFactory.TRANSPORT_ID, localTransport);
+ extension.registerConduitInitiator("http://schemas.xmlsoap.org/wsdl/soap/", localTransport);
+ extension.registerConduitInitiator("http://schemas.xmlsoap.org/soap/http", localTransport);
+ extension.registerConduitInitiator("http://schemas.xmlsoap.org/soap/", localTransport);
+
+ bus.setExtension(new WSDLManagerImpl(), WSDLManager.class);
+
+ addNamespace("wsdl", SOAPConstants.WSDL11_NS);
+ addNamespace("wsdlsoap", SOAPConstants.WSDL11_SOAP_NS);
+ addNamespace("xsd", SOAPConstants.XSD);
+ }
+
+}
Propchange: incubator/cxf/trunk/rt/testsupport/src/test/java/org/apache/cxf/testsupport/TestUtilitiesWithBasicBus.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/testsupport/src/test/java/org/apache/cxf/testsupport/TestUtilitiesWithBasicBus.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/cxf/trunk/rt/testsupport/src/test/java/org/apache/cxf/testsupport/TestUtilitiesWithBasicBus.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java?rev=587523&r1=587274&r2=587523&view=diff
==============================================================================
--- incubator/cxf/trunk/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java (original)
+++ incubator/cxf/trunk/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java Tue Oct 23 07:41:56 2007
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.header_test.rpc;
+package org.apache.cxf.testutils.header_test.rpc;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import javax.jws.WebParam;
+import org.apache.header_test.rpc.TestRPCHeader;
import org.junit.Assert;
import org.junit.Test;