You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/12/12 07:48:34 UTC
svn commit: r356183 - in /beehive/trunk:
system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/
system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/
wsm/src/axis/org/apache/beehive/wsm/ax...
Author: ekoneil
Date: Sun Dec 11 22:48:22 2005
New Revision: 356183
URL: http://svn.apache.org/viewcvs?rev=356183&view=rev
Log:
Some cleanup / renaming of type mapping and registry APIs before really mixing this all up.
BB: self
Test: WSM and service control pass
Added:
beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisLookupService.java (contents, props changed)
- copied, changed from r355665, beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java
beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/TypeSystemLookupService.java (contents, props changed)
- copied, changed from r355665, beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanLookupService.java (contents, props changed)
- copied, changed from r355665, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java
Removed:
beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java
beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java
Modified:
beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java
beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScAxisCall.java
beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java
beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java
beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java
beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/tools/Wsdl2AJava.java
beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
Modified: beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java?rev=356183&r1=356182&r2=356183&view=diff
==============================================================================
--- beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java (original)
+++ beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java Sun Dec 11 22:48:22 2005
@@ -20,7 +20,7 @@
import org.apache.beehive.controls.system.webservice.wsdl.WsdlOpParameter;
import org.apache.beehive.controls.system.webservice.wsdl.WsdlOpReturnType;
import org.apache.beehive.controls.system.webservice.wsdl.WsdlOperation;
-import org.apache.beehive.wsm.axis.databinding.SystemTypeLookupService;
+import org.apache.beehive.wsm.axis.databinding.TypeSystemLookupService;
import org.apache.beehive.wsm.util.JavaClassUtils;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
@@ -240,9 +240,9 @@
return void.class;
}
- SystemTypeLookupService stls = new SystemTypeLookupService();
+ TypeSystemLookupService typeSystemLookup = new TypeSystemLookupService();
if (!isArray) {
- return stls.qname2class(xmlType);
+ return typeSystemLookup.qname2class(xmlType);
}
//
@@ -251,10 +251,10 @@
//
Class javaReturnType;
if (itemXmlType != null) {
- javaReturnType = stls.qname2class(itemXmlType);
+ javaReturnType = typeSystemLookup.qname2class(itemXmlType);
}
else {
- javaReturnType = stls.qname2class(xmlType);
+ javaReturnType = typeSystemLookup.qname2class(xmlType);
}
Object o = Array.newInstance(javaReturnType, 1);
return o.getClass();
Modified: beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScAxisCall.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScAxisCall.java?rev=356183&r1=356182&r2=356183&view=diff
==============================================================================
--- beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScAxisCall.java (original)
+++ beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScAxisCall.java Sun Dec 11 22:48:22 2005
@@ -24,7 +24,7 @@
import org.apache.beehive.controls.api.ControlException;
import org.apache.beehive.controls.system.webservice.wsdl.WsdlOpParameter;
import org.apache.beehive.controls.system.webservice.wsdl.WsdlOperation;
-import org.apache.beehive.wsm.axis.databinding.SystemTypeLookupService;
+import org.apache.beehive.wsm.axis.databinding.TypeSystemLookupService;
import org.apache.beehive.wsm.axis.registration.AxisTypeRegistrar;
import javax.jws.soap.SOAPBinding;
@@ -52,7 +52,7 @@
ScAxisCall(Service service) throws ServiceException {
_call = service.createCall();
TypeMapping typeMapping = service.getTypeMappingRegistry().getDefaultTypeMapping();
- _typeRegistrar = new AxisTypeRegistrar(typeMapping, new SystemTypeLookupService());
+ _typeRegistrar = new AxisTypeRegistrar(typeMapping, new TypeSystemLookupService());
}
/* ----------------------------- Protected Methods ------------------------- */
@@ -69,7 +69,7 @@
protected void addFault(QName faultName, QName xmlType, boolean isComplexType,
WsdlOperation.SOAPBindingStyle style, WsdlOperation.SOAPBindingUse use) {
- SystemTypeLookupService lookup = new SystemTypeLookupService();
+ TypeSystemLookupService lookup = new TypeSystemLookupService();
Class javaType = lookup.qname2class(xmlType);
QName registeredTypeQName = registerType(javaType, xmlType, style, use);
((org.apache.axis.client.Call) _call).addFault(faultName, javaType, registeredTypeQName, isComplexType);
Modified: beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java?rev=356183&r1=356182&r2=356183&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java (original)
+++ beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java Sun Dec 11 22:48:22 2005
@@ -52,7 +52,7 @@
import org.apache.axis.utils.BeanPropertyDescriptor;
import org.apache.axis.utils.BeanUtils;
import org.apache.axis.Constants;
-import org.apache.beehive.wsm.axis.databinding.SystemTypeLookupService;
+import org.apache.beehive.wsm.axis.databinding.TypeSystemLookupService;
import org.apache.beehive.wsm.axis.registration.AxisTypeMappingMetaData;
import org.apache.beehive.wsm.axis.util.encoding.XmlBeanDeserializerFactory;
import org.apache.beehive.wsm.axis.util.encoding.XmlBeanSerializerFactory;
@@ -370,6 +370,9 @@
if(Void.TYPE.equals(type))
return null;
+ // todo: need to replace this with delegation to the BindingLookupService's implementation
+ // for the built-in types
+ /* get built-in type QName */
if(AxisTypeMappingMetaData.isBuiltInType(type))
return AxisTypeMappingMetaData.getBuiltInTypeQname(type);
@@ -380,7 +383,7 @@
/* the type needs to be registered */
TypeMapping tm = desc.getTypeMapping();
- BindingLookupService lookupService = new SystemTypeLookupService();
+ BindingLookupService lookupService = new TypeSystemLookupService();
QName qname = lookupService.class2qname(type, defaultNamespace);
if(type.isArray()) {
Copied: beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisLookupService.java (from r355665, beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisLookupService.java?p2=beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisLookupService.java&p1=beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java&r1=355665&r2=356183&rev=356183&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java (original)
+++ beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisLookupService.java Sun Dec 11 22:48:22 2005
@@ -29,7 +29,7 @@
import org.apache.beehive.wsm.axis.registration.AxisTypeMappingMetaData;
import org.apache.beehive.wsm.databinding.BindingLookupService;
-public class AxisTypeLookup
+public class AxisLookupService
implements BindingLookupService {
private static final char[] PACKAGE_SEPARATORS = {'.', ':'};
Propchange: beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisLookupService.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/TypeSystemLookupService.java (from r355665, beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/TypeSystemLookupService.java?p2=beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/TypeSystemLookupService.java&p1=beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java&r1=355665&r2=356183&rev=356183&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java (original)
+++ beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/TypeSystemLookupService.java Sun Dec 11 22:48:22 2005
@@ -23,55 +23,50 @@
import javax.xml.namespace.QName;
import org.apache.beehive.wsm.databinding.BindingLookupService;
-import org.apache.beehive.wsm.databinding.xmlbeans.XmlBeanTypeLookup;
+import org.apache.beehive.wsm.databinding.xmlbeans.XmlBeanLookupService;
-public class SystemTypeLookupService
+public class TypeSystemLookupService
implements BindingLookupService {
- private ArrayList<BindingLookupService> LOOKUP_SERVICE_LIST = new ArrayList<BindingLookupService>();
+ private ArrayList<BindingLookupService> _lookupServiceList = new ArrayList<BindingLookupService>();
- public SystemTypeLookupService() {
- LOOKUP_SERVICE_LIST.add(new XmlBeanTypeLookup());
- LOOKUP_SERVICE_LIST.add(new AxisTypeLookup());
+ public TypeSystemLookupService() {
+ _lookupServiceList.add(new XmlBeanLookupService());
+ _lookupServiceList.add(new AxisLookupService());
}
- /*
- * @see TypeLookUpServices#getClassQName(java.lang.Class)
- */
- public QName class2qname(Class cls) {
- QName qname = null;
-
- for(BindingLookupService lookUpService : LOOKUP_SERVICE_LIST) {
- if(null != (qname = lookUpService.class2qname(cls)))
- break;
+ public void addBindingLookupService(BindingLookupService bindingLookupService) {
+ _lookupServiceList.add(bindingLookupService);
+ }
+
+ public void removeBindingLookupService(BindingLookupService bindingLookupService) {
+ _lookupServiceList.remove(bindingLookupService);
+ }
+
+ public QName class2qname(Class clazz) {
+ for(BindingLookupService lookUpService : _lookupServiceList) {
+ QName qname = lookUpService.class2qname(clazz);
+ if(qname != null)
+ return qname;
}
- return qname;
+ return null;
}
- /*
- * @see TypeLookUpServices#getClassQName(java.lang.Class)
- */
- public QName class2qname(Class cls, String namespace) {
- QName qname = null;
-
- for(BindingLookupService lookUpService : LOOKUP_SERVICE_LIST) {
- if(null != (qname = lookUpService.class2qname(cls, namespace)))
- break;
+ public QName class2qname(Class clazz, String namespace) {
+ for(BindingLookupService lookUpService : _lookupServiceList) {
+ QName qname = lookUpService.class2qname(clazz, namespace);
+ if(qname != null)
+ return qname;
}
- return qname;
+ return null;
}
- /*
- * @see TypeLookUpServices#Qname2Class(javax.xml.namespace.QName)
- */
public Class qname2class(QName qname) {
- Class cls = null;
- for(BindingLookupService lookUpService : LOOKUP_SERVICE_LIST) {
- if(null != (cls = lookUpService.qname2class(qname)))
- break;
+ for(BindingLookupService lookUpService : _lookupServiceList) {
+ Class clazz = lookUpService.qname2class(qname);
+ if(clazz != null)
+ return clazz;
}
- if(null == cls)
- cls = Object.class;
- return cls;
+ return Object.class;
}
}
Propchange: beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/TypeSystemLookupService.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java?rev=356183&r1=356182&r2=356183&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java (original)
+++ beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java Sun Dec 11 22:48:22 2005
@@ -32,27 +32,16 @@
initBuildInTypes();
}
- /**
- * @param cls
- * @return boolean
- */
public static boolean isBuiltInType(Class cls) {
return (builtInTypes.containsKey(cls));
}
- /*
- * @see org.apache.beehive.wsm.registration.TypeRegistrar#getBuiltInTypeQname(java.lang.Class)
- */
public static QName getBuiltInTypeQname(Class cls) {
return builtInTypes.get(cls);
}
- /**
- *
- */
private static void initBuildInTypes() {
- // HexBinary binary data needs to use the hex binary
- // serializer/deserializer
+ // HexBinary binary data needs to use the hex binary serializer/deserializer
addBuiltInType(Constants.XSD_HEXBIN, HexBinary.class);
addBuiltInType(Constants.XSD_HEXBIN, byte[].class);
Modified: beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java?rev=356183&r1=356182&r2=356183&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java (original)
+++ beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java Sun Dec 11 22:48:22 2005
@@ -50,18 +50,14 @@
super(tm, lookupService);
}
- /**
- * @param cls
- * @return boolean
- */
+ public QName getVoidType() {
+ return XMLType.AXIS_VOID;
+ }
+
protected boolean isBuiltInType(Class cls) {
- return (AxisTypeMappingMetaData.isBuiltInType(cls));
+ return AxisTypeMappingMetaData.isBuiltInType(cls);
}
- /**
- * @param cls
- * @param q
- */
protected void registerClassAsWithDefaultSearialization(Class cls, QName q, SOAPBinding.Style style, SOAPBinding.Use use) {
try {
LOGGER.debug("Assigned Default Serialization to class: " + cls.getCanonicalName() + " qname:" + q);
@@ -142,24 +138,11 @@
}
}
- /**
- * @param cls
- * @param q
- */
protected void registerClassAsXMLBeans(Class cls, QName q) {
LOGGER.debug("Assigned XMLBeans Serialization to class: " + cls.getCanonicalName() + " qname:" + q);
mTypeMapping.register(cls, q, new XmlBeanSerializerFactory(cls, q), new XmlBeanDeserializerFactory(cls, q));
}
- /**
- * @param cls
- * @param q
- * @throws ClassNotFoundException
- * @throws NoSuchMethodException
- * @throws InstantiationException
- * @throws IllegalAccessException
- * @throws InvocationTargetException
- */
protected void registerClassAsDataHandler(Class cls, QName q)
throws ClassNotFoundException, NoSuchMethodException,
InstantiationException, IllegalAccessException,
@@ -181,10 +164,6 @@
mTypeMapping.register(cls, q, sf, dsf);
}
- /**
- * @param cls
- * @param q
- */
protected void registerClassAsSoapEncodedArray(Class cls, QName q) {
LOGGER.debug("Assigned Array Serialization to class: " + cls.getCanonicalName()
+ " qname:" + q + " Array element qname: " + lookupService.class2qname(cls.getComponentType()));
@@ -193,35 +172,15 @@
new ArrayDeserializerFactory());
}
- /**
- * @param cls
- * @param q
- * @return boolean
- */
protected boolean classIsRegistered(Class cls, QName q) {
return mTypeMapping.isRegistered(cls, q);
}
- /**
- * @param cls
- * @return QName
- */
protected QName getRegisteredQName(Class cls) {
QName currentQName = ((org.apache.axis.encoding.TypeMapping)mTypeMapping).getTypeQName(cls);
return currentQName;
}
- /**
- * @return QName
- */
- public QName getVoidType() {
- return XMLType.AXIS_VOID;
- }
-
-
- /* (non-Javadoc)
- * @see org.apache.beehive.wsm.registration.TypeRegistrar#getBuiltInTypeQname(java.lang.Class)
- */
protected QName getBuiltInTypeQname(Class cls) {
return AxisTypeMappingMetaData.getBuiltInTypeQname(cls);
}
Modified: beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/tools/Wsdl2AJava.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/tools/Wsdl2AJava.java?rev=356183&r1=356182&r2=356183&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/tools/Wsdl2AJava.java (original)
+++ beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/tools/Wsdl2AJava.java Sun Dec 11 22:48:22 2005
@@ -20,7 +20,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
-import org.apache.beehive.wsm.axis.databinding.SystemTypeLookupService;
+import org.apache.beehive.wsm.axis.databinding.TypeSystemLookupService;
import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
import org.apache.beehive.wsm.model.wsdl.XmlBeanWSDLProcessor;
import org.apache.beehive.wsm.tools.wsdl2ajava.Model2AJava;
@@ -43,7 +43,7 @@
System.out.println("Base source directory: " + args[1]);
System.out.println("Processing WSDL: " + args[0]);
- SystemTypeLookupService lookupService = new SystemTypeLookupService();
+ TypeSystemLookupService lookupService = new TypeSystemLookupService();
XmlBeanWSDLProcessor processor;
try {
processor = new XmlBeanWSDLProcessor(Utilities.parseWSDL(args[0]), lookupService);
Copied: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanLookupService.java (from r355665, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanLookupService.java?p2=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanLookupService.java&p1=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java&r1=355665&r2=356183&rev=356183&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanLookupService.java Sun Dec 11 22:48:22 2005
@@ -35,11 +35,11 @@
* XMLBean based implementation fo the {@link BindingLookupService} which provides a mechanims for translating
* a Java class name to a {@link QName} and a {@link QName} to a Java class.
*/
-public class XmlBeanTypeLookup
+public class XmlBeanLookupService
implements BindingLookupService {
- private static Log LOGGER = LogFactory.getLog(XmlBeanTypeLookup.class);
- private static XmlBeanTypeLookup THE_LOOKUP = new XmlBeanTypeLookup();
+ private static Log LOGGER = LogFactory.getLog(XmlBeanLookupService.class);
+ private static XmlBeanLookupService THE_LOOKUP = new XmlBeanLookupService();
/*
public static Class q2Class(QName q) {
Propchange: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanLookupService.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/jsr181/wsdl/XmlBeanWSDLProcessorTest.java?rev=356183&r1=356182&r2=356183&view=diff
==============================================================================
--- beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/jsr181/wsdl/XmlBeanWSDLProcessorTest.java (original)
+++ beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/jsr181/wsdl/XmlBeanWSDLProcessorTest.java Sun Dec 11 22:48:22 2005
@@ -21,7 +21,7 @@
import java.util.Iterator;
import junit.framework.TestCase;
-import org.apache.beehive.wsm.axis.databinding.SystemTypeLookupService;
+import org.apache.beehive.wsm.axis.databinding.TypeSystemLookupService;
import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
@@ -47,7 +47,7 @@
InputStream is = null;
try {
is = Thread.currentThread().getContextClassLoader().getResourceAsStream("schemas/starwars.wsdl");
- SystemTypeLookupService lookupService = new SystemTypeLookupService();
+ TypeSystemLookupService lookupService = new TypeSystemLookupService();
XmlBeanWSDLProcessor xbwp = new XmlBeanWSDLProcessor(Utilities.parseWSDL(is), lookupService);
clientModel = xbwp.getObjectModel();
}
@@ -72,18 +72,18 @@
public void testMethodLevelSettings()
throws Exception {
-
+
Collection<? extends BeehiveWsMethodMetadata> serverMethods = serverModel.getMethods();
Collection<? extends BeehiveWsMethodMetadata> clientMethods = clientModel.getMethods();
assertEquals(serverMethods.size(), clientMethods.size());
for (BeehiveWsMethodMetadata wmm : serverMethods) {
-
+
List<BeehiveWsParameterMetadata> params = wmm.getParams();
String[] paramClasses = new String[params.size()];
int pcIndex = 0;
for (BeehiveWsParameterMetadata param : params)
paramClasses[pcIndex] = param.getJavaType();
-
+
BeehiveWsMethodMetadata clientMethod = clientModel.getMethod(wmm.getWmOperationName(), paramClasses);
boolean paramStylesMatch =
(clientModel.getSoapBinding().getParameterStyle() == serverModel.getSoapBinding().getParameterStyle());
@@ -93,9 +93,9 @@
compareParameterMetadata(params, clientMethod.getParams());
}
else {
- assertFalse("a matching client method for " + wmm.getWmOperationName()
+ assertFalse("a matching client method for " + wmm.getWmOperationName()
+ " could not be found and the Soap bindings match.",
- paramStylesMatch);
+ paramStylesMatch);
}
}
}