Author: dkulp
Date: Wed Apr 9 14:13:38 2008
New Revision: 646537
URL: http://svn.apache.org/viewvc?rev=646537&view=rev
Log:
Merged revisions 646471 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r646471 | dkulp | 2008-04-09 14:26:56 -0400 (Wed, 09 Apr 2008) | 4 lines
Start working on supporting the IBM 1.6 JDK
* Put javascripts tests to forkmode pertest to avoid some socket issues or
other cleanup problems that are making the tests take about 15 minutes on IBM
jdk
* Make the FaultBean generator create consistent beans so they are
dependendent on which JDK generated them.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java?rev=646537&r1=646536&r2=646537&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
Wed Apr 9 14:13:38 2008
@@ -21,6 +21,9 @@
import java.lang.reflect.Method;
import java.util.Arrays;
+import java.util.Map;
+import java.util.TreeMap;
+
import javax.xml.namespace.QName;
import javax.xml.ws.WebFault;
@@ -81,16 +84,21 @@
}
private void buildBeanFields(final Class exceptionClass, final JavaClass
jClass) {
+ Map<String, JavaField> fields = new TreeMap<String, JavaField>();
+
for (Method method : exceptionClass.getMethods()) {
if (isIncludedGetter(method)) {
JavaField field = new JavaField(getFieldName(method),
method.getReturnType().getName(),
"");
field.setOwner(jClass);
- jClass.addField(field);
- jClass.appendGetter(field);
- jClass.appendSetter(field);
+ fields.put(field.getName(), field);
}
+ }
+ for (Map.Entry<String, JavaField> ent : fields.entrySet()) {
+ jClass.addField(ent.getValue());
+ jClass.appendGetter(ent.getValue());
+ jClass.appendSetter(ent.getValue());
}
}