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/29 19:43:50 UTC
svn commit: r359871 - in /beehive/trunk:
system-controls/external/wsm-snapshot/ system-controls/test/webservice/
system-controls/test/webservice/webapp/
wsm/src/axis/org/apache/beehive/wsm/axis/
wsm/src/core/org/apache/beehive/wsm/model/wsdl/ wsm/test/...
Author: ekoneil
Date: Thu Dec 29 10:43:30 2005
New Revision: 359871
URL: http://svn.apache.org/viewcvs?rev=359871&view=rev
Log:
Fixup WSM and WSC so that both can evolve independently. The WSC is still pretty coupled to WSM, and as a result, the server-side of WSM (extensions to Axis) can't be changed without side-effecting the WSC. In order to move WSM forward, the two need to be decoupled.
This change snapshots WSM into the system-controls/external/wsm-snapshot directory. This is only *temporary*; hopefully Chad can take a look at the WSC in '06 and complete the decoupling of the two.
BB: self
Test: WSM && WSC pass
Added:
beehive/trunk/system-controls/external/wsm-snapshot/
beehive/trunk/system-controls/external/wsm-snapshot/beehive-jsr181.jar (with props)
beehive/trunk/system-controls/external/wsm-snapshot/beehive-wsdltypes.jar (with props)
beehive/trunk/system-controls/external/wsm-snapshot/beehive-wsm-axis.jar (with props)
beehive/trunk/system-controls/external/wsm-snapshot/beehive-wsm.jar (with props)
beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/beans/ComplexJavaBean.java (contents, props changed)
- copied, changed from r359257, beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/beans/ComplexJavaBean.java
Removed:
beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/beans/ComplexJavaBean.java
Modified:
beehive/trunk/system-controls/test/webservice/build.xml
beehive/trunk/system-controls/test/webservice/webapp/build.xml
beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java
beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/FakeDocWebService.java
beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/FakeRpcWebService.java
beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/exceptions/ComplexUserDefinedException.java
beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java
beehive/trunk/wsm/test/src/junit-services/web/ImplementationBeanService.java
beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/jsr181/model/ImplementationBeanServiceTest.java
beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
Added: beehive/trunk/system-controls/external/wsm-snapshot/beehive-jsr181.jar
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/external/wsm-snapshot/beehive-jsr181.jar?rev=359871&view=auto
==============================================================================
Binary file - no diff available.
Propchange: beehive/trunk/system-controls/external/wsm-snapshot/beehive-jsr181.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: beehive/trunk/system-controls/external/wsm-snapshot/beehive-wsdltypes.jar
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/external/wsm-snapshot/beehive-wsdltypes.jar?rev=359871&view=auto
==============================================================================
Binary file - no diff available.
Propchange: beehive/trunk/system-controls/external/wsm-snapshot/beehive-wsdltypes.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: beehive/trunk/system-controls/external/wsm-snapshot/beehive-wsm-axis.jar
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/external/wsm-snapshot/beehive-wsm-axis.jar?rev=359871&view=auto
==============================================================================
Binary file - no diff available.
Propchange: beehive/trunk/system-controls/external/wsm-snapshot/beehive-wsm-axis.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: beehive/trunk/system-controls/external/wsm-snapshot/beehive-wsm.jar
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/external/wsm-snapshot/beehive-wsm.jar?rev=359871&view=auto
==============================================================================
Binary file - no diff available.
Propchange: beehive/trunk/system-controls/external/wsm-snapshot/beehive-wsm.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: beehive/trunk/system-controls/test/webservice/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/build.xml?rev=359871&r1=359870&r2=359871&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/build.xml (original)
+++ beehive/trunk/system-controls/test/webservice/build.xml Thu Dec 29 10:43:30 2005
@@ -155,8 +155,6 @@
<echo message="--------------------------------------------------"/>
<echo message="| End WSC Server tests |"/>
<echo message="--------------------------------------------------"/>
-
- <fail if="drtfailed" message="One or more tests in the ServiceControl DRT failed."/>
</target>
<!-- =================================================================== -->
@@ -214,6 +212,8 @@
</fileset>
</batchtest>
</junit>
+
+ <fail if="drtfailed" message="One or more tests in the ServiceControl DRT failed."/>
</target>
<target name="build.webapp" description="Build the webapp for the drts.">
Modified: beehive/trunk/system-controls/test/webservice/webapp/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/build.xml?rev=359871&r1=359870&r2=359871&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/build.xml (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/build.xml Thu Dec 29 10:43:30 2005
@@ -60,7 +60,27 @@
<mkdir dir="${build.dir}"/>
<mkdir dir="${classes.dir}"/>
- <deploy-wsm webappDir="${build.dir}"/>
+<!-- <deploy-wsm webappDir="${build.dir}"/> -->
+
+ <!-- HACK: the copy block below is used temporarily to use a snapshot of WSM
+ for the WSC DRTs. WSM needs to evolve some, and the WSC is a little
+ too tightly coupled for that to happen easily
+ -->
+ <copy todir="${build.dir}/WEB-INF/lib">
+ <fileset dir="${beehive.home}/system-controls/external/wsm-snapshot">
+ <include name="beehive-wsm.jar"/>
+ <include name="beehive-wsm-axis.jar"/>
+ <include name="beehive-wsdltypes.jar"/>
+ <include name="beehive-jsr181.jar"/>
+ </fileset>
+ <fileset dir="${beehive.home}/wsm/external/axis-1.2" includes="*.jar"/>
+ <fileset refid="log4j.fileset"/>
+ <fileset refid="xbean.fileset"/>
+ <fileset refid="jsr173.fileset"/>
+ <fileset refid="controls.fileset"/>
+ <fileset refid="velocity.fileset"/>
+ <fileset refid="commons-discovery.fileset"/>
+ </copy>
<copy todir="${build.dir}/WEB-INF/lib" file="${mailapi.jar}"/>
<copy todir="${build.dir}/WEB-INF/lib" file="${activation.jar}"/>
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=359871&r1=359870&r2=359871&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 Thu Dec 29 10:43:30 2005
@@ -50,7 +50,6 @@
import org.apache.axis.utils.BeanUtils;
import org.apache.axis.Constants;
import org.apache.beehive.wsm.axis.databinding.AxisBindingLookupFactory;
-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;
import org.apache.beehive.wsm.databinding.BindingLookupStrategy;
@@ -394,8 +393,8 @@
return null;
/* get built-in javaType QName */
- /* todo: does this configure the QName correctly when the targetNamespace is SOAP-ENC, for example? */
- QName builtInQName = AxisTypeMappingMetaData.getBuiltInTypeQname(javaType);
+ QName builtInQName = axisServiceDesc.getTypeMapping().getTypeQName(javaType);
+ // QName builtInQName = AxisTypeMappingMetaData.getBuiltInTypeQname(javaType);
if(builtInQName != null)
return builtInQName;
@@ -527,8 +526,8 @@
*/
axisTypeMapping.register(javaType,
qname,
- new EnhancedBeanSerializerFactory(javaType, qname, axisTypeDesc),
- new EnhancedBeanDeserializerFactory(javaType, qname, axisTypeDesc));
+ new BeanSerializerFactory(javaType, qname), //, axisTypeDesc),
+ new BeanDeserializerFactory(javaType, qname)); //, axisTypeDesc));
/*
now register the types for this bean properties (attributes)
@@ -639,35 +638,4 @@
}
return null;
}
-}
-
-/*
- * A TEMP SOLUTION TO BEAN Serialization/Deserialization problem The problem is
- * that the Axis factories use the types that are defined for a class, so a
- * given class can't be in multiple name spaces. In this solution the factory
- * gets the type descriptor in the constructor
- */
-class EnhancedBeanSerializerFactory
- extends BeanSerializerFactory {
-
- public EnhancedBeanSerializerFactory(Class javaType, QName xmlType, TypeDesc typeDesc) {
- super(javaType, xmlType);
-
- this.typeDesc = typeDesc;
-
- if(typeDesc != null)
- propertyDescriptor = typeDesc.getPropertyDescriptors();
- else propertyDescriptor = BeanUtils.getPd(javaType, null);
- }
-}
-
-class EnhancedBeanDeserializerFactory
- extends BeanDeserializerFactory {
-
- public EnhancedBeanDeserializerFactory(Class javaType, QName xmlType, TypeDesc typeDesc) {
- super(javaType, xmlType);
-
- this.typeDesc = typeDesc;
- propertyMap = getProperties(javaType, typeDesc);
- }
-}
+}
\ No newline at end of file
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java?rev=359871&r1=359870&r2=359871&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java Thu Dec 29 10:43:30 2005
@@ -61,7 +61,11 @@
* A factory that produces a {@link BeehiveWsTypeMetadata} object model representing a web service. This
* class also provides a set of operations for determining the service name, etc from a WSDL.
*/
-/* todo: convert this class into a BeehiveWsMetadataFactory implementation */
+/*
+ todo: convert this class into a BeehiveWsMetadataFactory implementation for building an object
+ model from a WSDL document
+ todo: rewrite this to use WSDL4J instead of XMLBeans
+ */
public class XmlBeanWSDLProcessor {
private static final String WSDL_SOAP_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/soap/";
@@ -85,10 +89,12 @@
_bindingLookupStrategy = lookupStrategy;
}
+/*
public QName getServiceName() {
TService[] services = _defDoc.getDefinitions().getServiceArray();
return new QName(services[0].getName());
}
+*/
/**
* Create a map of schema namespaces -> is element form qualified. Each key is a schema
@@ -96,6 +102,7 @@
* false if not set or set to 'unqualified'.
* @return Map of namespace -> is element form qualified.
*/
+/*
public Map<String, Boolean> genElementFormQualifiedMap()
{
HashMap<String, Boolean> map = new HashMap<String, Boolean>();
@@ -111,7 +118,7 @@
}
return map;
}
-
+*/
public BeehiveWsTypeMetadata getObjectModel()
throws Exception {
@@ -159,11 +166,11 @@
return wsm;
}
- public static org.xmlsoap.schemas.wsdl.soap.TOperation[] getSOAPOperations(TBindingOperation bo) {
+ private static org.xmlsoap.schemas.wsdl.soap.TOperation[] getSOAPOperations(TBindingOperation bo) {
return selectChildren(bo, org.xmlsoap.schemas.wsdl.soap.TOperation.class);
}
- public static org.xmlsoap.schemas.wsdl.soap.TBinding[] getSOAPBinding(TBinding b) {
+ private static org.xmlsoap.schemas.wsdl.soap.TBinding[] getSOAPBinding(TBinding b) {
XmlObject[] kids = b.selectChildren(new QName(WSDL_SOAP_NAMESPACE, "binding"));
org.xmlsoap.schemas.wsdl.soap.TBinding[] res = new org.xmlsoap.schemas.wsdl.soap.TBinding[kids.length];
@@ -173,7 +180,7 @@
return res;
}
- public static org.xmlsoap.schemas.wsdl.soap.TBody[] getSOAPBody(TBindingOperationMessage bom) {
+ private static org.xmlsoap.schemas.wsdl.soap.TBody[] getSOAPBody(TBindingOperationMessage bom) {
XmlObject[] kids = bom.selectChildren(new QName(WSDL_SOAP_NAMESPACE, "body"));
org.xmlsoap.schemas.wsdl.soap.TBody[] res = new org.xmlsoap.schemas.wsdl.soap.TBody[kids.length];
@@ -183,7 +190,7 @@
return res;
}
- public static org.xmlsoap.schemas.wsdl.soap.THeader[] getSOAPHeader(TBindingOperationMessage bom) {
+ private static org.xmlsoap.schemas.wsdl.soap.THeader[] getSOAPHeader(TBindingOperationMessage bom) {
XmlObject[] kids = bom.selectChildren(new QName(WSDL_SOAP_NAMESPACE, "header"));
org.xmlsoap.schemas.wsdl.soap.THeader[] res = new org.xmlsoap.schemas.wsdl.soap.THeader[kids.length];
@@ -193,7 +200,7 @@
return res;
}
- public static org.xmlsoap.schemas.wsdl.soap.TAddress[] getSOAPAddress(TPort port) {
+ private static org.xmlsoap.schemas.wsdl.soap.TAddress[] getSOAPAddress(TPort port) {
return selectChildren(port, org.xmlsoap.schemas.wsdl.soap.TAddress.class);
}
Modified: beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/FakeDocWebService.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/FakeDocWebService.java?rev=359871&r1=359870&r2=359871&view=diff
==============================================================================
--- beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/FakeDocWebService.java (original)
+++ beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/FakeDocWebService.java Thu Dec 29 10:43:30 2005
@@ -23,7 +23,6 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import org.apache.beehive.wsm.axis.beans.ComplexJavaBean;
import org.apache.beehive.wsm.axis.exceptions.ComplexUserDefinedException;
import org.apache.beehive.wsm.axis.exceptions.SimpleUserDefinedException;
@@ -41,7 +40,7 @@
@WebMethod(operationName = "processThingy")
@Oneway
- public void processModeratelyComplexObject(@WebParam(name = "thingy") ComplexJavaBean mco) {
+ public void processModeratelyComplexObject(@WebParam(name = "thingy") org.apache.beehive.wsm.beans.ComplexJavaBean mco) {
}
@WebMethod
Modified: beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/FakeRpcWebService.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/FakeRpcWebService.java?rev=359871&r1=359870&r2=359871&view=diff
==============================================================================
--- beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/FakeRpcWebService.java (original)
+++ beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/FakeRpcWebService.java Thu Dec 29 10:43:30 2005
@@ -24,7 +24,6 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import org.apache.beehive.wsm.axis.beans.ComplexJavaBean;
import org.apache.beehive.wsm.holders.SessionIdHolder;
/**
@@ -43,7 +42,7 @@
@WebMethod(operationName = "processThingy")
@Oneway
- public void processModeratelyComplexObject(@WebParam(name = "thingy") ComplexJavaBean mco) {
+ public void processModeratelyComplexObject(@WebParam(name = "thingy") org.apache.beehive.wsm.beans.ComplexJavaBean mco) {
}
@WebMethod
Modified: beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/exceptions/ComplexUserDefinedException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/exceptions/ComplexUserDefinedException.java?rev=359871&r1=359870&r2=359871&view=diff
==============================================================================
--- beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/exceptions/ComplexUserDefinedException.java (original)
+++ beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/exceptions/ComplexUserDefinedException.java Thu Dec 29 10:43:30 2005
@@ -24,8 +24,8 @@
private String _msg2;
public ComplexUserDefinedException(String str1, String str2 ) {
- this._msg1 = str1;
- this._msg2 = str2;
+ _msg1 = str1;
+ _msg2 = str2;
}
public String getMsg1() {
@@ -37,11 +37,11 @@
}
public void setMsg1(String msg1) {
- this._msg1 = msg1;
+ _msg1 = msg1;
}
public void setMsg2(String msg2) {
- this._msg2 = msg2;
+ _msg2 = msg2;
}
}
Copied: beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/beans/ComplexJavaBean.java (from r359257, beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/beans/ComplexJavaBean.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/beans/ComplexJavaBean.java?p2=beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/beans/ComplexJavaBean.java&p1=beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/beans/ComplexJavaBean.java&r1=359257&r2=359871&rev=359871&view=diff
==============================================================================
--- beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/axis/beans/ComplexJavaBean.java (original)
+++ beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/beans/ComplexJavaBean.java Thu Dec 29 10:43:30 2005
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.beehive.wsm.axis.beans;
+package org.apache.beehive.wsm.beans;
import java.io.Serializable;
import java.util.Collection;
Propchange: beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/beans/ComplexJavaBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java?rev=359871&r1=359870&r2=359871&view=diff
==============================================================================
--- beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java (original)
+++ beehive/trunk/wsm/test/src/junit-services/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java Thu Dec 29 10:43:30 2005
@@ -26,7 +26,7 @@
parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
public class StarWars {
- public static net.superflaco.Character stashed;
+ private static net.superflaco.Character stashed;
@WebMethod
public net.superflaco.Character getChewie() {
@@ -68,15 +68,14 @@
if (stashed == null)
stashed = getChewie();
- if (ch != null) {
+ if (ch != null)
System.out.println("Chewie: " + getChewie().xmlText());
System.out.println("stashed: " + ch.xmlText());
- }
+
net.superflaco.Character out = stashed;
stashed = ch;
return out;
}
-
@WebMethod
public net.superflaco.Character changeName(@WebParam(name = "newname") String name) {
Modified: beehive/trunk/wsm/test/src/junit-services/web/ImplementationBeanService.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/src/junit-services/web/ImplementationBeanService.java?rev=359871&r1=359870&r2=359871&view=diff
==============================================================================
--- beehive/trunk/wsm/test/src/junit-services/web/ImplementationBeanService.java (original)
+++ beehive/trunk/wsm/test/src/junit-services/web/ImplementationBeanService.java Thu Dec 29 10:43:30 2005
@@ -25,7 +25,7 @@
*
*/
@WebService(name = "Abacus",
- targetNamespace = "http://www.superflaco.com/AnnotationTest")
+ targetNamespace = "http://beehive.apache.org/test/wsm/AnnotationTest")
public class ImplementationBeanService {
@WebMethod(operationName = "GoLoco", action = "LocoAction")
Modified: beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/jsr181/model/ImplementationBeanServiceTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/jsr181/model/ImplementationBeanServiceTest.java?rev=359871&r1=359870&r2=359871&view=diff
==============================================================================
--- beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/jsr181/model/ImplementationBeanServiceTest.java (original)
+++ beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/jsr181/model/ImplementationBeanServiceTest.java Thu Dec 29 10:43:30 2005
@@ -54,7 +54,7 @@
/* todo: test endpointInterface */
assertEquals("Invalid wsTargetNamespace;",
- "http://www.superflaco.com/AnnotationTest",
+ "http://beehive.apache.org/test/wsm/AnnotationTest",
_objectModel.getTargetNamespace());
}
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=359871&r1=359870&r2=359871&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 Thu Dec 29 10:43:30 2005
@@ -37,20 +37,21 @@
private static final String CLASSNAME = "org.apache.beehive.wsm.jsr181.wsdl.StarWars";
- private BeehiveWsTypeMetadata serverModel;
- private BeehiveWsTypeMetadata clientModel;
+ private BeehiveWsTypeMetadata _serverModel;
+ private BeehiveWsTypeMetadata _clientModel;
- public void setUp() throws Exception {
+ public void setUp()
+ throws Exception {
Class clazz = Class.forName(CLASSNAME);
- serverModel = Jsr181ObjectModelStore.load(clazz);
+ _serverModel = Jsr181ObjectModelStore.load(clazz);
InputStream is = null;
try {
is = Thread.currentThread().getContextClassLoader().getResourceAsStream("schemas/starwars.wsdl");
BindingLookupStrategy bindingLookupStrategy = (new BindingLookupFactory()).getInstance();
XmlBeanWSDLProcessor xbwp = new XmlBeanWSDLProcessor(Utilities.parseWSDL(is), bindingLookupStrategy);
- clientModel = xbwp.getObjectModel();
+ _clientModel = xbwp.getObjectModel();
}
finally {
if(is != null)
@@ -61,21 +62,22 @@
public void testServiceWideSettings()
throws Exception {
- assertEquals(serverModel.getName(), clientModel.getName());
- assertEquals(serverModel.getServiceName(), clientModel.getServiceName());
- assertEquals(serverModel.getTargetNamespace(), clientModel.getTargetNamespace());
-
- // NOTE jcolwell@bea.com 2005-Jan-07 -- not checking equivalence of Parameter style since the
- // client can use BARE even if the server uses WRAPPED
- assertEquals(serverModel.getSoapBinding().getStyle(), clientModel.getSoapBinding().getStyle());
- assertEquals(serverModel.getSoapBinding().getUse(), clientModel.getSoapBinding().getUse());
+ assertEquals(_serverModel.getName(), _clientModel.getName());
+ assertEquals(_serverModel.getServiceName(), _clientModel.getServiceName());
+ assertEquals(_serverModel.getTargetNamespace(), _clientModel.getTargetNamespace());
+
+ /*
+ note: not checking equivalence of Parameter style since the client can use BARE even if the server uses WRAPPED
+ */
+ assertEquals(_serverModel.getSoapBinding().getStyle(), _clientModel.getSoapBinding().getStyle());
+ assertEquals(_serverModel.getSoapBinding().getUse(), _clientModel.getSoapBinding().getUse());
}
public void testMethodLevelSettings()
throws Exception {
- Collection<? extends BeehiveWsMethodMetadata> serverMethods = serverModel.getMethods();
- Collection<? extends BeehiveWsMethodMetadata> clientMethods = clientModel.getMethods();
+ Collection<? extends BeehiveWsMethodMetadata> serverMethods = _serverModel.getMethods();
+ Collection<? extends BeehiveWsMethodMetadata> clientMethods = _clientModel.getMethods();
assertEquals(serverMethods.size(), clientMethods.size());
for (BeehiveWsMethodMetadata wmm : serverMethods) {
@@ -85,9 +87,9 @@
for (BeehiveWsParameterMetadata param : params)
paramClasses[pcIndex] = param.getJavaType();
- BeehiveWsMethodMetadata clientMethod = clientModel.getMethod(wmm.getWmOperationName(), paramClasses);
+ BeehiveWsMethodMetadata clientMethod = _clientModel.getMethod(wmm.getWmOperationName(), paramClasses);
boolean paramStylesMatch =
- (clientModel.getSoapBinding().getParameterStyle() == serverModel.getSoapBinding().getParameterStyle());
+ (_clientModel.getSoapBinding().getParameterStyle() == _serverModel.getSoapBinding().getParameterStyle());
if (clientMethod != null && paramStylesMatch) {
compareMethodMetadata(wmm, clientMethod);