You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2007/06/18 06:14:15 UTC
svn commit: r548202 - in /incubator/cxf/trunk/rt:
databinding/jaxb/src/test/java/org/apache/cxf/jaxb/
frontend/jaxws/src/test/java/org/apache/cxf/jaxws/
frontend/simple/src/main/java/org/apache/cxf/frontend/
frontend/simple/src/test/java/org/apache/cxf...
Author: ffang
Date: Sun Jun 17 21:14:13 2007
New Revision: 548202
URL: http://svn.apache.org/viewvc?view=rev&rev=548202
Log:
[CXF-340] generated user extra class in wsdl
Modified:
incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java?view=diff&rev=548202&r1=548201&r2=548202
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java Sun Jun 17 21:14:13 2007
@@ -51,6 +51,8 @@
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
+import org.apache.hello_world.types.GreetMe;
+import org.apache.hello_world_soap_http.types.GreetMeOneWay;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
import org.junit.After;
@@ -196,11 +198,11 @@
@Test
public void testExtraClass() {
- Class[] extraClass = new Class[] {java.rmi.Remote.class, java.rmi.RemoteException.class};
+ Class[] extraClass = new Class[] {GreetMe.class, GreetMeOneWay.class};
jaxbDataBinding.setExtraClass(extraClass);
assertEquals(jaxbDataBinding.getExtraClass().length, 2);
- assertEquals(jaxbDataBinding.getExtraClass()[0], java.rmi.Remote.class);
- assertEquals(jaxbDataBinding.getExtraClass()[1], java.rmi.RemoteException.class);
+ assertEquals(jaxbDataBinding.getExtraClass()[0], GreetMe.class);
+ assertEquals(jaxbDataBinding.getExtraClass()[1], GreetMeOneWay.class);
}
}
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java?view=diff&rev=548202&r1=548201&r2=548202
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java Sun Jun 17 21:14:13 2007
@@ -33,6 +33,8 @@
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.helpers.XPathUtils;
import org.apache.cxf.jaxb.JAXBDataBinding;
+import org.apache.cxf.jaxws.javaee.DescriptionType;
+import org.apache.cxf.jaxws.javaee.DisplayNameType;
import org.apache.cxf.jaxws.service.Hello;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.wsdl.WSDLManager;
@@ -67,14 +69,14 @@
props = new HashMap<String, Object>();
}
props.put("jaxb.additionalContextClasses",
- new Class[] {java.rmi.Remote.class, java.rmi.RemoteException.class});
+ new Class[] {DescriptionType.class, DisplayNameType.class});
sf.setProperties(props);
Server server = sf.create();
assertNotNull(server);
Class[] extraClass = ((JAXBDataBinding)sf.getServiceFactory().getDataBinding()).getExtraClass();
assertEquals(extraClass.length, 2);
- assertEquals(extraClass[0], java.rmi.Remote.class);
- assertEquals(extraClass[1], java.rmi.RemoteException.class);
+ assertEquals(extraClass[0], DescriptionType.class);
+ assertEquals(extraClass[1], DisplayNameType.class);
}
@Test
Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java?view=diff&rev=548202&r1=548201&r2=548202
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java Sun Jun 17 21:14:13 2007
@@ -41,10 +41,11 @@
}
public Client create() {
+
if (client != null) {
return client;
}
-
+ applyExtraClass();
try {
Endpoint ep = createEndpoint();
@@ -56,7 +57,6 @@
}
applyFeatures();
- applyExtraClass();
return client;
}
Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java?view=diff&rev=548202&r1=548201&r2=548202
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java Sun Jun 17 21:14:13 2007
@@ -81,6 +81,7 @@
public Server create() {
try {
+ applyExtraClass();
if (serviceBean != null && getServiceClass() == null) {
setServiceClass(serviceBean.getClass());
}
@@ -107,7 +108,6 @@
}
applyFeatures();
- applyExtraClass();
return server;
}
Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java?view=diff&rev=548202&r1=548201&r2=548202
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java Sun Jun 17 21:14:13 2007
@@ -34,6 +34,8 @@
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.hello_world.types.GreetMe;
+import org.apache.hello_world_soap_http.types.GreetMeOneWay;
import org.junit.Test;
public class ClientFactoryBeanTest extends AbstractSimpleFrontendTest {
@@ -89,13 +91,13 @@
props = new HashMap<String, Object>();
}
props.put("jaxb.additionalContextClasses",
- new Class[] {java.rmi.Remote.class, java.rmi.RemoteException.class});
+ new Class[] {GreetMe.class, GreetMeOneWay.class});
cfBean.setProperties(props);
Client client = cfBean.create();
assertNotNull(client);
Class[] extraClass = ((JAXBDataBinding)cfBean.getServiceFactory().getDataBinding()).getExtraClass();
assertEquals(extraClass.length, 2);
- assertEquals(extraClass[0], java.rmi.Remote.class);
- assertEquals(extraClass[1], java.rmi.RemoteException.class);
+ assertEquals(extraClass[0], GreetMe.class);
+ assertEquals(extraClass[1], GreetMeOneWay.class);
}
}
Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java?view=diff&rev=548202&r1=548201&r2=548202
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java Sun Jun 17 21:14:13 2007
@@ -35,6 +35,8 @@
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.hello_world.types.GreetMe;
+import org.apache.hello_world_soap_http.types.GreetMeOneWay;
import org.junit.Test;
public class ServerFactoryTest extends AbstractSimpleFrontendTest {
@@ -64,13 +66,13 @@
props = new HashMap<String, Object>();
}
props.put("jaxb.additionalContextClasses",
- new Class[] {java.rmi.Remote.class, java.rmi.RemoteException.class});
+ new Class[] {GreetMe.class, GreetMeOneWay.class});
svrBean.setProperties(props);
svrBean.create();
Class[] extraClass = ((JAXBDataBinding)svrBean.getServiceFactory().getDataBinding()).getExtraClass();
assertEquals(extraClass.length, 2);
- assertEquals(extraClass[0], java.rmi.Remote.class);
- assertEquals(extraClass[1], java.rmi.RemoteException.class);
+ assertEquals(extraClass[0], GreetMe.class);
+ assertEquals(extraClass[1], GreetMeOneWay.class);
}
public class CustomDestinationFactory extends AbstractTransportFactory implements DestinationFactory {