svn commit: r646471 - in /incubator/cxf/trunk: rt/javascript/pom.xml tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java

[dkulp]

Author: dkulp
Date: Wed Apr  9 11:26:56 2008
New Revision: 646471

URL: http://svn.apache.org/viewvc?rev=646471&view=rev
Log:
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/trunk/rt/javascript/pom.xml
    
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java

Modified: incubator/cxf/trunk/rt/javascript/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/pom.xml?rev=646471&r1=646470&r2=646471&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/pom.xml (original)
+++ incubator/cxf/trunk/rt/javascript/pom.xml Wed Apr  9 11:26:56 2008
@@ -13,6 +13,11 @@
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
+    <properties>
+        <surefire.fork.mode>pertest</surefire.fork.mode>
+    </properties>
+
+
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java?rev=646471&r1=646470&r2=646471&view=diff
==============================================================================
--- 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
 (original)
+++ 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
 Wed Apr  9 11:26:56 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;
 
@@ -87,16 +90,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());
         }
     }