Rather than automatically rolling back code changes, perhaps you should
take some time to see if the test is correct? This change fixed a very
legitimate problem we were having with the WSDL2Java code that was causing
incorrect metadata to be created. If the test was created to validate the
improper behavior, or if there is a problem in some other part of the code
that was uncovered by this, then that's a different issue.
Please post some information about what tests were failing.
- James Snell
IBM Emerging Technologies
[EMAIL PROTECTED]
(559) 587-1233 (office)
(700) 544-9035 (t/l)
Programming Web Services With SOAP
O'Reilly & Associates, ISBN 0596000952
Have I not commanded you? Be strong and courageous.
Do not be terrified, do not be discouraged, for the Lord your
God will be with you whereever you go. - Joshua 1:9
[EMAIL PROTECTED]
02/28/2003 08:21 AM
Please respond to axis-dev
To
[EMAIL PROTECTED]
cc
bcc
Subject
cvs commit: xml-axis/java/src/org/apache/axis/description TypeDesc.java
dims 2003/02/28 08:21:58
Modified: java/src/org/apache/axis/wsdl/toJava
JavaBeanHelperWriter.java
java/src/org/apache/axis/utils JavaUtils.java
java/src/org/apache/axis/message RPCElement.java
java/src/org/apache/axis/description TypeDesc.java
Log:
Rolling back changes to get "ant clean all-tests" to work.
Revision Changes Path
1.34 +3 -4
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java
Index: JavaBeanHelperWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- JavaBeanHelperWriter.java 27 Feb 2003 20:14:18 -0000 1.33
+++ JavaBeanHelperWriter.java 28 Feb 2003 16:21:54 -0000 1.34
@@ -273,18 +273,17 @@
// Some special handling for arrays
TypeEntry elemType = elem.getType();
- while (elemType.getRefType() != null &&
- !(elem.getType().getDimensions().indexOf("[")
> -1)) {
+ while (elemType.getRefType() != null) {
elemType = elemType.getRefType();
}
QName xmlType = elemType.getQName();
- if ((xmlType != null &&
xmlType.getLocalPart().indexOf("[") > 0)) {
+ if (xmlType != null &&
xmlType.getLocalPart().indexOf("[") > 0) {
// Skip array types, because they are special
xmlType = null;
}
-
+
pw.print(" ");
if (!wroteElemDecl) {
pw.print("org.apache.axis.description.ElementDesc ");
1.94 +0 -20 xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
Index: JavaUtils.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- JavaUtils.java 28 Feb 2003 14:56:11 -0000 1.93
+++ JavaUtils.java 28 Feb 2003 16:21:56 -0000 1.94
@@ -223,25 +223,6 @@
log.debug( Messages.getMessage("convert00", clsName,
destClass.getName()));
}
-
- if (arg instanceof java.util.HashMap &&
- java.util.Map.class.isAssignableFrom(destClass)) {
- if (java.util.HashMap.class.isAssignableFrom(destClass))
return arg;
- try {
- java.util.Map newMap =
(java.util.Map)destClass.newInstance();
- for (java.util.Iterator i =
((java.util.Map)arg).keySet().iterator();
- i.hasNext();) {
- Object key = i.next();
- Object value = ((java.util.Map)arg).get(key);
- newMap.put(key,value);
- }
- return newMap;
- } catch (Exception e) {
- return arg;
- }
- }
-
-
// See if a previously converted value is stored in the argument.
Object destValue = null;
if (arg instanceof ConvertCache) {
@@ -833,7 +814,6 @@
// identifier character, capitalize the next character.
// For example: "22hi" becomes "22Hi"
wordStart = !Character.isLetter(c);
- //wordStart = !Character.isJavaIdentifierPart(c)
}
// covert back to a String
1.84 +1 -12 xml-axis/java/src/org/apache/axis/message/RPCElement.java
Index: RPCElement.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/message/RPCElement.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- RPCElement.java 28 Feb 2003 14:59:37 -0000 1.83
+++ RPCElement.java 28 Feb 2003 16:21:57 -0000 1.84
@@ -249,18 +249,7 @@
// Get the type in the signature (java type or its holder)
Class sigType = paramDesc.getJavaType();
if(!JavaUtils.isConvertable(value, sigType))
- match = false;
-
- //if (!sigType.isArray() &&
value.getClass().isArray() &&
- // !sigType.equals(Object.class)) {
- // match = false;
- //}
- //
- //if (operation.getUse() == Use.ENCODED
&&
- // sigType.isArray() &&
- // !value.getClass().isArray()) {
- // match = false;
- //}
+ match = false;
}
}
// This is not the right operation, try the next one.
1.29 +4 -4
xml-axis/java/src/org/apache/axis/description/TypeDesc.java
Index: TypeDesc.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/description/TypeDesc.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- TypeDesc.java 28 Feb 2003 02:11:24 -0000 1.28
+++ TypeDesc.java 28 Feb 2003 16:21:58 -0000 1.29
@@ -308,8 +308,8 @@
*/
public String getFieldNameForElement(QName qname, boolean ignoreNS)
{
-// if (fields == null)
-// return null;
+ if (fields == null)
+ return null;
// have we already computed the answer to this question?
if (fieldElementMap != null) {
@@ -361,8 +361,8 @@
*/
public String getFieldNameForAttribute(QName qname)
{
-// if (fields == null)
-// return null;
+ if (fields == null)
+ return null;
String possibleMatch = null;
