Author: mmerz
Date: Tue Nov 30 15:51:35 2004
New Revision: 109261
URL: http://svn.apache.org/viewcvs?view=rev&rev=109261
Log:
Added and modified numerous classes to better support conversion from WSDL
documents into the WSM object model. This should help with start from WSDL web
service development as well as provide functionality that can be used by web
service clients such as the ServiceControl.
A getMethod(String, Class...) function has been added to the Jsr181TypeMetadata
interface so one no longer needs to iterate the collection looking for a given
method. When adding methods to the type metadata, an Exception is thrown if an
identical method is already present in the web service and unless the service
uses RPC style, overloading is not permitted.
The jsr181/model/client package provides an additional QName xmlType field in
cases where a WSDL specifies an xml type for which a corresponding Java type
cannot be found or can ensure that the mapping is consistent when there are many
to one mappings for a given Java type
e.g. String -> xsd:string or soapenc:string.
Contributor: Jonathan Colwell
Added:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java
(contents, props changed)
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
(contents, props changed)
incubator/beehive/trunk/wsm/drt/tests/schemas/
incubator/beehive/trunk/wsm/drt/tests/schemas/starwars.wsdl
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java
(contents, props changed)
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientMethodMetadata.java
(contents, props changed)
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientMethodMetadataImpl.java
(contents, props changed)
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientParameterMetadata.java
(contents, props changed)
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientParameterMetadataImpl.java
(contents, props changed)
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/InvalidTypeMappingException.java
- copied, changed from r106957,
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/InvalidTypeMappingException.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/TypeMappingUtil.java
(contents, props changed)
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/XmlBeanTypeMappingUtil.java
(contents, props changed)
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java
(contents, props changed)
Removed:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessorTest.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/InvalidTypeMappingException.java
Modified:
incubator/beehive/trunk/wsm/drt/build.xml
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
Modified: incubator/beehive/trunk/wsm/drt/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/build.xml?view=diff&rev=109261&p1=incubator/beehive/trunk/wsm/drt/build.xml&r1=109260&p2=incubator/beehive/trunk/wsm/drt/build.xml&r2=109261
==============================================================================
--- incubator/beehive/trunk/wsm/drt/build.xml (original)
+++ incubator/beehive/trunk/wsm/drt/build.xml Tue Nov 30 15:51:35 2004
@@ -75,7 +75,7 @@
<target name="build" depends="dirs">
<ant target="build-tests"/>
</target>
- <target name="build-tests" depends="dirs">
+ <target name="build-tests" depends="dirs,xbean">
<!-- Build the test source directory -->
<javac srcdir="${tests.src}"
destdir="${build.tests}"
@@ -89,6 +89,25 @@
<fileset dir="${tests.src}" includes="**/*.xml"/>
</copy>
</target>
+
+ <target name="xbean">
+ <!-- XMLBean build -->
+ <taskdef name="xmlbeanbuild"
+ classname="org.apache.xmlbeans.impl.tool.XMLBean">
+ <classpath>
+ <path refid="drt.classpath"/>
+ </classpath>
+ </taskdef>
+ <xmlbeanbuild
+ schema="${tests.src}/schemas"
+ classgendir="${build.tests}"
+ failonerror="true">
+ <classpath>
+ <path refid="drt.classpath"/>
+ </classpath>
+ </xmlbeanbuild>
+ </target>
+
<target name="run-drt">
<echo message="** junit logfiles written to ${drt.logs} **"/>
<junit failureproperty="wsmdrtfailed" printsummary="on"
tempdir="${build.dir}" fork="yes">
Modified:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java?view=diff&rev=109261&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java&r1=109260&p2=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java&r2=109261
==============================================================================
---
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
(original)
+++
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
Tue Nov 30 15:51:35 2004
@@ -125,7 +125,7 @@
}
}
- protected Jsr181TypeMetadata makeFakeMetadata() {
+ protected Jsr181TypeMetadata makeFakeMetadata() throws Exception {
Jsr181TypeMetadata wstm =
new Jsr181TypeMetadataImpl(WS_CLASS.getName());
wstm.setWsName(WS_NAME);
Modified:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java?view=diff&rev=109261&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java&r1=109260&p2=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java&r2=109261
==============================================================================
---
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java
(original)
+++
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java
Tue Nov 30 15:51:35 2004
@@ -62,7 +62,10 @@
* examine the generated WSDL to see that it matches the settings in
* FakeWebService. For the moment, just having at least one
* operation and the correct name is sufficient.
- */
+ *
+ * NOTE [EMAIL PROTECTED] 2004-Nov-29 -- commented out until the
WSDLProcessor
+ * is refactored to properly support both WSDL parsing and generation.
+ *
public void testGenerateWSDL() throws Exception {
MessageContext mc = new MessageContext(null);
mc.setService(fakeSOAPService);
@@ -106,6 +109,7 @@
}
}
}
+*/
public void testInvokeSOAPService() throws Exception {
MessageContext mc = new MessageContext(new AxisServer());
Added:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java?view=auto&rev=109261
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java
Tue Nov 30 15:51:35 2004
@@ -0,0 +1,128 @@
+/*
+ * starwars.jws
+ *
+ * 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.
+ *
+ *
+ * Original author: Jonathan Colwell
+ */
+package org.apache.beehive.wsm.jsr181.wsdl;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPMessageHandler;
+import javax.jws.soap.SOAPMessageHandlers;
+
+
+/*******************************************************************************
+ *
+ *
+ * @author Jonathan Colwell
+ */
[EMAIL PROTECTED](name="starwars",
+ serviceName="starwarsService",
+ targetNamespace="http://starwars";)
[EMAIL PROTECTED](style = SOAPBinding.Style.DOCUMENT,
+ use = SOAPBinding.Use.LITERAL,
+ parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+public class StarWars {
+
+
+ public static net.superflaco.Character stashed;
+
+ @WebMethod
+ public net.superflaco.Character getChewie()
+ {
+ net.superflaco.Character chewie = net.superflaco.Character.Factory
+ .newInstance();
+ chewie.setName("Chewbacca");
+ net.superflaco.System sys =
net.superflaco.System.Factory.newInstance();
+ sys.addPlanet("WookieWorld");
+ sys.addPlanet("WookieWorld2");
+ sys.addPlanet("WookieWorld3");
+ sys.setName("WookieSector");
+ sys.addStar("WookieStar");
+ chewie.setHome(sys);
+ chewie.setFaction("smuggler");
+ chewie.setEvil(false);
+ chewie.setJedi(false);
+ return chewie;
+ }
+
+ @WebMethod
+ public String viewCharName()
+ {
+ return viewChar().getName();
+ }
+
+ @WebMethod
+ public net.superflaco.System viewCharSystem()
+ {
+ return viewChar().getHome();
+ }
+
+ @WebMethod
+ public net.superflaco.Character viewChar()
+ {
+ if (stashed == null) {
+ stashed = getChewie();
+ }
+ return stashed;
+ }
+ /*
+ @WebMethod
+ public boolean stashCadet(net.superflaco.SpacecadetDocument cadet)
+ {
+ if (cadet != null) {
+ net.superflaco.Character ch = cadet.getSpacecadet();
+ if (ch != null && ch.getName() != null && ch.getPlanet() != null) {
+ stashChar(ch);
+ return true;
+ }
+ }
+ return false;
+ }*/
+
+ @WebMethod
+ public net.superflaco.Character stashChar(@WebParam(name="character")
+ net.superflaco.Character ch)
+ {
+ if (stashed == null) {
+ stashed = getChewie();
+ }
+
+ 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) {
+ net.superflaco.Character ch = viewChar();
+ ch.setName(name);
+ return ch;
+ }
+}
Deleted:
/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessorTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessorTest.java?view=auto&rev=109260
==============================================================================
Added:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java?view=auto&rev=109261
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
Tue Nov 30 15:51:35 2004
@@ -0,0 +1,141 @@
+/*
+ * XmlBeanWSDLProcessorTest.java
+ *
+ * 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.
+ *
+ *
+ * Original author: Jonathan Colwell
+ */
+package org.apache.beehive.wsm.jsr181.wsdl;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.Collection;
+import java.util.List;
+import java.util.Iterator;
+import javax.jws.WebParam;
+import javax.jws.soap.SOAPBinding;
+import javax.wsdl.OperationType;
+
+import junit.framework.TestCase;
+import org.apache.axis.constants.Style;
+import org.apache.axis.constants.Use;
+import org.apache.axis.description.OperationDesc;
+import org.apache.axis.description.ParameterDesc;
+import org.apache.axis.description.ServiceDesc;
+import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
+import
org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
+
+/*******************************************************************************
+ *
+ *
+ * @author Jonathan Colwell
+ */
+public class XmlBeanWSDLProcessorTest extends TestCase {
+
+ private static final String BEEHIVE_HOME = System.getenv("BEEHIVE_HOME");
+
+ Jsr181TypeMetadata serverModel;
+ Jsr181TypeMetadata clientModel;
+
+ public void setUp() throws Exception {
+ File f = new File(BEEHIVE_HOME,
+ "wsm/drt/tests/schemas/starwars.wsdl");
+
+ serverModel = (Jsr181TypeMetadata)WsmReflectionAnnotationProcessor
+ .getInstance().getObjectModel(StarWars.class);
+
+ XmlBeanWSDLProcessor xbwp = new XmlBeanWSDLProcessor();
+ clientModel = xbwp.createObjectModel(new FileInputStream(f));
+ }
+
+ public void tearDown() {
+ }
+
+ public void testServiceWideSettings() throws Exception {
+
+ assertEquals(serverModel.getWsName(), clientModel.getWsName());
+ assertEquals(serverModel.getWsServiceName(),
+ clientModel.getWsServiceName());
+ assertEquals(serverModel.getWsTargetNamespace(),
+ clientModel.getWsTargetNamespace());
+ assertEquals(serverModel.getSoapBinding(),
clientModel.getSoapBinding());
+ /*
+ * NOTE [EMAIL PROTECTED] 2004-Nov-09 -- add tests for SOAPHandlers,
+ * HandlerChains and other JSR-181 features.
+ */
+ }
+
+ public void testMethodLevelSettings() throws Exception {
+
+ Collection<Jsr181MethodMetadata> serverMethods = serverModel
+ .getMethods();
+ Collection<Jsr181MethodMetadata> clientMethods = clientModel
+ .getMethods();
+ assertEquals(serverMethods.size(), clientMethods.size());
+ for (Jsr181MethodMetadata wmm : serverMethods) {
+
+ List<Jsr181ParameterMetadata> params = wmm.getParams();
+ Class[] paramClasses = new Class[params.size()];
+ int pcIndex = 0;
+ for (Jsr181ParameterMetadata param : params) {
+ paramClasses[pcIndex] = param.getJavaType();
+ }
+
+ Jsr181MethodMetadata clientMethod = clientModel
+ .getMethod(wmm.getWmOperationName(), paramClasses);
+
+ compareMethodMetadata(wmm, clientMethod);
+ compareParameterMetadata(params, clientMethod.getParams());
+ }
+ }
+
+ private void compareMethodMetadata(Jsr181MethodMetadata server,
+ Jsr181MethodMetadata client)
+ throws Exception {
+
+ assertEquals(server.getWmOperationName(), client.getWmOperationName());
+ assertEquals(server.isOneWay(), client.isOneWay());
+ // FIXME [EMAIL PROTECTED] 2004-Nov-10 -- see FIXME below
+ assertEquals(server.getJavaReturnType(), client.getJavaReturnType());
+ assertEquals(server.getWrTargetNamespace(),
+ client.getWrTargetNamespace());
+ assertEquals(server.getWrName(), client.getWrName());
+ }
+
+ private void compareParameterMetadata
+ (List<Jsr181ParameterMetadata> serverParams,
+ List<Jsr181ParameterMetadata> clientParams) {
+
+ assertEquals(serverParams.size(), clientParams.size());
+ Iterator<Jsr181ParameterMetadata> servIt = serverParams.iterator();
+ Iterator<Jsr181ParameterMetadata> clientIt = clientParams.iterator();
+ while (servIt.hasNext() && clientIt.hasNext()) {
+ Jsr181ParameterMetadata srvParam = servIt.next();
+ Jsr181ParameterMetadata clParam = clientIt.next();
+ assertEquals(srvParam.getJavaType(), clParam.getJavaType());
+ assertEquals(srvParam.getWpMode(), clParam.getWpMode());
+ assertEquals(srvParam.getWpName(), clParam.getWpName());
+ assertEquals(srvParam.getWpTargetNamespace(),
+ clParam.getWpTargetNamespace());
+ assertEquals(srvParam.isWpHeader(),
+ clParam.isWpHeader());
+ }
+ }
+}
Added: incubator/beehive/trunk/wsm/drt/tests/schemas/starwars.wsdl
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/schemas/starwars.wsdl?view=auto&rev=109261
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/wsm/drt/tests/schemas/starwars.wsdl Tue Nov 30
15:51:35 2004
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://starwars";
xmlns:apachesoap="http://xml.apache.org/xml-soap"; xmlns:impl="http://starwars";
xmlns:intf="http://starwars"; xmlns:tns1="http://superflaco.net";
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.2RC1
+Built on Oct 29, 2004 (04:30:47 EDT)-->
+ <wsdl:types>
+ <schema elementFormDefault="qualified" targetNamespace="http://starwars";
xmlns="http://www.w3.org/2001/XMLSchema";>
+ <import namespace="http://superflaco.net"/>
+ <import namespace="http://superflaco.net"/>
+ <import namespace="http://superflaco.net"/>
+ <element name="changeName">
+ <complexType>
+ <sequence>
+ <element name="newname" type="xsd:string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="changeNameResponse">
+ <complexType>
+ <sequence>
+ <element name="result" type="tns1:character"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="getChewie">
+ <complexType/>
+ </element>
+ <element name="getChewieResponse">
+ <complexType>
+ <sequence>
+ <element name="result" type="tns1:character"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="viewCharName">
+ <complexType/>
+ </element>
+ <element name="viewCharNameResponse">
+ <complexType>
+ <sequence>
+ <element name="result" type="xsd:string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="viewCharSystem">
+ <complexType/>
+ </element>
+ <element name="viewCharSystemResponse">
+ <complexType>
+ <sequence>
+ <element name="result" type="tns1:system"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="viewChar">
+ <complexType/>
+ </element>
+ <element name="viewCharResponse">
+ <complexType>
+ <sequence>
+ <element name="result" type="tns1:character"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="stashChar">
+ <complexType>
+ <sequence>
+ <element name="character" type="tns1:character"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="stashCharResponse">
+ <complexType>
+ <sequence>
+ <element name="result" type="tns1:character"/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ <schema elementFormDefault="qualified"
targetNamespace="http://superflaco.net";
xmlns="http://www.w3.org/2001/XMLSchema";>
+ <xs:complexType name="character" xmlns:flaco="http://superflaco.net";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+
+ <xs:sequence>
+
+ <xs:element name="name" type="xs:string"/>
+
+ <xs:element name="home" type="flaco:system"/>
+
+ <xs:element name="faction" type="xs:string"/>
+
+ <xs:element name="evil" type="xs:boolean"/>
+
+ <xs:element name="jedi" type="xs:boolean"/>
+
+ </xs:sequence>
+
+ </xs:complexType>
+ <xs:complexType name="system" xmlns:flaco="http://superflaco.net";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+
+ <xs:sequence>
+
+ <xs:element name="name" type="xs:string"/>
+
+ <xs:element maxOccurs="unbounded" name="planet"
type="xs:string"/>
+
+ <xs:element maxOccurs="unbounded" name="star"
type="xs:string"/>
+
+ </xs:sequence>
+
+ </xs:complexType>
+ <xs:element name="spacecadet" type="flaco:character"
xmlns:flaco="http://superflaco.net";
xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ </schema>
+ </wsdl:types>
+
+ <wsdl:message name="viewCharNameResponse">
+
+ <wsdl:part element="impl:viewCharNameResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="getChewieRequest">
+
+ <wsdl:part element="impl:getChewie" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="changeNameResponse">
+
+ <wsdl:part element="impl:changeNameResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="stashCharRequest">
+
+ <wsdl:part element="impl:stashChar" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="viewCharSystemRequest">
+
+ <wsdl:part element="impl:viewCharSystem" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="stashCharResponse">
+
+ <wsdl:part element="impl:stashCharResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="changeNameRequest">
+
+ <wsdl:part element="impl:changeName" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="viewCharResponse">
+
+ <wsdl:part element="impl:viewCharResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="getChewieResponse">
+
+ <wsdl:part element="impl:getChewieResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="viewCharNameRequest">
+
+ <wsdl:part element="impl:viewCharName" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="viewCharRequest">
+
+ <wsdl:part element="impl:viewChar" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="viewCharSystemResponse">
+
+ <wsdl:part element="impl:viewCharSystemResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:portType name="starwars">
+
+ <wsdl:operation name="changeName">
+
+ <wsdl:input message="impl:changeNameRequest"
name="changeNameRequest"/>
+
+ <wsdl:output message="impl:changeNameResponse"
name="changeNameResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="getChewie">
+
+ <wsdl:input message="impl:getChewieRequest" name="getChewieRequest"/>
+
+ <wsdl:output message="impl:getChewieResponse"
name="getChewieResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="viewCharName">
+
+ <wsdl:input message="impl:viewCharNameRequest"
name="viewCharNameRequest"/>
+
+ <wsdl:output message="impl:viewCharNameResponse"
name="viewCharNameResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="viewCharSystem">
+
+ <wsdl:input message="impl:viewCharSystemRequest"
name="viewCharSystemRequest"/>
+
+ <wsdl:output message="impl:viewCharSystemResponse"
name="viewCharSystemResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="viewChar">
+
+ <wsdl:input message="impl:viewCharRequest" name="viewCharRequest"/>
+
+ <wsdl:output message="impl:viewCharResponse" name="viewCharResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="stashChar">
+
+ <wsdl:input message="impl:stashCharRequest" name="stashCharRequest"/>
+
+ <wsdl:output message="impl:stashCharResponse"
name="stashCharResponse"/>
+
+ </wsdl:operation>
+
+ </wsdl:portType>
+
+ <wsdl:binding name="starwarsSoapBinding" type="impl:starwars">
+
+ <wsdlsoap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="changeName">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="changeNameRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="changeNameResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="getChewie">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="getChewieRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="getChewieResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="viewCharName">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="viewCharNameRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="viewCharNameResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="viewCharSystem">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="viewCharSystemRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="viewCharSystemResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="viewChar">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="viewCharRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="viewCharResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="stashChar">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="stashCharRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="stashCharResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ </wsdl:binding>
+
+ <wsdl:service name="starwarsService">
+
+ <wsdl:port binding="impl:starwarsSoapBinding" name="starwars">
+
+ <wsdlsoap:address
location="http://jcolwell01/petstoreWeb/starwars.jws"/>
+
+ </wsdl:port>
+
+ </wsdl:service>
+
+</wsdl:definitions>
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java?view=diff&rev=109261&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java&r1=109260&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java&r2=109261
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
Tue Nov 30 15:51:35 2004
@@ -57,6 +57,7 @@
import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.util.InvalidTypeMappingException;
import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlObject;
Deleted:
/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/InvalidTypeMappingException.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/InvalidTypeMappingException.java?view=auto&rev=109260
==============================================================================
Added:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java?view=auto&rev=109261
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java
Tue Nov 30 15:51:35 2004
@@ -0,0 +1,339 @@
+/*
+ * AxisTypeMappingUtil.java
+ *
+ * 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.
+ *
+ *
+ * Original author: Jonathan Colwell
+ */
+package org.apache.beehive.wsm.axis.util;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+import java.io.File;
+import java.io.Serializable;
+
+import java.rmi.Remote;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jws.WebParam;
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPHeader;
+import javax.wsdl.OperationType;
+
+import org.apache.axis.Message;
+import org.apache.axis.client.Call;
+import org.apache.axis.client.Service;
+import org.apache.axis.client.Stub;
+import org.apache.axis.description.ElementDesc;
+import org.apache.axis.description.FaultDesc;
+import org.apache.axis.description.FieldDesc;
+import org.apache.axis.description.OperationDesc;
+import org.apache.axis.description.ParameterDesc;
+import org.apache.axis.description.TypeDesc;
+import org.apache.axis.encoding.DeserializerFactory;
+import org.apache.axis.encoding.SerializerFactory;
+import org.apache.axis.encoding.TypeMapping;
+import org.apache.axis.encoding.ser.ArraySerializerFactory;
+import org.apache.axis.encoding.ser.BeanSerializerFactory;
+import org.apache.axis.encoding.ser.ArrayDeserializerFactory;
+import org.apache.axis.encoding.ser.BeanDeserializerFactory;
+import org.apache.axis.encoding.ser.VectorDeserializerFactory;
+import org.apache.axis.message.SOAPHeaderElement;
+import org.apache.axis.utils.BeanPropertyDescriptor;
+import org.apache.axis.wsdl.fromJava.Namespaces;
+import org.apache.axis.wsdl.fromJava.Types;
+
+import org.apache.beehive.wsm.axis.util.encoding.CollectionSerializerFactory;
+import org.apache.beehive.wsm.axis.util.encoding.XmlBeanDeserializerFactory;
+import org.apache.beehive.wsm.axis.util.encoding.XmlBeanSerializerFactory;
+import org.apache.beehive.wsm.jsr181.util.InvalidTypeMappingException;
+import org.apache.beehive.wsm.jsr181.util.XmlBeanTypeMappingUtil;
+
+import org.apache.xmlbeans.SchemaType;
+import org.apache.xmlbeans.SchemaTypeLoader;
+import org.apache.xmlbeans.XmlBeans;
+import org.apache.xmlbeans.XmlObject;
+
+import org.w3c.dom.Element;
+
+/*******************************************************************************
+ *
+ * @author Jonathan Colwell
+ */
+public class AxisTypeMappingUtil extends XmlBeanTypeMappingUtil {
+
+ private TypeMapping mTypeMapping;
+
+ public AxisTypeMappingUtil(TypeMapping tm) {
+ super();
+
+ mTypeMapping = tm;
+ }
+
+ public QName registerType(Class cls) throws InvalidTypeMappingException {
+ return registerType(cls, null);
+ }
+
+ public QName registerType(Class cls, QName expectedType)
+ throws InvalidTypeMappingException {
+
+ QName q;
+
+ if (Void.TYPE.equals(cls)) {
+ q = null;
+ }
+ else if (Collection.class.isAssignableFrom(cls)) {
+ /*
+ * NOTE [EMAIL PROTECTED] 2004-Oct-11 --
+ * overriding the default Axis conversion of all Collections
+ * to {http://schemas.xmlsoap.org/soap/encoding/}Array
+ * since the namespace prefix is left hanging with literal use
+ */
+ if (expectedType == null) {
+ q = generateQName(cls, "http://no.namespace.specified";);
+ }
+ else {
+ q = expectedType;
+ }
+ mTypeMapping.register(cls, q,
+ new CollectionSerializerFactory(cls, q),
+ new VectorDeserializerFactory(cls, q));
+ }
+ else {
+
+ q = mTypeMapping.getTypeQName(cls);
+
+ if (q == null ||
+ (expectedType != null && !expectedType.equals(q))) {
+
+ if (expectedType == null) {
+ q = generateQName(cls, "http://no.namespace.specified";);
+ }
+ else {
+ q = expectedType;
+ }
+
+ if (cls.isArray()) {
+ if (!mTypeMapping.isRegistered(cls, q)) {
+ mTypeMapping.register(cls, q,
+ new ArraySerializerFactory(cls, q),
+ new ArrayDeserializerFactory());
+ }
+ q = registerType(cls.getComponentType());
+ // TODO: fix the expected type thing for arrays.
+ if (expectedType != null) {
+ q = expectedType;
+ }
+ }
+ else if (!mTypeMapping.isRegistered(cls, q)) {
+ if (XmlObject.class.isAssignableFrom(cls)) {
+ mTypeMapping.register(cls, q,
+ new XmlBeanSerializerFactory(cls, q),
+ new XmlBeanDeserializerFactory(cls, q));
+ }
+ /*
+ * NOTE [EMAIL PROTECTED] 2004-Oct-11 -- these datahandler
+ * using classes are generally already registered but
+ * just in case...
+ */
+ else if (isActivationEnabled() &&
+ (java.awt.Image.class.isAssignableFrom(cls)
+ || getMultipartClass().isAssignableFrom(cls)
+ || getDataHandlerClass().isAssignableFrom(cls)))
{
+ try {
+ /*
+ * NOTE [EMAIL PROTECTED] 2004-Oct-08 -- doing
+ * reflection here in case AXIS was built without
+ * attachment support.
+ */
+ ClassLoader cl = getClass().getClassLoader();
+ Class<SerializerFactory> sfClass =
+ (Class<SerializerFactory>)
+
cl.loadClass("org.apache.axis.encoding.ser.JAFDataHandlerSerializerFactory");
+ Class<DeserializerFactory> dsfClass =
+ (Class<DeserializerFactory>)
+
cl.loadClass("org.apache.axis.encoding.ser.JAFDataHandlerDeserializerFactory");
+ Constructor<SerializerFactory> sfCon =
+ sfClass.getConstructor(Class.class,
+ QName.class);
+ Constructor<DeserializerFactory> dsfCon =
+ dsfClass.getConstructor(Class.class,
+ QName.class);
+ SerializerFactory sf = sfCon.newInstance(cls, q);
+ DeserializerFactory dsf = dsfCon.newInstance(cls,
q);
+ mTypeMapping.register(cls, q, sf, dsf);
+ } catch (Exception e) {
+ /*
+ * FIXME [EMAIL PROTECTED] 2004-Oct-08 --
+ * log this properly
+ */
+ e.printStackTrace();
+ }
+ } else if (Serializable.class.isAssignableFrom(cls)
+ /*
+ * NOTE [EMAIL PROTECTED] 2004-Oct-11 --
+ * java.io.Serializable is required and
+ * java.rmi.Remote is prohibited
+ * by the jax-rpc spec
+ */
+ && !Remote.class.isAssignableFrom(cls)
+ /*
+ * NOTE [EMAIL PROTECTED] 2004-Oct-11 --
+ * restricting against File since even though it
+ * is technically serializable, it doesn't make
+ * sense to serialize as a bean.
+ * That and it causes an infinite
+ * loop as it keeps returning itself from the
+ * getAbsoluteFile and getCanonicalFile calls
+ */
+ && !File.class.isAssignableFrom(cls)) {
+ TypeDesc td = TypeDesc.getTypeDescForClass(cls);
+ TypeDesc superTd = null;
+ BeanPropertyDescriptor[] superPd = null;
+ if (null == td) {
+ td = new TypeDesc(cls);
+ Class supa = cls.getSuperclass();
+ if ((supa != null)
+ && (supa != java.lang.Object.class)
+ && (supa != java.lang.Exception.class)
+ && (supa != java.lang.Throwable.class)
+ && (supa != java.rmi.RemoteException.class)
+ && (supa != org.apache.axis.AxisFault.class)) {
+ registerType(supa);
+ }
+ superTd = TypeDesc
+ .getTypeDescForClass(supa);
+ if (superTd != null) {
+ superPd = superTd.getPropertyDescriptors();
+ }
+ td.setXmlType(q);
+ TypeDesc.registerTypeDescForClass(cls, td);
+ } else {
+ td = null;
+ }
+ mTypeMapping.register(cls, q,
+ new BeanSerializerFactory(cls, q),
+ /*
+ * NOTE [EMAIL PROTECTED] 2004-Oct-11 --
+ * should check that the type to
deserialize
+ * has a default contructor but with this
+ * setup there is no way to know if it is
+ * used only in serialization.
+ */
+ new BeanDeserializerFactory(cls, q));
+ Map serProps = BeanDeserializerFactory
+ .getProperties(cls, null);
+ for (BeanPropertyDescriptor beanProps :
+ (Collection<BeanPropertyDescriptor>) serProps
+ .values()) {
+ Class subType = beanProps.getType();
+ if (!(subType.isPrimitive()
+ || subType.getName().startsWith("java.")
+ || subType.getName().startsWith("javax."))) {
+ registerType(subType);
+ }
+ if (td != null) {
+ String ns = q.getNamespaceURI();
+ if (superTd != null && superPd != null) {
+ for (int j = 0; j < superPd.length; j++) {
+ if (beanProps.getName()
+ .equals(superPd[j]
+ .getName())) {
+ ns = superTd.getXmlType()
+ .getNamespaceURI();
+ break;
+ }
+ }
+ }
+ FieldDesc fd = new ElementDesc();
+ fd.setJavaType(subType);
+ fd.setFieldName(beanProps.getName());
+ fd.setXmlName(new QName(ns,
+ beanProps.getName()));
+ // NOTE [EMAIL PROTECTED] 2004-Oct-28 -- might
need
+ // to do more to ensure a useful type QName.
+
fd.setXmlType(mTypeMapping.getTypeQName(subType));
+ td.addFieldDesc(fd);
+ }
+ }
+ } else {
+ throw new InvalidTypeMappingException
+ ("failed to register " + cls.getName()
+ + " as a valid web service datatype,"
+ + " consider using a custom type mapping");
+ }
+ }
+ }
+ }
+ return q;
+ }
+
+ public Class q2Class(QName qType) {
+
+ Class cls = super.q2Class(qType);
+ if (Object.class.equals(cls) && mTypeMapping != null) {
+ cls = mTypeMapping.getClassForQName(qType);
+ return cls;
+ }
+ else {
+ return null;
+ }
+ }
+
+ private boolean isActivationEnabled() {
+ return null != getDataHandlerClass() && null != getMultipartClass();
+ }
+
+ private Class getDataHandlerClass() {
+ try {
+ return getClass().getClassLoader()
+ .loadClass("javax.activation.DataHandler");
+ } catch (Exception e) {
+ }
+ return null;
+ }
+
+ private Class getMultipartClass() {
+ try {
+ return getClass().getClassLoader()
+ .loadClass("javax.mail.internet.MimeMultipart");
+ } catch (Exception e) {
+ }
+ return null;
+ }
+
+ public QName generateQName(Class type, String defaultNS) {
+
+ QName generated = super.generateQName(type, defaultNS);
+ if (generated == null) {
+ String namespace = Namespaces.makeNamespace(type.getName());
+ if (namespace == null || namespace
+ .endsWith("DefaultNamespace")) {
+ namespace = defaultNS;
+ }
+ generated = new QName(namespace,
+ Types.getLocalNameFromFullName(type
+ .getName()));
+ }
+ return generated;
+ }
+}
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java?view=diff&rev=109261&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java&r1=109260&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java&r2=109261
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
Tue Nov 30 15:51:35 2004
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Array;
import java.util.HashSet;
import java.util.Set;
@@ -32,6 +33,7 @@
import org.apache.axis.wsdl.fromJava.Types;
import org.apache.xmlbeans.SchemaType;
import org.apache.xmlbeans.XmlBeans;
+import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
import org.w3.x2001.xmlSchema.SchemaDocument;
@@ -44,6 +46,7 @@
import org.xml.sax.Attributes;
import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
import org.xmlsoap.schemas.wsdl.TDefinitions;
+import org.xmlsoap.schemas.wsdl.TTypes;
/**
* ****************************************************************************
@@ -73,18 +76,16 @@
} else {
context.setWriteXMLType(null);
context.startElement(name, attributes);
- /*
- XmlObject xObj = (XmlObject)value;
- context.writeString(xObj.xmlText(new XmlOptions().setSaveInner()));
-
- */
- Node n = ((XmlObject) value).newDomNode();
- NodeList kids = n.getChildNodes();
- for (int j = 0; j < kids.getLength(); j++) {
- Node kid = kids.item(j);
- if (kid.getNodeType() == Node.ELEMENT_NODE) {
- context.writeDOMElement((Element) kid);
+
+ XmlCursor xCur = ((XmlObject) value).newCursor();
+ if (xCur.toFirstContentToken() == XmlCursor.TokenType.START) {
+ do {
+ Node n = xCur.getDomNode();
+ if (n.getNodeType() == Node.ELEMENT_NODE) {
+ context.writeDOMElement((Element)n);
+ }
}
+ while (xCur.toNextSibling());
}
context.endElement();
}
@@ -124,9 +125,38 @@
XmlOptions opts = new XmlOptions()
.setLoadReplaceDocumentElement(null);
Element root = doc.getDocumentElement();
+ String schemaSrc = docType.getSourceName();
InputStream stream = docType.getTypeSystem()
- .getSourceAsStream(docType.getSourceName());
- SchemaDocument schemaDoc = SchemaDocument.Factory.parse(stream);
+ .getSourceAsStream(schemaSrc);
+
+ SchemaDocument.Schema schema = null;
+ if (schemaSrc.endsWith(".wsdl") || schemaSrc.endsWith(".WSDL")) {
+ DefinitionsDocument defDoc =
+ DefinitionsDocument.Factory.parse(stream);
+ TTypes tt = defDoc.getDefinitions().getTypesArray(0);
+ SchemaDocument.Schema[] schemas = selectChildren
+ (tt,SchemaDocument.Schema.class);
+ if (schemas.length == 1) {
+ schema = schemas[0];
+ }
+ else {
+ String stNS = docType.getName().getNamespaceURI();
+ System.out.println("target NS " + stNS);
+ for (SchemaDocument.Schema s : schemas) {
+ System.out.println("comparing schema namespace "
+ + s.getTargetNamespace());
+ if (stNS.equals(s.getTargetNamespace())) {
+ schema = s;
+ break;
+ }
+ }
+ }
+ }
+ else {
+ SchemaDocument schemaDoc =
SchemaDocument.Factory.parse(stream);
+ schema = schemaDoc.getSchema();
+ }
+
/*
FIXME [EMAIL PROTECTED] 2004-Oct-21 -- it would be great if
the Types.loadInputSchema took an input source instead of a
@@ -159,37 +189,56 @@
} else {
throw new Exception("null document");
}
- SchemaDocument.Schema schema = schemaDoc.getSchema();
- String targetNamespace = schema.getTargetNamespace();
- if (targetNamespace != null) {
- System.out.println(existingNameSpaces);
- if (!existingNameSpaces.contains(targetNamespace)) {
- TopLevelComplexType[] schemaTypes = schema
+ if (schema != null) {
+ String targetNamespace = schema.getTargetNamespace();
+ if (targetNamespace != null) {
+
+ if (!existingNameSpaces.contains(targetNamespace)) {
+ TopLevelComplexType[] schemaTypes = schema
.getComplexTypeArray();
- for (TopLevelComplexType top : schemaTypes) {
- types.writeSchemaElement(targetNamespace,
+ for (TopLevelComplexType top : schemaTypes) {
+ types.writeSchemaElement(targetNamespace,
(Element) doc
.importNode(top.newDomNode()
.getFirstChild(),
true));
- }
- TopLevelElement[] elements = schemaDoc.getSchema()
+ }
+ TopLevelElement[] elements = schema
.getElementArray();
- for (TopLevelElement element : elements) {
- types.writeSchemaElement(targetNamespace,
+ for (TopLevelElement element : elements) {
+ types.writeSchemaElement(targetNamespace,
(Element) doc
.importNode(element.newDomNode()
.getFirstChild(),
true));
+ }
}
+ return null;
}
- return null;
}
throw new Exception(javaType.getName()
- + "did not specify a target namspace");
- } else {
+ + "did not specify a target namespace");
+ }
+ else {
throw new Exception(javaType.getName()
+ " must be a subclass of XmlObject");
}
+ }
+
+
+ // NOTE [EMAIL PROTECTED] 2004-Nov-15 --
+ // once the WSDLProcessor is changed to an interface, remove this function
+ // and use the one in the upcoming XmlBeanWSDLProcessor.
+ private static <T extends XmlObject> T[] selectChildren(XmlObject parent,
+ Class<T>
childClass)
+ throws IllegalAccessException, NoSuchFieldException {
+ // retrieve the SchemaType from the static type field
+ SchemaType st = (SchemaType) childClass.getField("type").get(null);
+ XmlObject[] kids = parent.selectChildren(st.getDocumentElementName());
+ T[] castKids = (T[]) Array.newInstance(childClass, kids.length);
+ for (int j = 0; j < castKids.length; j++) {
+ castKids[j] = childClass.cast(kids[j]);
+ }
+ return castKids;
}
}
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadata.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadata.java?view=diff&rev=109261&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadata.java&r1=109260&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadata.java&r2=109261
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadata.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadata.java
Tue Nov 30 15:51:35 2004
@@ -77,7 +77,15 @@
void setWsWsdlLocation(String wsWsdlLocation);
Collection<Jsr181MethodMetadata> getMethods();
- void addMethod(Jsr181MethodMetadata method);
+
+ public abstract Jsr181MethodMetadata getMethod(String methodName,
+ Class... paramTypes);
+
+ /**
+ * @throws ValidateException if duplicate methods are encountered or if a
+ * Document style service attempts to overload methods.
+ */
+ void addMethod(Jsr181MethodMetadata method) throws ValidationException;
List<SOAPMessageHandlerInfo> getSoapHandlers();
void addSOAPHandler(SOAPMessageHandlerInfo soapHandler);
@@ -85,4 +93,4 @@
String getServiceImplementationBean();
String getServiceEndpointInterface();
-}
\ No newline at end of file
+}
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java?view=diff&rev=109261&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java&r1=109260&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java&r2=109261
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java
Tue Nov 30 15:51:35 2004
@@ -27,8 +27,10 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.jws.HandlerChain;
import javax.jws.WebService;
@@ -54,8 +56,9 @@
private String wsWsdlLocation;
private String wsTargetNamespace;
private String wsEndpointInterface;
- private Collection<Jsr181MethodMetadata> methods =
- new ArrayList<Jsr181MethodMetadata>();
+ private Map<String, Jsr181MethodMetadata> methodMap =
+ new HashMap<String, Jsr181MethodMetadata>();
+ private Set<Jsr181MethodMetadata> noDuplicateMethods;
private SOAPBindingInfo soapBinding;
private String hcFileName;
private String hcName;
@@ -459,7 +462,13 @@
);
}
- validateDuplicatedMethods();
+ /*
+ * NOTE [EMAIL PROTECTED] 2004-Nov-29 -- removed the call to
+ * validateDuplicatedMethods since the new map based technique
+ * should prevent duplicates. Delete validateDuplicatedMethods if
+ * all works well and it doesn't mess up anything Wolfgang was
+ * dependent on.
+ */
}
/**
@@ -501,31 +510,32 @@
String methodName = method.getWmOperationName();
for ( int k = 0 ; k < methods.length ; k++ )
{
- if ( i == k ) continue; // skip the same method.
+ if ( i != k ) { // skip the same method.
- Jsr181MethodMetadata method_ = methods[k];
- if ( methodName.equals( method_.getWmOperationName() ) )
- {
- // Found the duplicated method's name !
- // make sure just an overloading method or duplicated
method signature.
-
- if ( hasSameParameterTypes ( method, method_ ) )
+ Jsr181MethodMetadata method_ = methods[k];
+ if ( methodName.equals( method_.getWmOperationName() ) )
{
- if (0 < seiClassName.length())
+ // Found the duplicated method's name !
+ // make sure just an overloading method or duplicated
method signature.
+
+ if ( hasSameParameterTypes ( method, method_ ) )
{
- throw new ValidationException("There're
duplicated operationName ( "
+ if (0 < seiClassName.length())
+ {
+ throw new ValidationException("There're
duplicated operationName ( "
+ method.getWmOperationName() + " ) of
methods, ( "
+ method.getJavaMethodName() + " )
and ( "
+ method_.getJavaMethodName() + " ) ,
in class ( "
- + seiClassName + " )" );
- }
- else
- {
- throw new ValidationException("There're
duplicated operationName ( "
+ + seiClassName + " ) " + i + " != " +
k );
+ }
+ else
+ {
+ throw new ValidationException("There're
duplicated operationName ( "
+ method.getWmOperationName() + " ) of
methods, ( "
+ method.getJavaMethodName() + " )
and ( "
+ method_.getJavaMethodName() + " ) ,
in class ( "
+ sibClassName + " )" );
+ }
}
}
}
@@ -610,11 +620,18 @@
return found;
}
+
public DefinitionsDocument getWSDLAsDocument()
throws IOException, XmlException {
- return WSDLProcessor.parseWSDL(getWsWsdlLocation());
+
+ // NOTE [EMAIL PROTECTED] 2004-Nov-30 -- removing this while the
+ // WSDLProcessor is being refactored.
+
+ //return WSDLProcessor.parseWSDL(getWsWsdlLocation());
+ return null;
}
+
/**
* @return Returns the hcFileName.
*/
@@ -675,6 +692,9 @@
* @return Returns the soapBinding.
*/
public SOAPBindingInfo getSoapBinding() {
+ if (soapBinding == null) {
+ soapBinding = new SOAPBindingInfo();
+ }
return soapBinding;
}
@@ -759,11 +779,68 @@
* @return Returns the methods.
*/
public Collection<Jsr181MethodMetadata> getMethods() {
- return Collections.unmodifiableCollection(methods);
+ if (noDuplicateMethods == null) {
+ noDuplicateMethods = Collections
+ .unmodifiableSet(new HashSet<Jsr181MethodMetadata>
+ (methodMap.values()));
+ }
+ return noDuplicateMethods;
+ }
+
+ public Jsr181MethodMetadata getMethod(String methodName,
+ Class... paramTypes) {
+ String sig = createCompleteMethodSignature(methodName, paramTypes);
+
+ Jsr181MethodMetadata meta = methodMap.get(sig);
+ if (meta == null) {
+ /*
+ * NOTE [EMAIL PROTECTED] 2004-Nov-29 --
+ * this fallback may be a bad thing but it is nice to have if the
+ * WSDLProcessor cannot map the Java types properly when used on
the
+ * client side.
+ */
+ meta = methodMap.get(methodName + '('+ paramTypes.length + ')');
+ }
+ return meta;
}
- public void addMethod(Jsr181MethodMetadata method) {
- methods.add(method);
+ public void addMethod(Jsr181MethodMetadata method)
+ throws ValidationException {
+
+ // NOTE [EMAIL PROTECTED] 2004-Nov-29 -- clear the Set that prevents
+ // duplicates being returned from getMethods().
+ noDuplicateMethods = null;
+ List<Jsr181ParameterMetadata> params = method.getParams();
+ Class[] paramTypes = new Class[params.size()];
+ int j = 0;
+ for (Jsr181ParameterMetadata param : params) {
+ Class javaType = param.getJavaType();
+ if (javaType == null) {
+ throw new NullPointerException
+ ("null is not a valid parameter class");
+ }
+ paramTypes[j++] = javaType;
+ }
+ String opName = method.getWmOperationName();
+ String sig = createCompleteMethodSignature(opName, paramTypes);
+
+ if (methodMap.containsKey(sig)) {
+ throw new ValidationException(sig
+ + " is already present in this Web
Service and duplicate methods are not permitted.");
+ }
+ else if (SOAPBinding.Style.DOCUMENT
+ .equals(getSoapBinding().getStyle())
+ && methodMap.containsKey(opName)) {
+
+ throw new ValidationException
+ ("This Web Service already contains an operation called "
+ + opName
+ + " and method overloading is not permitted when using the
Document style.");
+ }
+ else {
+ methodMap.put(sig, method);
+ methodMap.put(opName + '(' + paramTypes.length + ')', method);
+ }
}
public List<SOAPMessageHandlerInfo> getSoapHandlers() {
@@ -792,5 +869,26 @@
targetNamespace = tokens[i] + "." + targetNamespace;
}
return "http://"; + targetNamespace;
+ }
+
+ private String createCompleteMethodSignature(String name,
+ Class... paramTypes) {
+
+ StringBuilder sb = new StringBuilder(name);
+ sb.append('(');
+ boolean firstParam = true;
+ if (paramTypes != null) {
+ for (Class type : paramTypes) {
+ if (firstParam) {
+ firstParam = false;
+ }
+ else {
+ sb.append(',');
+ }
+ sb.append(type.getName());
+ }
+ }
+ sb.append(')');
+ return sb.toString();
}
}
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java?view=diff&rev=109261&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java&r1=109260&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java&r2=109261
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java
Tue Nov 30 15:51:35 2004
@@ -21,9 +21,10 @@
*/
public class SOAPBindingInfo {
- SOAPBinding.Style style;
- SOAPBinding.Use use;
- SOAPBinding.ParameterStyle parameterStyle;
+ SOAPBinding.Style style = SOAPBinding.Style.DOCUMENT;
+ SOAPBinding.Use use = SOAPBinding.Use.LITERAL;
+ SOAPBinding.ParameterStyle parameterStyle = SOAPBinding
+ .ParameterStyle.WRAPPED;
/**
*
@@ -87,5 +88,38 @@
setParameterStyle(annotation.parameterStyle());
// set the defaults -- no defaults to set
+ }
+
+ public int hashCode() {
+ return (((getStyle().hashCode() * 31) + getUse().hashCode()) * 31)
+ + getParameterStyle().hashCode();
+ }
+
+ public String toString() {
+ StringBuffer sb = new StringBuffer("SOAPBindingInfo: ");
+ boolean rpc = (getStyle() == SOAPBinding.Style.RPC);
+ boolean encoded = (getUse() == SOAPBinding.Use.ENCODED);
+ sb.append(rpc ? "RPC" : "DOCUMENT");
+ sb.append('/');
+ sb.append(encoded ? "ENCODED" : "LITERAL");
+ if (!rpc && !encoded) {
+ sb.append('-');
+ sb.append((getParameterStyle() == SOAPBinding
+ .ParameterStyle.BARE)
+ ? "BARE" : "WRAPPED");
+ }
+ return sb.toString();
+ }
+
+ public boolean equals(Object o) {
+ if (o != null) {
+ if (o instanceof SOAPBindingInfo) {
+ SOAPBindingInfo sbi = (SOAPBindingInfo)o;
+ return (getStyle().equals(sbi.getStyle())
+ && getUse().equals(sbi.getUse())
+ &&
getParameterStyle().equals(sbi.getParameterStyle()));
+ }
+ }
+ return false;
}
}
Added:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientMethodMetadata.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientMethodMetadata.java?view=auto&rev=109261
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientMethodMetadata.java
Tue Nov 30 15:51:35 2004
@@ -0,0 +1,37 @@
+/*
+ * ClientMethodMetadata.java
+ *
+ * Copyright 2004 BEA Systems, Inc.
+ *
+ * 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.
+ *
+ *
+ * Original author: Jonathan Colwell
+ */
+package org.apache.beehive.wsm.jsr181.model.client;
+
+import java.util.List;
+import javax.xml.namespace.QName;
+import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
+
+/******************************************************************************
+ *
+ * @author Jonathan Colwell
+ */
+public interface ClientMethodMetadata extends Jsr181MethodMetadata {
+
+ public QName getXmlReturnType();
+
+ public void setXmlReturnType(QName xmlType);
+
+}
Added:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientMethodMetadataImpl.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientMethodMetadataImpl.java?view=auto&rev=109261
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientMethodMetadataImpl.java
Tue Nov 30 15:51:35 2004
@@ -0,0 +1,51 @@
+/*
+ * ClientMethodMetadataImpl.java
+ *
+ * Copyright 2004 BEA Systems, Inc.
+ *
+ * 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.
+ *
+ *
+ * Original author: Jonathan Colwell
+ */
+package org.apache.beehive.wsm.jsr181.model.client;
+
+import java.util.List;
+import javax.xml.namespace.QName;
+import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadataImpl;
+
+/******************************************************************************
+ *
+ * @author Jonathan Colwell
+ */
+public class ClientMethodMetadataImpl extends Jsr181MethodMetadataImpl
+ implements ClientMethodMetadata {
+
+ public ClientMethodMetadataImpl(String operationName,
+ Class javaType,
+ QName xmlReturnType) {
+ super(operationName, javaType);
+ setXmlReturnType(xmlReturnType);
+ }
+
+ private QName mXMLReturnType;
+
+ public QName getXmlReturnType() {
+ return mXMLReturnType;
+ }
+
+ public void setXmlReturnType(QName xmlReturnType) {
+ mXMLReturnType = xmlReturnType;
+ }
+}
Added:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientParameterMetadata.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientParameterMetadata.java?view=auto&rev=109261
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientParameterMetadata.java
Tue Nov 30 15:51:35 2004
@@ -0,0 +1,37 @@
+/*
+ * ClientParameterMetadata.java
+ *
+ * Copyright 2004 BEA Systems, Inc.
+ *
+ * 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.
+ *
+ *
+ * Original author: Jonathan Colwell
+ */
+package org.apache.beehive.wsm.jsr181.model.client;
+
+import javax.xml.namespace.QName;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
+
+/******************************************************************************
+ *
+ * @author Jonathan Colwell
+ */
+public interface ClientParameterMetadata extends Jsr181ParameterMetadata {
+
+
+ public QName getXmlType();
+
+ public void setXmlType(QName xmlType);
+
+}
Added:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientParameterMetadataImpl.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientParameterMetadataImpl.java?view=auto&rev=109261
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ClientParameterMetadataImpl.java
Tue Nov 30 15:51:35 2004
@@ -0,0 +1,42 @@
+/*
+ * ClientParameterMetadataImpl.java
+ *
+ * Copyright 2004 BEA Systems, Inc.
+ *
+ * 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.
+ *
+ *
+ * Original author: Jonathan Colwell
+ */
+package org.apache.beehive.wsm.jsr181.model.client;
+
+import javax.xml.namespace.QName;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
+
+/******************************************************************************
+ *
+ * @author Jonathan Colwell
+ */
+public class ClientParameterMetadataImpl extends Jsr181ParameterMetadataImpl
implements ClientParameterMetadata {
+
+ private QName mXMLType;
+
+ public QName getXmlType() {
+ return mXMLType;
+ }
+
+ public void setXmlType(QName xmlType) {
+ mXMLType = xmlType;
+ }
+}
Copied:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/InvalidTypeMappingException.java
(from r106957,
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/InvalidTypeMappingException.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/InvalidTypeMappingException.java?view=diff&rev=109261&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/InvalidTypeMappingException.java&r1=106957&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/InvalidTypeMappingException.java&r2=109261
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/InvalidTypeMappingException.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/InvalidTypeMappingException.java
Tue Nov 30 15:51:35 2004
@@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beehive.wsm.axis;
+package org.apache.beehive.wsm.jsr181.util;
/**
* ****************************************************************************
Added:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/TypeMappingUtil.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/TypeMappingUtil.java?view=auto&rev=109261
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/TypeMappingUtil.java
Tue Nov 30 15:51:35 2004
@@ -0,0 +1,41 @@
+/*
+ * TypeMappingUtil.java
+ *
+ * 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.
+ *
+ *
+ * Original author: Jonathan Colwell
+ */
+package org.apache.beehive.wsm.jsr181.util;
+
+import javax.xml.namespace.QName;
+
+/*******************************************************************************
+ *
+ *
+ * @author Jonathan Colwell
+ */
+public interface TypeMappingUtil {
+
+ public QName registerType(Class cls) throws InvalidTypeMappingException;
+
+ public QName registerType(Class cls, QName expectedType)
+ throws InvalidTypeMappingException;
+
+ public Class q2Class(QName qType);
+
+ public QName generateQName(Class type, String defaultNS);
+}
Added:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/XmlBeanTypeMappingUtil.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/XmlBeanTypeMappingUtil.java?view=auto&rev=109261
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/XmlBeanTypeMappingUtil.java
Tue Nov 30 15:51:35 2004
@@ -0,0 +1,147 @@
+/*
+ * XmlBeanTypeMappingUtil.java
+ *
+ * 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.
+ *
+ *
+ * Original author: Jonathan Colwell
+ */
+package org.apache.beehive.wsm.jsr181.util;
+
+import java.lang.reflect.Method;
+
+import javax.xml.namespace.QName;
+
+import org.apache.xmlbeans.SchemaType;
+import org.apache.xmlbeans.SchemaTypeLoader;
+import org.apache.xmlbeans.XmlBeans;
+import org.apache.xmlbeans.XmlObject;
+
+/*******************************************************************************
+ *
+ *
+ * @author Jonathan Colwell
+ */
+public class XmlBeanTypeMappingUtil implements TypeMappingUtil {
+
+ public QName registerType(Class cls) throws InvalidTypeMappingException {
+ throw new InvalidTypeMappingException
+ ("this implementation does not support type registration");
+ }
+
+ public QName registerType(Class cls, QName expectedType)
+ throws InvalidTypeMappingException {
+
+ throw new InvalidTypeMappingException
+ ("this implementation does not support type registration");
+ }
+
+ public QName generateQName(Class type, String defaultNS) {
+
+ if (XmlObject.class.isAssignableFrom(type)) {
+ return XmlBeans.typeForClass(type).getName();
+ }
+ else {
+ return null;
+ }
+ }
+
+ public Class q2Class(QName qType) {
+
+ SchemaTypeLoader stl = XmlBeans.getContextTypeLoader();
+ SchemaType st = stl.findType(qType);
+ if (st != null) {
+ Class xmlClass = st.getJavaClass();
+ String clName = xmlClass.getName();
+ if (st.isBuiltinType()) {
+ Method[] declared = xmlClass.getDeclaredMethods();
+ Class natural =
+ scanDeclaredMethodsForViableReturnType(declared);
+ if (natural != null) {
+ return natural;
+ }
+ else {
+ // NOTE [EMAIL PROTECTED] 2004-Nov-12 --
+ // XmlString declares no methods
+
+ 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;
+ }
+ }
+ }
+ }
+ /*
+ else if (st.isSimpleType()){
+ System.out.println(clName + " is simple but not built in");
+ }
+ else {
+ System.out.println(clName + " is NOT built in");
+ }
+ System.out.println("resulting class: " + xmlClass.getName());
+ */
+ return xmlClass;
+ }
+ else {
+ // NOTE [EMAIL PROTECTED] 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 Object.class;
+ }
+ }
+
+ private Class scanDeclaredMethodsForViableReturnType
+ (Method[] declared) {
+
+ for (Method meth : declared) {
+
+ Class returnType = meth.getReturnType();
+ System.out.println(returnType.getName());
+ if (!returnType.equals(Void.TYPE)) {
+ /*
+ * NOTE [EMAIL PROTECTED] 2004-Nov-12 --
+ * 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;
+ }
+}
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java?view=diff&rev=109261&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java&r1=109260&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java&r2=109261
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
Tue Nov 30 15:51:35 2004
@@ -1,467 +1,45 @@
/*
- * Copyright 2004 The Apache Software Foundation.
+ * WSDLProcessor.java
+ *
+ * Copyright 2004 BEA Systems, Inc.
*
* 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:$
+ *
+ *
+ * Original author: Jonathan Colwell
*/
-
package org.apache.beehive.wsm.jsr181.wsdl;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Array;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.jws.WebParam;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.namespace.QName;
-
-import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
-import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadataImpl;
import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
-import org.apache.xmlbeans.SchemaType;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
-import org.xmlsoap.schemas.wsdl.TBinding;
-import org.xmlsoap.schemas.wsdl.TBindingOperation;
-import org.xmlsoap.schemas.wsdl.TBindingOperationMessage;
-import org.xmlsoap.schemas.wsdl.TDefinitions;
-import org.xmlsoap.schemas.wsdl.TMessage;
-import org.xmlsoap.schemas.wsdl.TOperation;
-import org.xmlsoap.schemas.wsdl.TParam;
-import org.xmlsoap.schemas.wsdl.TPart;
-import org.xmlsoap.schemas.wsdl.TPort;
-import org.xmlsoap.schemas.wsdl.TPortType;
-import org.xmlsoap.schemas.wsdl.TService;
-import org.xmlsoap.schemas.wsdl.soap.TStyleChoice;
-import org.xmlsoap.schemas.wsdl.soap.UseChoice;
+import java.io.InputStream;
+import java.io.IOException;
-/**
- * ****************************************************************************
+/*******************************************************************************
+ * Creates a WebServiceTYPEMetadata Object from a WSDL.
+ *
+ * @author Jonathan Colwell
*/
-public class WSDLProcessor {
-
- public static final String TRANSPORT =
- "http://schemas.xmlsoap.org/soap/http";;
-
- public static final String SOAPENCODING =
- "http://schemas.xmlsoap.org/soap/encoding/";;
-
- public static final String WSDLNS =
"http://schemas.xmlsoap.org/wsdl/soap/";;
-
- public static final String WSDLSOAPNS =
- "http://schemas.xmlsoap.org/wsdl/soap/";;
-
- public static Jsr181TypeMetadata toWebServiceMetadata
- (DefinitionsDocument defDoc)
- throws IllegalAccessException, NoSuchFieldException {
- Jsr181TypeMetadata wsm = new Jsr181TypeMetadataImpl(null);
- Map<String, Jsr181MethodMetadata> methodMap =
- new HashMap<String, Jsr181MethodMetadata>();
- TDefinitions defs = defDoc.getDefinitions();
- Map<String, TPart[]> messageMap = new HashMap<String, TPart[]>();
- if (defs.sizeOfMessageArray() > 0) {
- TMessage[] messages = defs.getMessageArray();
- for (TMessage msg : messages) {
- messageMap.put(msg.getName(), msg.getPartArray());
- }
- }
- if (defs.sizeOfPortTypeArray() > 0) {
- TPortType tP = defs.getPortTypeArray(0);
- wsm.setWsName(tP.getName());
- TOperation[] operations = tP.getOperationArray();
- for (TOperation op : operations) {
- processTOperation(op, wsm, methodMap, messageMap);
- }
- }
- if (defs.sizeOfBindingArray() > 0) {
- TBinding tBind = defs.getBindingArray(0);
- processTBinding(tBind, wsm, methodMap);
- }
- if (defs.sizeOfServiceArray() > 0) {
- wsm.setWsServiceName(defs.getServiceArray(0).getName());
- }
- return wsm;
- }
-
- public static DefinitionsDocument fromWebServiceMetadata
- (Jsr181TypeMetadata wsm)
- throws Exception {
- String ns = wsm.getWsTargetNamespace();
- DefinitionsDocument defDoc = DefinitionsDocument.Factory.newInstance();
- TDefinitions tDefs = defDoc.addNewDefinitions();
- TPortType tPT = tDefs.addNewPortType();
- tPT.setName(wsm.getWsName());
- TBinding tBind = tDefs.addNewBinding();
- tBind.setName(tPT.getName() + "Binding");
- tBind.setType(new QName(ns, tPT.getName()));
- org.xmlsoap.schemas.wsdl.soap.BindingDocument bindDoc =
-
org.xmlsoap.schemas.wsdl.soap.BindingDocument.Factory.newInstance();
- org.xmlsoap.schemas.wsdl.soap.TBinding tSoapBind = bindDoc
- .addNewBinding();
- if
(SOAPBinding.Style.DOCUMENT.equals(wsm.getSoapBinding().getStyle())) {
- tSoapBind.setStyle(TStyleChoice.DOCUMENT);
- } else {
- tSoapBind.setStyle(TStyleChoice.RPC);
- }
- tSoapBind.setTransport(TRANSPORT);
- insertChild(tBind, bindDoc);
- processMethodMetadata(wsm.getMethods(), tDefs, tPT, tBind, ns);
- TService tServ = tDefs.addNewService();
- tServ.setName(wsm.getWsServiceName());
- TPort tPort = tServ.addNewPort();
- tPort.setName(wsm.getWsName());
- tPort.setBinding(new QName(ns, tBind.getName()));
- org.xmlsoap.schemas.wsdl.soap.AddressDocument addrDoc =
-
org.xmlsoap.schemas.wsdl.soap.AddressDocument.Factory.newInstance();
- org.xmlsoap.schemas.wsdl.soap.TAddress tAddr = addrDoc.addNewAddress();
- tAddr.setLocation("fake://FAKEURL");
- insertChild(tPort, tAddr);
- return defDoc;
- }
-
- private static void processTOperation(TOperation op,
- Jsr181TypeMetadata wsm,
- Map<String,
- Jsr181MethodMetadata> methodMap,
- Map<String, TPart[]> messageMap) {
- String opName = op.getName();
- TParam outputParam = op.getOutput();
- Class returnType = Void.TYPE;
- if (outputParam != null) {
- TPart[] returnTypes = messageMap
- .get(outputParam.getMessage().getLocalPart());
- if (returnTypes.length > 0) {
- String returnName = returnTypes[0].getName();
- QName qReturnType = returnTypes[0].getType();
-
- /*
- * FIXME [EMAIL PROTECTED] 2004-Sep-13 --
- * properly convert the QName to a java class
- */
- returnType = null;
- }
- }
- Jsr181MethodMetadata wmm =
- new Jsr181MethodMetadataImpl(opName, returnType);
- //wmm.setJavaMethodName(opName);
- wmm.setWmOperationName(opName);
- methodMap.put(opName, wmm);
- List paramOrder = op.getParameterOrder();
- if (paramOrder != null) {
- TParam inputParam = op.getInput();
- TPart[] parameters = messageMap
- .get(inputParam.getMessage().getLocalPart());
- for (Object ord : paramOrder) {
- /*
- * NOTE [EMAIL PROTECTED] 2004-Aug-31 -- assuming just a
- * few params so a quick skim through the array
- * should be okay
- */
- for (TPart currentParam : parameters) {
- if (ord.equals(currentParam.getName())) {
- QName qParamType = currentParam.getType();
- Jsr181ParameterMetadata wpm =
- new Jsr181ParameterMetadataImpl();
- /* wpm.setJavaType(qParamType.getNamespaceURI() +
- '.' + qParamType.getLocalPart());*/
- wpm.setWpName((String) ord);
- wpm.setWpMode(WebParam.Mode.IN);
- wmm.addParam(wpm);
- break;
- }
- }
- }
- }
- wsm.addMethod(wmm);
- }
-
- private static void processTBinding(TBinding tBind,
- Jsr181TypeMetadata wsm,
- Map<String,
- Jsr181MethodMetadata> methodMap)
- throws IllegalAccessException, NoSuchFieldException {
- org.xmlsoap.schemas.wsdl.soap.TBinding[] soapBinding =
- getSOAPBinding(tBind);
- SOAPBindingInfo soapInfo = new SOAPBindingInfo();
- if (TStyleChoice.DOCUMENT.equals(soapBinding[0].getStyle())) {
- soapInfo.setStyle(SOAPBinding.Style.DOCUMENT);
- } else {
- soapInfo.setStyle(SOAPBinding.Style.RPC);
- }
- wsm.setSoapBinding(soapInfo);
- TBindingOperation[] tBops = tBind.getOperationArray();
- for (TBindingOperation tBop : tBops) {
- Jsr181MethodMetadata wmm = methodMap.get(tBop.getName());
- org.xmlsoap.schemas.wsdl.soap.TOperation[] soapOperations =
- getSOAPOperations(tBop);
- if (soapOperations.length > 0) {
- wmm.setWmAction(soapOperations[0].getSoapAction());
- if (TStyleChoice.DOCUMENT.equals(soapOperations[0]
- .getStyle())) {
- soapInfo = new SOAPBindingInfo();
- soapInfo.setStyle(SOAPBinding.Style.DOCUMENT);
- } else if (TStyleChoice.RPC.equals(soapOperations[0]
- .getStyle())) {
- soapInfo = new SOAPBindingInfo();
- soapInfo.setStyle(SOAPBinding.Style.RPC);
- }
- }
- TBindingOperationMessage tbMsg = tBop.getInput();
- if (tbMsg == null) {
- tbMsg = tBop.getOutput();
- }
- if (tbMsg != null) {
- org.xmlsoap.schemas.wsdl.soap.TBody[] bodies =
- getSOAPBody(tbMsg);
- if (bodies.length > 0) {
- if (wsm.getWsTargetNamespace() == null) {
- wsm.setWsTargetNamespace(bodies[0].getNamespace());
- }
- if (UseChoice.LITERAL.equals(bodies[0].getUse())) {
- soapInfo.setUse(SOAPBinding.Use.LITERAL);
- } else {
- soapInfo.setUse(SOAPBinding.Use.ENCODED);
- }
- }
- }
- }
- }
-
- private static void processMethodMetadata
- (Collection<Jsr181MethodMetadata> methods,
- TDefinitions defs,
- TPortType portType,
- TBinding bind,
- String namespace) {
- for (Jsr181MethodMetadata op : methods) {
- String operationName = op.getWmOperationName();
- String request = operationName + "Request";
- String response = operationName + "Response";
- TMessage tMsg = defs.addNewMessage();
- tMsg.setName(request);
- List<String> paramOrder = new ArrayList<String>();
- processParameterMetadata(op.getParams(), paramOrder, tMsg);
- if (!op.isOneWay()) {
- tMsg = defs.addNewMessage();
- tMsg.setName(response);
- TPart tPart = tMsg.addNewPart();
- tPart.setName(op.getWrName());
- tPart.setType(class2QName(op.getJavaReturnType()));
- //tPart.setElement(new QName("some", "element");
- }
- TOperation tOp = portType.addNewOperation();
- tOp.setName(operationName);
- tOp.setParameterOrder(paramOrder);
- TParam input = tOp.addNewInput();
- TParam output = tOp.addNewOutput();
- input.setName(request);
- input.setMessage(new QName(namespace, request));
- if (!op.isOneWay()) {
- output.setName(response);
- output.setMessage(new QName(namespace, response));
- }
- processBindingOperationMetadata(bind.addNewOperation(),
- op,
- namespace,
- operationName,
- request,
- response);
- }
- }
-
- private static void processParameterMetadata
- (Collection<Jsr181ParameterMetadata> params,
- List<String> paramOrder,
- TMessage msg) {
- for (Jsr181ParameterMetadata param : params) {
- TPart tPart = msg.addNewPart();
- tPart.setName(param.getWpName());
- tPart.setType(class2QName(param.getJavaType()));
- paramOrder.add(param.getWpName());
- }
- }
-
- private static void processBindingOperationMetadata(TBindingOperation tBop,
- Jsr181MethodMetadata
op,
- String namespace,
- String operationName,
- String request,
- String response) {
- tBop.setName(operationName);
- org.xmlsoap.schemas.wsdl.soap.OperationDocument opDoc =
- org.xmlsoap.schemas.wsdl.soap.OperationDocument.Factory
- .newInstance();
- org.xmlsoap.schemas.wsdl.soap.TOperation tSoapOperation =
- opDoc.addNewOperation();
- tSoapOperation.setSoapAction(op.getWmAction());
-// SOAPBindingInfo sb = op.getSoapBinding();
-// if (sb != null && SOAPBinding.Style.DOCUMENT.equals(sb.getStyle())) {
-// tSoapOperation.setStyle(TStyleChoice.DOCUMENT);
-// }
-// else {
-// tSoapOperation.setStyle(TStyleChoice.RPC);
-// }
- insertChild(tBop, opDoc);
- TBindingOperationMessage inBom = tBop.addNewInput();
- TBindingOperationMessage outBom = tBop.addNewOutput();
- inBom.setName(request);
- outBom.setName(response);
-
- /*
- * NOTE [EMAIL PROTECTED] 2004-Aug-31 -- Using the same body
- * for both the input and output, this may need to be changed.
- */
- org.xmlsoap.schemas.wsdl.soap.BodyDocument bodDoc =
-
org.xmlsoap.schemas.wsdl.soap.BodyDocument.Factory.newInstance();
- org.xmlsoap.schemas.wsdl.soap.TBody tBod = bodDoc.addNewBody();
-
-// if (sb != null && SOAPBinding.Use.LITERAL.equals(sb.getUse())) {
-// tBod.setUse(UseChoice.LITERAL);
-// }
-// else {
-// tBod.setUse(UseChoice.ENCODED);
-// }
-
- /*
- * NOTE [EMAIL PROTECTED] 2004-Aug-31 -- not sure what parts
- * get set here.
- */
- // tBod.setParts(?);
-
- tBod.setNamespace(namespace);
- List<String> encodingStyles = new ArrayList<String>();
- encodingStyles.add(SOAPENCODING);
- tBod.setEncodingStyle(encodingStyles);
- insertChild(inBom, bodDoc);
- insertChild(outBom, bodDoc);
- }
-
- public static boolean insertChild(XmlObject parent, XmlObject child) {
- // might need to use copyXmlContents() instead if copyXml copies too
much
- XmlCursor kidCursor = child.newCursor();
- XmlCursor parentCursor = parent.newCursor();
- parentCursor.toFirstContentToken();
- //parentCursor.toNextToken();
- kidCursor.toNextToken();
- return kidCursor.copyXml(parentCursor);
- }
-
- public static Jsr181TypeMetadata loadWebServiceMetadataFromWSDL
- (String wsdlLocation)
- throws IOException,
- XmlException,
- IllegalAccessException,
- NoSuchFieldException {
- return toWebServiceMetadata(parseWSDL(wsdlLocation));
- }
-
- public static DefinitionsDocument parseWSDL(String wsdlLocation)
- throws IOException, MalformedURLException, XmlException {
- if (wsdlLocation.indexOf("://") > 2) {
- return parseWSDL(new URL(wsdlLocation));
- } else {
- return parseWSDL(new File(wsdlLocation));
- }
- }
-
- public static DefinitionsDocument parseWSDL(File wsdlFile)
- throws IOException, XmlException {
- return DefinitionsDocument.Factory.parse(wsdlFile);
- }
-
- public static DefinitionsDocument parseWSDL(URL wsdlURL)
- throws IOException, MalformedURLException, XmlException {
- return DefinitionsDocument.Factory.parse(wsdlURL);
- }
-
- public static org.xmlsoap.schemas.wsdl.soap.TOperation[]
- getSOAPOperations(TBindingOperation bo)
- throws IllegalAccessException, NoSuchFieldException {
- return selectChildren(bo,
org.xmlsoap.schemas.wsdl.soap.TOperation.class);
- }
-
- public static org.xmlsoap.schemas.wsdl.soap.TBinding[]
- getSOAPBinding(TBinding b)
- throws IllegalAccessException, NoSuchFieldException {
- return selectChildren(b, org.xmlsoap.schemas.wsdl.soap.TBinding.class);
- }
-
- public static org.xmlsoap.schemas.wsdl.soap.TBody[]
- getSOAPBody(TBindingOperationMessage bom)
- throws IllegalAccessException, NoSuchFieldException {
- return selectChildren(bom, org.xmlsoap.schemas.wsdl.soap.TBody.class);
- }
-
- public static org.xmlsoap.schemas.wsdl.soap.TAddress[]
- getSOAPAddress(TPort port)
- throws IllegalAccessException, NoSuchFieldException {
- return selectChildren(port,
org.xmlsoap.schemas.wsdl.soap.TAddress.class);
- }
-
- private static <T extends XmlObject> T[] selectChildren(XmlObject parent,
- Class<T>
childClass)
- throws IllegalAccessException, NoSuchFieldException {
- // retrieve the SchemaType from the static type field
- SchemaType st = (SchemaType) childClass.getField("type").get(null);
- XmlObject[] kids = parent.selectChildren(st.getDocumentElementName());
- T[] castKids = (T[]) Array.newInstance(childClass, kids.length);
- for (int j = 0; j < castKids.length; j++) {
- castKids[j] = childClass.cast(kids[j]);
- }
- return castKids;
- }
-
- public static QName class2QName(String typeName) {
- if (typeName == null) {
- return new QName("java", "UnknownType");
- } else {
- // this cheesy impl won't work for inner classes,
- // see more details below
- int lastDot = typeName.lastIndexOf('.');
- return new QName(typeName.substring(0, lastDot),
- typeName.substring(lastDot + 1));
- }
- }
-
- public static QName class2QName(Class type) {
- /*
- * FIXME [EMAIL PROTECTED] 2004-Aug-30 -- this method should be
replaced
- * by a fully functional mechanism for mapping Java types to XML.
- * Just taking the easy way out to get this working, but pretty much
- * unusable for the moment.
- */
- if (type == null) {
- return new QName("java", "UnknownType");
- } else {
- String packageName = type.getPackage().getName();
- String className = type.getName();
- className = className.substring(packageName.length());
- return new QName(packageName, className);
- }
- }
+public interface WSDLProcessor {
+
+ /**
+ * Converts a WSDL document in the provided InputStream into the WSM
+ * Model.
+ *
+ * @param wsdlStream an InputStream containing a WSDL document.
+ * @return a WSM Object model representing the service in the provided
WSDL.
+ */
+ public Jsr181TypeMetadata createObjectModel(InputStream wsdlStream)
+ throws Exception;
+
}
Added:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java?view=auto&rev=109261
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java
Tue Nov 30 15:51:35 2004
@@ -0,0 +1,644 @@
+/*
+ * XmlBeanWSDLProcessor.java
+ *
+ * Copyright 2004 BEA Systems, Inc.
+ *
+ * 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.
+ *
+ *
+ * Original author: Jonathan Colwell
+ */
+package org.apache.beehive.wsm.jsr181.wsdl;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jws.WebParam;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.namespace.QName;
+
+import org.apache.beehive.wsm.jsr181.model.client.ClientMethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.client.ClientMethodMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.client.ClientParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.client.ClientParameterMetadataImpl;
+import org.apache.beehive.wsm.jsr181.util.TypeMappingUtil;
+import org.apache.beehive.wsm.jsr181.util.XmlBeanTypeMappingUtil;
+
+import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
+import org.apache.xmlbeans.SchemaType;
+import org.apache.xmlbeans.SchemaTypeLoader;
+import org.apache.xmlbeans.XmlBeans;
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
+import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
+import org.xmlsoap.schemas.wsdl.TBinding;
+import org.xmlsoap.schemas.wsdl.TBindingOperation;
+import org.xmlsoap.schemas.wsdl.TBindingOperationMessage;
+import org.xmlsoap.schemas.wsdl.TDefinitions;
+import org.xmlsoap.schemas.wsdl.TMessage;
+import org.xmlsoap.schemas.wsdl.TOperation;
+import org.xmlsoap.schemas.wsdl.TParam;
+import org.xmlsoap.schemas.wsdl.TPart;
+import org.xmlsoap.schemas.wsdl.TPort;
+import org.xmlsoap.schemas.wsdl.TPortType;
+import org.xmlsoap.schemas.wsdl.TService;
+import org.xmlsoap.schemas.wsdl.TTypes;
+import org.xmlsoap.schemas.wsdl.soap.TStyleChoice;
+import org.xmlsoap.schemas.wsdl.soap.UseChoice;
+import org.w3.x2001.xmlSchema.Element;
+import org.w3.x2001.xmlSchema.Group;
+import org.w3.x2001.xmlSchema.ComplexType;
+import org.w3.x2001.xmlSchema.SchemaDocument.Schema;
+
+/*******************************************************************************
+ * An Implementation of WSDLProcessor that uses XmlBeans to convert the WSDL
+ * into the WSM Object Model.
+ *
+ * @author Jonathan Colwell
+ */
+public class XmlBeanWSDLProcessor implements WSDLProcessor {
+
+ private TypeMappingUtil mTmu;
+
+ public Jsr181TypeMetadata createObjectModel(InputStream wsdlStream)
+ throws Exception {
+
+ DefinitionsDocument defDoc = parseWSDL(wsdlStream);
+ return toWebServiceMetadata(defDoc);
+
+ }
+
+ public void setTypeMappingUtil(TypeMappingUtil tmu) {
+ mTmu = tmu;
+ }
+
+ public TypeMappingUtil getTypeMappingUtil() {
+ if (mTmu == null) {
+ mTmu = new XmlBeanTypeMappingUtil();
+ }
+ return mTmu;
+ }
+
+ public static final String TRANSPORT =
+ "http://schemas.xmlsoap.org/soap/http";;
+
+ public static final String SOAPENCODING =
+ "http://schemas.xmlsoap.org/soap/encoding/";;
+
+ public static final String WSDLNS =
"http://schemas.xmlsoap.org/wsdl/soap/";;
+
+ public static final String WSDLSOAPNS =
+ "http://schemas.xmlsoap.org/wsdl/soap/";;
+
+ public Jsr181TypeMetadata toWebServiceMetadata
+ (DefinitionsDocument defDoc)
+ throws Exception {
+ Jsr181TypeMetadata wsm = new Jsr181TypeMetadataImpl(null);
+ Map<String, Jsr181MethodMetadata> methodMap =
+ new HashMap<String, Jsr181MethodMetadata>();
+ TDefinitions defs = defDoc.getDefinitions();
+ wsm.setWsTargetNamespace(defs.getTargetNamespace());
+ Map<String, TPart[]> messageMap = new HashMap<String, TPart[]>();
+
+ if (defs.sizeOfServiceArray() > 0) {
+ wsm.setWsServiceName(defs.getServiceArray(0).getName());
+ }
+
+ if (defs.sizeOfMessageArray() > 0) {
+ TMessage[] messages = defs.getMessageArray();
+ for (TMessage msg : messages) {
+ messageMap.put(msg.getName(), msg.getPartArray());
+ }
+ }
+
+ TBinding tBind = null;
+ if (defs.sizeOfBindingArray() > 0) {
+ tBind = defs.getBindingArray(0);
+ processTBinding(tBind, wsm);
+ }
+
+ if (defs.sizeOfPortTypeArray() > 0) {
+ TPortType tP = defs.getPortTypeArray(0);
+ wsm.setWsName(tP.getName());
+ TOperation[] operations = tP.getOperationArray();
+ TTypes types = null;
+ if (defs.sizeOfTypesArray() > 0) {
+ types = defs.getTypesArray(0);
+ }
+
+ for (TOperation op : operations) {
+
+ processTOperation(op,
+ wsm,
+ methodMap,
+ messageMap,
+ types);
+ }
+ }
+
+ if (tBind != null) {
+ processTBindingOperation(tBind, wsm, methodMap);
+ }
+ return wsm;
+ }
+
+ /*
+ public static DefinitionsDocument fromWebServiceMetadata
+ (WebServiceTYPEMetadata wsm)
+ throws Exception {
+ String ns = wsm.getWsTargetNamespace();
+ DefinitionsDocument defDoc = DefinitionsDocument.Factory.newInstance();
+ TDefinitions tDefs = defDoc.addNewDefinitions();
+ TPortType tPT = tDefs.addNewPortType();
+ tPT.setName(wsm.getWsName());
+ TBinding tBind = tDefs.addNewBinding();
+ tBind.setName(tPT.getName() + "Binding");
+ tBind.setType(new QName(ns, tPT.getName()));
+ org.xmlsoap.schemas.wsdl.soap.BindingDocument bindDoc =
+
org.xmlsoap.schemas.wsdl.soap.BindingDocument.Factory.newInstance();
+ org.xmlsoap.schemas.wsdl.soap.TBinding tSoapBind = bindDoc
+ .addNewBinding();
+ if
(SOAPBinding.Style.DOCUMENT.equals(wsm.getSoapBinding().getStyle())) {
+ tSoapBind.setStyle(TStyleChoice.DOCUMENT);
+ } else {
+ tSoapBind.setStyle(TStyleChoice.RPC);
+ }
+ tSoapBind.setTransport(TRANSPORT);
+ insertChild(tBind, bindDoc);
+ processMethodMetadata(wsm.getMethods(), tDefs, tPT, tBind, ns);
+ TService tServ = tDefs.addNewService();
+ tServ.setName(wsm.getWsServiceName());
+ TPort tPort = tServ.addNewPort();
+ tPort.setName(wsm.getWsName());
+ tPort.setBinding(new QName(ns, tBind.getName()));
+ org.xmlsoap.schemas.wsdl.soap.AddressDocument addrDoc =
+
org.xmlsoap.schemas.wsdl.soap.AddressDocument.Factory.newInstance();
+ org.xmlsoap.schemas.wsdl.soap.TAddress tAddr = addrDoc.addNewAddress();
+ tAddr.setLocation("fake://FAKEURL");
+ insertChild(tPort, tAddr);
+ return defDoc;
+ }
+ */
+
+ private void processTOperation(TOperation op,
+ Jsr181TypeMetadata wsm,
+ Map<String,
+ Jsr181MethodMetadata> methodMap,
+ Map<String, TPart[]> messageMap,
+ TTypes types) throws Exception {
+ String opName = op.getName();
+ TParam outputParam = op.getOutput();
+
+ ClientParameterMetadata[] paraMeta =
+ processParameters(outputParam, types, messageMap, wsm);
+ if (paraMeta != null && paraMeta.length == 1) {
+ ClientMethodMetadata wmm =
+ new ClientMethodMetadataImpl(opName,
+ paraMeta[0].getJavaType(),
+ paraMeta[0].getXmlType());
+
+ wmm.setWmOperationName(opName);
+ // FIXME [EMAIL PROTECTED] 2004-Nov-10 --
+ // do something better with the action
+ wmm.setWmAction(opName);
+ if (Void.TYPE.equals(paraMeta[0].getJavaType())) {
+ // FIXME [EMAIL PROTECTED] 2004-Nov-22 --
+ // check for faults before setting as oneway.
+ wmm.setOneWay(true);
+ }
+ else {
+ wmm.setWrName(paraMeta[0].getWpName());
+ wmm.setWrTargetNamespace(paraMeta[0].getWpTargetNamespace());
+ }
+
+ methodMap.put(opName, wmm);
+
+ List paramOrder = op.getParameterOrder();
+ TParam inputParam = op.getInput();
+ if (inputParam != null) {
+
+ ClientParameterMetadata[] params =
+ processParameters(inputParam, types, messageMap, wsm);
+
+ if (paramOrder != null) {
+ for (Object ord : paramOrder) {
+ for (ClientParameterMetadata wpm : params) {
+ if (ord.equals(wpm.getWpName())) {
+
+ wpm.setWpMode(WebParam.Mode.IN);
+ wmm.addParam(wpm);
+ break;
+ }
+ }
+ }
+ }
+ else if (params.length > 0) {
+ for (ClientParameterMetadata wpm : params) {
+ // FIXME [EMAIL PROTECTED] 2004-Nov-09 --
+ // handle INOUT and OUT Params and Double check DOC/Lit
rules
+ wpm.setWpMode(WebParam.Mode.IN);
+ wmm.addParam(wpm);
+ }
+ }
+ }
+
+ List<Jsr181ParameterMetadata> params = wmm.getParams();
+ System.out.println("adding method " + wmm.getWmOperationName()
+ + " returning " + wmm.getJavaReturnType()
+ + " with the following " + params.size()
+ + " parameters");
+
+ for (Jsr181ParameterMetadata wpm : params) {
+ System.out.println(wpm.getWpName() + ':' + wpm.getJavaType());
+ }
+
+ wsm.addMethod(wmm);
+ }
+ }
+
+ private ClientParameterMetadata[]
+ processParameters(TParam parameter,
+ TTypes types,
+ Map<String, TPart[]> messageMap,
+ Jsr181TypeMetadata wsm) {
+
+ if (parameter != null) {
+ TPart[] messageParts = messageMap
+ .get(parameter.getMessage().getLocalPart());
+
+ List<ClientParameterMetadata> paramList =
+ new ArrayList<ClientParameterMetadata>(messageParts.length);
+ int j = 0;
+ for (TPart messagePart : messageParts) {
+
+
+ QName paramXmlType;
+ if (messagePart.isSetElement()) {
+ QName element = messagePart.getElement();
+ if (types != null) {
+ try {
+ Schema[] schemas = selectChildren(types,
+ Schema.class);
+
+ for (Schema s : schemas) {
+ if (s.getTargetNamespace()
+ .equals(element.getNamespaceURI())) {
+ Element[] elements = s.getElementArray();
+ for (Element e : elements) {
+ if (e.getName()
+ .equals(element.getLocalPart())) {
+ ClientParameterMetadata wpm =
+ new
ClientParameterMetadataImpl();
+ if (e.isSetType()) {
+ // NOTE [EMAIL PROTECTED]
2004-Nov-09 --
+ // DOC/BARE case
+ wpm.setWpName(e.getName());
+ // FIXME [EMAIL PROTECTED]
2004-Nov-09 -- double check the namespace stuff
+ wpm.setWpTargetNamespace
+ (s.getTargetNamespace());
+ QName type = e.getType();
+ wpm.setXmlType(type);
+
wpm.setJavaType(getTypeMappingUtil()
+
.q2Class(type));
+
+ /*
+
System.out.println(wpm.getWpName()
+ + " of type "
+ + wpm.getJavaType());
+ */
+ paramList.add(wpm);
+ }
+ else {
+ ComplexType ct =
e.getComplexType();
+ if (ct != null
+ && ct.isSetSequence()) {
+ // DOC/LIT WSDL
+ Group g = ct.getSequence();
+ if (g.sizeOfElementArray()
== 1) {
+ e =
g.getElementArray(0);
+
wpm.setWpName(e.getName());
+ // FIXME [EMAIL
PROTECTED] 2004-Nov-09 -- double check the namespace stuff
+
wpm.setWpTargetNamespace
+
(s.getTargetNamespace());
+
+ QName type =
e.getType();
+ wpm.setXmlType(type);
+
wpm.setJavaType(getTypeMappingUtil().q2Class(type));
+ /*
+
System.out.println(wpm.getWpName()
+ + " of type "
+ + wpm.getJavaType());
+ */
+ paramList.add(wpm);
+ }
+ else {
+ // FIXME [EMAIL
PROTECTED] 2004-Nov-09 -- take this exception out once the code works
consistently.
+ throw new
Exception("how did I get here");
+ }
+ }
+ }
+ break;
+ }
+ }
+ break;
+ }
+ }
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ else {
+ ClientParameterMetadata wpm =
+ new ClientParameterMetadataImpl();
+ // FIXME [EMAIL PROTECTED] 2004-Nov-09 -- figure out where
RPC parameter namespaces should be specified in the WSDL.
+ wpm.setWpTargetNamespace(wsm.getWsTargetNamespace());
+ wpm.setWpName(messagePart.getName());
+ QName type = messagePart.getType();
+ wpm.setXmlType(type);
+ wpm.setJavaType(getTypeMappingUtil().q2Class(type));
+ /*
+ System.out.println(wpm.getWpName()
+ + " of type "
+ + wpm.getJavaType());
+ */
+ paramList.add(wpm);
+ }
+ }
+ return paramList
+ .toArray(new ClientParameterMetadata[paramList.size()]);
+ }
+ return new ClientParameterMetadata[0];
+ }
+
+ private void processTBinding(TBinding tBind,
+ Jsr181TypeMetadata wsm)
+ throws IllegalAccessException, NoSuchFieldException {
+
+ org.xmlsoap.schemas.wsdl.soap.TBinding[] soapBinding =
+ getSOAPBinding(tBind);
+ SOAPBindingInfo soapInfo = new SOAPBindingInfo();
+ if (soapBinding != null && soapBinding.length > 0) {
+ if (TStyleChoice.RPC.equals(soapBinding[0].getStyle())) {
+ soapInfo.setStyle(SOAPBinding.Style.RPC);
+ }
+ wsm.setSoapBinding(soapInfo);
+ }
+ }
+
+ private void processTBindingOperation(TBinding tBind,
+ Jsr181TypeMetadata wsm,
+ Map<String,
+ Jsr181MethodMetadata> methodMap)
+ throws IllegalAccessException, NoSuchFieldException {
+
+ TBindingOperation[] tBops = tBind.getOperationArray();
+ for (TBindingOperation tBop : tBops) {
+ Jsr181MethodMetadata wmm = methodMap.get(tBop.getName());
+ if (wmm != null) {
+ org.xmlsoap.schemas.wsdl.soap.TOperation[] soapOperations =
+ getSOAPOperations(tBop);
+ if (soapOperations!= null && soapOperations.length > 0) {
+ wmm.setWmAction(soapOperations[0].getSoapAction());
+ }
+ TBindingOperationMessage tbMsg = tBop.getInput();
+ if (tbMsg == null) {
+ tbMsg = tBop.getOutput();
+ }
+ if (tbMsg != null) {
+ org.xmlsoap.schemas.wsdl.soap.TBody[] bodies =
+ getSOAPBody(tbMsg);
+ if (bodies.length > 0) {
+ if (wsm.getWsTargetNamespace() == null) {
+ wsm.setWsTargetNamespace(bodies[0]
+ .getNamespace());
+ }
+ SOAPBindingInfo soapInfo = wsm.getSoapBinding();
+ if (UseChoice.ENCODED.equals(bodies[0].getUse())) {
+ soapInfo.setUse(SOAPBinding.Use.ENCODED);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /*
+ private static void processMethodMetadata
+ (Collection<WebServiceMETHODMetadata> methods,
+ TDefinitions defs,
+ TPortType portType,
+ TBinding bind,
+ String namespace) {
+ for (WebServiceMETHODMetadata op : methods) {
+ String operationName = op.getWmOperationName();
+ String request = operationName + "Request";
+ String response = operationName + "Response";
+ TMessage tMsg = defs.addNewMessage();
+ tMsg.setName(request);
+ List<String> paramOrder = new ArrayList<String>();
+ processParameterMetadata(op.getParams(), paramOrder, tMsg);
+ if (!op.isOneWay()) {
+ tMsg = defs.addNewMessage();
+ tMsg.setName(response);
+ TPart tPart = tMsg.addNewPart();
+ tPart.setName(op.getWrName());
+ tPart.setType(class2QName(op.getJavaReturnType()));
+ //tPart.setElement(new QName("some", "element");
+ }
+ TOperation tOp = portType.addNewOperation();
+ tOp.setName(operationName);
+ tOp.setParameterOrder(paramOrder);
+ TParam input = tOp.addNewInput();
+ TParam output = tOp.addNewOutput();
+ input.setName(request);
+ input.setMessage(new QName(namespace, request));
+ if (!op.isOneWay()) {
+ output.setName(response);
+ output.setMessage(new QName(namespace, response));
+ }
+ processBindingOperationMetadata(bind.addNewOperation(),
+ op,
+ namespace,
+ operationName,
+ request,
+ response);
+ }
+ }
+
+ private static void processParameterMetadata
+ (Collection<WebServicePARAMETERMetadata> params,
+ List<String> paramOrder,
+ TMessage msg) {
+ for (WebServicePARAMETERMetadata param : params) {
+ TPart tPart = msg.addNewPart();
+ tPart.setName(param.getWpName());
+ tPart.setType(class2QName(param.getJavaType()));
+ paramOrder.add(param.getWpName());
+ }
+ }
+
+ private static void processBindingOperationMetadata(TBindingOperation tBop,
+
WebServiceMETHODMetadata op,
+ String namespace,
+ String operationName,
+ String request,
+ String response) {
+ tBop.setName(operationName);
+ org.xmlsoap.schemas.wsdl.soap.OperationDocument opDoc =
+ org.xmlsoap.schemas.wsdl.soap.OperationDocument.Factory
+ .newInstance();
+ org.xmlsoap.schemas.wsdl.soap.TOperation tSoapOperation =
+ opDoc.addNewOperation();
+ tSoapOperation.setSoapAction(op.getWmAction());
+// SOAPBindingInfo sb = op.getSoapBinding();
+// if (sb != null && SOAPBinding.Style.DOCUMENT.equals(sb.getStyle())) {
+// tSoapOperation.setStyle(TStyleChoice.DOCUMENT);
+// }
+// else {
+// tSoapOperation.setStyle(TStyleChoice.RPC);
+// }
+ insertChild(tBop, opDoc);
+ TBindingOperationMessage inBom = tBop.addNewInput();
+ TBindingOperationMessage outBom = tBop.addNewOutput();
+ inBom.setName(request);
+ outBom.setName(response);
+ */
+ /*
+ * NOTE [EMAIL PROTECTED] 2004-Aug-31 -- Using the same body
+ * for both the input and output, this may need to be changed.
+ */
+ /*
+ org.xmlsoap.schemas.wsdl.soap.BodyDocument bodDoc =
+
org.xmlsoap.schemas.wsdl.soap.BodyDocument.Factory.newInstance();
+ org.xmlsoap.schemas.wsdl.soap.TBody tBod = bodDoc.addNewBody();
+
+// if (sb != null && SOAPBinding.Use.LITERAL.equals(sb.getUse())) {
+// tBod.setUse(UseChoice.LITERAL);
+// }
+// else {
+// tBod.setUse(UseChoice.ENCODED);
+// }
+ */
+ /*
+ * NOTE [EMAIL PROTECTED] 2004-Aug-31 -- not sure what parts
+ * get set here.
+ */
+ // tBod.setParts(?);
+ /*
+ tBod.setNamespace(namespace);
+ List<String> encodingStyles = new ArrayList<String>();
+ encodingStyles.add(SOAPENCODING);
+ tBod.setEncodingStyle(encodingStyles);
+ insertChild(inBom, bodDoc);
+ insertChild(outBom, bodDoc);
+ }
+
+
+ public static boolean insertChild(XmlObject parent, XmlObject child) {
+ // might need to use copyXmlContents() instead if copyXml copies too
much
+ XmlCursor kidCursor = child.newCursor();
+ XmlCursor parentCursor = parent.newCursor();
+ parentCursor.toFirstContentToken();
+ //parentCursor.toNextToken();
+ kidCursor.toNextToken();
+ return kidCursor.copyXml(parentCursor);
+ }
+ */
+
+ public Jsr181TypeMetadata loadWebServiceMetadataFromWSDL
+ (String wsdlLocation)
+ throws Exception {
+ return toWebServiceMetadata(parseWSDL(wsdlLocation));
+ }
+
+ public static DefinitionsDocument parseWSDL(String wsdlLocation)
+ throws IOException, MalformedURLException, XmlException {
+ if (wsdlLocation.indexOf("://") > 2) {
+ return parseWSDL(new URL(wsdlLocation));
+ } else {
+ return parseWSDL(new File(wsdlLocation));
+ }
+ }
+
+ public static DefinitionsDocument parseWSDL(File wsdlFile)
+ throws IOException, XmlException {
+ return DefinitionsDocument.Factory.parse(wsdlFile);
+ }
+
+ public static DefinitionsDocument parseWSDL(URL wsdlURL)
+ throws IOException, MalformedURLException, XmlException {
+ return DefinitionsDocument.Factory.parse(wsdlURL);
+ }
+
+ public static DefinitionsDocument parseWSDL(InputStream wsdlStream)
+ throws IOException, MalformedURLException, XmlException {
+ return DefinitionsDocument.Factory.parse(wsdlStream);
+ }
+
+ public static org.xmlsoap.schemas.wsdl.soap.TOperation[]
+ getSOAPOperations(TBindingOperation bo)
+ throws IllegalAccessException, NoSuchFieldException {
+ return selectChildren(bo,
org.xmlsoap.schemas.wsdl.soap.TOperation.class);
+ }
+
+ public static org.xmlsoap.schemas.wsdl.soap.TBinding[]
+ getSOAPBinding(TBinding b)
+ throws IllegalAccessException, NoSuchFieldException {
+ return selectChildren(b, org.xmlsoap.schemas.wsdl.soap.TBinding.class);
+ }
+
+ public static org.xmlsoap.schemas.wsdl.soap.TBody[]
+ getSOAPBody(TBindingOperationMessage bom)
+ throws IllegalAccessException, NoSuchFieldException {
+ return selectChildren(bom, org.xmlsoap.schemas.wsdl.soap.TBody.class);
+ }
+
+ public static org.xmlsoap.schemas.wsdl.soap.TAddress[]
+ getSOAPAddress(TPort port)
+ throws IllegalAccessException, NoSuchFieldException {
+ return selectChildren(port,
org.xmlsoap.schemas.wsdl.soap.TAddress.class);
+ }
+
+ private static <T extends XmlObject> T[] selectChildren(XmlObject parent,
+ Class<T>
childClass)
+ throws IllegalAccessException, NoSuchFieldException {
+ // retrieve the SchemaType from the static type field
+ SchemaType st = (SchemaType) childClass.getField("type").get(null);
+ XmlObject[] kids = parent.selectChildren(st.getDocumentElementName());
+ T[] castKids = (T[]) Array.newInstance(childClass, kids.length);
+ for (int j = 0; j < castKids.length; j++) {
+ castKids[j] = childClass.cast(kids[j]);
+ }
+ return castKids;
+ }
+}
+
