Author: dkulp
Date: Fri Aug 24 17:49:15 2007
New Revision: 569590
URL: http://svn.apache.org/viewvc?rev=569590&view=rev
Log:
[CXF-832] First part of jboss issues
* Fix problem with creating duplicate schema elements in code first with
Request/Response wrappers
* Fix issues in WrapperClassIn/OutInterceptor if WebParamResult name matches
the RequestWrapper names.
Added:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Echo.java
(with props)
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/EchoResponse.java
(with props)
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/HelloWithNoWebParam.java
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java?rev=569590&r1=569589&r2=569590&view=diff
==============================================================================
---
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
(original)
+++
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
Fri Aug 24 17:49:15 2007
@@ -134,6 +134,25 @@
}
/**
+ * Returns the n'th message part.
+ *
+ * @param n the n'th part to retrieve.
+ * @return the message part; or <code>null</code> if not found.
+ */
+ public MessagePartInfo getMessagePart(int n) {
+ if (n == -1) {
+ return null;
+ }
+ for (MessagePartInfo mpi : messageParts.values()) {
+ if (n == 0) {
+ return mpi;
+ }
+ n--;
+ }
+ return null;
+ }
+
+ /**
* Returns all message parts for this message.
*
* @return all message parts.
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java?rev=569590&r1=569589&r2=569590&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
Fri Aug 24 17:49:15 2007
@@ -139,7 +139,13 @@
queries = keepInOrder(queries,
operation.getOperationInfo(),
names);
- if (!emptyQueries && CollectionUtils.isEmpty(queries.values())) {
+ if (!emptyQueries && CollectionUtils.isEmpty(queries.values())) {
+ if (operation.isUnwrappedCapable()) {
+ //maybe the wrapper was skipped
+ return getParameters(message,
operation.getUnwrappedOperation());
+ }
+
+
throw new Fault(new
org.apache.cxf.common.i18n.Message("ORDERED_PARAM_REQUIRED",
BUNDLE,
names.toString()));
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java?rev=569590&r1=569589&r2=569590&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
Fri Aug 24 17:49:15 2007
@@ -30,6 +30,7 @@
import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
+import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.BindingMessageInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessageInfo;
@@ -84,36 +85,26 @@
if (lst == null) {
return;
}
- Class<?> wrapperClass = null;
- Object wrappedObject = null;
- MessagePartInfo wrapperPart = null;
- if (wrappedMessageInfo != null) {
- for (MessagePartInfo part :
wrappedMessageInfo.getMessageParts()) {
- //headers should appear in both, find the part that doesn't
- if (messageInfo.getMessagePart(part.getName()) == null) {
- wrapperClass = part.getTypeClass();
- for (Object o : lst) {
- if (wrapperClass.isInstance(o)) {
- wrappedObject = o;
- wrapperPart = part;
- break;
- }
- }
- break;
- }
- }
- }
-
if (lst != null) {
message.put(MessageInfo.class, messageInfo);
message.put(BindingMessageInfo.class, bmi);
ex.put(BindingOperationInfo.class, boi2);
ex.put(OperationInfo.class, op);
}
+
if (isGET(message)) {
LOG.info("WrapperClassInInterceptor skipped in HTTP GET
method");
return;
}
+
+ MessagePartInfo wrapperPart = wrappedMessageInfo.getMessagePart(0);
+ Class<?> wrapperClass = wrapperPart.getTypeClass();
+ Object wrappedObject = lst.get(wrapperPart.getIndex());
+ if (!wrapperClass.isInstance(wrappedObject)) {
+ wrappedObject = null;
+ wrapperPart = null;
+ wrapperClass = null;
+ }
if (wrapperClass == null || wrappedObject == null) {
return;
}
@@ -129,8 +120,9 @@
newParams = new
MessageContentsList(helper.getWrapperParts(wrappedObject));
for (MessagePartInfo part : messageInfo.getMessageParts()) {
- if (wrappedMessageInfo.getMessagePart(part.getName()) !=
null) {
- newParams.put(part, lst.get(part));
+ if
(Boolean.TRUE.equals(part.getProperty(ReflectionServiceFactoryBean.HEADER))) {
+ MessagePartInfo mpi =
wrappedMessageInfo.getMessagePart(part.getName());
+ newParams.put(mpi, lst.get(part));
}
}
} catch (Exception e) {
@@ -149,7 +141,7 @@
List<Class<?>> partClasses = new ArrayList<Class<?>>();
for (MessagePartInfo p : messageInfo.getMessageParts()) {
- if (wrappedMessageInfo.getMessagePart(p.getName()) != null) {
+ if
(Boolean.TRUE.equals(p.getProperty(ReflectionServiceFactoryBean.HEADER))) {
int idx = p.getIndex();
ensureSize(elTypeNames, idx);
ensureSize(partClasses, idx);
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java?rev=569590&r1=569589&r2=569590&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
Fri Aug 24 17:49:15 2007
@@ -28,6 +28,7 @@
import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
+import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.BindingMessageInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessageInfo;
@@ -101,9 +102,18 @@
parts.get(0).setProperty("WRAPPER_CLASS", helper);
}
try {
+ MessageContentsList newObjs = new MessageContentsList();
Object o2 = helper.createWrapperObject(objs);
- objs.clear();
- objs.put(parts.get(0), o2);
+ newObjs.put(parts.get(0), o2);
+
+ for (MessagePartInfo p : messageInfo.getMessageParts()) {
+ if
(Boolean.TRUE.equals(p.getProperty(ReflectionServiceFactoryBean.HEADER))) {
+ MessagePartInfo mpi =
wrappedMsgInfo.getMessagePart(p.getName());
+ newObjs.put(mpi, objs.get(p));
+ }
+ }
+
+ message.setContent(List.class, newObjs);
} catch (Exception e) {
throw new Fault(e);
}
Modified:
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=569590&r1=569589&r2=569590&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Fri Aug 24 17:49:15 2007
@@ -414,7 +414,9 @@
protected void initializeWrappedSchema(ServiceInfo serviceInfo) {
for (OperationInfo op : serviceInfo.getInterface().getOperations()) {
if (op.getUnwrappedOperation() != null) {
- if (op.hasInput()) {
+ if (op.hasInput()
+ && op.getInput().getMessageParts().get(0).getTypeClass()
== null) {
+
QName wraperBeanName =
op.getInput().getMessageParts().get(0).getElementQName();
XmlSchemaElement e = null;
for (SchemaInfo s : serviceInfo.getSchemas()) {
@@ -442,7 +444,9 @@
}
- if (op.hasOutput()) {
+ if (op.hasOutput()
+ && op.getOutput().getMessageParts().get(0).getTypeClass()
== null) {
+
QName wraperBeanName =
op.getOutput().getMessageParts().get(0).getElementQName();
XmlSchemaElement e = null;
for (SchemaInfo s : serviceInfo.getSchemas()) {
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java?rev=569590&r1=569589&r2=569590&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java
Fri Aug 24 17:49:15 2007
@@ -45,7 +45,7 @@
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(ServerGreeterNoWsdl.class));
+ launchServer(ServerGreeterNoWsdl.class, true));
}
@Test
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java?rev=569590&r1=569589&r2=569590&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
Fri Aug 24 17:49:15 2007
@@ -186,6 +186,9 @@
}
private void runDocLitTest(DocLitWrappedCodeFirstService port) throws
Exception {
+ String echoMsg = port.echo("Hello");
+ assertEquals("Hello", echoMsg);
+
List<String> rev = new
ArrayList<String>(Arrays.asList(DocLitWrappedCodeFirstServiceImpl.DATA));
Collections.reverse(rev);
@@ -265,6 +268,7 @@
}
*/
}
+
@Test
public void testRpcLitNoWsdl() throws Exception {
QName portName = new
QName("http://cxf.apache.org/systest/jaxws/RpcLitCodeFirstService";,
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java?rev=569590&r1=569589&r2=569590&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
Fri Aug 24 17:49:15 2007
@@ -23,10 +23,13 @@
import javax.jws.WebMethod;
import javax.jws.WebParam;
+import javax.jws.WebResult;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.Holder;
+import javax.xml.ws.Holder;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
@WebService(name = "DocLitWrappedCodeFirstService",
targetNamespace =
"http://cxf.apache.org/systest/jaxws/DocLitWrappedCodeFirstService";)
@@ -75,6 +78,16 @@
@WebMethod
int throwException(int i) throws ServiceTestFault;
+
+ @WebMethod
+ @WebResult(targetNamespace =
"http://cxf.apache.org/systest/jaxws/DocLitWrappedCodeFirstService";,
+ name = "result")
+ @RequestWrapper(className = "org.apache.cxf.systest.jaxws.Echo")
+ @ResponseWrapper(className = "org.apache.cxf.systest.jaxws.EchoResponse")
+ String echo(@WebParam(targetNamespace =
+
"http://cxf.apache.org/systest/jaxws/DocLitWrappedCodeFirstService";,
+ name = "String_1")
+ String msg);
static class Foo {
String name;
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java?rev=569590&r1=569589&r2=569590&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
Fri Aug 24 17:49:15 2007
@@ -116,5 +116,9 @@
public int throwException(int i) throws ServiceTestFault {
throw new ServiceTestFault(new ServiceTestFault.ServiceTestDetails(i));
}
+
+ public String echo(String msg) {
+ return msg;
+ }
}
Added:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Echo.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Echo.java?rev=569590&view=auto
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Echo.java
(added)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Echo.java
Fri Aug 24 17:49:15 2007
@@ -0,0 +1,61 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
[EMAIL PROTECTED](XmlAccessType.FIELD)
[EMAIL PROTECTED](name = "echo", propOrder = { "string1" })
+public class Echo {
+
+ @XmlElement(name = "String_1",
+ namespace =
"http://cxf.apache.org/systest/jaxws/DocLitWrappedCodeFirstService";,
+ required = true,
+ nillable = true)
+ protected String string1;
+
+ /**
+ * Gets the value of the string1 property.
+ *
+ * @return
+ * possible object is
+ * [EMAIL PROTECTED] String }
+ *
+ */
+ public String getString1() {
+ return string1;
+ }
+
+ /**
+ * Sets the value of the string1 property.
+ *
+ * @param value
+ * allowed object is
+ * [EMAIL PROTECTED] String }
+ *
+ */
+ public void setString1(String value) {
+ this.string1 = value;
+ }
+
+}
Propchange:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Echo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Echo.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/EchoResponse.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/EchoResponse.java?rev=569590&view=auto
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/EchoResponse.java
(added)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/EchoResponse.java
Fri Aug 24 17:49:15 2007
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
[EMAIL PROTECTED](XmlAccessType.FIELD)
[EMAIL PROTECTED](name = "echoResponse", propOrder = { "result" })
+public class EchoResponse {
+
+ @XmlElement(
+ namespace =
"http://cxf.apache.org/systest/jaxws/DocLitWrappedCodeFirstService";,
+ required = true, nillable = true)
+ protected String result;
+
+ /**
+ * Gets the value of the result property.
+ *
+ * @return
+ * possible object is
+ * [EMAIL PROTECTED] String }
+ *
+ */
+ public String getResult() {
+ return result;
+ }
+
+ /**
+ * Sets the value of the result property.
+ *
+ * @param value
+ * allowed object is
+ * [EMAIL PROTECTED] String }
+ *
+ */
+ public void setResult(String value) {
+ this.result = value;
+ }
+
+}
Propchange:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/EchoResponse.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/EchoResponse.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java?rev=569590&r1=569589&r2=569590&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java
Fri Aug 24 17:49:15 2007
@@ -35,6 +35,11 @@
protected void run() {
+ Object implementor4 = new DocLitWrappedCodeFirstServiceImpl();
+ Endpoint.publish(DOCLIT_CODEFIRST_URL, implementor4);
+
+
+
Object implementor1 = new AnonymousComplexTypeImpl();
String address = "http://localhost:9000/anonymous_complex_typeSOAP";;
Endpoint.publish(address, implementor1);
@@ -47,8 +52,8 @@
address = "http://localhost:9002/ordered_param_holder/";;
Endpoint.publish(address, implementor3);
- Object implementor4 = new DocLitWrappedCodeFirstServiceImpl();
- Endpoint.publish(DOCLIT_CODEFIRST_URL, implementor4);
+ //Object implementor4 = new DocLitWrappedCodeFirstServiceImpl();
+ //Endpoint.publish(DOCLIT_CODEFIRST_URL, implementor4);
Object implementor5 = new RpcLitCodeFirstServiceImpl();
Endpoint.publish(RPCLIT_CODEFIRST_URL, implementor5);
Modified:
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/HelloWithNoWebParam.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/HelloWithNoWebParam.java?rev=569590&r1=569589&r2=569590&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/HelloWithNoWebParam.java
(original)
+++
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/HelloWithNoWebParam.java
Fri Aug 24 17:49:15 2007
@@ -28,8 +28,8 @@
public interface HelloWithNoWebParam {
- @ResponseWrapper(className =
"org.apache.cxf.tools.fortest.withannotation.doc.SayHi")
- @RequestWrapper(className =
"org.apache.cxf.tools.fortest.withannotation.doc.SayHiResponse")
+ @ResponseWrapper(className =
"org.apache.cxf.tools.fortest.withannotation.doc.SayHiResponse")
+ @RequestWrapper(className =
"org.apache.cxf.tools.fortest.withannotation.doc.SayHi")
@WebMethod(operationName = "sayHi")
void sayHi(
long l1
Modified:
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl?rev=569590&r1=569589&r2=569590&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl
(original)
+++
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl
Fri Aug 24 17:49:15 2007
@@ -30,18 +30,8 @@
<xs:complexType name="sayHiResponse"/>
</xs:schema>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns="http://apache.org/";
xmlns:ns0="http://doc.withannotation.fortest.tools.cxf.apache.org/";
attributeFormDefault="unqualified" elementFormDefault="unqualified"
targetNamespace="http://apache.org/";>
-<xsd:element name="sayHi" nillable="true" type="ns0:sayHiResponse"/>
-<xsd:element name="sayHiResponse" nillable="true" type="ns0:sayHi"/>
-<xsd:element name="sayHi" type="sayHi"/>
-<xsd:complexType name="sayHi">
-<xsd:sequence>
-<xsd:element name="arg0" type="xsd:long"/>
-</xsd:sequence>
-</xsd:complexType>
-<xsd:element name="sayHiResponse" type="sayHiResponse"/>
-<xsd:complexType name="sayHiResponse">
-<xsd:sequence/>
-</xsd:complexType>
+<xsd:element name="sayHi" nillable="true" type="ns0:sayHi"/>
+<xsd:element name="sayHiResponse" nillable="true" type="ns0:sayHiResponse"/>
</xsd:schema>
</wsdl:types>
<wsdl:message name="sayHiResponse">
