Author: darran.lofthouse(a)jboss.com
Date: 2006-12-10 12:58:14 -0500 (Sun, 10 Dec 2006)
New Revision: 1619
Added:
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wrapped-mapping.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wrapped-mapping.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml
Modified:
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wstools-config.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wstools-config.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wstools-config.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wstools-config.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wstools-config.xml
Log:
JBWS-1260 - Mapping file generation for first four scenarios.
Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
---
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-12-10
17:58:14 UTC (rev 1619)
@@ -60,6 +60,7 @@
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils;
+import org.jboss.ws.tools.helpers.ReturnTypeUnwrapper;
import org.jboss.ws.tools.interfaces.WSDLToJavaIntf;
import org.jboss.ws.utils.JavaUtils;
import org.w3c.dom.Element;
@@ -218,95 +219,6 @@
}
}
- private class WrappedType
- {
-
- public XSTypeDefinition xt;
- public XSAttributeDeclaration unwrappedAttribute;
- public XSElementDeclaration unwrappedElement;
- public String suffix = "";
-
- public WrappedType(XSTypeDefinition xt)
- {
- this.xt = xt;
- }
-
- public boolean unwrap()
- {
- if (isWrapped() == false)
- return false;
-
- if (xt instanceof XSComplexTypeDefinition == false)
- throw new WSException("Tried to unwrap a non-complex type.");
-
- XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt;
-
- boolean unwrappedAttribute = false;
- boolean unwrappedElement = false;
-
- unwrappedAttribute = unwrapAttributeUses(wrapper.getAttributeUses());
-
- XSParticle particle = wrapper.getParticle();
- if (particle != null)
- {
- XSTerm term = particle.getTerm();
-
- if (term instanceof XSModelGroup == false)
- throw new WSException("Expected model group, could not
unwrap");
-
- XSModelGroup group = (XSModelGroup)term;
-
- unwrappedElement = unwrapModelGroup(group);
- }
-
- // We can only say we unwrapped if we only unwrapped one.
- return unwrappedAttribute ^ unwrappedElement;
- }
-
- private boolean unwrapModelGroup(XSModelGroup group)
- {
- XSObjectList particles = group.getParticles();
- if (particles.getLength() == 1)
- {
- XSParticle particle = (XSParticle)particles.item(0);
- boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs()
> 1;
- XSTerm term = particle.getTerm();
-
- if (term instanceof XSModelGroup)
- {
- return unwrapModelGroup((XSModelGroup)term);
- }
- else if (term instanceof XSElementDeclaration)
- {
- unwrappedElement = (XSElementDeclaration)term;
- if (array)
- {
- suffix = "[]";
- }
- }
-
- }
-
- return unwrappedElement != null;
- }
-
- private boolean unwrapAttributeUses(XSObjectList attributeUses)
- {
- if (attributeUses.getLength() == 1)
- {
- XSObject object = attributeUses.item(0);
- if (object instanceof XSAttributeUse)
- {
- XSAttributeUse attributeUse = (XSAttributeUse)object;
- unwrappedAttribute = attributeUse.getAttrDeclaration();
- }
- }
-
- return unwrappedAttribute != null;
- }
-
- }
-
//***************************************************************************
// PRIVATE METHODS
//***************************************************************************
@@ -675,18 +587,19 @@
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),
xmlType.getNamespaceURI());
- WrappedType wt = new WrappedType(xt);
- if (wt.unwrap())
+ ReturnTypeUnwrapper unwrapper = new ReturnTypeUnwrapper(xt, isWrapped());
+ if (unwrapper.unwrap())
{
- if (wt.unwrappedElement != null)
+ if (unwrapper.unwrappedElement != null)
{
- xt = wt.unwrappedElement.getTypeDefinition();
- containingElement = containingElement + wt.unwrappedElement.getName();
- arraySuffix = wt.suffix;
+ xt = unwrapper.unwrappedElement.getTypeDefinition();
+ containingElement = containingElement +
unwrapper.unwrappedElement.getName();
+ if (unwrapper.array)
+ arraySuffix = "[]";
}
- else if (wt.unwrappedAttribute != null)
+ else if (unwrapper.unwrappedAttribute != null)
{
- xt = wt.unwrappedAttribute.getTypeDefinition();
+ xt = unwrapper.unwrappedAttribute.getTypeDefinition();
}
}
Modified:
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
---
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-12-10
17:58:14 UTC (rev 1619)
@@ -22,7 +22,9 @@
package org.jboss.ws.tools.helpers;
import java.beans.Introspector;
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import javax.xml.namespace.QName;
@@ -87,9 +89,10 @@
// provide logging
private static final Logger log = Logger.getLogger(MappingFileGeneratorHelper.class);
private WSDLDefinitions wsdlDefinitions = null;
+ private String typeNamespace;
private String serviceName = null;
private String packageName = null;
-
+
private Set<String> registeredTypes = new HashSet<String>();
private LiteralTypeMapping typeMapping = null;
@@ -99,11 +102,11 @@
private String parameterStyle;
- public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, String pname,
Class seiClass, String tns, LiteralTypeMapping ltm, String paramStyle)
+ public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, String pname,
Class seiClass, LiteralTypeMapping ltm, String paramStyle)
{
this.wsdlDefinitions = wsdl;
this.serviceName = sname;
- this.packageName = pname;
+ this.packageName = pname;
this.typeMapping = ltm;
this.wsdlStyle = utils.getWSDLStyle(wsdl);
@@ -111,6 +114,14 @@
checkEssentials();
}
+ /**
+ * Returns the type namespace that was discovered during generation.
+ */
+ public String getTypeNamespace()
+ {
+ return typeNamespace;
+ }
+
public PackageMapping constructPackageMapping(JavaWsdlMapping jwm, String packageType,
String ns)
{
PackageMapping pk = new PackageMapping(jwm);
@@ -228,29 +239,46 @@
WSDLProperty wprop =
wiout.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME);
QName messageName = new QName(targetNS, wprop.getValue(),
WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS);
- if (isWrapped())
+ wprop = wiout.getProperty(Constants.WSDL_PROPERTY_PART_NAME);
+ String partName = wprop.getValue();
+ String containingElement = xmlName.getLocalPart();
+ boolean array = false;
+ JBossXSModel schemaModel =
WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
+ XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(),
xmlType.getNamespaceURI());
+
+ ReturnTypeUnwrapper unwrapper = new ReturnTypeUnwrapper(xt, isWrapped());
+ if (unwrapper.unwrap())
{
- JBossXSModel schemaModel =
WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
- XSTypeDefinition xt =
schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
- unwrapResponse(semm, messageName, xt);
-
- continue;
+ if (unwrapper.unwrappedElement != null)
+ {
+ XSElementDeclaration element = unwrapper.unwrappedElement;
+ xt = element.getTypeDefinition();
+ partName = element.getName();
+ containingElement = containingElement +
unwrapper.unwrappedElement.getName();
+ array = unwrapper.array;
+ }
+ else if (unwrapper.unwrappedAttribute != null)
+ {
+ xt = unwrapper.unwrappedAttribute.getTypeDefinition();
+ }
}
//Check it is a holder. If it is, return
if (wiop.getInputByPartName(xmlName.getLocalPart()) != null)
continue;
- String javaType = getJavaTypeAsString(xmlName, xmlType, false, true);
+ if (xt instanceof XSSimpleTypeDefinition)
+ xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
+ String javaType = getJavaTypeAsString(xmlName, xmlType, array, true);
+
if (isDocStyle() == false && "void".equals(javaType))
continue;
WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm);
wrvm.setMethodReturnValue(javaType);
wrvm.setWsdlMessage(messageName);
- wprop = wiout.getProperty(Constants.WSDL_PROPERTY_PART_NAME);
- wrvm.setWsdlMessagePartName(wprop.getValue());
+ wrvm.setWsdlMessagePartName(partName);
semm.setWsdlReturnValueMapping(wrvm);
}
}
@@ -276,16 +304,20 @@
paramMode =
WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_IN_OUT_HOLDER_PARAM_MODE;
else paramMode = WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_IN_PARAM_MODE;
- if (isWrapped())
+ boolean wrapped = isWrapped();
+
+ if (wrapped)
{
JBossXSModel schemaModel =
WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(),
xmlType.getNamespaceURI());
- unwrapRequest(semm, wsdlMessageName, xt);
- break;
+ wrapped = unwrapRequest(semm, wsdlMessageName, xt);
}
- MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, xmlName,
xmlType, k, wsdlMessageName, paramMode, partName, false, true);
- semm.addMethodParamPartsMapping(mpin);
+ if (wrapped == false)
+ {
+ MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, xmlName,
xmlType, k, wsdlMessageName, paramMode, partName, false, true);
+ semm.addMethodParamPartsMapping(mpin);
+ }
}
//Take care of out holders
WSDLInterfaceOperationOutput[] outs = wiop.getOutputs();
@@ -353,67 +385,64 @@
}
}
- private void unwrapRequest(ServiceEndpointMethodMapping methodMapping, String
messageName, XSTypeDefinition xt)
+ private boolean unwrapRequest(ServiceEndpointMethodMapping methodMapping, String
messageName, XSTypeDefinition xt)
{
if (xt instanceof XSComplexTypeDefinition == false)
throw new WSException("Tried to unwrap a non-complex type.");
+ List<MethodParamPartsMapping> partsMappings = new
ArrayList<MethodParamPartsMapping>();
+
XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt;
- XSParticle particle = wrapper.getParticle();
- XSTerm term = particle.getTerm();
- if (term instanceof XSModelGroup == false)
- throw new WSException("Expected model group, could not unwrap");
- unwrapRequestParticles(methodMapping, messageName, (XSModelGroup)term);
- }
- private int unwrapRequestParticles(ServiceEndpointMethodMapping methodMapping, String
messageName, XSModelGroup group)
- {
- if (group.getCompositor() != XSModelGroup.COMPOSITOR_SEQUENCE)
- throw new WSException("Only a sequence type can be unwrapped.");
+ boolean appendedAttribute = unwrapAttributes(partsMappings, methodMapping,
wrapper.getAttributeUses());
+ boolean unwrappedElement = false;
- int elementCount = 0;
- XSObjectList particles = group.getParticles();
- for (int i = 0; i < particles.getLength(); i++)
+ XSParticle particle = wrapper.getParticle();
+ if (particle == null)
{
- XSParticle particle = (XSParticle)particles.item(i);
+ if (appendedAttribute)
+ {
+ addMethodParamPartsMappings(partsMappings, methodMapping);
+ }
+
+ return true;
+ }
+ else
+ {
XSTerm term = particle.getTerm();
if (term instanceof XSModelGroup)
{
- elementCount += unwrapRequestParticles(methodMapping, messageName,
(XSModelGroup)term);
+ unwrappedElement = unwrapGroup(partsMappings, methodMapping, messageName,
(XSModelGroup)term);
}
- else if (term instanceof XSElementDeclaration)
- {
- XSElementDeclaration element = (XSElementDeclaration)term;
- QName xmlName = new QName(element.getNamespace(), element.getName());
- QName xmlType = new QName(element.getTypeDefinition().getNamespace(),
element.getTypeDefinition().getName());
- boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs()
> 1;
- MethodParamPartsMapping parts = getMethodParamPartsMapping(methodMapping,
xmlName, xmlType, elementCount, messageName, "IN", xmlName.getLocalPart(),
array,
- !element.getNillable());
- methodMapping.addMethodParamPartsMapping(parts);
- elementCount++;
- }
}
- return elementCount;
+ if ((appendedAttribute && unwrappedElement) || unwrappedElement)
+ {
+ addMethodParamPartsMappings(partsMappings, methodMapping);
+
+ return true;
+ }
+
+ return false;
}
- private void unwrapResponse(ServiceEndpointMethodMapping methodMapping, QName
messageName, XSTypeDefinition xt)
+ private void addMethodParamPartsMappings(List<MethodParamPartsMapping>
partsMappings, ServiceEndpointMethodMapping methodMapping)
{
- if (xt instanceof XSComplexTypeDefinition == false)
- throw new WSException("Tried to unwrap a non-complex type.");
+ for (MethodParamPartsMapping current : partsMappings)
+ {
+ methodMapping.addMethodParamPartsMapping(current);
+ }
+ }
- XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt;
- XSParticle particle = wrapper.getParticle();
- XSTerm term = particle.getTerm();
- if (term instanceof XSModelGroup == false)
- throw new WSException("Expected model group, could not unwrap");
- unwrapResponseParticles(methodMapping, messageName, (XSModelGroup)term);
+ private boolean unwrapAttributes(List<MethodParamPartsMapping> partsMappings,
ServiceEndpointMethodMapping methodMapping, XSObjectList attributes)
+ {
+ return false;
}
- private boolean unwrapResponseParticles(ServiceEndpointMethodMapping methodMapping,
QName messageName, XSModelGroup group)
+ private boolean unwrapGroup(List<MethodParamPartsMapping> partsMappings,
ServiceEndpointMethodMapping methodMapping, String messageName, XSModelGroup group)
{
if (group.getCompositor() != XSModelGroup.COMPOSITOR_SEQUENCE)
- throw new WSException("Only a sequence type can be unwrapped.");
+ return false;
XSObjectList particles = group.getParticles();
for (int i = 0; i < particles.getLength(); i++)
@@ -422,28 +451,35 @@
XSTerm term = particle.getTerm();
if (term instanceof XSModelGroup)
{
- if (unwrapResponseParticles(methodMapping, messageName, (XSModelGroup)term))
- return true;
+ if (unwrapGroup(partsMappings, methodMapping, messageName,
(XSModelGroup)term) == false)
+ return false;
}
else if (term instanceof XSElementDeclaration)
{
XSElementDeclaration element = (XSElementDeclaration)term;
+ XSTypeDefinition type = element.getTypeDefinition();
+
QName xmlName = new QName(element.getNamespace(), element.getName());
- QName xmlType = new QName(element.getTypeDefinition().getNamespace(),
element.getTypeDefinition().getName());
+ QName xmlType;
+ if (type.getAnonymous())
+ {
+ xmlType = new QName(type.getNamespace(), messageName);
+ }
+ else
+ {
+ xmlType = new QName(type.getNamespace(), type.getName());
+ }
+
boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs()
> 1;
- String javaType = getJavaTypeAsString(xmlName, xmlType, array,
!element.getNillable());
- WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(methodMapping);
- wrvm.setMethodReturnValue(javaType);
- wrvm.setWsdlMessage(messageName);
- wrvm.setWsdlMessagePartName(xmlName.getLocalPart());
- methodMapping.setWsdlReturnValueMapping(wrvm);
-
- return true;
+ MethodParamPartsMapping part = getMethodParamPartsMapping(methodMapping,
xmlName, xmlType, partsMappings.size(), messageName, "IN",
xmlName.getLocalPart(),
+ array, !element.getNillable());
+ partsMappings.add(part);
}
}
- return false;
+ // If we reach here we must have successfully unwrapped the parameters.
+ return true;
}
private void checkEssentials()
@@ -473,7 +509,7 @@
return xsmodel.getTypeDefinition(xmlType.getLocalPart(),
xmlType.getNamespaceURI());
}
- private void addJavaXMLTypeMap(XSTypeDefinition xt,String name, String
containingElement, JavaWsdlMapping jwm, boolean skipWrapperArray)
+ private void addJavaXMLTypeMap(XSTypeDefinition xt, String name, String
containingElement, JavaWsdlMapping jwm, boolean skipWrapperArray)
{
JavaXmlTypeMapping jxtm = null;
@@ -512,6 +548,11 @@
jxtm.setRootTypeQName(new QName(xt.getNamespace(), xt.getName(),
"typeNS"));
}
+ if (typeNamespace == null)
+ {
+ typeNamespace = xt.getNamespace();
+ }
+
if (registeredTypes.contains(javaType))
return;
Added:
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java
===================================================================
---
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2006-12-10
17:58:14 UTC (rev 1619)
@@ -0,0 +1,128 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ */
+package org.jboss.ws.tools.helpers;
+
+import org.apache.xerces.xs.XSAttributeDeclaration;
+import org.apache.xerces.xs.XSAttributeUse;
+import org.apache.xerces.xs.XSComplexTypeDefinition;
+import org.apache.xerces.xs.XSElementDeclaration;
+import org.apache.xerces.xs.XSModelGroup;
+import org.apache.xerces.xs.XSObject;
+import org.apache.xerces.xs.XSObjectList;
+import org.apache.xerces.xs.XSParticle;
+import org.apache.xerces.xs.XSTerm;
+import org.apache.xerces.xs.XSTypeDefinition;
+import org.jboss.ws.WSException;
+
+/**
+ * A helper class to unwrap a return type is possible.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 10 Dec 2006
+ */
+public class ReturnTypeUnwrapper
+{
+
+ public XSTypeDefinition xt;
+ public XSAttributeDeclaration unwrappedAttribute;
+ public XSElementDeclaration unwrappedElement;
+ public boolean array = false;
+ private boolean wrapped;
+
+ public ReturnTypeUnwrapper(XSTypeDefinition xt, boolean wrapped)
+ {
+ this.xt = xt;
+ this.wrapped = wrapped;
+ }
+
+ public boolean unwrap()
+ {
+ if (wrapped == false)
+ return false;
+
+ if (xt instanceof XSComplexTypeDefinition == false)
+ throw new WSException("Tried to unwrap a non-complex type.");
+
+ XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt;
+
+ boolean unwrappedAttribute = false;
+ boolean unwrappedElement = false;
+
+ unwrappedAttribute = unwrapAttributeUses(wrapper.getAttributeUses());
+
+ XSParticle particle = wrapper.getParticle();
+ if (particle != null)
+ {
+ XSTerm term = particle.getTerm();
+
+ if (term instanceof XSModelGroup == false)
+ throw new WSException("Expected model group, could not unwrap");
+
+ XSModelGroup group = (XSModelGroup)term;
+
+ unwrappedElement = unwrapModelGroup(group);
+ }
+
+ // We can only say we unwrapped if we only unwrapped one.
+ return unwrappedAttribute ^ unwrappedElement;
+ }
+
+ private boolean unwrapModelGroup(XSModelGroup group)
+ {
+ XSObjectList particles = group.getParticles();
+ if (particles.getLength() == 1)
+ {
+ XSParticle particle = (XSParticle)particles.item(0);
+ boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() >
1;
+ XSTerm term = particle.getTerm();
+
+ if (term instanceof XSModelGroup)
+ {
+ return unwrapModelGroup((XSModelGroup)term);
+ }
+ else if (term instanceof XSElementDeclaration)
+ {
+ unwrappedElement = (XSElementDeclaration)term;
+ this.array = array;
+ }
+
+ }
+
+ return unwrappedElement != null;
+ }
+
+ private boolean unwrapAttributeUses(XSObjectList attributeUses)
+ {
+ if (attributeUses.getLength() == 1)
+ {
+ XSObject object = attributeUses.item(0);
+ if (object instanceof XSAttributeUse)
+ {
+ XSAttributeUse attributeUse = (XSAttributeUse)object;
+ unwrappedAttribute = attributeUse.getAttrDeclaration();
+ }
+ }
+
+ return unwrappedAttribute != null;
+ }
+
+}
Property changes on:
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified:
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
---
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-12-10
17:58:14 UTC (rev 1619)
@@ -308,7 +308,7 @@
//Generate the Mapping File
if (w2jc.mappingFileNeeded)
{
- MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new
LiteralTypeMapping());
+ MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new
LiteralTypeMapping());
mgf.setPackageName(getPackageName(wsdl, glc));
mgf.setServiceName(wsdl.getServices()[0].getName().toString());
mgf.setParameterStyle(w2jc.parameterStyle);
Modified:
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java
===================================================================
---
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2006-12-10
17:58:14 UTC (rev 1619)
@@ -84,11 +84,6 @@
protected Class serviceEndpointInterface = null;
/**
- * Server side generation - user can provide a type Namespace
- */
- protected String typeNamespace;
-
- /**
* Type Mapping that is input from outside
*/
protected LiteralTypeMapping typeMapping = null;
@@ -145,17 +140,6 @@
this.serviceName = serviceName;
}
- /**
- * The user may have generated the types in a different namespace
- * aka typeNamespace in comparison to the wsdl targetNamespace
- *
- * @param typeNamespace
- */
- public void setTypeNamespace(String typeNamespace)
- {
- this.typeNamespace = typeNamespace;
- }
-
public void setParameterStyle(String paramStyle)
{
this.parameterStyle = paramStyle;
@@ -173,16 +157,8 @@
public JavaWsdlMapping generate() throws IOException
{
MappingFileGeneratorHelper helper = new
MappingFileGeneratorHelper(this.wsdlDefinitions, this.serviceName, this.packageName,
this.serviceEndpointInterface,
- this.typeNamespace, this.typeMapping, this.parameterStyle);
- String targetNS = wsdlDefinitions.getTargetNamespace();
- if (typeNamespace == null)
- typeNamespace = targetNS;
+ this.typeMapping, this.parameterStyle);
JavaWsdlMapping jwm = new JavaWsdlMapping();
- //Construct package mapping
- //Check if the user has provided a typeNamespace
- if (typeNamespace != null && typeNamespace.equals(targetNS) == false ||
isServerSideGeneration())
- jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName,
typeNamespace));
- jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName, targetNS));
//If the schema has types, we will need to generate the java/xml type mapping
helper.constructJavaXmlTypeMapping(jwm);
@@ -196,6 +172,19 @@
jwm.addServiceInterfaceMappings(helper.constructServiceInterfaceMapping(jwm,
wsdlService));
helper.constructServiceEndpointInterfaceMapping(jwm, wsdlService);
}
+
+ // Add package to namespace mapping after helper has generated the rest of the
file.
+ String targetNS = wsdlDefinitions.getTargetNamespace();
+ String typeNamespace = helper.getTypeNamespace();
+ if (typeNamespace == null)
+ typeNamespace = targetNS;
+
+ //Construct package mapping
+ //Check if the user has provided a typeNamespace
+ if (typeNamespace != null && typeNamespace.equals(targetNS) == false ||
isServerSideGeneration())
+ jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName,
typeNamespace));
+ jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName, targetNS));
+
return jwm;
}
@@ -219,7 +208,7 @@
MethodParamPartsMapping[] mppmarr = mm.getMethodParamPartsMappings();
int lenmppmarr = mppmarr != null ? mppmarr.length : 0;
for (int j = 0; j < lenmppmarr; j++)
- {
+ {
listInputs.addAll(xst.getVARList((XSComplexTypeDefinition)xsmodel.getTypeDefinition(opname,
typeNamespace), xsmodel, false));
}
JavaWriter jw = new JavaWriter();
Modified:
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java
===================================================================
---
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2006-12-10
17:58:14 UTC (rev 1619)
@@ -192,21 +192,21 @@
return typeMapping;
}
- protected void generateMappingFile(String packageName, WSDLDefinitions wsdl,
TypeMapping typeMapping, String serviceName, String fileLoc, Class seiClass,
- String typeNamespace) throws IOException
- {
- MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new
LiteralTypeMapping());
- mgf.setPackageName(packageName);
- mgf.setServiceName(serviceName);
- if (seiClass != null)
- mgf.setServiceEndpointInterface(seiClass);
- if (typeNamespace != null && typeNamespace.length() > 0)
- mgf.setTypeNamespace(typeNamespace);
- JavaWsdlMapping jwm = mgf.generate();
- FileWriter fw = new FileWriter(fileLoc);
- fw.write(DOMWriter.printNode(DOMUtils.parse(jwm.serialize()), true));
- fw.close();
- }
+ // protected void generateMappingFile(String packageName, WSDLDefinitions wsdl,
TypeMapping typeMapping, String serviceName, String fileLoc, Class seiClass,
+ // String typeNamespace) throws IOException
+ // {
+ // MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new
LiteralTypeMapping());
+ // mgf.setPackageName(packageName);
+ // mgf.setServiceName(serviceName);
+ // if (seiClass != null)
+ // mgf.setServiceEndpointInterface(seiClass);
+ // if (typeNamespace != null && typeNamespace.length() > 0)
+ // mgf.setTypeNamespace(typeNamespace);
+ // JavaWsdlMapping jwm = mgf.generate();
+ // FileWriter fw = new FileWriter(fileLoc);
+ // fw.write(DOMWriter.printNode(DOMUtils.parse(jwm.serialize()), true));
+ // fw.close();
+ // }
protected void generateServiceFile(String packageName, WSDLDefinitions wsdl, String
location) throws IOException
{
Modified:
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
===================================================================
---
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2006-12-10
17:58:14 UTC (rev 1619)
@@ -27,6 +27,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
/**
@@ -47,26 +48,26 @@
tests.add('B');
tests.add('C');
tests.add('D');
- tests.add('E');
- tests.add('F');
- tests.add('G');
- tests.add('H');
- tests.add('I');
- tests.add('J');
- tests.add('K');
- tests.add('L');
- tests.add('M');
- tests.add('N');
- tests.add('O');
- tests.add('P');
- tests.add('Q');
- tests.add('R');
- tests.add('S');
- tests.add('T');
- tests.add('U');
- tests.add('V');
- tests.add('W');
- tests.add('X');
+ //tests.add('E');
+ // tests.add('F');
+ // tests.add('G');
+ // tests.add('H');
+ // tests.add('I');
+ // tests.add('J');
+ // tests.add('K');
+ // tests.add('L');
+ // tests.add('M');
+ // tests.add('N');
+ // tests.add('O');
+ // tests.add('P');
+ // tests.add('Q');
+ // tests.add('R');
+ // tests.add('S');
+ // tests.add('T');
+ // tests.add('U');
+ // tests.add('V');
+ // tests.add('W');
+ // tests.add('X');
}
/**
@@ -587,6 +588,9 @@
new WSTools().generate(args);
compareSource(resourceDir + "/PhoneBook_PortType.java", toolsDir +
"/org/jboss/test/ws/jbws1260/PhoneBook_PortType.java");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/wrapped-mapping.xml", toolsDir
+ "/wrapped-mapping.xml");
}
private static void compareSource(final String expectedName, final String
generatedName) throws Exception
Modified:
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
===================================================================
---
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2006-12-10
17:58:14 UTC (rev 1619)
@@ -1,27 +1,28 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ */
package org.jboss.test.ws.tools.validation;
import java.io.File;
+import java.util.HashMap;
import javax.xml.namespace.QName;
@@ -48,419 +49,423 @@
public class JaxrpcMappingValidator
{
public static Logger log = Logger.getLogger(JaxrpcMappingValidator.class);
- /**
- * Validates two jaxrpc mapping files given their location as strings
- *
- * @param mappingFile1 location of the first mapping file
- * @param mappingFile2 location of the second mapping file
- * @return true - both are equal, false - Do not match
- * @throws Exception
- */
- public boolean validate(String mappingFile1, String mappingFile2) throws Exception
- {
- JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance();
- JavaWsdlMapping javaWsdlMapping1 = mappingFactory.parse(new
File(mappingFile1).toURL());
- JavaWsdlMapping javaWsdlMapping2 = mappingFactory.parse(new
File(mappingFile2).toURL());
- return validate(javaWsdlMapping1,javaWsdlMapping2);
- }
-
- /**
- * Validates two mapping metadata models
- *
- * @param jw1 metadata model for the first mapping file
- * @param jw2 metadata model for the second mapping file
- * @return
- */
- public boolean validate(JavaWsdlMapping jw1, JavaWsdlMapping jw2)
- {
- boolean bool = true;
- bool = validatePackageMappings(jw1.getPackageMappings(),jw2.getPackageMappings());
- if(bool)
- bool = validateJavaXmlTypeMappings(jw1.getJavaXmlTypeMappings(),
- jw2.getJavaXmlTypeMappings());
- else
- throw new IllegalStateException("Validation of PackageMappings
failed");
- if(bool)
- bool = validateServiceInterfaceMappings(jw1.getServiceInterfaceMappings(),
- jw2.getServiceInterfaceMappings());
- else
- throw new IllegalStateException("Validation of JavaXmlTypeMappings
failed");
- if(bool)
- bool =
validateServiceEndpointInterfaceMappings(jw1.getServiceEndpointInterfaceMappings(),
- jw2.getServiceEndpointInterfaceMappings());
- else
- throw new IllegalStateException("Validation of ServiceInterfaceMappings
failed");
-
- if(bool == false)
- throw new IllegalStateException("Validation of
ServiceEndpointInterfaceMappings failed");
- return bool;
- }
-
- //PRIVATE METHODS
- private boolean validatePackageMappings(PackageMapping[] pm1, PackageMapping[] pm2)
- {
- boolean bool = true;
- int len1 = pm1 != null ? pm1.length : 0;
- int len2 = pm2 != null ? pm2.length : 0;
- if(len1 != len2) return false;
- for(int i =0; i < len1; i++)
- {
- bool = validatePackageMapping( pm1[i], pm2[i]);
- if( bool == false) break;
- }
- return bool;
- }
-
- private boolean validatePackageMapping(PackageMapping pm1, PackageMapping pm2)
- {
- boolean bool = true;
- bool = checkStringEquality(pm1.getPackageType(),pm2.getPackageType());
- if(bool)
- bool = checkStringEquality(pm1.getNamespaceURI(),pm2.getNamespaceURI());
- else
- throw new IllegalStateException("Validation of PackageMapping/PackageType
failed");
-
- if(bool == false)
- throw new IllegalStateException("Validation of PackageMapping/NamespaceURI
failed");
- return bool;
- }
-
- private boolean validateJavaXmlTypeMappings(JavaXmlTypeMapping[] jm1,
- JavaXmlTypeMapping[] jm2)
- {
- boolean bool = true;
- int len1 = jm1 != null ? jm1.length : 0;
- int len2 = jm2 != null ? jm2.length : 0;
- if(len1 != len2)
- {
- throw new IllegalStateException("Length of JavaXmlTypeMapping[] do not
match");
- }
+ /**
+ * Validates two jaxrpc mapping files given their location as strings
+ *
+ * @param mappingFile1 location of the first mapping file
+ * @param mappingFile2 location of the second mapping file
+ * @return true - both are equal, false - Do not match
+ * @throws Exception
+ */
+ public boolean validate(String mappingFile1, String mappingFile2) throws Exception
+ {
+ JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance();
+ JavaWsdlMapping javaWsdlMapping1 = mappingFactory.parse(new
File(mappingFile1).toURL());
+ JavaWsdlMapping javaWsdlMapping2 = mappingFactory.parse(new
File(mappingFile2).toURL());
+ return validate(javaWsdlMapping1, javaWsdlMapping2);
+ }
- for(int i =0; i < len1; i++)
- {
- //Now go over the other array to see possible match
- for(int j = 0; j < len1; j++)
- {
- bool = validateJavaXmlTypeMapping( jm1[i], jm2[j]);
- if(bool)
- break;
- }
- //bool = validateJavaXmlTypeMapping( jm1[i], jm2[i]);
- if( bool == false)
- {
- throw new IllegalStateException(jm1[i] + " does not match with other
side");
- }
- }
- return bool;
- }
-
- private boolean validateJavaXmlTypeMapping(JavaXmlTypeMapping jm1,
- JavaXmlTypeMapping jm2)
- {
- boolean bool = true;
- bool = checkStringEquality(jm1.getJavaType(),jm2.getJavaType());
- if(bool)
- bool = checkStringEquality(jm1.getQnameScope(),jm2.getQnameScope());
- if(bool)
- bool = checkQNameEquality(jm1.getRootTypeQName(),jm2.getRootTypeQName());
- if(bool)
- bool =
checkQNameEquality(jm1.getAnonymousTypeQName(),jm2.getAnonymousTypeQName());
- if(bool)
- bool =
validateVariableMappings(jm1.getVariableMappings(),jm2.getVariableMappings());
-
- return bool;
- }
-
- private boolean validateVariableMappings(VariableMapping[] vm1, VariableMapping[] vm2)
- {
- boolean bool = true;
- int len1 = vm1 != null ? vm1.length : 0;
- int len2 = vm2 != null ? vm2.length : 0;
- if(len1 != len2)
- {
- throw new IllegalStateException("Length of VariableMapping[] do not
match");
- }
+ /**
+ * Validates two mapping metadata models
+ *
+ * @param jw1 metadata model for the first mapping file
+ * @param jw2 metadata model for the second mapping file
+ * @return
+ */
+ public boolean validate(JavaWsdlMapping jw1, JavaWsdlMapping jw2)
+ {
+ boolean bool = true;
+ bool = validatePackageMappings(jw1.getPackageMappings(),
jw2.getPackageMappings());
+ if (bool)
+ bool = validateJavaXmlTypeMappings(jw1.getJavaXmlTypeMappings(),
jw2.getJavaXmlTypeMappings());
+ else throw new IllegalStateException("Validation of PackageMappings
failed");
+ if (bool)
+ bool = validateServiceInterfaceMappings(jw1.getServiceInterfaceMappings(),
jw2.getServiceInterfaceMappings());
+ else throw new IllegalStateException("Validation of JavaXmlTypeMappings
failed");
- for(int i =0; i < len1; i++)
- {
- bool = validateVariableMapping( vm1[i], vm2[i]);
- if( bool == false)
- throw new IllegalStateException("VariableMapping" + vm1[i] + "
does not match with "+vm2[i]);
-
- }
- return bool;
- }
-
- private boolean validateVariableMapping(VariableMapping vm1, VariableMapping vm2)
- {
- boolean bool = true;
- bool = checkStringEquality(vm1.getJavaVariableName(),vm2.getJavaVariableName());
- if(bool)
- bool = checkStringEquality(vm1.getXmlAttributeName(),vm2.getXmlAttributeName());
- if(bool)
- bool = checkStringEquality(vm1.getXmlElementName(),vm2.getXmlElementName());
- if(bool)
- bool = vm1.getXmlWildcard() == vm2.getXmlWildcard();
- if(bool)
- bool = vm1.isDataMember() == vm2.isDataMember();
- return bool;
- }
-
- private boolean validateServiceInterfaceMappings(ServiceInterfaceMapping[] sim1,
- ServiceInterfaceMapping[] sim2)
- {
- boolean bool = true;
- int len1 = sim1 != null ? sim1.length : 0;
- int len2 = sim2 != null ? sim2.length : 0;
- if(len1 != len2)
- {
- throw new IllegalStateException("Length of ServiceInterfaceMapping[] do not
match");
- }
+ if (bool)
+ bool =
validateServiceEndpointInterfaceMappings(jw1.getServiceEndpointInterfaceMappings(),
jw2.getServiceEndpointInterfaceMappings());
+ else throw new IllegalStateException("Validation of ServiceInterfaceMappings
failed");
- for(int i =0; i < len1; i++)
- {
- bool = validateServiceInterfaceMapping( sim1[i], sim2[i]);
- if( bool == false) break;
- }
- return bool;
- }
-
- private boolean validateServiceInterfaceMapping(ServiceInterfaceMapping sim1,
- ServiceInterfaceMapping sim2)
- {
- boolean bool = true;
- bool = checkStringEquality(sim1.getServiceInterface(),sim2.getServiceInterface());
- if(bool)
- bool = checkQNameEquality(sim1.getWsdlServiceName(),sim2.getWsdlServiceName());
- if(bool)
- bool = validatePortMappings(sim1.getPortMappings(),sim2.getPortMappings());
- return bool;
- }
-
- private boolean validatePortMappings(PortMapping[] pm1, PortMapping[] pm2 )
- {
- boolean bool = true;
+ if (bool == false)
+ throw new IllegalStateException("Validation of
ServiceEndpointInterfaceMappings failed");
+ return bool;
+ }
- int len1 = pm1 != null ? pm1.length : 0;
- int len2 = pm2 != null ? pm2.length : 0;
- if(len1 != len2)
- {
- throw new IllegalStateException("Length of PortMapping[] do not
match");
- }
+ //PRIVATE METHODS
+ private boolean validatePackageMappings(PackageMapping[] pm1, PackageMapping[] pm2)
+ {
+ boolean bool = true;
+ int len1 = pm1 != null ? pm1.length : 0;
+ int len2 = pm2 != null ? pm2.length : 0;
+ if (len1 != len2)
+ throw new IllegalStateException("Number of package mappings does not match
expected=" + len1 + " actual=" + len2);
- for(int i =0; i < len1; i++)
- {
- bool = validatePortMapping( pm1[i], pm2[i]);
- if( bool == false) break;
- }
- return bool;
- }
-
- private boolean validatePortMapping( PortMapping pm1, PortMapping pm2)
- {
- boolean bool = true;
- bool = checkStringEquality(pm1.getPortName(),pm2.getJavaPortName());
- if(bool)
- bool = checkStringEquality(pm1.getJavaPortName(),pm2.getJavaPortName());
- return bool;
- }
-
- private boolean
validateServiceEndpointInterfaceMappings(ServiceEndpointInterfaceMapping[] sm1,
- ServiceEndpointInterfaceMapping[] sm2)
- {
- boolean bool = true;
+ for (int i = 0; i < len1; i++)
+ {
+ bool = validatePackageMapping(pm1[i], pm2[i]);
+ if (bool == false)
+ break;
+ }
+ return bool;
+ }
- int len1 = sm1 != null ? sm1.length : 0;
- int len2 = sm2 != null ? sm2.length : 0;
- if(len1 != len2)
- {
- throw new IllegalStateException("Length of ServiceEndpointInterfaceMapping[]
do not match");
- }
+ private boolean validatePackageMapping(PackageMapping pm1, PackageMapping pm2)
+ {
+ String expectedPackage = pm1.getPackageType();
+ String actualPackage = pm2.getPackageType();
- for(int i =0; i < len1; i++)
- {
- for(int j = 0 ; j < len1; j++)
- {
- bool = validateServiceEndpointInterfaceMapping( sm1[i], sm2[j]);
- if (bool)
- break;
- }
- if( bool == false)
- throw new IllegalStateException(sm1[i].getServiceEndpointInterface() + "
has no match");
- }
- return bool;
- }
-
- private boolean validateServiceEndpointInterfaceMapping(ServiceEndpointInterfaceMapping
sm1,
- ServiceEndpointInterfaceMapping sm2)
- {
- boolean bool = true;
- bool =
checkStringEquality(sm1.getServiceEndpointInterface(),sm2.getServiceEndpointInterface());
- if(bool)
- bool = checkQNameEquality(sm1.getWsdlBinding(),sm2.getWsdlBinding());
- if(bool)
- bool = checkQNameEquality(sm1.getWsdlPortType(),sm2.getWsdlPortType());
- if(bool)
- bool =
validateServiceEndpointMethodMappings(sm1.getServiceEndpointMethodMappings(),
- sm2.getServiceEndpointMethodMappings());
- return bool;
- }
-
- private boolean validateServiceEndpointMethodMappings(ServiceEndpointMethodMapping[]
semm1,
- ServiceEndpointMethodMapping[] semm2)
- {
- boolean bool = true;
+ if (checkStringEquality(expectedPackage, actualPackage) == false)
+ {
+ throw new IllegalStateException("Package type '" + expectedPackage
+ "' does not equal '" + actualPackage + "'");
+ }
- int len1 = semm1 != null ? semm1.length : 0;
- int len2 = semm2 != null ? semm2.length : 0;
- if(len1 != len2)
- {
- throw new IllegalStateException("Length of ServiceEndpointMethodMapping[] do
not match");
- }
+ String expectedNamespace = pm1.getNamespaceURI();
+ String actualNamespace = pm2.getNamespaceURI();
- for(int i =0; i < len1; i++)
- {
- for(int j = 0 ; j < len1; j++)
- {
- bool = validateServiceEndpointMethodMapping( semm1[i], semm2[j]);
- if(bool)
- break;
- }
- if( bool == false)
- throw new IllegalStateException(semm1[i].getJavaMethodName() + " do not
match in"
- + " in ServiceEndpointMethod Mapping");
-
- }
- return bool;
- }
-
- private boolean validateServiceEndpointMethodMapping(ServiceEndpointMethodMapping
semm1,
- ServiceEndpointMethodMapping semm2)
- {
- boolean bool = true;
- bool = checkStringEquality(semm1.getJavaMethodName(),semm2.getJavaMethodName());
- if(bool)
- bool = checkStringEquality(semm1.getWsdlOperation(),semm2.getWsdlOperation());
- else
- log.error("getJavaMethodName check failed");
- if(bool)
- bool = semm1.isWrappedElement() == semm2.isWrappedElement();
- else
- log.error("wsdloperation check failed");
- if(bool)
- bool = validateWsdlReturnValueMapping(semm1.getWsdlReturnValueMapping(),
- semm2.getWsdlReturnValueMapping());
- else
- log.error("isWrappedElement check failed");
- if(bool)
- bool = validateMethodParamPartsMappings(semm1.getMethodParamPartsMappings(),
- semm2.getMethodParamPartsMappings());
- else
- log.error("validateWsdlReturnValueMapping check failed");
-
- if(bool == false)
- log.error("validateMethodParamPartsMappings check failed");
- return bool;
- }
-
- private boolean validateWsdlReturnValueMapping(WsdlReturnValueMapping w1,
WsdlReturnValueMapping w2)
- {
- checkNullParametersInconsistency(w1,w2,WsdlReturnValueMapping.class);
- boolean bool = true;
- if(w1 != null && w2 != null)
- {
- bool = checkStringEquality(w1.getMethodReturnValue(),w2.getMethodReturnValue());
- if(bool)
- bool =
checkStringEquality(w1.getWsdlMessagePartName(),w2.getWsdlMessagePartName());
- if(bool)
- bool = checkQNameEquality(w1.getWsdlMessage(),w2.getWsdlMessage());
- }
-
- return bool;
- }
-
- private boolean validateMethodParamPartsMappings(MethodParamPartsMapping[] mppm1,
- MethodParamPartsMapping[] mppm2)
- {
- boolean bool = true;
+ if (checkStringEquality(expectedPackage, actualPackage) == false)
+ {
+ throw new IllegalStateException("Namespace '" + expectedNamespace
+ "' does not equal '" + actualNamespace + "'");
+ }
- int len1 = mppm1 != null ? mppm1.length : 0;
- int len2 = mppm2 != null ? mppm2.length : 0;
- if(len1 != len2)
- {
- throw new IllegalStateException("Length of MethodParamPartsMapping[] do not
match");
- }
+ return true;
+ }
- for(int i =0; i < len1; i++)
- {
- bool = validateMethodParamPartsMapping( mppm1[i], mppm2[i]);
- if( bool == false) break;
- }
- return bool;
- }
-
- private boolean validateMethodParamPartsMapping(MethodParamPartsMapping mppm1,
- MethodParamPartsMapping mppm2)
- {
- boolean bool = true;
- bool = mppm1.getParamPosition() == mppm2.getParamPosition();
- if(bool)
- bool = checkStringEquality(mppm1.getParamType(), mppm2.getParamType());
- if(bool)
- bool =
validateWsdlMessageMapping(mppm1.getWsdlMessageMapping(),mppm2.getWsdlMessageMapping());
- return bool;
- }
-
- private boolean validateWsdlMessageMapping(WsdlMessageMapping wmm1,WsdlMessageMapping
wmm2)
- {
- String semmName =
wmm1.getMethodParamPartsMapping().getServiceEndpointMethodMapping().getJavaMethodName();
-
- String path = "ServiceEndpointMethodMapping-"+semmName +
"/methodparampartsmapping";
- boolean bool = true;
- if(bool)
- bool = checkStringEquality(wmm1.getParameterMode(),wmm2.getParameterMode());
- if(bool)
- bool =
checkStringEquality(wmm1.getWsdlMessagePartName(),wmm2.getWsdlMessagePartName());
- else
- throw new IllegalStateException(path + "/parameterMode does not
match");
- if(bool)
- bool = checkQNameEquality(wmm1.getWsdlMessage(),wmm2.getWsdlMessage());
- if(bool)
- bool = wmm1.isSoapHeader() == wmm2.isSoapHeader();
- else
- throw new IllegalStateException(path + "/wsdlMessage does not match");
- return bool;
- }
-
- //PRIVATE EQUALITY CHECKS
-
- private boolean checkStringEquality(String str1, String str2)
- {
- if(str1 == null && str2 == null)
- return true;
- if(str1 == null && str2 != null)
- return false;
- if(str1 != null && str2 == null)
- return false;
- return str1.equals(str2);
- }
-
- private boolean checkQNameEquality(QName q1, QName q2)
- {
- if(q1 == null && q2 == null)
- return true;
- if(q1 == null && q2 != null)
- return false;
- if(q1 != null && q2 == null)
- return false;
- return q1.equals(q2);
- }
-
- private void checkNullParametersInconsistency(Object o1, Object o2, Class c)
- {
- WSDLUtils utils = WSDLUtils.getInstance();
- if((o1 == null && o2 != null) || (o1 != null && o2 == null) )
- throw new IllegalStateException(utils.getJustClassName(c) + " does not
match");
- }
+ private boolean validateJavaXmlTypeMappings(JavaXmlTypeMapping[] jm1,
JavaXmlTypeMapping[] jm2)
+ {
+ boolean bool = true;
+ int len1 = jm1 != null ? jm1.length : 0;
+ int len2 = jm2 != null ? jm2.length : 0;
+ if (len1 != len2)
+ {
+ throw new IllegalStateException("Length of JavaXmlTypeMapping[] do not
match");
+ }
+
+ // Don't need the order to be the same so cope with this.
+ HashMap actualMappings = new HashMap(len1);
+
+ for (int i = 0; i < len1; i++)
+ {
+ JavaXmlTypeMapping current = jm2[i];
+ String name = current.getJavaType();
+ if (actualMappings.containsKey(name))
+ {
+ throw new IllegalStateException("Type '" + name + "'
registered more than once.");
+ }
+
+ actualMappings.put(name, current);
+ }
+
+ for (int i = 0; i < len1; i++)
+ {
+ JavaXmlTypeMapping expected = jm1[i];
+ JavaXmlTypeMapping actual =
(JavaXmlTypeMapping)actualMappings.get(expected.getJavaType());
+
+ if (actual == null)
+ {
+ throw new IllegalStateException("Mapping not found for '" +
expected.getJavaType() + "'");
+ }
+
+ if (validateJavaXmlTypeMapping(expected, actual) == false)
+ {
+ throw new IllegalStateException(expected + " does not match with other
side " + actual);
+ }
+ }
+
+ return true;
+ }
+
+ private boolean validateJavaXmlTypeMapping(JavaXmlTypeMapping jm1, JavaXmlTypeMapping
jm2)
+ {
+ boolean bool = true;
+ bool = checkStringEquality(jm1.getJavaType(), jm2.getJavaType());
+ if (bool)
+ bool = checkStringEquality(jm1.getQnameScope(), jm2.getQnameScope());
+ if (bool)
+ bool = checkQNameEquality(jm1.getRootTypeQName(), jm2.getRootTypeQName());
+ if (bool)
+ bool = checkQNameEquality(jm1.getAnonymousTypeQName(),
jm2.getAnonymousTypeQName());
+ if (bool)
+ bool = validateVariableMappings(jm1.getVariableMappings(),
jm2.getVariableMappings());
+
+ return bool;
+ }
+
+ private boolean validateVariableMappings(VariableMapping[] vm1, VariableMapping[]
vm2)
+ {
+ boolean bool = true;
+ int len1 = vm1 != null ? vm1.length : 0;
+ int len2 = vm2 != null ? vm2.length : 0;
+ if (len1 != len2)
+ {
+ throw new IllegalStateException("Length of VariableMapping[] do not
match");
+ }
+
+ for (int i = 0; i < len1; i++)
+ {
+ bool = validateVariableMapping(vm1[i], vm2[i]);
+ if (bool == false)
+ throw new IllegalStateException("VariableMapping" + vm1[i] + "
does not match with " + vm2[i]);
+
+ }
+ return bool;
+ }
+
+ private boolean validateVariableMapping(VariableMapping vm1, VariableMapping vm2)
+ {
+ boolean bool = true;
+ bool = checkStringEquality(vm1.getJavaVariableName(), vm2.getJavaVariableName());
+ if (bool)
+ bool = checkStringEquality(vm1.getXmlAttributeName(),
vm2.getXmlAttributeName());
+ if (bool)
+ bool = checkStringEquality(vm1.getXmlElementName(), vm2.getXmlElementName());
+ if (bool)
+ bool = vm1.getXmlWildcard() == vm2.getXmlWildcard();
+ if (bool)
+ bool = vm1.isDataMember() == vm2.isDataMember();
+ return bool;
+ }
+
+ private boolean validateServiceInterfaceMappings(ServiceInterfaceMapping[] sim1,
ServiceInterfaceMapping[] sim2)
+ {
+ boolean bool = true;
+ int len1 = sim1 != null ? sim1.length : 0;
+ int len2 = sim2 != null ? sim2.length : 0;
+ if (len1 != len2)
+ {
+ throw new IllegalStateException("Length of ServiceInterfaceMapping[] do not
match");
+ }
+
+ for (int i = 0; i < len1; i++)
+ {
+ bool = validateServiceInterfaceMapping(sim1[i], sim2[i]);
+ if (bool == false)
+ break;
+ }
+ return bool;
+ }
+
+ private boolean validateServiceInterfaceMapping(ServiceInterfaceMapping sim1,
ServiceInterfaceMapping sim2)
+ {
+ boolean bool = true;
+ bool = checkStringEquality(sim1.getServiceInterface(),
sim2.getServiceInterface());
+ if (bool)
+ bool = checkQNameEquality(sim1.getWsdlServiceName(),
sim2.getWsdlServiceName());
+ if (bool)
+ bool = validatePortMappings(sim1.getPortMappings(), sim2.getPortMappings());
+ return bool;
+ }
+
+ private boolean validatePortMappings(PortMapping[] pm1, PortMapping[] pm2)
+ {
+ boolean bool = true;
+
+ int len1 = pm1 != null ? pm1.length : 0;
+ int len2 = pm2 != null ? pm2.length : 0;
+ if (len1 != len2)
+ {
+ throw new IllegalStateException("Length of PortMapping[] do not
match");
+ }
+
+ for (int i = 0; i < len1; i++)
+ {
+ bool = validatePortMapping(pm1[i], pm2[i]);
+ if (bool == false)
+ break;
+ }
+ return bool;
+ }
+
+ private boolean validatePortMapping(PortMapping pm1, PortMapping pm2)
+ {
+ boolean bool = true;
+ bool = checkStringEquality(pm1.getPortName(), pm2.getJavaPortName());
+ if (bool)
+ bool = checkStringEquality(pm1.getJavaPortName(), pm2.getJavaPortName());
+ return bool;
+ }
+
+ private boolean
validateServiceEndpointInterfaceMappings(ServiceEndpointInterfaceMapping[] sm1,
ServiceEndpointInterfaceMapping[] sm2)
+ {
+ boolean bool = true;
+
+ int len1 = sm1 != null ? sm1.length : 0;
+ int len2 = sm2 != null ? sm2.length : 0;
+ if (len1 != len2)
+ {
+ throw new IllegalStateException("Length of
ServiceEndpointInterfaceMapping[] do not match");
+ }
+
+ for (int i = 0; i < len1; i++)
+ {
+ for (int j = 0; j < len1; j++)
+ {
+ bool = validateServiceEndpointInterfaceMapping(sm1[i], sm2[j]);
+ if (bool)
+ break;
+ }
+ if (bool == false)
+ throw new IllegalStateException(sm1[i].getServiceEndpointInterface() + "
has no match");
+ }
+ return bool;
+ }
+
+ private boolean
validateServiceEndpointInterfaceMapping(ServiceEndpointInterfaceMapping sm1,
ServiceEndpointInterfaceMapping sm2)
+ {
+ boolean bool = true;
+ bool = checkStringEquality(sm1.getServiceEndpointInterface(),
sm2.getServiceEndpointInterface());
+ if (bool)
+ bool = checkQNameEquality(sm1.getWsdlBinding(), sm2.getWsdlBinding());
+ if (bool)
+ bool = checkQNameEquality(sm1.getWsdlPortType(), sm2.getWsdlPortType());
+ if (bool)
+ bool =
validateServiceEndpointMethodMappings(sm1.getServiceEndpointMethodMappings(),
sm2.getServiceEndpointMethodMappings());
+ return bool;
+ }
+
+ private boolean validateServiceEndpointMethodMappings(ServiceEndpointMethodMapping[]
semm1, ServiceEndpointMethodMapping[] semm2)
+ {
+ boolean bool = true;
+
+ int len1 = semm1 != null ? semm1.length : 0;
+ int len2 = semm2 != null ? semm2.length : 0;
+ if (len1 != len2)
+ {
+ throw new IllegalStateException("Length of ServiceEndpointMethodMapping[]
do not match");
+ }
+
+ for (int i = 0; i < len1; i++)
+ {
+ for (int j = 0; j < len1; j++)
+ {
+ bool = validateServiceEndpointMethodMapping(semm1[i], semm2[j]);
+ if (bool)
+ break;
+ }
+ if (bool == false)
+ throw new IllegalStateException(semm1[i].getJavaMethodName() + " do not
match in" + " in ServiceEndpointMethod Mapping");
+
+ }
+ return bool;
+ }
+
+ private boolean validateServiceEndpointMethodMapping(ServiceEndpointMethodMapping
semm1, ServiceEndpointMethodMapping semm2)
+ {
+ boolean bool = true;
+ bool = checkStringEquality(semm1.getJavaMethodName(), semm2.getJavaMethodName());
+ if (bool)
+ bool = checkStringEquality(semm1.getWsdlOperation(), semm2.getWsdlOperation());
+ else log.error("getJavaMethodName check failed");
+ if (bool)
+ bool = semm1.isWrappedElement() == semm2.isWrappedElement();
+ else log.error("wsdloperation check failed");
+ if (bool)
+ bool = validateWsdlReturnValueMapping(semm1.getWsdlReturnValueMapping(),
semm2.getWsdlReturnValueMapping());
+ else log.error("isWrappedElement check failed");
+ if (bool)
+ bool = validateMethodParamPartsMappings(semm1.getMethodParamPartsMappings(),
semm2.getMethodParamPartsMappings());
+ else log.error("validateWsdlReturnValueMapping check failed");
+
+ if (bool == false)
+ log.error("validateMethodParamPartsMappings check failed");
+ return bool;
+ }
+
+ private boolean validateWsdlReturnValueMapping(WsdlReturnValueMapping w1,
WsdlReturnValueMapping w2)
+ {
+ checkNullParametersInconsistency(w1, w2, WsdlReturnValueMapping.class);
+ boolean bool = true;
+ if (w1 != null && w2 != null)
+ {
+ bool = checkStringEquality(w1.getMethodReturnValue(),
w2.getMethodReturnValue());
+ if (bool)
+ bool = checkStringEquality(w1.getWsdlMessagePartName(),
w2.getWsdlMessagePartName());
+ if (bool)
+ bool = checkQNameEquality(w1.getWsdlMessage(), w2.getWsdlMessage());
+ }
+
+ return bool;
+ }
+
+ private boolean validateMethodParamPartsMappings(MethodParamPartsMapping[] mppm1,
MethodParamPartsMapping[] mppm2)
+ {
+ boolean bool = true;
+
+ int len1 = mppm1 != null ? mppm1.length : 0;
+ int len2 = mppm2 != null ? mppm2.length : 0;
+ if (len1 != len2)
+ {
+ throw new IllegalStateException("Length of MethodParamPartsMapping[] do not
match");
+ }
+
+ for (int i = 0; i < len1; i++)
+ {
+ bool = validateMethodParamPartsMapping(mppm1[i], mppm2[i]);
+ if (bool == false)
+ break;
+ }
+ return bool;
+ }
+
+ private boolean validateMethodParamPartsMapping(MethodParamPartsMapping mppm1,
MethodParamPartsMapping mppm2)
+ {
+ boolean bool = true;
+ bool = mppm1.getParamPosition() == mppm2.getParamPosition();
+ if (bool)
+ bool = checkStringEquality(mppm1.getParamType(), mppm2.getParamType());
+ if (bool)
+ bool = validateWsdlMessageMapping(mppm1.getWsdlMessageMapping(),
mppm2.getWsdlMessageMapping());
+ return bool;
+ }
+
+ private boolean validateWsdlMessageMapping(WsdlMessageMapping wmm1, WsdlMessageMapping
wmm2)
+ {
+ String semmName =
wmm1.getMethodParamPartsMapping().getServiceEndpointMethodMapping().getJavaMethodName();
+
+ String path = "ServiceEndpointMethodMapping-" + semmName +
"/methodparampartsmapping";
+ boolean bool = true;
+ if (bool)
+ bool = checkStringEquality(wmm1.getParameterMode(), wmm2.getParameterMode());
+ if (bool)
+ bool = checkStringEquality(wmm1.getWsdlMessagePartName(),
wmm2.getWsdlMessagePartName());
+ else throw new IllegalStateException(path + "/parameterMode does not
match");
+ if (bool)
+ bool = checkQNameEquality(wmm1.getWsdlMessage(), wmm2.getWsdlMessage());
+ if (bool)
+ bool = wmm1.isSoapHeader() == wmm2.isSoapHeader();
+ else throw new IllegalStateException(path + "/wsdlMessage does not
match");
+ return bool;
+ }
+
+ //PRIVATE EQUALITY CHECKS
+
+ private boolean checkStringEquality(String str1, String str2)
+ {
+ if (str1 == null && str2 == null)
+ return true;
+ if (str1 == null && str2 != null)
+ return false;
+ if (str1 != null && str2 == null)
+ return false;
+ return str1.equals(str2);
+ }
+
+ private boolean checkQNameEquality(QName q1, QName q2)
+ {
+ if (q1 == null && q2 == null)
+ return true;
+ if (q1 == null && q2 != null)
+ return false;
+ if (q1 != null && q2 == null)
+ return false;
+ return q1.equals(q2);
+ }
+
+ private void checkNullParametersInconsistency(Object o1, Object o2, Class c)
+ {
+ WSDLUtils utils = WSDLUtils.getInstance();
+ if ((o1 == null && o2 != null) || (o1 != null && o2 == null))
+ throw new IllegalStateException(utils.getJustClassName(c) + " does not
match");
+ }
}
Added:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wrapped-mapping.xml
===================================================================
---
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wrapped-mapping.xml 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wrapped-mapping.xml 2006-12-10
17:58:14 UTC (rev 1619)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping
xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1260</package-type>
+ <
namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1260</package-type>
+ <
namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.LookupResponse</java-type>
+
<
anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>l...
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.Lookup</java-type>
+
<
anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>l...
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+
<service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface>
+ <wsdl-service-name
xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceN...
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+
<service-endpoint-interface>org.jboss.test.ws.jbws1260.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type
xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp...
+ <wsdl-binding
xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN...
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN...
+ <wsdl-message-part-name>surname</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN...
+ <wsdl-message-part-name>number</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wrapped-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wstools-config.xml
===================================================================
---
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wstools-config.xml 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_A/wstools-config.xml 2006-12-10
17:58:14 UTC (rev 1619)
@@ -1,5 +1,5 @@
<configuration>
<wsdl-java location="resources/tools/jbws1260/scenario_A/Wrapped.wsdl"
parameter-style="wrapped">
- <!--mapping file="wrapped-mapping.xml"/-->
+ <mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Added:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml
===================================================================
---
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml 2006-12-10
17:58:14 UTC (rev 1619)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping
xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1260</package-type>
+ <
namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1260</package-type>
+ <
namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.LookupResponse</java-type>
+
<
anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>l...
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.Lookup</java-type>
+
<
anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>l...
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+
<service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface>
+ <wsdl-service-name
xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceN...
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+
<service-endpoint-interface>org.jboss.test.ws.jbws1260.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type
xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp...
+ <wsdl-binding
xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN...
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN...
+ <wsdl-message-part-name>firstName</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN...
+ <wsdl-message-part-name>surname</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+
<method-return-value>org.jboss.test.ws.jbws1260.LookupResponse</method-return-value>
+ <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN...
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wstools-config.xml
===================================================================
---
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wstools-config.xml 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wstools-config.xml 2006-12-10
17:58:14 UTC (rev 1619)
@@ -1,5 +1,5 @@
<configuration>
<wsdl-java location="resources/tools/jbws1260/scenario_B/Wrapped.wsdl"
parameter-style="wrapped">
- <!--mapping file="wrapped-mapping.xml"/-->
+ <mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Added:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wrapped-mapping.xml
===================================================================
---
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wrapped-mapping.xml 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wrapped-mapping.xml 2006-12-10
17:58:14 UTC (rev 1619)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping
xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1260</package-type>
+ <
namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1260</package-type>
+ <
namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type>
+ <root-type-qname
xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN...
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.Person</java-type>
+ <root-type-qname
xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN...
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+
<service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface>
+ <wsdl-service-name
xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceN...
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+
<service-endpoint-interface>org.jboss.test.ws.jbws1260.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type
xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp...
+ <wsdl-binding
xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN...
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN...
+ <wsdl-message-part-name>surname</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN...
+ <wsdl-message-part-name>number</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wrapped-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wstools-config.xml
===================================================================
---
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wstools-config.xml 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_C/wstools-config.xml 2006-12-10
17:58:14 UTC (rev 1619)
@@ -1,5 +1,5 @@
<configuration>
<wsdl-java location="resources/tools/jbws1260/scenario_C/Wrapped.wsdl"
parameter-style="wrapped">
- <!--mapping file="wrapped-mapping.xml"/-->
+ <mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Added:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml
===================================================================
---
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml 2006-12-10
17:58:14 UTC (rev 1619)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping
xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1260</package-type>
+ <
namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1260</package-type>
+ <
namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type>
+ <root-type-qname
xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN...
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.Person</java-type>
+ <root-type-qname
xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN...
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+
<service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface>
+ <wsdl-service-name
xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceN...
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+
<service-endpoint-interface>org.jboss.test.ws.jbws1260.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type
xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp...
+ <wsdl-binding
xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN...
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN...
+ <wsdl-message-part-name>firstName</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN...
+ <wsdl-message-part-name>surname</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+
<method-return-value>org.jboss.test.ws.jbws1260.TelephoneNumber</method-return-value>
+ <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN...
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wstools-config.xml
===================================================================
---
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wstools-config.xml 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wstools-config.xml 2006-12-10
17:58:14 UTC (rev 1619)
@@ -1,5 +1,5 @@
<configuration>
<wsdl-java location="resources/tools/jbws1260/scenario_D/Wrapped.wsdl"
parameter-style="wrapped">
- <!--mapping file="wrapped-mapping.xml"/-->
+ <mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Added:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml
===================================================================
---
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml 2006-12-10
17:58:14 UTC (rev 1619)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping
xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1260</package-type>
+ <
namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1260</package-type>
+ <
namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type>
+ <root-type-qname
xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN...
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>Number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type>
+
<
anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>P...
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type>
+
<
anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>T...
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.Person</java-type>
+ <root-type-qname
xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN...
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>name</java-variable-name>
+ <xml-element-name>Name</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+
<service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface>
+ <wsdl-service-name
xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceN...
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+
<service-endpoint-interface>org.jboss.test.ws.jbws1260.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type
xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp...
+ <wsdl-binding
xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN...
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1260.LookupName</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN...
+ <wsdl-message-part-name>Name</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+
<method-return-value>org.jboss.test.ws.jbws1260.LookupResponseNumber</method-return-value>
+ <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN...
+ <wsdl-message-part-name>Number</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wstools-config.xml
===================================================================
---
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wstools-config.xml 2006-12-10
13:47:51 UTC (rev 1618)
+++
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_E/wstools-config.xml 2006-12-10
17:58:14 UTC (rev 1619)
@@ -1,5 +1,5 @@
<configuration>
<wsdl-java location="resources/tools/jbws1260/scenario_E/Wrapped.wsdl"
parameter-style="wrapped">
- <!--mapping file="wrapped-mapping.xml"/-->
+ <mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>