You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/07/11 18:20:56 UTC
svn commit: r1502273 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/interceptor/
rt/core/src/main/java/org/apache/cxf/service/factory/
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws...
Author: dkulp
Date: Thu Jul 11 16:20:56 2013
New Revision: 1502273
URL: http://svn.apache.org/r1502273
Log:
Use the right constant
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java?rev=1502273&r1=1502272&r2=1502273&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java Thu Jul 11 16:20:56 2013
@@ -50,12 +50,11 @@ import org.apache.cxf.service.model.Serv
import org.apache.cxf.service.model.ServiceModelUtil;
import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
+import org.apache.ws.commons.schema.constants.Constants;
public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInterceptor<Message> {
public static final String NO_VALIDATE_PARTS = AbstractInDatabindingInterceptor.class.getName()
+ ".novalidate-parts";
- private static final QName XSD_ANY = new QName("http://www.w3.org/2001/XMLSchema", "anyType", "xsd");
-
private static final ResourceBundle BUNDLE = BundleUtils
.getBundle(AbstractInDatabindingInterceptor.class);
@@ -214,7 +213,7 @@ public abstract class AbstractInDatabind
return p;
}
- if (XSD_ANY.equals(p.getTypeQName())) {
+ if (Constants.XSD_ANYTYPE.equals(p.getTypeQName())) {
lastChoice = p;
lastBoi = boi;
lastMsgInfo = msgInfo;
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties?rev=1502273&r1=1502272&r2=1502273&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties Thu Jul 11 16:20:56 2013
@@ -25,7 +25,6 @@ COULD_NOT_FIND_PORTTYPE = Could not find
USING_PROXY_FOR_SERVICE = Service class: {0} is a java.lang.reflect.Proxy instance. This is known not to work well as \
annotations on the real instance are not available. We suggest overriding the ServiceClass via spring config or \
other configuration. (serviceClass/implementorClass attributes on the endpoint/server spring config entry)
-REFERENCE_TO_UNDEFINED_TYPE = Schema element {0} references undefined type {1} for service {2}.
UNMAPPABLE_PORT_TYPE= Service class {0} method {1} part {2} cannot be mapped to schema. Check for use of a JAX-WS-specific type \
without the JAX-WS service factory bean.
INTRACTABLE_PART= Message part {0} of Message {1} cannot be processed. This can be caused by the use of JAX-WS-specific types \
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java?rev=1502273&r1=1502272&r2=1502273&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java Thu Jul 11 16:20:56 2013
@@ -282,7 +282,7 @@ public abstract class AbstractTypeCreato
protected AegisType createObjectType() {
ObjectType type = new ObjectType();
- type.setSchemaType(Constants.XSD_ANY);
+ type.setSchemaType(Constants.XSD_ANYTYPE);
type.setTypeClass(Object.class);
type.setTypeMapping(getTypeMapping());
return type;
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java?rev=1502273&r1=1502272&r2=1502273&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java Thu Jul 11 16:20:56 2013
@@ -230,16 +230,16 @@ public class DefaultTypeMapping implemen
defaultRegister(tm, defaultNillable, Double.class, Constants.XSD_DOUBLE, new DoubleType());
defaultRegister(tm, defaultNillable, Integer.class, Constants.XSD_INT, new IntType());
defaultRegister(tm, defaultNillable, Long.class, Constants.XSD_LONG, new LongType());
- defaultRegister(tm, defaultNillable, Object.class, Constants.XSD_ANY, new ObjectType());
+ defaultRegister(tm, defaultNillable, Object.class, Constants.XSD_ANYTYPE, new ObjectType());
defaultRegister(tm, defaultNillable, Byte.class, Constants.XSD_BYTE, new ByteType());
defaultRegister(tm, defaultNillable, Short.class, Constants.XSD_SHORT, new ShortType());
- defaultRegister(tm, defaultNillable, Source.class, Constants.XSD_ANY, new SourceType());
+ defaultRegister(tm, defaultNillable, Source.class, Constants.XSD_ANYTYPE, new SourceType());
defaultRegister(tm, defaultNillable, String.class, Constants.XSD_STRING, new StringType());
defaultRegister(tm, defaultNillable, Time.class, Constants.XSD_TIME, new TimeType());
defaultRegister(tm, defaultNillable, Timestamp.class, Constants.XSD_DATETIME,
new TimestampType());
defaultRegister(tm, defaultNillable, URI.class, Constants.XSD_ANYURI, new URIType());
- defaultRegister(tm, defaultNillable, XMLStreamReader.class, Constants.XSD_ANY,
+ defaultRegister(tm, defaultNillable, XMLStreamReader.class, Constants.XSD_ANYTYPE,
new XMLStreamReaderType());
defaultRegister(tm, defaultNillable, boolean.class, Constants.XSD_BOOLEAN,
@@ -270,7 +270,7 @@ public class DefaultTypeMapping implemen
new DataHandlerType(enableMtomXmime, null));
- defaultRegister(tm, defaultNillable, Document.class, Constants.XSD_ANY, new DocumentType());
+ defaultRegister(tm, defaultNillable, Document.class, Constants.XSD_ANYTYPE, new DocumentType());
if (enableJDOM) {
registerJDOMTypes(tm, defaultNillable);
}
@@ -280,7 +280,7 @@ public class DefaultTypeMapping implemen
private static void registerJDOMTypes(TypeMapping tm, boolean defaultNillable) {
try {
Class<?> jdomDocClass = ClassLoaderUtils.loadClass("org.jdom.Document", DefaultTypeMapping.class);
- defaultRegister(tm, defaultNillable, jdomDocClass, Constants.XSD_ANY,
+ defaultRegister(tm, defaultNillable, jdomDocClass, Constants.XSD_ANYTYPE,
new JDOMDocumentType());
} catch (ClassNotFoundException e) {
@@ -290,7 +290,7 @@ public class DefaultTypeMapping implemen
try {
Class<?> jdomElementClass =
ClassLoaderUtils.loadClass("org.jdom.Element", DefaultTypeMapping.class);
- defaultRegister(tm, defaultNillable, jdomElementClass, Constants.XSD_ANY,
+ defaultRegister(tm, defaultNillable, jdomElementClass, Constants.XSD_ANYTYPE,
new JDOMElementType());
} catch (ClassNotFoundException e) {
// not available.
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=1502273&r1=1502272&r2=1502273&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Thu Jul 11 16:20:56 2013
@@ -370,7 +370,7 @@ public class JaxWsServiceFactoryBean ext
MessagePartInfo mpi = mInfo.addMessagePart("parameters");
mpi.setElement(true);
mpi.setTypeClass(c);
- mpi.setTypeQName(Constants.XSD_ANY);
+ mpi.setTypeQName(Constants.XSD_ANYTYPE);
mInfo = op.createMessage(new QName(catchAll.getNamespaceURI(),
name + "Response"),
@@ -379,7 +379,7 @@ public class JaxWsServiceFactoryBean ext
mpi = mInfo.addMessagePart("parameters");
mpi.setElement(true);
mpi.setTypeClass(c);
- mpi.setTypeQName(Constants.XSD_ANY);
+ mpi.setTypeQName(Constants.XSD_ANYTYPE);
BindingOperationInfo bo = new BindingOperationInfo(bind, op);
op.setProperty("operation.is.synthetic", Boolean.TRUE);
@@ -693,7 +693,7 @@ public class JaxWsServiceFactoryBean ext
protected void initializeParameter(MessagePartInfo part, Class<?> rawClass, Type type) {
if (implInfo.isWebServiceProvider()) {
- part.setTypeQName(Constants.XSD_ANY);
+ part.setTypeQName(Constants.XSD_ANYTYPE);
part.setTypeClass(rawClass);
return;
}
Modified: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java?rev=1502273&r1=1502272&r2=1502273&view=diff
==============================================================================
--- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java Thu Jul 11 16:20:56 2013
@@ -220,7 +220,7 @@ public class DocLiteralInInterceptor ext
List<MessagePartInfo> bparts = bmsg.getMessageParts();
if (bparts.size() == 0
|| (bparts.size() == 1
- && Constants.XSD_ANY.equals(bparts.get(0).getTypeQName()))) {
+ && Constants.XSD_ANYTYPE.equals(bparts.get(0).getTypeQName()))) {
BindingOperationInfo boi = ep.getEndpointInfo().getBinding().getOperation(op);
exchange.put(BindingOperationInfo.class, boi);
exchange.put(OperationInfo.class, op);
Modified: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java?rev=1502273&r1=1502272&r2=1502273&view=diff
==============================================================================
--- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java Thu Jul 11 16:20:56 2013
@@ -119,7 +119,7 @@ public class URIMappingInterceptor exten
for (BindingOperationInfo b : service.getOperations()) {
if (b.getInput() != null && !b.getInput().getMessageInfo().getMessageParts().isEmpty()) {
MessagePartInfo inf = b.getInput().getMessageInfo().getMessagePart(0);
- if (Constants.XSD_ANY.equals(inf.getTypeQName())) {
+ if (Constants.XSD_ANYTYPE.equals(inf.getTypeQName())) {
return b;
}
}