scheu 2002/09/25 11:56:16
Modified: java/src/org/apache/axis/encoding
SerializationContextImpl.java
java/src/org/apache/axis/wsdl/fromJava Types.java
Log:
Some nit changes per Glen's review.
Also some minor changes to change several Java2WSDL messages
from errors to warnings. (These are cases where Java2WSDL
can't convert a class into a wsdl type and defaults to using anytype.)
Revision Changes Path
1.75 +5 -6
xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java
Index: SerializationContextImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- SerializationContextImpl.java 25 Sep 2002 18:27:03 -0000 1.74
+++ SerializationContextImpl.java 25 Sep 2002 18:56:16 -0000 1.75
@@ -1211,7 +1211,6 @@
// prefered xmlType
if (shouldSendType ||
(xmlType != null &&
- actualXMLType.value != null &&
(!xmlType.equals(actualXMLType.value)))) {
attributes = setTypeAttribute(attributes,
actualXMLType.value);
@@ -1277,12 +1276,12 @@
* getSerializer
* Attempts to get a serializer for the indicated javaType and xmlType.
* @param javaType is the type of the object
- * @param preferXmlType is the preferred qname type.
+ * @param xmlType is the preferred qname type.
* @param actualXmlType is set to a QNameHolder or null.
* If a QNameHolder, the actual xmlType is returned.
* @return found class/serializer or null
**/
- private Serializer getSerializer(Class javaType, QName preferXMLType,
+ private Serializer getSerializer(Class javaType, QName xmlType,
QNameHolder actualXMLType) {
SerializerFactory serFactory = null ;
TypeMapping tm = getTypeMapping();
@@ -1291,12 +1290,12 @@
}
while (javaType != null) {
- serFactory = (SerializerFactory) tm.getSerializer(javaType,
preferXMLType);
+ serFactory = (SerializerFactory) tm.getSerializer(javaType, xmlType);
if (serFactory != null)
break;
// Walk my interfaces...
- serFactory = getSerializerFactoryFromInterface(javaType, preferXMLType,
tm);
+ serFactory = getSerializerFactoryFromInterface(javaType, xmlType, tm);
// Finally, head to my superclass
if (serFactory != null)
@@ -1321,7 +1320,7 @@
if (actualXMLType.value == null) {
actualXMLType.value =
((TypeMappingImpl) tm).getXMLType(javaType,
- preferXMLType);
+ xmlType);
}
}
}
1.59 +4 -4 xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java
Index: Types.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Types.java 19 Sep 2002 20:45:54 -0000 1.58
+++ Types.java 25 Sep 2002 18:56:16 -0000 1.59
@@ -953,7 +953,7 @@
javaType.isPrimitive()) {
if (issueErrors &&
!beanCompatErrs.contains(javaType)) {
- log.error(Messages.getMessage("beanCompatType00",
+ log.warn(Messages.getMessage("beanCompatType00",
javaType.getName()));
beanCompatErrs.add(javaType);
}
@@ -966,7 +966,7 @@
javaType.getName().startsWith("javax.")) {
if (issueErrors &&
!beanCompatErrs.contains(javaType)) {
- log.error(Messages.getMessage("beanCompatPkg00",
+ log.warn(Messages.getMessage("beanCompatPkg00",
javaType.getName()));
beanCompatErrs.add(javaType);
}
@@ -986,7 +986,7 @@
} catch (java.lang.NoSuchMethodException e) {
if (issueErrors &&
!beanCompatErrs.contains(javaType)) {
- log.error(Messages.getMessage("beanCompatConstructor00",
+ log.warn(Messages.getMessage("beanCompatConstructor00",
javaType.getName()));
beanCompatErrs.add(javaType);
}
@@ -1009,7 +1009,7 @@
if (issueErrors &&
!beanCompatErrs.contains(javaType)) {
- log.error(Messages.getMessage("beanCompatExtends00",
+ log.warn(Messages.getMessage("beanCompatExtends00",
javaType.getName(),
superClass.getName(),
javaType.getName()));
