You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cs...@apache.org on 2006/02/09 21:44:31 UTC
svn commit: r376434 [3/3] - in /beehive/trunk: system-controls/
system-controls/src/webservice/ system-controls/src/webservice/control/
system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/generator/
system-controls/src/...
Added: beehive/trunk/system-controls/test/webservice/webapp/wsdl/schematypes/XmlSourceDocLitWrapped.wsdl
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/wsdl/schematypes/XmlSourceDocLitWrapped.wsdl?rev=376434&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/wsdl/schematypes/XmlSourceDocLitWrapped.wsdl (added)
+++ beehive/trunk/system-controls/test/webservice/webapp/wsdl/schematypes/XmlSourceDocLitWrapped.wsdl Thu Feb 9 12:44:19 2006
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://xml.attachments" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://xml.attachments" xmlns:intf="http://xml.attachments" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<!--WSDL created by Apache Axis version: 1.2
+Built on May 03, 2005 (02:20:24 EDT)-->
+ <wsdl:types>
+ <schema elementFormDefault="qualified" targetNamespace="http://xml.attachments" xmlns="http://www.w3.org/2001/XMLSchema">
+ <import namespace="http://xml.apache.org/xml-soap"/>
+ <element name="echoXml">
+ <complexType>
+ <sequence>
+ <element name="xml" type="apachesoap:Source"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="echoXmlResponse">
+ <complexType>
+ <sequence>
+ <element name="return" type="apachesoap:Source"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="echoXmlArray">
+ <complexType>
+ <sequence>
+ <element maxOccurs="unbounded" name="xmlArr" type="apachesoap:Source"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="echoXmlArrayResponse">
+ <complexType>
+ <sequence>
+ <element maxOccurs="unbounded" name="return" type="apachesoap:Source"/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </wsdl:types>
+
+ <wsdl:message name="echoXmlRequest">
+
+ <wsdl:part element="impl:echoXml" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="echoXmlArrayResponse">
+
+ <wsdl:part element="impl:echoXmlArrayResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="echoXmlResponse">
+
+ <wsdl:part element="impl:echoXmlResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="echoXmlArrayRequest">
+
+ <wsdl:part element="impl:echoXmlArray" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:portType name="XmlSourceDocLitWrapped">
+
+ <wsdl:operation name="echoXml">
+
+ <wsdl:input message="impl:echoXmlRequest" name="echoXmlRequest"/>
+
+ <wsdl:output message="impl:echoXmlResponse" name="echoXmlResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="echoXmlArray">
+
+ <wsdl:input message="impl:echoXmlArrayRequest" name="echoXmlArrayRequest"/>
+
+ <wsdl:output message="impl:echoXmlArrayResponse" name="echoXmlArrayResponse"/>
+
+ </wsdl:operation>
+
+ </wsdl:portType>
+
+ <wsdl:binding name="XmlSourceDocLitWrappedSoapBinding" type="impl:XmlSourceDocLitWrapped">
+
+ <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="echoXml">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="echoXmlRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="echoXmlResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="echoXmlArray">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="echoXmlArrayRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="echoXmlArrayResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ </wsdl:binding>
+
+ <wsdl:service name="XmlSourceDocLitWrappedService">
+
+ <wsdl:port binding="impl:XmlSourceDocLitWrappedSoapBinding" name="XmlSourceDocLitWrapped">
+
+ <wsdlsoap:address location="http://localhost:8080/ServiceControlDRT/attachments/xml/XmlSourceDocLitWrapped.jws"/>
+
+ </wsdl:port>
+
+ </wsdl:service>
+
+</wsdl:definitions>
Added: beehive/trunk/system-controls/test/webservice/webapp/wsdl/schematypes/XmlSourceRpcEnc.wsdl
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/wsdl/schematypes/XmlSourceRpcEnc.wsdl?rev=376434&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/wsdl/schematypes/XmlSourceRpcEnc.wsdl (added)
+++ beehive/trunk/system-controls/test/webservice/webapp/wsdl/schematypes/XmlSourceRpcEnc.wsdl Thu Feb 9 12:44:19 2006
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://xml.attachments" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://xml.attachments" xmlns:intf="http://xml.attachments" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<!--WSDL created by Apache Axis version: 1.2
+Built on May 03, 2005 (02:20:24 EDT)-->
+ <wsdl:types>
+ <schema targetNamespace="http://xml.attachments" xmlns="http://www.w3.org/2001/XMLSchema">
+ <import namespace="http://xml.apache.org/xml-soap"/>
+ <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+ <complexType name="ArrayOf_apachesoap_Source">
+ <complexContent>
+ <restriction base="soapenc:Array">
+ <attribute ref="soapenc:arrayType" wsdl:arrayType="apachesoap:Source[]"/>
+ </restriction>
+ </complexContent>
+ </complexType>
+ </schema>
+ </wsdl:types>
+
+ <wsdl:message name="echoXmlRequest">
+
+ <wsdl:part name="xml" type="apachesoap:Source"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="echoXmlArrayResponse">
+
+ <wsdl:part name="return" type="impl:ArrayOf_apachesoap_Source"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="echoXmlResponse">
+
+ <wsdl:part name="return" type="apachesoap:Source"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="echoXmlArrayRequest">
+
+ <wsdl:part name="xmlArr" type="impl:ArrayOf_apachesoap_Source"/>
+
+ </wsdl:message>
+
+ <wsdl:portType name="XmlSourceRpcEnc">
+
+ <wsdl:operation name="echoXml" parameterOrder="xml">
+
+ <wsdl:input message="impl:echoXmlRequest" name="echoXmlRequest"/>
+
+ <wsdl:output message="impl:echoXmlResponse" name="echoXmlResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="echoXmlArray" parameterOrder="xmlArr">
+
+ <wsdl:input message="impl:echoXmlArrayRequest" name="echoXmlArrayRequest"/>
+
+ <wsdl:output message="impl:echoXmlArrayResponse" name="echoXmlArrayResponse"/>
+
+ </wsdl:operation>
+
+ </wsdl:portType>
+
+ <wsdl:binding name="XmlSourceRpcEncSoapBinding" type="impl:XmlSourceRpcEnc">
+
+ <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="echoXml">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="echoXmlRequest">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xml.attachments" use="encoded"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="echoXmlResponse">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xml.attachments" use="encoded"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="echoXmlArray">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="echoXmlArrayRequest">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xml.attachments" use="encoded"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="echoXmlArrayResponse">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xml.attachments" use="encoded"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ </wsdl:binding>
+
+ <wsdl:service name="XmlSourceRpcEncService">
+
+ <wsdl:port binding="impl:XmlSourceRpcEncSoapBinding" name="XmlSourceRpcEnc">
+
+ <wsdlsoap:address location="http://localhost:8080/ServiceControlDRT/attachments/xml/XmlSourceRpcEnc.jws"/>
+
+ </wsdl:port>
+
+ </wsdl:service>
+
+</wsdl:definitions>
Added: beehive/trunk/system-controls/test/webservice/webapp/wsdl/schematypes/XmlSourceRpcLit.wsdl
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/wsdl/schematypes/XmlSourceRpcLit.wsdl?rev=376434&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/wsdl/schematypes/XmlSourceRpcLit.wsdl (added)
+++ beehive/trunk/system-controls/test/webservice/webapp/wsdl/schematypes/XmlSourceRpcLit.wsdl Thu Feb 9 12:44:19 2006
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://xml.attachments" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://xml.attachments" xmlns:intf="http://xml.attachments" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<!--WSDL created by Apache Axis version: 1.2
+Built on May 03, 2005 (02:20:24 EDT)-->
+ <wsdl:types>
+ <schema targetNamespace="http://xml.attachments" xmlns="http://www.w3.org/2001/XMLSchema">
+ <import namespace="http://xml.apache.org/xml-soap"/>
+ <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+ <complexType name="ArrayOf_apachesoap_Source">
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="item" type="apachesoap:Source"/>
+ </sequence>
+ </complexType>
+ </schema>
+ </wsdl:types>
+
+ <wsdl:message name="echoXmlRequest">
+
+ <wsdl:part name="xml" type="apachesoap:Source"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="echoXmlArrayResponse">
+
+ <wsdl:part name="return" type="impl:ArrayOf_apachesoap_Source"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="echoXmlResponse">
+
+ <wsdl:part name="return" type="apachesoap:Source"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="echoXmlArrayRequest">
+
+ <wsdl:part name="xmlArr" type="impl:ArrayOf_apachesoap_Source"/>
+
+ </wsdl:message>
+
+ <wsdl:portType name="XmlSourceRpcLit">
+
+ <wsdl:operation name="echoXml" parameterOrder="xml">
+
+ <wsdl:input message="impl:echoXmlRequest" name="echoXmlRequest"/>
+
+ <wsdl:output message="impl:echoXmlResponse" name="echoXmlResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="echoXmlArray" parameterOrder="xmlArr">
+
+ <wsdl:input message="impl:echoXmlArrayRequest" name="echoXmlArrayRequest"/>
+
+ <wsdl:output message="impl:echoXmlArrayResponse" name="echoXmlArrayResponse"/>
+
+ </wsdl:operation>
+
+ </wsdl:portType>
+
+ <wsdl:binding name="XmlSourceRpcLitSoapBinding" type="impl:XmlSourceRpcLit">
+
+ <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="echoXml">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="echoXmlRequest">
+
+ <wsdlsoap:body namespace="http://xml.attachments" use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="echoXmlResponse">
+
+ <wsdlsoap:body namespace="http://xml.attachments" use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="echoXmlArray">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="echoXmlArrayRequest">
+
+ <wsdlsoap:body namespace="http://xml.attachments" use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="echoXmlArrayResponse">
+
+ <wsdlsoap:body namespace="http://xml.attachments" use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ </wsdl:binding>
+
+ <wsdl:service name="XmlSourceRpcLitService">
+
+ <wsdl:port binding="impl:XmlSourceRpcLitSoapBinding" name="XmlSourceRpcLit">
+
+ <wsdlsoap:address location="http://localhost:8080/ServiceControlDRT/attachments/xml/XmlSourceRpcLit.jws"/>
+
+ </wsdl:port>
+
+ </wsdl:service>
+
+</wsdl:definitions>
Modified: beehive/trunk/wsm/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/build.xml?rev=376434&r1=376433&r2=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/build.xml (original)
+++ beehive/trunk/wsm/build.xml Thu Feb 9 12:44:19 2006
@@ -37,6 +37,15 @@
<property name="axis.dir" location="src/axis"/>
<property name="axis.classes" location="${classes.dir}/axis"/>
+ <property name="webservice-utils-core.dir" location="src/webservice-utils/core"/>
+ <property name="webservice-utils-core.classes" location="${classes.dir}/webservice-utils-core"/>
+
+ <property name="webservice-utils-axis.dir" location="src/webservice-utils/axis"/>
+ <property name="webservice-utils-axis.classes" location="${classes.dir}/webservice-utils-axis"/>
+
+ <property name="webservice-utils-xmlbeans.dir" location="src/webservice-utils/xmlbeans"/>
+ <property name="webservice-utils-xmlbeans.classes" location="${classes.dir}/webservice-utils-xmlbeans"/>
+
<property name="wsdl.schema.dir" location="src/schema-wsdl"/>
<property name="temp.wsdl.classes.dir" location="${build.dir}/temp-wsdltypes"/>
@@ -57,6 +66,7 @@
<pathelement location="${jars.dir}/beehive-wsdltypes.jar"/>
<pathelement location="${jsr181.jar}"/>
<pathelement location="${core.classes}"/>
+ <pathelement location="${webservice-utils-core.classes}"/>
<pathelement location="external/axis-1.2/jaxrpc.jar"/>
<pathelement location="external/axis-1.2/wsdl4j.jar"/>
</path>
@@ -66,6 +76,8 @@
<path refid="controls.dependency.path"/>
<path refid="webservice.classpath"/>
<pathelement location="${core.classes}"/>
+ <pathelement location="${webservice-utils-axis.classes}"/>
+ <pathelement location="${webservice-utils-xmlbeans.classes}"/>
</path>
<!-- ==================================================================== -->
@@ -75,6 +87,9 @@
<mkdir dir="${api.classes}"/>
<mkdir dir="${core.classes}"/>
<mkdir dir="${axis.classes}"/>
+ <mkdir dir="${webservice-utils-core.classes}"/>
+ <mkdir dir="${webservice-utils-axis.classes}"/>
+ <mkdir dir="${webservice-utils-xmlbeans.classes}"/>
<mkdir dir="${jars.dir}"/>
<mkdir dir="${docs.dir}"/>
</target>
@@ -147,10 +162,14 @@
<echo message="| WSM Core build starting |"/>
<echo message="--------------------------------------------------"/>
+ <javac destdir="${webservice-utils-core.classes}" classpathref="core.classpath" debug="on">
+ <src path="${webservice-utils-core.dir}"/>
+ </javac>
+
<javac destdir="${core.classes}" classpathref="core.classpath" debug="on">
<src path="${core.dir}"/>
</javac>
-
+
<copy todir="${core.classes}" overwrite="true">
<fileset dir="${core.dir}" includes="**/*.template,**/*.vm,META-INF/**"/>
<fileset dir="${core.dir}" includes="**/*.properties"/>
@@ -159,7 +178,8 @@
<jar jarfile="${wsm.jar}">
<fileset dir="${core.classes}"/>
- <manifest>
+ <fileset dir="${webservice-utils-core.classes}"/>
+ <manifest>
<attribute name="Extension-Name" value="Beehive WSM Library"/>
<attribute name="Specification-Title" value="Beehive WSM Library"/>
<attribute name="Specification-Vendor" value="Apache Software Foundation"/>
@@ -178,6 +198,14 @@
<echo message="| WSM AXIS build starting |"/>
<echo message="--------------------------------------------------"/>
+ <javac destdir="${webservice-utils-xmlbeans.classes}" classpathref="axis.classpath" debug="on">
+ <src path="${webservice-utils-xmlbeans.dir}"/>
+ </javac>
+
+ <javac destdir="${webservice-utils-axis.classes}" classpathref="axis.classpath" debug="on">
+ <src path="${webservice-utils-axis.dir}"/>
+ </javac>
+
<javac destdir="${axis.classes}" classpathref="axis.classpath" debug="on">
<src path="${axis.dir}"/>
</javac>
@@ -188,7 +216,9 @@
<jar jarfile="${wsm-axis.jar}">
<fileset dir="${axis.classes}"/>
- <manifest>
+ <fileset dir="${webservice-utils-axis.classes}"/>
+ <fileset dir="${webservice-utils-xmlbeans.classes}"/>
+ <manifest>
<attribute name="Extension-Name" value="Axis Runtime for Beehive WSM"/>
<attribute name="Specification-Title" value="Axis Runtime for Beehive WSM"/>
<attribute name="Specification-Vendor" value="Apache Software Foundation"/>
Copied: beehive/trunk/wsm/src/axis/META-INF/services/org.apache.beehive.webservice.utils.databinding.BindingLookupFactory (from r372277, beehive/trunk/wsm/src/axis/META-INF/services/org.apache.beehive.wsm.databinding.BindingLookupFactory)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/axis/META-INF/services/org.apache.beehive.webservice.utils.databinding.BindingLookupFactory?p2=beehive/trunk/wsm/src/axis/META-INF/services/org.apache.beehive.webservice.utils.databinding.BindingLookupFactory&p1=beehive/trunk/wsm/src/axis/META-INF/services/org.apache.beehive.wsm.databinding.BindingLookupFactory&r1=372277&r2=376434&rev=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/META-INF/services/org.apache.beehive.wsm.databinding.BindingLookupFactory (original)
+++ beehive/trunk/wsm/src/axis/META-INF/services/org.apache.beehive.webservice.utils.databinding.BindingLookupFactory Thu Feb 9 12:44:19 2006
@@ -1 +1 @@
-org.apache.beehive.wsm.axis.databinding.AxisBindingLookupFactory
\ No newline at end of file
+org.apache.beehive.webservice.utils.databinding.AxisBindingLookupFactory
\ No newline at end of file
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=376434&r1=376433&r2=376434&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 Feb 9 12:44:19 2006
@@ -28,6 +28,7 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.holders.Holder;
import javax.xml.rpc.encoding.XMLType;
+import javax.xml.transform.Source;
import org.apache.axis.constants.Style;
import org.apache.axis.constants.Use;
@@ -48,19 +49,19 @@
import org.apache.axis.encoding.ser.ArraySerializerFactory;
import org.apache.axis.utils.BeanPropertyDescriptor;
import org.apache.axis.Constants;
-import org.apache.beehive.wsm.axis.databinding.AxisBindingLookupFactory;
-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;
+import org.apache.beehive.webservice.utils.encoding.XmlBeanDeserializerFactory;
+import org.apache.beehive.webservice.utils.encoding.XmlBeanSerializerFactory;
+import org.apache.beehive.webservice.utils.databinding.BindingLookupStrategy;
+import org.apache.beehive.webservice.utils.databinding.TypeMappingConstants;
+import org.apache.beehive.webservice.utils.databinding.AxisBindingLookupFactory;
+import org.apache.beehive.webservice.utils.JavaClassUtils;
import org.apache.beehive.wsm.model.WsmOperation;
import org.apache.beehive.wsm.model.WsmParameter;
import org.apache.beehive.wsm.model.WsmSoapBinding;
import org.apache.beehive.wsm.model.WsmService;
import org.apache.beehive.wsm.exception.InvalidTypeMappingException;
import org.apache.beehive.wsm.exception.ConfigurationException;
-import org.apache.beehive.wsm.util.JavaClassUtils;
import org.apache.beehive.wsm.util.TypeUtils;
-import org.apache.beehive.wsm.util.TypeMappingConstants;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
import org.apache.xmlbeans.XmlBeans;
@@ -201,6 +202,12 @@
else if (isActivationEnabled() && getDataHandlerClass().isAssignableFrom(type)) {
/* no-op: Axis will have already set the value correctly */
}
+ else if (isActivationEnabled() && getMultipartClass().isAssignableFrom(type)) {
+ /* no-op: Axis will have already set the value correctly */
+ }
+ else if (isActivationEnabled() && Source.class.isAssignableFrom(type)) {
+ /* no-op: Axis will have already set the value correctly */
+ }
else {
qn = configureTypeMapping(axisServiceDesc, returnType, wsmOperation.getTargetNamespace());
axisOperationDesc.setReturnType(qn);
@@ -283,6 +290,9 @@
throw new IllegalArgumentException("Illegal value for WebParam.Mode: " + mode);
}
axisParameterDesc.setJavaType(paramType);
+ if (wsmServiceDesc.getSoapBinding().getStyle() == SOAPBinding.Style.RPC && paramType.isArray()) {
+ axisParameterDesc.setItemQName(new QName("", "item"));
+ }
// new
//axisOperationDesc.addParameter(axisParameterDesc);
@@ -448,10 +458,15 @@
return null;
/* get built-in javaType QName */
- QName builtInQName = axisServiceDesc.getTypeMapping().getTypeQName(javaType);
+ QName qname = axisServiceDesc.getTypeMapping().getTypeQName(javaType);
// QName builtInQName = AxisTypeMappingMetaData.getBuiltInTypeQname(javaType);
- if(builtInQName != null)
- return builtInQName;
+ if(qname != null) {
+ // we may have found a qname, but that does not necessarily mean its been registered
+ if (axisServiceDesc.getTypeMapping().isRegistered(javaType, qname)) {
+ return qname;
+ }
+
+ }
/*
If the type isn't a built-in type, the type mapping information needs to be explicitly configured
@@ -470,7 +485,9 @@
Use an Axis-specific method to lookup the Java type -> QName mapping
*/
BindingLookupStrategy lookupStrategy = new AxisBindingLookupFactory().getInstance();
- QName qname = lookupStrategy.class2qname(javaType, targetNamespace);
+ if (qname == null) {
+ qname = lookupStrategy.class2qname(javaType, targetNamespace);
+ }
/* todo: what happens when this QName is null? */
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/WsmOperation.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/WsmOperation.java?rev=376434&r1=376433&r2=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/WsmOperation.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/WsmOperation.java Thu Feb 9 12:44:19 2006
@@ -22,8 +22,6 @@
import java.util.Collections;
import javax.xml.namespace.QName;
-import org.apache.beehive.wsm.util.JavaClassUtils;
-
/**
*/
public class WsmOperation
@@ -40,7 +38,7 @@
private QName _xmlReturnType;
public final String getJavaReturnTypeFullName() {
- return JavaClassUtils.convertToReadableName(getJavaReturnType());
+ return org.apache.beehive.webservice.utils.JavaClassUtils.convertToReadableName(getJavaReturnType());
}
public void addParameter(WsmParameter parameter) {
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/WsmParameter.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/WsmParameter.java?rev=376434&r1=376433&r2=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/WsmParameter.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/WsmParameter.java Thu Feb 9 12:44:19 2006
@@ -21,7 +21,7 @@
import javax.jws.WebParam;
import javax.xml.namespace.QName;
-import org.apache.beehive.wsm.util.JavaClassUtils;
+import org.apache.beehive.webservice.utils.JavaClassUtils;
/**
*/
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=376434&r1=376433&r2=376434&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 Feb 9 12:44:19 2006
@@ -25,12 +25,12 @@
import javax.jws.soap.SOAPBinding;
import javax.xml.namespace.QName;
-import org.apache.beehive.wsm.databinding.BindingLookupStrategy;
+import org.apache.beehive.webservice.utils.databinding.BindingLookupStrategy;
import org.apache.beehive.wsm.model.WsmOperation;
import org.apache.beehive.wsm.model.WsmParameter;
import org.apache.beehive.wsm.model.WsmSoapBinding;
import org.apache.beehive.wsm.model.WsmService;
-import org.apache.beehive.wsm.util.JavaClassUtils;
+import org.apache.beehive.webservice.utils.JavaClassUtils;
import org.apache.xmlbeans.SchemaType;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.impl.xb.xsdschema.ComplexType;
@@ -442,7 +442,7 @@
// doc / lit / bare
if (els != null && els.length == 1) {
WsmParameter pm = elementToParamMetaData(s.getTargetNamespace(), els[0]);
- if (JavaClassUtils.isArray(pm.getJavaType())) {
+ if (org.apache.beehive.webservice.utils.JavaClassUtils.isArray(pm.getJavaType())) {
pm.setName(e.getName());
paramList.add(pm);
paramAdded = true;
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/tools/wsdl2ajava/Wsdl2AJava.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/tools/wsdl2ajava/Wsdl2AJava.java?rev=376434&r1=376433&r2=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/tools/wsdl2ajava/Wsdl2AJava.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/tools/wsdl2ajava/Wsdl2AJava.java Thu Feb 9 12:44:19 2006
@@ -20,8 +20,8 @@
import java.io.IOException;
import java.net.MalformedURLException;
-import org.apache.beehive.wsm.databinding.BindingLookupStrategy;
-import org.apache.beehive.wsm.databinding.BindingLookupFactory;
+import org.apache.beehive.webservice.utils.databinding.BindingLookupStrategy;
+import org.apache.beehive.webservice.utils.databinding.BindingLookupFactory;
import org.apache.beehive.wsm.model.WsmService;
import org.apache.beehive.wsm.model.wsdl.XmlBeanWSDLProcessor;
import org.apache.beehive.wsm.tools.wsdl2ajava.Model2AJava;
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/TypeUtils.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/TypeUtils.java?rev=376434&r1=376433&r2=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/TypeUtils.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/TypeUtils.java Thu Feb 9 12:44:19 2006
@@ -36,6 +36,14 @@
public static Class getHolderValueClass(Type holderClass) {
Class res = null;
+ /* TODO: CAS - I don't believe this block really applies to wsm, it is the only reference
+ to GenericHolder in WSM - needs a bit more investigation but I think the if block can
+ be removed as well as GenericHolder from wsm.
+
+ This method can be simplified further by changing the parameter type of Holder class
+ to 'java.lang.Class' instead of type. It might also be worth considering removing this
+ class (TypeUtils) and just putting this method in the ServiceDescriptionFactory.
+ */
if(holderClass instanceof ParameterizedType) {
ParameterizedType pt = (ParameterizedType)holderClass;
Type raw = pt.getRawType();
Copied: beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisBindingLookupFactory.java (from r372277, beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisBindingLookupFactory.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisBindingLookupFactory.java?p2=beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisBindingLookupFactory.java&p1=beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisBindingLookupFactory.java&r1=372277&r2=376434&rev=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisBindingLookupFactory.java (original)
+++ beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisBindingLookupFactory.java Thu Feb 9 12:44:19 2006
@@ -17,12 +17,12 @@
*
*
*/
-package org.apache.beehive.wsm.axis.databinding;
+package org.apache.beehive.webservice.utils.databinding;
-import org.apache.beehive.wsm.databinding.BindingLookupStrategy;
-import org.apache.beehive.wsm.databinding.BindingLookupChain;
-import org.apache.beehive.wsm.databinding.BindingLookupFactory;
-import org.apache.beehive.wsm.databinding.xmlbeans.XmlBeanLookupStrategy;
+import org.apache.beehive.webservice.utils.databinding.BindingLookupStrategy;
+import org.apache.beehive.webservice.utils.databinding.BindingLookupFactory;
+import org.apache.beehive.webservice.utils.databinding.XmlBeanLookupStrategy;
+import org.apache.beehive.webservice.utils.databinding.BindingLookupChain;
public class AxisBindingLookupFactory
extends BindingLookupFactory {
Propchange: beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisBindingLookupFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisLookupStrategy.java (from r372277, beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisLookupStrategy.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisLookupStrategy.java?p2=beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisLookupStrategy.java&p1=beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisLookupStrategy.java&r1=372277&r2=376434&rev=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisLookupStrategy.java (original)
+++ beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisLookupStrategy.java Thu Feb 9 12:44:19 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beehive.wsm.axis.databinding;
+package org.apache.beehive.webservice.utils.databinding;
import javax.xml.namespace.QName;
import javax.xml.rpc.encoding.TypeMappingRegistry;
@@ -26,8 +26,6 @@
import org.apache.axis.wsdl.fromJava.Namespaces;
import org.apache.axis.wsdl.fromJava.Types;
import org.apache.axis.wsdl.toJava.Utils;
-import org.apache.beehive.wsm.axis.registration.AxisTypeMappingMetaData;
-import org.apache.beehive.wsm.databinding.BindingLookupStrategy;
/**
* Strategy for mapping QName objects to Class objects and vice versa. This implementation
@@ -97,13 +95,25 @@
if (Constants.NS_URI_XMLSOAP.equals(qType.getNamespaceURI())) {
if ("Image".equals(qType.getLocalPart()) || "Image[]".equals(qType.getLocalPart())) {
return java.awt.Image.class;
- } else if ("DataHandler".equals(qType.getLocalPart()) || "DataHandler[]".equals(qType.getLocalPart())) {
+ }
+ else if ("DataHandler".equals(qType.getLocalPart()) || "DataHandler[]".equals(qType.getLocalPart())) {
try {
return Class.forName("javax.activation.DataHandler");
}
catch (ClassNotFoundException e) {
// fall through
}
+ }
+ else if ("Multipart".equals(qType.getLocalPart()) || "Multipart[]".equals(qType.getLocalPart())) {
+ try {
+ return Class.forName("javax.mail.internet.MimeMultipart");
+ }
+ catch (ClassNotFoundException e) {
+ // fall through
+ }
+ }
+ else if ("Source".equals(qType.getLocalPart()) || "Source[]".equals(qType.getLocalPart())) {
+ return javax.xml.transform.Source.class;
}
}
Propchange: beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisLookupStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisTypeMappingMetaData.java (from r372277, beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisTypeMappingMetaData.java?p2=beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisTypeMappingMetaData.java&p1=beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java&r1=372277&r2=376434&rev=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java (original)
+++ beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisTypeMappingMetaData.java Thu Feb 9 12:44:19 2006
@@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beehive.wsm.axis.registration;
+package org.apache.beehive.webservice.utils.databinding;
import java.util.HashMap;
import javax.xml.namespace.QName;
import org.apache.axis.Constants;
+import org.apache.axis.utils.JavaUtils;
import org.apache.axis.types.HexBinary;
/**
@@ -109,16 +110,13 @@
addBuiltInType(Constants.SOAP_VECTOR, java.util.Vector.class);
- // if (JavaUtils.isAttachmentSupported()) {
- // addBuiltInType(Constants.MIME_IMAGE, java.awt.Image.class);
- // addBuiltInType(Constants.MIME_MULTIPART,
- // javax.mail.internet.MimeMultipart.class);
- // addBuiltInType(Constants.MIME_SOURCE,
- // javax.xml.transform.Source.class);
+ if (JavaUtils.isAttachmentSupported()) {
+ addBuiltInType(Constants.MIME_IMAGE, java.awt.Image.class);
+ // addBuiltInType(Constants.MIME_MULTIPART, javax.mail.internet.MimeMultipart.class);
+ addBuiltInType(Constants.MIME_SOURCE, javax.xml.transform.Source.class);
// addBuiltInType(Constants.MIME_OCTETSTREAM, OctetStream.class);
- // addBuiltInType(Constants.MIME_DATA_HANDLER,
- // javax.activation.DataHandler.class);
- // }
+ // addBuiltInType(Constants.MIME_DATA_HANDLER, javax.activation.DataHandler.class);
+ }
addBuiltInType(Constants.XSD_TOKEN, org.apache.axis.types.Token.class);
addBuiltInType(Constants.XSD_NORMALIZEDSTRING, org.apache.axis.types.NormalizedString.class);
Propchange: beehive/trunk/wsm/src/webservice-utils/axis/org/apache/beehive/webservice/utils/databinding/AxisTypeMappingMetaData.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/JavaClassUtils.java (from r372277, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/JavaClassUtils.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/JavaClassUtils.java?p2=beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/JavaClassUtils.java&p1=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/JavaClassUtils.java&r1=372277&r2=376434&rev=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/JavaClassUtils.java (original)
+++ beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/JavaClassUtils.java Thu Feb 9 12:44:19 2006
@@ -15,7 +15,7 @@
*
* $Header:$Factory
*/
-package org.apache.beehive.wsm.util;
+package org.apache.beehive.webservice.utils;
import java.lang.reflect.Array;
Propchange: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/JavaClassUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupChain.java (from r371603, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/BindingLookupChain.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupChain.java?p2=beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupChain.java&p1=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/BindingLookupChain.java&r1=371603&r2=376434&rev=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/BindingLookupChain.java (original)
+++ beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupChain.java Thu Feb 9 12:44:19 2006
@@ -17,19 +17,18 @@
*
*
*/
-package org.apache.beehive.wsm.databinding;
+package org.apache.beehive.webservice.utils.databinding;
import java.util.ArrayList;
import javax.xml.namespace.QName;
-import org.apache.beehive.wsm.databinding.BindingLookupStrategy;
-import org.apache.beehive.wsm.databinding.xmlbeans.XmlBeanLookupStrategy;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
- * Implementation of the {@link BindingLookupStrategy} class that chains together some number of
- * {@link BindingLookupStrategy} implementations. This list should be managed using the add / remove methods.
+ * Implementation of the {@link org.apache.beehive.webservice.utils.databinding.BindingLookupStrategy} class that chains
+ * together some number of {@link org.apache.beehive.webservice.utils.databinding.BindingLookupStrategy}
+ * implementations. This list should be managed using the add / remove methods.
*/
public final class BindingLookupChain
implements BindingLookupStrategy {
Propchange: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupChain.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupFactory.java (from r371603, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/BindingLookupFactory.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupFactory.java?p2=beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupFactory.java&p1=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/BindingLookupFactory.java&r1=371603&r2=376434&rev=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/BindingLookupFactory.java (original)
+++ beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupFactory.java Thu Feb 9 12:44:19 2006
@@ -15,10 +15,9 @@
$Header:$
*/
-package org.apache.beehive.wsm.databinding;
+package org.apache.beehive.webservice.utils.databinding;
-import org.apache.beehive.wsm.util.SchemaTypesLookupStrategy;
-import org.apache.beehive.wsm.exception.BindingConfigurationException;
+import org.apache.beehive.webservice.utils.exception.BindingConfigurationException;
import org.apache.commons.discovery.tools.DiscoverClass;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Propchange: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupStrategy.java (from r371603, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/BindingLookupStrategy.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupStrategy.java?p2=beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupStrategy.java&p1=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/BindingLookupStrategy.java&r1=371603&r2=376434&rev=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/BindingLookupStrategy.java (original)
+++ beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupStrategy.java Thu Feb 9 12:44:19 2006
@@ -17,7 +17,7 @@
*
*
*/
-package org.apache.beehive.wsm.databinding;
+package org.apache.beehive.webservice.utils.databinding;
import javax.xml.namespace.QName;
Propchange: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/BindingLookupStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/SchemaTypesLookupStrategy.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/SchemaTypesLookupStrategy.java?rev=376434&view=auto
==============================================================================
--- beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/SchemaTypesLookupStrategy.java (added)
+++ beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/SchemaTypesLookupStrategy.java Thu Feb 9 12:44:19 2006
@@ -0,0 +1,94 @@
+/*
+ Copyright 2004 The Apache Software Foundation.
+
+ Licensed 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.
+
+ $Header:$
+ */
+package org.apache.beehive.webservice.utils.databinding;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import javax.xml.namespace.QName;
+
+/**
+ *
+ */
+public class SchemaTypesLookupStrategy
+ implements BindingLookupStrategy, TypeMappingConstants {
+
+ private static HashMap<Class, QName> SCHEMA_TYPES = new HashMap<Class, QName>();
+
+ public QName class2qname(Class clazz) {
+ return SCHEMA_TYPES.get(clazz);
+ }
+
+ public QName class2qname(Class clazz, String namespace) {
+ return SCHEMA_TYPES.get(clazz);
+ }
+
+ public Class qname2class(QName qname) {
+ Iterator values = SCHEMA_TYPES.entrySet().iterator();
+ while(values.hasNext()) {
+ Map.Entry entry = (Map.Entry)values.next();
+ if(entry.getValue().equals(qname))
+ return (Class)entry.getKey();
+ }
+ return null;
+ }
+
+ static {
+ addBuiltInType(XSD_HEXBIN, byte[].class);
+ addBuiltInType(XSD_BYTE, byte[].class);
+ addBuiltInType(XSD_BASE64, byte[].class);
+ // anySimpleType is mapped to java.lang.String according to JAX-RPC 1.1 spec.
+ addBuiltInType(XSD_ANYSIMPLETYPE, String.class);
+ // If SOAP 1.1 over the wire, map wrapper classes to XSD primitives.
+ addBuiltInType(XSD_STRING, String.class);
+ addBuiltInType(XSD_BOOLEAN, Boolean.class);
+ addBuiltInType(XSD_DOUBLE, Double.class);
+ addBuiltInType(XSD_FLOAT, Float.class);
+ addBuiltInType(XSD_INT, Integer.class);
+ addBuiltInType(XSD_INTEGER, java.math.BigInteger.class);
+ addBuiltInType(XSD_DECIMAL, java.math.BigDecimal.class);
+ addBuiltInType(XSD_LONG, Long.class);
+ addBuiltInType(XSD_SHORT, Short.class);
+ addBuiltInType(XSD_BYTE, Byte.class);
+ // The XSD Primitives are mapped to java primitives.
+ addBuiltInType(XSD_BOOLEAN, boolean.class);
+ addBuiltInType(XSD_DOUBLE, double.class);
+ addBuiltInType(XSD_FLOAT, float.class);
+ addBuiltInType(XSD_INT, int.class);
+ addBuiltInType(XSD_LONG, long.class);
+ addBuiltInType(XSD_SHORT, short.class);
+ addBuiltInType(XSD_BYTE, byte.class);
+ // Map QNAME to the jax rpc QName class
+ addBuiltInType(XSD_QNAME, QName.class);
+ // The closest match for anytype is Object
+ addBuiltInType(XSD_ANYTYPE, Object.class);
+ // See the SchemaVersion classes for where the registration of
+ // dateTime (for 2001) and timeInstant (for 1999 & 2000) happen.
+ addBuiltInType(XSD_DATE, java.sql.Date.class);
+ // See the SchemaVersion classes for where the registration of
+ // dateTime (for 2001) and timeInstant (for 1999 & 2000) happen.
+ addBuiltInType(XSD_DATETIME, java.util.Date.class);
+ addBuiltInType(XSD_DATETIME, java.util.Calendar.class);
+
+ addBuiltInType(SOAP_ARRAY, java.util.ArrayList.class);
+ }
+
+ private static void addBuiltInType(QName qname, Class clazz) {
+ SCHEMA_TYPES.put(clazz, qname);
+ }
+}
\ No newline at end of file
Propchange: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/SchemaTypesLookupStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/TypeMappingConstants.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/TypeMappingConstants.java?rev=376434&view=auto
==============================================================================
--- beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/TypeMappingConstants.java (added)
+++ beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/TypeMappingConstants.java Thu Feb 9 12:44:19 2006
@@ -0,0 +1,123 @@
+/**
+ Copyright 2004 The Apache Software Foundation.
+
+ Licensed 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.
+
+ $Header:$
+ */
+package org.apache.beehive.webservice.utils.databinding;
+
+import javax.xml.namespace.QName;
+
+/**
+ *
+ */
+public interface TypeMappingConstants {
+
+ public static final String NS_URI_XML = "http://www.w3.org/XML/1998/namespace";
+
+ public static final String URI_1999_SCHEMA_XSD = "http://www.w3.org/1999/XMLSchema";
+ public static final String URI_2000_SCHEMA_XSD = "http://www.w3.org/2000/10/XMLSchema";
+ public static final String URI_2001_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
+ public static final String URI_DEFAULT_SCHEMA_XSD = URI_2001_SCHEMA_XSD;
+
+ public static final String URI_SOAP11_ENC = "http://schemas.xmlsoap.org/soap/encoding/";
+ public static final String URI_SOAP12_ENC = "http://www.w3.org/2003/05/soap-encoding";
+ public static final String URI_DEFAULT_SOAP_ENC = URI_SOAP11_ENC;
+
+ public static final String NS_URI_XMLSOAP = "http://xml.apache.org/xml-soap";
+
+ public static final QName XSD_STRING = new QName(URI_DEFAULT_SCHEMA_XSD, "string");
+ public static final QName XSD_BOOLEAN = new QName(URI_DEFAULT_SCHEMA_XSD, "boolean");
+ public static final QName XSD_DOUBLE = new QName(URI_DEFAULT_SCHEMA_XSD, "double");
+ public static final QName XSD_FLOAT = new QName(URI_DEFAULT_SCHEMA_XSD, "float");
+ public static final QName XSD_INT = new QName(URI_DEFAULT_SCHEMA_XSD, "int");
+ public static final QName XSD_INTEGER = new QName(URI_DEFAULT_SCHEMA_XSD, "integer");
+ public static final QName XSD_LONG = new QName(URI_DEFAULT_SCHEMA_XSD, "long");
+ public static final QName XSD_SHORT = new QName(URI_DEFAULT_SCHEMA_XSD, "short");
+ public static final QName XSD_BYTE = new QName(URI_DEFAULT_SCHEMA_XSD, "byte");
+ public static final QName XSD_DECIMAL = new QName(URI_DEFAULT_SCHEMA_XSD, "decimal");
+ public static final QName XSD_BASE64 = new QName(URI_DEFAULT_SCHEMA_XSD, "base64Binary");
+ public static final QName XSD_HEXBIN = new QName(URI_DEFAULT_SCHEMA_XSD, "hexBinary");
+ public static final QName XSD_ANYSIMPLETYPE = new QName(URI_DEFAULT_SCHEMA_XSD, "anySimpleType");
+ public static final QName XSD_ANYTYPE = new QName(URI_DEFAULT_SCHEMA_XSD, "anyType");
+ public static final QName XSD_ANY = new QName(URI_DEFAULT_SCHEMA_XSD, "any");
+ public static final QName XSD_QNAME = new QName(URI_DEFAULT_SCHEMA_XSD, "QName");
+ public static final QName XSD_DATETIME = new QName(URI_DEFAULT_SCHEMA_XSD, "dateTime");
+ public static final QName XSD_DATE = new QName(URI_DEFAULT_SCHEMA_XSD, "date");
+ public static final QName XSD_TIME = new QName(URI_DEFAULT_SCHEMA_XSD, "time");
+ public static final QName XSD_TIMEINSTANT1999 = new QName(URI_1999_SCHEMA_XSD, "timeInstant");
+ public static final QName XSD_TIMEINSTANT2000 = new QName(URI_2000_SCHEMA_XSD, "timeInstant");
+
+ public static final QName XSD_NORMALIZEDSTRING = new QName(URI_2001_SCHEMA_XSD, "normalizedString");
+ public static final QName XSD_TOKEN = new QName(URI_2001_SCHEMA_XSD, "token");
+
+ public static final QName XSD_UNSIGNEDLONG = new QName(URI_2001_SCHEMA_XSD, "unsignedLong");
+ public static final QName XSD_UNSIGNEDINT = new QName(URI_2001_SCHEMA_XSD, "unsignedInt");
+ public static final QName XSD_UNSIGNEDSHORT = new QName(URI_2001_SCHEMA_XSD, "unsignedShort");
+ public static final QName XSD_UNSIGNEDBYTE = new QName(URI_2001_SCHEMA_XSD, "unsignedByte");
+ public static final QName XSD_POSITIVEINTEGER = new QName(URI_2001_SCHEMA_XSD, "positiveInteger");
+ public static final QName XSD_NEGATIVEINTEGER = new QName(URI_2001_SCHEMA_XSD, "negativeInteger");
+ public static final QName XSD_NONNEGATIVEINTEGER = new QName(URI_2001_SCHEMA_XSD, "nonNegativeInteger");
+ public static final QName XSD_NONPOSITIVEINTEGER = new QName(URI_2001_SCHEMA_XSD, "nonPositiveInteger");
+
+ public static final QName XSD_YEARMONTH = new QName(URI_2001_SCHEMA_XSD, "gYearMonth");
+ public static final QName XSD_MONTHDAY = new QName(URI_2001_SCHEMA_XSD, "gMonthDay");
+ public static final QName XSD_YEAR = new QName(URI_2001_SCHEMA_XSD, "gYear");
+ public static final QName XSD_MONTH = new QName(URI_2001_SCHEMA_XSD, "gMonth");
+ public static final QName XSD_DAY = new QName(URI_2001_SCHEMA_XSD, "gDay");
+ public static final QName XSD_DURATION = new QName(URI_2001_SCHEMA_XSD, "duration");
+
+ public static final QName XSD_NAME = new QName(URI_2001_SCHEMA_XSD, "Name");
+ public static final QName XSD_NCNAME = new QName(URI_2001_SCHEMA_XSD, "NCName");
+ public static final QName XSD_NMTOKEN = new QName(URI_2001_SCHEMA_XSD, "NMTOKEN");
+ public static final QName XSD_NMTOKENS = new QName(URI_2001_SCHEMA_XSD, "NMTOKENS");
+ public static final QName XSD_NOTATION = new QName(URI_2001_SCHEMA_XSD, "NOTATION");
+ public static final QName XSD_ENTITY = new QName(URI_2001_SCHEMA_XSD, "ENTITY");
+ public static final QName XSD_ENTITIES = new QName(URI_2001_SCHEMA_XSD, "ENTITIES");
+ public static final QName XSD_IDREF = new QName(URI_2001_SCHEMA_XSD, "IDREF");
+ public static final QName XSD_IDREFS = new QName(URI_2001_SCHEMA_XSD, "IDREFS");
+ public static final QName XSD_ANYURI = new QName(URI_2001_SCHEMA_XSD, "anyURI");
+ public static final QName XSD_LANGUAGE = new QName(URI_2001_SCHEMA_XSD, "language");
+ public static final QName XSD_ID = new QName(URI_2001_SCHEMA_XSD, "ID");
+ public static final QName XSD_SCHEMA = new QName(URI_2001_SCHEMA_XSD, "schema");
+
+ public static final QName XML_LANG = new QName(NS_URI_XML, "lang");
+
+ public static final QName SOAP_BASE64 = new QName(URI_DEFAULT_SOAP_ENC, "base64");
+ public static final QName SOAP_BASE64BINARY = new QName(URI_DEFAULT_SOAP_ENC, "base64Binary");
+ public static final QName SOAP_STRING = new QName(URI_DEFAULT_SOAP_ENC, "string");
+ public static final QName SOAP_BOOLEAN = new QName(URI_DEFAULT_SOAP_ENC, "boolean");
+ public static final QName SOAP_DOUBLE = new QName(URI_DEFAULT_SOAP_ENC, "double");
+ public static final QName SOAP_FLOAT = new QName(URI_DEFAULT_SOAP_ENC, "float");
+ public static final QName SOAP_INT = new QName(URI_DEFAULT_SOAP_ENC, "int");
+ public static final QName SOAP_LONG = new QName(URI_DEFAULT_SOAP_ENC, "long");
+ public static final QName SOAP_SHORT = new QName(URI_DEFAULT_SOAP_ENC, "short");
+ public static final QName SOAP_BYTE = new QName(URI_DEFAULT_SOAP_ENC, "byte");
+ public static final QName SOAP_INTEGER = new QName(URI_DEFAULT_SOAP_ENC, "integer");
+ public static final QName SOAP_DECIMAL = new QName(URI_DEFAULT_SOAP_ENC, "decimal");
+ public static final QName SOAP_ARRAY = new QName(URI_DEFAULT_SOAP_ENC, "Array");
+ public static final QName SOAP_COMMON_ATTRS11 = new QName(URI_SOAP11_ENC, "commonAttributes");
+ public static final QName SOAP_COMMON_ATTRS12 = new QName(URI_SOAP12_ENC, "commonAttributes");
+ public static final QName SOAP_ARRAY_ATTRS11 = new QName(URI_SOAP11_ENC, "arrayAttributes");
+ public static final QName SOAP_ARRAY_ATTRS12 = new QName(URI_SOAP12_ENC, "arrayAttributes");
+ public static final QName SOAP_ARRAY12 = new QName(URI_SOAP12_ENC, "Array");
+
+ // unsupported since they're bound to Axis
+ /*
+ private static final QName SOAP_MAP = new QName(NS_URI_XMLSOAP, "Map");
+ private static final QName SOAP_ELEMENT = new QName(NS_URI_XMLSOAP, "Element");
+ private static final QName SOAP_DOCUMENT = new QName(NS_URI_XMLSOAP, "Document");
+ private static final QName SOAP_VECTOR = new QName(NS_URI_XMLSOAP, "Vector");
+ */
+}
Propchange: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/databinding/TypeMappingConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/exception/BindingConfigurationException.java (from r371603, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/exception/BindingConfigurationException.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/exception/BindingConfigurationException.java?p2=beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/exception/BindingConfigurationException.java&p1=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/exception/BindingConfigurationException.java&r1=371603&r2=376434&rev=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/exception/BindingConfigurationException.java (original)
+++ beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/exception/BindingConfigurationException.java Thu Feb 9 12:44:19 2006
@@ -15,10 +15,10 @@
$Header:$
*/
-package org.apache.beehive.wsm.exception;
+package org.apache.beehive.webservice.utils.exception;
/**
- * Exception thrown when errors occur creating a {@link org.apache.beehive.wsm.databinding.BindingLookupFactory}.
+ * Exception thrown when errors occur creating a {@link org.apache.beehive.webservice.utils.databinding.BindingLookupFactory}.
*/
public class BindingConfigurationException
extends RuntimeException {
Propchange: beehive/trunk/wsm/src/webservice-utils/core/org/apache/beehive/webservice/utils/exception/BindingConfigurationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/databinding/XmlBeanLookupStrategy.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/databinding/XmlBeanLookupStrategy.java?rev=376434&view=auto
==============================================================================
--- beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/databinding/XmlBeanLookupStrategy.java (added)
+++ beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/databinding/XmlBeanLookupStrategy.java Thu Feb 9 12:44:19 2006
@@ -0,0 +1,125 @@
+/*
+ *
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ *
+ * Licensed 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.beehive.webservice.utils.databinding;
+
+import java.lang.reflect.Method;
+import javax.xml.namespace.QName;
+
+import org.apache.xmlbeans.SchemaField;
+import org.apache.xmlbeans.SchemaType;
+import org.apache.xmlbeans.SchemaTypeLoader;
+import org.apache.xmlbeans.XmlBeans;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * XMLBean based implementation fo the {@link BindingLookupStrategy} which provides a mechanims for translating
+ * a Java class name to a {@link javax.xml.namespace.QName} and a {@link javax.xml.namespace.QName} to a Java class.
+ */
+public class XmlBeanLookupStrategy
+ implements BindingLookupStrategy {
+
+ private static Log LOGGER = LogFactory.getLog(XmlBeanLookupStrategy.class);
+
+ public QName class2qname(Class cls) {
+ if(XmlObject.class.isAssignableFrom(cls))
+ return XmlBeans.typeForClass(cls).getName();
+ else return null;
+ }
+
+ public QName class2qname(Class cls, String defaultnamespace) {
+ return class2qname(cls);
+ }
+
+ public Class qname2class(QName qname) {
+ LOGGER.debug("Get XMLBeans class for Qname: " + qname);
+
+ SchemaTypeLoader stl = XmlBeans.getContextTypeLoader();
+ SchemaType st = stl.findType(qname);
+ if(st == null) {
+ SchemaField sf = stl.findElement(qname);
+ if(sf != null)
+ st = sf.getType();
+ }
+
+ if(st != null) {
+ Class xmlClass = st.getJavaClass();
+
+ if(st.isBuiltinType()) {
+ Method[] declared = xmlClass.getDeclaredMethods();
+ Class natural = scanDeclaredMethodsForViableReturnType(declared);
+ if(natural != null)
+ return natural;
+ else {
+ if(xmlClass.isInterface()) {
+ for(Class cl : xmlClass.getInterfaces()) {
+ natural = scanDeclaredMethodsForViableReturnType(cl.getDeclaredMethods());
+ if(natural != null) {
+ return natural;
+ }
+ }
+ }
+ else {
+ declared = xmlClass.getSuperclass().getDeclaredMethods();
+ natural = scanDeclaredMethodsForViableReturnType(declared);
+ if(natural != null) {
+ return natural;
+ }
+ }
+ }
+ }
+ return xmlClass;
+ }
+ else {
+ // NOTE jcolwell@bea.com 2004-Nov-30 --
+ // keep in mind that a real TMU based on a viable SOAP stack should
+ // be used and this pure XmlBean implementation is just a fallback.
+ return null;
+ }
+ }
+
+ private Class scanDeclaredMethodsForViableReturnType(Method[] declared) {
+ /*
+ todo: does this make sense? IT looks as if the type of the class is determined based
+ on the method return types.
+ */
+ for(Method meth : declared) {
+ Class returnType = meth.getReturnType();
+ if(!returnType.equals(Void.TYPE)) {
+ /*
+ built-in XmlBeans types may be of the following natural types:
+ primitives, byte arrays, Strings, Calendars, BigIntegers and BigDecimals
+ */
+ if(returnType.isArray()
+ || returnType.isPrimitive()
+ || returnType.equals(String.class)
+ || returnType.equals(QName.class)
+ || returnType.equals(java.util.Calendar.class)
+ || returnType.equals(java.math.BigDecimal.class)
+ || returnType.equals(java.math.BigInteger.class)) {
+
+ return returnType;
+ }
+ }
+ }
+ return null;
+ }
+}
Propchange: beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/databinding/XmlBeanLookupStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializer.java (from r372277, beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializer.java?p2=beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializer.java&p1=beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java&r1=372277&r2=376434&rev=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java (original)
+++ beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializer.java Thu Feb 9 12:44:19 2006
@@ -19,7 +19,7 @@
*
* Original author: Jonathan Colwell
*/
-package org.apache.beehive.wsm.axis.util.encoding;
+package org.apache.beehive.webservice.utils.encoding;
import org.apache.axis.encoding.DeserializationContext;
import org.apache.axis.encoding.DeserializerImpl;
Propchange: beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializerFactory.java (from r372277, beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializerFactory.java?p2=beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializerFactory.java&p1=beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java&r1=372277&r2=376434&rev=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java (original)
+++ beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializerFactory.java Thu Feb 9 12:44:19 2006
@@ -19,7 +19,7 @@
*
* Original author: Jonathan Colwell
*/
-package org.apache.beehive.wsm.axis.util.encoding;
+package org.apache.beehive.webservice.utils.encoding;
import javax.xml.namespace.QName;
@@ -30,8 +30,8 @@
*/
public class XmlBeanDeserializerFactory
extends BaseDeserializerFactory {
-
+
public XmlBeanDeserializerFactory(Class javaType, QName xmlType) {
- super(XmlBeanDeserializer.class, xmlType, javaType);
+ super(org.apache.beehive.webservice.utils.encoding.XmlBeanDeserializer.class, xmlType, javaType);
}
}
Propchange: beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializer.java (from r372277, beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializer.java?p2=beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializer.java&p1=beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java&r1=372277&r2=376434&rev=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java (original)
+++ beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializer.java Thu Feb 9 12:44:19 2006
@@ -17,7 +17,7 @@
* limitations under the License.
*
*/
-package org.apache.beehive.wsm.axis.util.encoding;
+package org.apache.beehive.webservice.utils.encoding;
import java.io.IOException;
import java.util.HashSet;
Propchange: beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializerFactory.java (from r372277, beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializerFactory.java?p2=beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializerFactory.java&p1=beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java&r1=372277&r2=376434&rev=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java (original)
+++ beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializerFactory.java Thu Feb 9 12:44:19 2006
@@ -19,7 +19,7 @@
*
* Original author: Jonathan Colwell
*/
-package org.apache.beehive.wsm.axis.util.encoding;
+package org.apache.beehive.webservice.utils.encoding;
import javax.xml.namespace.QName;
@@ -32,8 +32,8 @@
*/
public class XmlBeanSerializerFactory
extends BaseSerializerFactory {
-
+
public XmlBeanSerializerFactory(Class javaType, QName xmlType) {
- super(XmlBeanSerializer.class, xmlType, javaType);
+ super(org.apache.beehive.webservice.utils.encoding.XmlBeanSerializer.class, xmlType, javaType);
}
}
Propchange: beehive/trunk/wsm/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/wsm/test/src/junit/log4j.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/src/junit/log4j.xml?rev=376434&r1=376433&r2=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/test/src/junit/log4j.xml (original)
+++ beehive/trunk/wsm/test/src/junit/log4j.xml Thu Feb 9 12:44:19 2006
@@ -25,4 +25,9 @@
<appender-ref ref="LOGFILE"/>
</category>
+ <category name="org.apache.beehive.webservices">
+ <priority value="trace"/>
+ <appender-ref ref="LOGFILE"/>
+ </category>
+
</log4j:configuration>
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=376434&r1=376433&r2=376434&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 Feb 9 12:44:19 2006
@@ -27,8 +27,8 @@
import org.apache.beehive.wsm.model.jsr181.Jsr181ObjectModelStore;
import org.apache.beehive.wsm.model.wsdl.XmlBeanWSDLProcessor;
import org.apache.beehive.wsm.wsdl.Utilities;
-import org.apache.beehive.wsm.databinding.BindingLookupStrategy;
-import org.apache.beehive.wsm.databinding.BindingLookupFactory;
+import org.apache.beehive.webservice.utils.databinding.BindingLookupStrategy;
+import org.apache.beehive.webservice.utils.databinding.BindingLookupFactory;
/**
*/
Modified: beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/types/ClassToQNameTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/types/ClassToQNameTest.java?rev=376434&r1=376433&r2=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/types/ClassToQNameTest.java (original)
+++ beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/types/ClassToQNameTest.java Thu Feb 9 12:44:19 2006
@@ -19,8 +19,8 @@
import javax.xml.namespace.QName;
-import org.apache.beehive.wsm.databinding.BindingLookupStrategy;
-import org.apache.beehive.wsm.util.SchemaTypesLookupStrategy;
+import org.apache.beehive.webservice.utils.databinding.SchemaTypesLookupStrategy;
+import org.apache.beehive.webservice.utils.databinding.BindingLookupStrategy;
import junit.framework.TestCase;
/**
Modified: beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/types/QNameToClassTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/types/QNameToClassTest.java?rev=376434&r1=376433&r2=376434&view=diff
==============================================================================
--- beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/types/QNameToClassTest.java (original)
+++ beehive/trunk/wsm/test/src/junit/org/apache/beehive/wsm/test/types/QNameToClassTest.java Thu Feb 9 12:44:19 2006
@@ -17,9 +17,9 @@
*/
package org.apache.beehive.wsm.test.types;
-import org.apache.beehive.wsm.util.SchemaTypesLookupStrategy;
-import org.apache.beehive.wsm.databinding.BindingLookupStrategy;
-import org.apache.beehive.wsm.databinding.xmlbeans.XmlBeanLookupStrategy;
+import org.apache.beehive.webservice.utils.databinding.SchemaTypesLookupStrategy;
+import org.apache.beehive.webservice.utils.databinding.BindingLookupStrategy;
+import org.apache.beehive.webservice.utils.databinding.XmlBeanLookupStrategy;
import junit.framework.TestCase;
/**