gdaniels 02/04/19 10:28:21
Modified: java/src/org/apache/axis/deployment/wsdd
WSDDTypeMapping.java WSDDBeanMapping.java
Log:
Refactor constructor for cleanliness.
Revision Changes Path
1.26 +8 -21
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTypeMapping.java
Index: WSDDTypeMapping.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTypeMapping.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- WSDDTypeMapping.java 27 Feb 2002 23:46:32 -0000 1.25
+++ WSDDTypeMapping.java 19 Apr 2002 17:28:21 -0000 1.26
@@ -54,13 +54,11 @@
*/
package org.apache.axis.deployment.wsdd;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.apache.axis.utils.XMLUtils;
-import org.apache.axis.utils.JavaUtils;
import org.apache.axis.Constants;
import org.apache.axis.encoding.SerializationContext;
+import org.apache.axis.utils.JavaUtils;
+import org.apache.axis.utils.XMLUtils;
+import org.w3c.dom.Element;
import org.xml.sax.helpers.AttributesImpl;
import javax.xml.rpc.namespace.QName;
@@ -96,8 +94,6 @@
public WSDDTypeMapping(Element e)
throws WSDDException
{
- this(e, true);
-
serializer = e.getAttribute("serializer");
deserializer = e.getAttribute("deserializer");
encodingStyle = e.getAttribute("encodingStyle");
@@ -105,23 +101,11 @@
encodingStyle = Constants.URI_CURRENT_SOAP_ENC;
}
- }
-
- /**
- * Constructor for use only by ourselves and our subclasses.
- *
- * Differentiated by an extra (unused) boolean argument
- */
- protected WSDDTypeMapping(Element e, boolean b)
- throws WSDDException
- {
- super(e);
-
String qnameStr = e.getAttribute("qname");
qname = XMLUtils.getQNameFromString(qnameStr, e);
// JSR 109 v0.093 indicates that this attribute is named "type"
-
+
String typeStr = e.getAttribute("type");
typeQName = XMLUtils.getQNameFromString(typeStr, e);
if (typeStr == null || typeStr.equals("")) {
@@ -226,6 +210,9 @@
WSDDConstants.WSDD_JAVA));
}
String loadName =
JavaUtils.getLoadableClassName(typeQName.getLocalPart());
+ if (JavaUtils.getWrapper(loadName) != null) {
+ // We're
+ }
ClassLoader cl = Thread.currentThread().getContextClassLoader();
return Class.forName(loadName, true, cl);
}
@@ -245,7 +232,7 @@
/**
* Set javaType (type= attribute or languageSpecificType= attribute)
- * @param lsType is the name of the class. (For arrays this
+ * @param javaType is the name of the class. (For arrays this
* could be the form my.Foo[] or could be in the form [Lmy.Foo;
*/
public void setLanguageSpecificType(String javaType)
1.6 +2 -7
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDBeanMapping.java
Index: WSDDBeanMapping.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDBeanMapping.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WSDDBeanMapping.java 27 Feb 2002 23:46:32 -0000 1.5
+++ WSDDBeanMapping.java 19 Apr 2002 17:28:21 -0000 1.6
@@ -54,13 +54,8 @@
*/
package org.apache.axis.deployment.wsdd;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.apache.axis.utils.XMLUtils;
-import org.apache.axis.utils.JavaUtils;
import org.apache.axis.encoding.SerializationContext;
-import org.apache.axis.Constants;
+import org.w3c.dom.Element;
import org.xml.sax.helpers.AttributesImpl;
import javax.xml.rpc.namespace.QName;
@@ -92,7 +87,7 @@
public WSDDBeanMapping(Element e)
throws WSDDException
{
- super(e, true);
+ super(e);
serializer = "org.apache.axis.encoding.ser.BeanSerializerFactory";
deserializer = "org.apache.axis.encoding.ser.BeanDeserializerFactory";
