Author: dkulp Date: Tue Apr 14 17:48:19 2009 New Revision: 764900 URL: http://svn.apache.org/viewvc?rev=764900&view=rev Log: Merged revisions 764892 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r764892 | dkulp | 2009-04-14 13:35:11 -0400 (Tue, 14 Apr 2009) | 9 lines Merged revisions 764887 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r764887 | dkulp | 2009-04-14 13:18:23 -0400 (Tue, 14 Apr 2009) | 2 lines [CXF-2172] Fix issues with RPC/Lit creating element parts intead of type parts ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 14 17:48:19 2009 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977,750980,750983 -750984,750986,750988,751006,751235,751238,751943,751979,752118,752142,752162,752244,752248,752563,752615,752852-752854,752856,752916-752917,752993,757964,757966,757971,757973,760076,760469,761762,761790,762395 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771,749890,750059-750060,750591,750689,750935,751067-751110,751233,751740,751787,751828,751840,752122,752132,752136,752558,752613,752680,752728,752753,752849,752880-752881,752992,754585,755365,757859,757899,760073,760468,761759,761789,762393 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977,750980,750983 -750984,750986,750988,751006,751235,751238,751943,751979,752118,752142,752162,752244,752248,752563,752615,752852-752854,752856,752916-752917,752993,757964,757966,757971,757973,760076,760469,761762,761790,762395,764892 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771,749890,750059-750060,750591,750689,750935,751067-751110,751233,751740,751787,751828,751840,752122,752132,752136,752558,752613,752680,752728,752753,752849,752880-752881,752992,754585,755365,757859,757899,760073,760468,761759,761789,762393,764887 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java?rev=764900&r1=764899&r2=764900&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java (original) +++ cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java Tue Apr 14 17:48:19 2009 @@ -97,8 +97,9 @@ } return; } - - boolean isElement = beanInfo.isElement(); + boolean isElement = beanInfo.isElement() + && !Boolean.TRUE.equals(part.getMessageInfo().getOperation() + .getProperty("operation.force.types")); boolean hasType = !beanInfo.getTypeNames().isEmpty(); if (isElement && isFromWrapper && hasType) { //if there is both a Global element and a global type, AND we are in a wrapper, Modified: cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=764900&r1=764899&r2=764900&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Tue Apr 14 17:48:19 2009 @@ -118,7 +118,7 @@ public static final String HEADER = "messagepart.isheader"; public static final String ELEMENT_NAME = "messagepart.elementName"; public static final String METHOD = "operation.method"; - + public static final String FORCE_TYPES = "operation.force.types"; private static final Logger LOG = LogUtils.getL7dLogger(ReflectionServiceFactoryBean.class, "SimpleMessages"); @@ -723,7 +723,8 @@ op.setProperty(m.getClass().getName(), m); op.setProperty("action", getAction(op, m)); - if (!isRPC(m) && isWrapped(m)) { + boolean isrpc = isRPC(m); + if (!isrpc && isWrapped(m)) { UnwrappedOperationInfo uOp = new UnwrappedOperationInfo(op); op.setUnwrappedOperation(uOp); @@ -753,6 +754,9 @@ } } } else { + if (isrpc) { + op.setProperty(FORCE_TYPES, Boolean.TRUE); + } createMessageParts(intf, op, m); } Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java?rev=764900&r1=764899&r2=764900&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java (original) +++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java Tue Apr 14 17:48:19 2009 @@ -19,13 +19,34 @@ package org.apache.cxf.systest.jaxws; +import java.io.InputStream; import java.lang.reflect.UndeclaredThrowableException; - +import java.net.HttpURLConnection; +import java.util.HashMap; +import java.util.Map; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; +import javax.jws.soap.SOAPBinding.Use; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; import javax.xml.ws.Endpoint; +import javax.xml.xpath.XPathConstants; + +import org.w3c.dom.Document; +import org.w3c.dom.NodeList; +import org.apache.cxf.binding.soap.Soap11; +import org.apache.cxf.helpers.XMLUtils; +import org.apache.cxf.helpers.XPathUtils; +import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.apache.cxf.testutil.common.AbstractClientServerTestBase; import org.apache.hello_world_rpclit.GreeterRPCLit; import org.apache.hello_world_rpclit.SOAPServiceRPCLit; import org.apache.hello_world_rpclit.types.MyComplexStruct; @@ -34,16 +55,19 @@ import org.junit.Test; -public class ClientServerRPCLitTest extends AbstractClientServerTestBase { +public class ClientServerRPCLitTest extends AbstractBusClientServerTestBase { private final QName portName = new QName("http://apache.org/hello_world_rpclit";, "SoapPortRPCLit"); public static class Server extends AbstractBusTestServerBase { protected void run() { + String address; Object implementor = new RPCLitGreeterImpl(); - String address = "http://localhost:9002/SOAPServiceRPCLit/SoapPort";; + address = "http://localhost:9002/SOAPServiceRPCLit/SoapPort";; Endpoint.publish(address, implementor); + address = "http://localhost:9002/TestRPCWsdl";; + Endpoint.publish(address, new MyService()); } public static void main(String[] args) { @@ -112,4 +136,98 @@ } } + + @Test + public void testNoElementParts() throws Exception { + HttpURLConnection httpConnection = + getHttpConnection("http://localhost:9002/TestRPCWsdl?wsdl";); + httpConnection.connect(); + + assertEquals(200, httpConnection.getResponseCode()); + assertEquals("OK", httpConnection.getResponseMessage()); + InputStream in = httpConnection.getInputStream(); + assertNotNull(in); + + Document doc = XMLUtils.parse(in); + assertNotNull(doc); + + + Map<String, String> ns = new HashMap<String, String>(); + ns.put("soap", Soap11.SOAP_NAMESPACE); + ns.put("wsdl", "http://schemas.xmlsoap.org/wsdl/";); + ns.put("xs", "http://www.w3.org/2001/XMLSchema";); + + + XPathUtils xu = new XPathUtils(ns); + + //make sure the wrapper types are anonymous types + NodeList ct = (NodeList) xu.getValue("//wsdl:definitions/wsdl:message/wsdl:pa...@element != '']", + doc, XPathConstants.NODESET); + assertNotNull(ct); + assertEquals(0, ct.getLength()); + + ct = (NodeList) xu.getValue("//wsdl:definitions/wsdl:message/wsdl:pa...@type != '']", + doc, XPathConstants.NODESET); + assertEquals(4, ct.getLength()); + } + + @WebService(serviceName = "MyObjectService", portName = "MyObjectServicePort") + @SOAPBinding(use = Use.LITERAL, style = Style.RPC) + public static class MyService { + + @WebMethod + public MyObject getMyObject(@WebParam(name = "longField1") long longField1) { + return generateMyObject(); + } + + @WebMethod + public int updateMyObject(@WebParam(name = "myObject") MyObject myObject) { + return 3; + } + private static MyObject generateMyObject() { + MyObject myObject = new MyObject(); + + long tempLong = 1; + myObject.setStringField1("S:" + tempLong++); + myObject.setStringField2("S:" + tempLong++); + myObject.setLongField1(tempLong++); + myObject.setLongField2(tempLong++); + return myObject; + } + } + + @XmlType(name = "MyObject") + @XmlAccessorType(XmlAccessType.PROPERTY) + @XmlRootElement(name = "MyObject") + public static class MyObject { + private String stringField1; + private String stringField2; + private long longField1; + private long longField2; + + public String getStringField1() { + return stringField1; + } + public void setStringField1(String stringField1) { + this.stringField1 = stringField1; + } + public String getStringField2() { + return stringField2; + } + public void setStringField2(String stringField2) { + this.stringField2 = stringField2; + } + public long getLongField1() { + return longField1; + } + public void setLongField1(long longField1) { + this.longField1 = longField1; + } + public long getLongField2() { + return longField2; + } + public void setLongField2(long longField2) { + this.longField2 = longField2; + } + } }
