Author: dkulp
Date: Tue Feb 19 10:23:52 2008
New Revision: 629177
URL: http://svn.apache.org/viewvc?rev=629177&view=rev
Log:
[CXF-1362] add propOrder to generated wrapper beans
Modified:
incubator/cxf/trunk/rt/transports/jbi/pom.xml
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/FaultDetail.java.source
Modified: incubator/cxf/trunk/rt/transports/jbi/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jbi/pom.xml?rev=629177&r1=629176&r2=629177&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/transports/jbi/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/jbi/pom.xml Tue Feb 19 10:23:52 2008
@@ -54,11 +54,16 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.servicemix</groupId>
Modified:
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java?rev=629177&r1=629176&r2=629177&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
(original)
+++
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
Tue Feb 19 10:23:52 2008
@@ -19,6 +19,9 @@
package org.apache.cxf.tools.java2wsdl.generator.wsdl11.annotator;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@@ -28,6 +31,7 @@
import org.apache.cxf.tools.common.model.JAnnotation;
import org.apache.cxf.tools.common.model.JAnnotationElement;
import org.apache.cxf.tools.common.model.JavaAnnotatable;
+import org.apache.cxf.tools.common.model.JavaField;
import org.apache.cxf.tools.java2wsdl.generator.wsdl11.model.WrapperBeanClass;
public class WrapperBeanAnnotator implements Annotator {
@@ -53,6 +57,15 @@
beanClass.getElementName().getLocalPart()));
xmlType.addElement(new JAnnotationElement("namespace",
beanClass.getElementName().getNamespaceURI()));
+
+ List<String> props = new ArrayList<String>();
+ for (JavaField f : beanClass.getFields()) {
+ props.add(f.getRawName());
+ }
+ if (props.size() > 1) {
+ xmlType.addElement(new JAnnotationElement("propOrder",
+ props));
+ }
// Revisit: why annotation is string?
beanClass.addAnnotation(xmlRootElement);
Modified:
incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/FaultDetail.java.source
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/FaultDetail.java.source?rev=629177&r1=629176&r2=629177&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/FaultDetail.java.source
(original)
+++
incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/FaultDetail.java.source
Tue Feb 19 10:23:52 2008
@@ -15,7 +15,7 @@
@XmlRootElement(namespace = "http://rpc.jaxws.fortest.tools.cxf.apache.org/";,
name = "PingMeFault")
@XmlAccessorType(XmlAccessType.FIELD)
[EMAIL PROTECTED](namespace = "http://rpc.jaxws.fortest.tools.cxf.apache.org/";,
name = "PingMeFault")
[EMAIL PROTECTED](namespace = "http://rpc.jaxws.fortest.tools.cxf.apache.org/";,
name = "PingMeFault", propOrder = {"code", "message"})
public class FaultDetail {
