You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2005/06/28 13:20:23 UTC
svn commit: r202157 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/deployment/repository/util/
samples/test/org/apache/axis/engine/ wsdl/src/org/apache/axis/wsdl/
wsdl/src/org/apache/axis/wsdl/builder/ wsdl/src/org/apache/axis/wsdl...
Author: chathura
Date: Tue Jun 28 04:20:21 2005
New Revision: 202157
URL: http://svn.apache.org/viewcvs?rev=202157&view=rev
Log:
A Wrapper element is added that will wrap both WOM and the WSDL4J definition so that it willbe available for each and every ServiceDescription.From this the the WSDL4J definition can be taken from this and can be altered with the required binbing and adding the correct port and can be serialised to show the correct WSDL 1.1 version. This would only be possible if the WOm is built from a WSDL 1.1 file.
Added:
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/WSDLVersionWrapper.java
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/util/ArchiveReader.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/ServiceDescriptionBuilderTest.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilder.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDL2ToWOMBuilder.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/XMLBeansExtension.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/TypeMappingAdapter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/template/java/MessageReceiverTemplate.xsl
webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java
webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java
webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java
webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/util/ArchiveReader.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/util/ArchiveReader.java Tue Jun 28 04:20:21 2005
@@ -23,6 +23,7 @@
import org.apache.axis.description.AxisDescWSDLComponentFactory;
import org.apache.axis.description.ModuleDescription;
import org.apache.axis.description.ServiceDescription;
+import org.apache.axis.wsdl.WSDLVersionWrapper;
import org.apache.axis.wsdl.builder.WOMBuilderFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -72,8 +73,9 @@
boolean foundservice = false;
try {
if(in!= null){
- WSDLDescription womDescription = WOMBuilderFactory.getBuilder(
+ WSDLVersionWrapper wsdlVersionWrapper = WOMBuilderFactory.getBuilder(
WOMBuilderFactory.WSDL11).build(in, new AxisDescWSDLComponentFactory());
+ WSDLDescription womDescription = wsdlVersionWrapper.getDescription();
Iterator iterator = womDescription.getServices().keySet().iterator();
if(iterator.hasNext()){
foundservice = true;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/ServiceDescriptionBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/ServiceDescriptionBuilderTest.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/ServiceDescriptionBuilderTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/ServiceDescriptionBuilderTest.java Tue Jun 28 04:20:21 2005
@@ -43,7 +43,7 @@
if(in == null){
throw new Exception("Input Stream is null , fileNot Found") ;
}
- WSDLDescription womDescription = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in, new AxisDescWSDLComponentFactory());
+ WSDLDescription womDescription = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in, new AxisDescWSDLComponentFactory()).getDescription();
Iterator iterator = womDescription.getServices().keySet().iterator();
if(iterator.hasNext()){
this.service = (ServiceDescription)iterator.next();
Added: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/WSDLVersionWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/WSDLVersionWrapper.java?rev=202157&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/WSDLVersionWrapper.java (added)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/WSDLVersionWrapper.java Tue Jun 28 04:20:21 2005
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.axis.wsdl;
+
+import javax.wsdl.Definition;
+
+import org.apache.wsdl.WSDLDescription;
+
+/**
+ * @author chathura@opensource.lk
+ *
+ */
+public class WSDLVersionWrapper {
+
+ private Definition definition;
+
+ private WSDLDescription description;
+
+
+
+ /**
+ *
+ * @param description WSDL 2.0 WOM description
+ * @param definition WSDL 1.1 WSDL4J based <code>Definition</code>
+ */
+ public WSDLVersionWrapper(WSDLDescription description, Definition definition) {
+ this.definition = definition;
+ this.description = description;
+ }
+
+ /**
+ * Returns the WSDL 1.1 Definition
+ * @return <code>DEfinition</code>
+ */
+ public Definition getDefinition() {
+ return definition;
+ }
+ /**
+ * Returns a WOM description
+ * @return <code>WSDLDescription</code>
+ */
+ public WSDLDescription getDescription() {
+ return description;
+ }
+}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilder.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilder.java Tue Jun 28 04:20:21 2005
@@ -19,14 +19,14 @@
import javax.wsdl.WSDLException;
-import org.apache.wsdl.WSDLDescription;
+import org.apache.axis.wsdl.WSDLVersionWrapper;
/**
* @author chathura@opensource.lk
*/
public interface WOMBuilder {
- public WSDLDescription build(InputStream in) throws WSDLException;
+ public WSDLVersionWrapper build(InputStream in) throws WSDLException;
- public WSDLDescription build (InputStream in, WSDLComponentFactory wsdlComponentFactory) throws WSDLException;
+ public WSDLVersionWrapper build (InputStream in, WSDLComponentFactory wsdlComponentFactory) throws WSDLException;
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDL2ToWOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDL2ToWOMBuilder.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDL2ToWOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDL2ToWOMBuilder.java Tue Jun 28 04:20:21 2005
@@ -19,18 +19,18 @@
import javax.wsdl.WSDLException;
-import org.apache.wsdl.WSDLDescription;
+import org.apache.axis.wsdl.WSDLVersionWrapper;
/**
* @author chathura@opensource.lk
*/
public class WSDL2ToWOMBuilder implements WOMBuilder {
- public WSDLDescription build(InputStream in) throws WSDLException {
+ public WSDLVersionWrapper build(InputStream in) throws WSDLException {
throw new UnsupportedOperationException("Not Implemented");
}
- public WSDLDescription build(InputStream in, WSDLComponentFactory wsdlComponenetFactory)throws WSDLException{
+ public WSDLVersionWrapper build(InputStream in, WSDLComponentFactory wsdlComponenetFactory)throws WSDLException{
throw new UnsupportedOperationException("Not Implemented");
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java Tue Jun 28 04:20:21 2005
@@ -24,6 +24,7 @@
import javax.wsdl.xml.WSDLReader;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.axis.wsdl.WSDLVersionWrapper;
import org.apache.axis.wsdl.builder.WOMBuilder;
import org.apache.axis.wsdl.builder.WSDLComponentFactory;
import org.apache.wsdl.WSDLDescription;
@@ -37,23 +38,25 @@
*/
public class WSDL1ToWOMBuilder implements WOMBuilder {
- public WSDLDescription build(InputStream in) throws WSDLException {
+ public WSDLVersionWrapper build(InputStream in) throws WSDLException {
- WSDLDescription wsdlDefinitions = new WSDLDescriptionImpl();
+ WSDLDescription wsdlDescription = new WSDLDescriptionImpl();
- WSDLPump pump = new WSDLPump(wsdlDefinitions, this.readInTheWSDLFile(in));
+ Definition wsdl1Definition = this.readInTheWSDLFile(in);
+ WSDLPump pump = new WSDLPump(wsdlDescription, wsdl1Definition);
pump.pump();
- return wsdlDefinitions;
+ return new WSDLVersionWrapper(wsdlDescription, wsdl1Definition);
}
- public WSDLDescription build (InputStream in, WSDLComponentFactory wsdlComponentFactory) throws WSDLException{
- WSDLDescription wsdlDefinitions = wsdlComponentFactory.createDescription();
+ public WSDLVersionWrapper build (InputStream in, WSDLComponentFactory wsdlComponentFactory) throws WSDLException{
+ WSDLDescription wsdlDescription = wsdlComponentFactory.createDescription();
- WSDLPump pump = new WSDLPump(wsdlDefinitions, this.readInTheWSDLFile(in), wsdlComponentFactory);
+ Definition wsdl1Definition = this.readInTheWSDLFile(in);
+ WSDLPump pump = new WSDLPump(wsdlDescription, wsdl1Definition, wsdlComponentFactory);
pump.pump();
- return wsdlDefinitions;
+ return new WSDLVersionWrapper(wsdlDescription, wsdl1Definition);
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java Tue Jun 28 04:20:21 2005
@@ -116,7 +116,7 @@
private WSDLDescription getWOM(CommandLineOptionParser parser) throws WSDLException, IOException {
String uri = ((CommandLineOption) parser.getAllOptions().get(CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION)).getOptionValue();
InputStream in = new FileInputStream(new File(uri));
- return WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
+ return WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in).getDescription();
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java Tue Jun 28 04:20:21 2005
@@ -363,6 +363,7 @@
writeTestClasses(axisBinding);
//write the local test classes
writeLocalTestClasses(axisBinding);
+ writeDatabindingSupporters(axisBinding);
//write a dummy implementation call for the tests to run.
writeTestSkeletonImpl(axisBinding);
//write a testservice.xml that will load the dummy skeleton impl for testing
@@ -495,7 +496,7 @@
addAttribute(doc,"package",configuration.getPackageName(), rootElement);
addAttribute(doc,"name",boundInterface.getName().getLocalPart()+MESSAGE_RECEIVER_SUFFIX,rootElement);
addAttribute(doc,"skeletonname",boundInterface.getName().getLocalPart() + SERVICE_CLASS_SUFFIX,rootElement);
- addAttribute(doc, "basereceiver", "org.apache.axis.receivers.RawXMLINOutMessageReceiver", rootElement);
+ addAttribute(doc, "basereceiver", "org.apache.axis.receivers.AbstractInOutSyncMessageReceiver", rootElement);
fillSyncAttributes(doc, rootElement);
loadOperations(boundInterface, doc, rootElement);
doc.appendChild(rootElement);
@@ -553,6 +554,7 @@
addAttribute(doc,"namespace",operation.getName().getNamespaceURI(),methodElement);
addAttribute(doc,"style",operation.getStyle(),methodElement);
addAttribute(doc,"dbsupportname",localPart+DATABINDING_SUPPORTER_NAME_SUFFIX,methodElement);
+ addAttribute(doc, "mep",operation.getMessageExchangePattern(), methodElement);
methodElement.appendChild(getInputElement(doc,operation));
methodElement.appendChild(getOutputElement(doc,operation));
rootElement.appendChild(methodElement);
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/XMLBeansExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/XMLBeansExtension.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/XMLBeansExtension.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/XMLBeansExtension.java Tue Jun 28 04:20:21 2005
@@ -62,6 +62,7 @@
Element schemaElement = ((Schema)extensiblityElt).getElelment();
// //add the namespaces
XmlOptions options = new XmlOptions();
+ options.setCompileDownloadUrls();
options.setLoadAdditionalNamespaces(configuration.getWom().getNamespaces());
xmlObjects[i] = XmlObject.Factory.parse(schemaElement,options);
} catch (XmlException e) {
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java Tue Jun 28 04:20:21 2005
@@ -47,17 +47,17 @@
public JavaTypeMapper() {
//add the basic types to the table
- this.map.put(new QName(XSD_SCHEMA_URL,"string"),String.class);
- this.map.put(new QName(XSD_SCHEMA_URL,"boolean"),Boolean.class);
- this.map.put(new QName(XSD_SCHEMA_URL,"double"),Double.class);
- this.map.put(new QName(XSD_SCHEMA_URL,"long"),Long.class);
- this.map.put(new QName(XSD_SCHEMA_URL,"float"),Float.class);
- this.map.put(new QName(XSD_SCHEMA_URL,"int"),Integer.class);
- this.map.put(new QName(XSD_SCHEMA_URL,"short"),Short.class);
- this.map.put(new QName(XSD_SCHEMA_URL,"byte"),Byte.class);
- this.map.put(new QName(XSD_SCHEMA_URL,"decimal"),BigDecimal.class);
- this.map.put(new QName(XSD_SCHEMA_URL,"date"),Date.class);
- this.map.put(new QName(XSD_SCHEMA_URL,"QName"),QName.class);
+ this.map.put(new QName(XSD_SCHEMA_URL,"string"),String.class.getName());
+ this.map.put(new QName(XSD_SCHEMA_URL,"boolean"),Boolean.class.getName());
+ this.map.put(new QName(XSD_SCHEMA_URL,"double"),Double.class.getName());
+ this.map.put(new QName(XSD_SCHEMA_URL,"long"),Long.class.getName());
+ this.map.put(new QName(XSD_SCHEMA_URL,"float"),Float.class.getName());
+ this.map.put(new QName(XSD_SCHEMA_URL,"int"),Integer.class.getName());
+ this.map.put(new QName(XSD_SCHEMA_URL,"short"),Short.class.getName());
+ this.map.put(new QName(XSD_SCHEMA_URL,"byte"),Byte.class.getName());
+ this.map.put(new QName(XSD_SCHEMA_URL,"decimal"),BigDecimal.class.getName());
+ this.map.put(new QName(XSD_SCHEMA_URL,"date"),Date.class.getName());
+ this.map.put(new QName(XSD_SCHEMA_URL,"QName"),QName.class.getName());
}
public String toString() {
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/TypeMappingAdapter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/TypeMappingAdapter.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/TypeMappingAdapter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/TypeMappingAdapter.java Tue Jun 28 04:20:21 2005
@@ -42,7 +42,7 @@
if (o!=null){
return (String)o;
}else{
- return "java.lang.Object";
+ return "org.apache.axis.om.OMElement";
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/template/java/MessageReceiverTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/template/java/MessageReceiverTemplate.xsl?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/template/java/MessageReceiverTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/template/java/MessageReceiverTemplate.xsl Tue Jun 28 04:20:21 2005
@@ -11,16 +11,18 @@
public class <xsl:value-of select="@name"></xsl:value-of> extends <xsl:value-of select="@basereceiver"/>{
- public void invokeBusinessLogic(org.apache.axis.context.MessageContext msgContext, org.apache.axis.context.MessageContext newMsgContext) {
+ public void invokeBusinessLogic(org.apache.axis.context.MessageContext msgContext, org.apache.axis.context.MessageContext newMsgContext)
+ throws org.apache.axis.engine.AxisFault{
try {
// get the implementation class for the Web Service
Object obj = getTheImplementationObject(msgContext);
-
- // find the WebService method
+
<xsl:value-of select="$skeletonname"></xsl:value-of> skel = (<xsl:value-of select="$skeletonname"></xsl:value-of>)obj;
- skel.init();
+ //Out Envelop
+ org.apache.axis.soap.SOAPEnvelope envelope = null;
+ //Find the operation that has been set by the Dispatch phase.
org.apache.axis.description.OperationDescription op = msgContext.getOperationContext().getAxisOperation();
if (op == null) {
throw new org.apache.axis.engine.AxisFault("Operation is not located, if this is doclit style the SOAP-ACTION should specified via the SOAP Action to use the RawXMLProvider");
@@ -30,9 +32,28 @@
if(op.getName() != null & (methodName = op.getName().getLocalPart()) != null){
<xsl:for-each select="method">
- if(methodName.equals("<xsl:value-of select="@name"></xsl:value-of> ")){
- skel.<xsl:value-of select="@name"></xsl:value-of>();
- }
+
+ <xsl:variable name="returntype"><xsl:value-of select="output/param/@type"/></xsl:variable>
+ <xsl:variable name="returnvariable"><xsl:value-of select="output/param/@name"/></xsl:variable>
+
+ if(methodName.equals("<xsl:value-of select="@name"></xsl:value-of> ")){
+ <xsl:for-each select="input/param">
+ <xsl:if test="@type!=''">
+ <xsl:value-of select="@type"/> <xsl:text> </xsl:text><xsl:value-of select="@name"/> = null;
+ </xsl:if>
+ </xsl:for-each>
+ <xsl:if test="$returntype!=''">
+ <xsl:value-of select="$returntype"/> <xsl:text> </xsl:text><xsl:value-of select="$returnvariable"/> = null;
+ </xsl:if>
+ <xsl:if test="count(input/param)='1'">
+ <xsl:if test="$returntype!=''"><xsl:value-of select="$returnvariable"/> =</xsl:if> skel.<xsl:value-of select="@name"></xsl:value-of>(
+ <xsl:for-each select="input/param">
+ <xsl:if test="@type!=''">
+ <xsl:value-of select="@name"/>
+ </xsl:if>
+ </xsl:for-each>);
+ </xsl:if>
+ }
</xsl:for-each>
}
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java Tue Jun 28 04:20:21 2005
@@ -44,7 +44,7 @@
InputStream in = new FileInputStream(
getTestResourceFile("BookQuote.wsdl"));
womDescription = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11)
- .build(in);
+ .build(in).getDescription();
assertNotNull(womDescription);
if(null !=womDescription){
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java Tue Jun 28 04:20:21 2005
@@ -21,14 +21,11 @@
import java.util.Iterator;
import javax.wsdl.Definition;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
+import org.apache.axis.wsdl.WSDLVersionWrapper;
import org.apache.axis.wsdl.builder.WOMBuilderFactory;
import org.apache.wsdl.extensions.ExtensionConstants;
import org.apache.wsdl.extensions.Schema;
-import org.apache.wsdl.util.Utils;
-import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -48,14 +45,15 @@
}
protected void setUp() throws Exception {
- InputStream in = new FileInputStream(getTestResourceFile("BookQuote.wsdl"));
- this.womDescription = WOMBuilderFactory.getBuilder(
- WOMBuilderFactory.WSDL11).build(in);
-
- WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
- Document doc = Utils.newDocument(new FileInputStream(getTestResourceFile(
- "BookQuote.wsdl")));
- this.wsdl4jDefinition = reader.readWSDL(null, doc);
+ WSDLVersionWrapper wsdlVersionWrapper = null;
+ if (null == this.womDescription) {
+ InputStream in = new FileInputStream(getTestResourceFile("BookQuote.wsdl"));
+ wsdlVersionWrapper = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
+ this.womDescription = wsdlVersionWrapper.getDescription();
+ }
+ if (null == wsdl4jDefinition) {
+ this.wsdl4jDefinition = wsdlVersionWrapper.getDefinition();
+ }
}
public void testInsertedMultipartType() {
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java Tue Jun 28 04:20:21 2005
@@ -21,15 +21,12 @@
import java.util.Iterator;
import javax.wsdl.Definition;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
+import org.apache.axis.wsdl.WSDLVersionWrapper;
import org.apache.axis.wsdl.builder.WOMBuilderFactory;
import org.apache.wsdl.extensions.ExtensionConstants;
import org.apache.wsdl.extensions.Schema;
-import org.apache.wsdl.util.Utils;
-import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -50,14 +47,15 @@
protected void setUp() throws Exception {
- InputStream in = new FileInputStream(getTestResourceFile("BookQuote.wsdl"));
- this.womDescription = WOMBuilderFactory.getBuilder(
- WOMBuilderFactory.WSDL11).build(in);
-
- WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
- Document doc = Utils.newDocument(new FileInputStream(getTestResourceFile(
- "BookQuote.wsdl")));
- this.wsdl4jDefinition = reader.readWSDL(null, doc);
+ WSDLVersionWrapper wsdlVersionWrapper = null;
+ if (null == this.womDescription) {
+ InputStream in = new FileInputStream(getTestResourceFile("BookQuote.wsdl"));
+ wsdlVersionWrapper = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
+ this.womDescription = wsdlVersionWrapper.getDescription();
+ }
+ if (null == wsdl4jDefinition) {
+ this.wsdl4jDefinition = wsdlVersionWrapper.getDefinition();
+ }
}
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java?rev=202157&r1=202156&r2=202157&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java Tue Jun 28 04:20:21 2005
@@ -24,12 +24,9 @@
import javax.wsdl.Operation;
import javax.wsdl.PortType;
import javax.wsdl.Service;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
+import org.apache.axis.wsdl.WSDLVersionWrapper;
import org.apache.axis.wsdl.builder.WOMBuilderFactory;
-import org.apache.wsdl.util.Utils;
-import org.w3c.dom.Document;
/**
* @author chathura@opensource.lk
@@ -46,14 +43,14 @@
private void initialize() throws Exception {
+ WSDLVersionWrapper wsdlVersionWrapper = null;
if (null == this.womDescription) {
InputStream in = new FileInputStream(getTestResourceFile("InteropTest.wsdl"));
- this.womDescription = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
+ wsdlVersionWrapper = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
+ this.womDescription = wsdlVersionWrapper.getDescription();
}
if (null == wsdl4jDefinition) {
- WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
- Document doc = Utils.newDocument(new FileInputStream(getTestResourceFile("InteropTest.wsdl")));
- this.wsdl4jDefinition = reader.readWSDL(null, doc);
+ this.wsdl4jDefinition = wsdlVersionWrapper.getDefinition();
}
}