[jbossws-commits] JBossWS SVN: r2493 - in trunk: jbossws-tests/src/main/java/org/jboss/test/ws/tools and 3 other directories.

Author: darran.lofthouse(a)jboss.com Date: 2007-03-01 13:47:56 -0500 (Thu, 01 Mar 2007) New Revision: 2493 Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java trunk/jbossws-tests/src/main/resources/tools/jbws1538/ trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml Removed: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java Log: JBWS-1538 - Prevent properties being added multiple times to generated JAX-RPC mapping. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-03-01 17:57:31 UTC (rev 2492) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-03-01 18:47:56 UTC (rev 2493) @@ -347,7 +347,8 @@ JBossXSModelGroup group = (JBossXSModelGroup)complexType.getParticle().getTerm(); group.setParticles(particles); - if(log.isDebugEnabled()) log.debug("generateNewType: " + sutils.write(complexType)); + if (log.isDebugEnabled()) + log.debug("generateNewType: " + sutils.write(complexType)); return complexType; } @@ -485,10 +486,9 @@ continue; } - String name = term.getName(); - String variableName = name; - if (reversedNames != null && reversedNames.get(name) != null) + String variableName = name; + if (reversedNames != null && reversedNames.get(name) != null) variableName = reversedNames.get(name); VariableMapping mapping = new VariableMapping(javaXmlTypeMapping); @@ -497,10 +497,42 @@ mapping.setXmlElementName(name); mapping.setDataMember(utils.doesPublicFieldExist(javaType, variableName)); - javaXmlTypeMapping.addVariableMapping(mapping); + if (isAlreadyMapped(javaXmlTypeMapping, mapping) == false) + { + javaXmlTypeMapping.addVariableMapping(mapping); + } } } + private boolean isAlreadyMapped(JavaXmlTypeMapping jxtm, VariableMapping vm) + { + String javaVariableName = vm.getJavaVariableName(); + String attributeName = vm.getXmlAttributeName(); + String elementName = vm.getXmlElementName(); + + for (VariableMapping current : jxtm.getVariableMappings()) + { + boolean matched = checkStringEquality(javaVariableName, current.getJavaVariableName()); + + if (matched) + { + matched = checkStringEquality(attributeName, current.getXmlAttributeName()); + } + + if (matched) + { + matched = checkStringEquality(elementName, current.getXmlElementName()); + } + + if (matched) + { + return true; + } + } + + return false; + } + private List<XSParticle> getXSParticlesForPublicFields(String typeNamespace, Class javaType, Map<String, QName> elementNames) { List<XSParticle> particles = new ArrayList<XSParticle>(); @@ -579,10 +611,10 @@ String fieldname = prop.getName(); Class fieldType = prop.getPropertyType(); - if (prop instanceof IndexedPropertyDescriptor && fieldType==null) + if (prop instanceof IndexedPropertyDescriptor && fieldType == null) { - log.warn("Indexed Properties without non-indexed accessors are not supported skipping: " + javaType.getName() + "." + fieldname); - continue; + log.warn("Indexed Properties without non-indexed accessors are not supported skipping: " + javaType.getName() + "." + fieldname); + continue; } // Skip magic work around property used in ParameterWrapping @@ -710,7 +742,7 @@ List<XSParticle> particles = new ArrayList<XSParticle>(0); List<Class> types = new ArrayList<Class>(0); - JBossXSComplexTypeDefinition complexType = new JBossXSComplexTypeDefinition(); + JBossXSComplexTypeDefinition complexType = new JBossXSComplexTypeDefinition(); complexType.setName(name); complexType.setNamespace(namespace); @@ -718,14 +750,14 @@ xsModel.addXSElementDeclaration(sutils.createGlobalXSElementDeclaration(name, complexType, namespace)); typeMapping.register(javaType, new QName(namespace, name), null, null); registerJavaTypeMapping(new QName(namespace, name), javaType, "complexType", particles, null); - + Class superClass = javaType.getSuperclass(); if (!Exception.class.equals(superClass) || Throwable.class.equals(superClass)) { JBossXSTypeDefinition baseType = generateType(null, superClass); complexType.setBaseType(baseType); } - + generateExceptionParticles(namespace, javaType, types, particles); boolean found = hasConstructor(javaType, types); @@ -750,7 +782,7 @@ } } - complexType.setParticle(createGroupParticle(namespace, particles)); + complexType.setParticle(createGroupParticle(namespace, particles)); return complexType; } @@ -876,4 +908,15 @@ return sutils.createXSParticle(targetNS, isArray, xsel); } + + 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); + } } \ No newline at end of file Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538 (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2007-02-28 00:40:40 UTC (rev 2479) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2007-03-01 18:47:56 UTC (rev 2493) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jbws1538; - -import org.jboss.test.ws.tools.WSToolsTest; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 28 Feb 2007 - */ -public class JBWS1538TestCase extends WSToolsTest -{ - - public final void testGenerate() throws Exception - { - String resourceDir = "resources/tools/jbws1538"; - String toolsDir = "tools/jbws1538"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - - new WSTools().generate(args); - - semanticallyValidateWSDL(resourceDir + "/TestService.wsdl", toolsDir + "/wsdl/TestService.wsdl"); - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2007-03-01 18:47:56 UTC (rev 2493) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jbws1538; + +import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 28 Feb 2007 + */ +public class JBWS1538TestCase extends WSToolsTest +{ + + public final void testGenerate() throws Exception + { + String resourceDir = "resources/tools/jbws1538"; + String toolsDir = "tools/jbws1538"; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + + new WSTools().generate(args); + + semanticallyValidateWSDL(resourceDir + "/TestService.wsdl", toolsDir + "/wsdl/TestService.wsdl"); + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java =================================================================== --- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java 2007-02-28 00:40:40 UTC (rev 2479) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java 2007-03-01 18:47:56 UTC (rev 2493) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jbws1538; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 27 Feb 2007 - */ -public class LevelFour extends LevelThree -{ - - private String fieldFour; - - public String getFieldFour() - { - return fieldFour; - } - - public void setFieldFour(String fieldFour) - { - this.fieldFour = fieldFour; - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java 2007-03-01 18:47:56 UTC (rev 2493) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jbws1538; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 27 Feb 2007 + */ +public class LevelFour extends LevelThree +{ + + private String fieldFour; + + public String getFieldFour() + { + return fieldFour; + } + + public void setFieldFour(String fieldFour) + { + this.fieldFour = fieldFour; + } + +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java =================================================================== --- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java 2007-02-28 00:40:40 UTC (rev 2479) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java 2007-03-01 18:47:56 UTC (rev 2493) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jbws1538; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 27 Feb 2007 - */ -public class LevelOne -{ - - private String fieldOne; - - public String getFieldOne() - { - return fieldOne; - } - - public void setFieldOne(String fieldOne) - { - this.fieldOne = fieldOne; - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java 2007-03-01 18:47:56 UTC (rev 2493) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jbws1538; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 27 Feb 2007 + */ +public class LevelOne +{ + + private String fieldOne; + + public String getFieldOne() + { + return fieldOne; + } + + public void setFieldOne(String fieldOne) + { + this.fieldOne = fieldOne; + } + +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java =================================================================== --- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java 2007-02-28 00:40:40 UTC (rev 2479) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java 2007-03-01 18:47:56 UTC (rev 2493) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jbws1538; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 27 Feb 2007 - */ -public class LevelThree extends LevelTwo -{ - - private String fieldThree; - - public String getFieldThree() - { - return fieldThree; - } - - public void setFieldThree(String fieldThree) - { - this.fieldThree = fieldThree; - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java 2007-03-01 18:47:56 UTC (rev 2493) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jbws1538; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 27 Feb 2007 + */ +public class LevelThree extends LevelTwo +{ + + private String fieldThree; + + public String getFieldThree() + { + return fieldThree; + } + + public void setFieldThree(String fieldThree) + { + this.fieldThree = fieldThree; + } + +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java =================================================================== --- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java 2007-02-28 00:40:40 UTC (rev 2479) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java 2007-03-01 18:47:56 UTC (rev 2493) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jbws1538; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 27 Feb 2007 - */ -public class LevelTwo extends LevelOne -{ - - private String fieldTwo; - - public String getFieldTwo() - { - return fieldTwo; - } - - public void setFieldTwo(String fieldTwo) - { - this.fieldTwo = fieldTwo; - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java 2007-03-01 18:47:56 UTC (rev 2493) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jbws1538; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 27 Feb 2007 + */ +public class LevelTwo extends LevelOne +{ + + private String fieldTwo; + + public String getFieldTwo() + { + return fieldTwo; + } + + public void setFieldTwo(String fieldTwo) + { + this.fieldTwo = fieldTwo; + } + +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java =================================================================== --- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java 2007-02-28 00:40:40 UTC (rev 2479) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java 2007-03-01 18:47:56 UTC (rev 2493) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jbws1538; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 27 Feb 2007 - */ -public interface TestEndpoint extends Remote -{ - - public LevelFour echo(final LevelFour levelFour) throws RemoteException; - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java 2007-03-01 18:47:56 UTC (rev 2493) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jbws1538; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 27 Feb 2007 + */ +public interface TestEndpoint extends Remote +{ + + public LevelFour echo(final LevelFour levelFour) throws RemoteException; + +} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1538 (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl =================================================================== --- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl 2007-02-28 00:40:40 UTC (rev 2479) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl 2007-03-01 18:47:56 UTC (rev 2493) @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1538' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1538/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1538' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://org.jboss.test.ws/jbws1538/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1538/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='echoResponse'> - <sequence> - <element name='result' nillable='true' type='tns:LevelFour'/> - </sequence> - </complexType> - <complexType name='LevelFour'> - <complexContent> - <extension base='tns:LevelThree'> - <sequence> - <element name='fieldFour' nillable='true' type='string'/> - </sequence> - </extension> - </complexContent> - </complexType> - <complexType name='LevelOne'> - <sequence> - <element name='fieldOne' nillable='true' type='string'/> - </sequence> - </complexType> - <complexType name='LevelThree'> - <complexContent> - <extension base='tns:LevelTwo'> - <sequence> - <element name='fieldThree' nillable='true' type='string'/> - </sequence> - </extension> - </complexContent> - </complexType> - <complexType name='echo'> - <sequence> - <element name='LevelFour_1' nillable='true' type='tns:LevelFour'/> - </sequence> - </complexType> - <complexType name='LevelTwo'> - <complexContent> - <extension base='tns:LevelOne'> - <sequence> - <element name='fieldTwo' nillable='true' type='string'/> - </sequence> - </extension> - </complexContent> - </complexType> - <element name='echo' type='tns:echo'/> - <element name='echoResponse' type='tns:echoResponse'/> - </schema> - </types> - <message name='TestEndpoint_echo'> - <part element='ns1:echo' name='echo'/> - </message> - <message name='TestEndpoint_echoResponse'> - <part element='ns1:echoResponse' name='echoResponse'/> - </message> - <portType name='TestEndpoint'> - <operation name='echo' parameterOrder='echo'> - <input message='tns:TestEndpoint_echo'/> - <output message='tns:TestEndpoint_echoResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl) =================================================================== --- trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl 2007-03-01 18:47:56 UTC (rev 2493) @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1538' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1538/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1538' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://org.jboss.test.ws/jbws1538/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1538/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <complexType name='echoResponse'> + <sequence> + <element name='result' nillable='true' type='tns:LevelFour'/> + </sequence> + </complexType> + <complexType name='LevelFour'> + <complexContent> + <extension base='tns:LevelThree'> + <sequence> + <element name='fieldFour' nillable='true' type='string'/> + </sequence> + </extension> + </complexContent> + </complexType> + <complexType name='LevelOne'> + <sequence> + <element name='fieldOne' nillable='true' type='string'/> + </sequence> + </complexType> + <complexType name='LevelThree'> + <complexContent> + <extension base='tns:LevelTwo'> + <sequence> + <element name='fieldThree' nillable='true' type='string'/> + </sequence> + </extension> + </complexContent> + </complexType> + <complexType name='echo'> + <sequence> + <element name='LevelFour_1' nillable='true' type='tns:LevelFour'/> + </sequence> + </complexType> + <complexType name='LevelTwo'> + <complexContent> + <extension base='tns:LevelOne'> + <sequence> + <element name='fieldTwo' nillable='true' type='string'/> + </sequence> + </extension> + </complexContent> + </complexType> + <element name='echo' type='tns:echo'/> + <element name='echoResponse' type='tns:echoResponse'/> + </schema> + </types> + <message name='TestEndpoint_echo'> + <part element='ns1:echo' name='echo'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part element='ns1:echoResponse' name='echoResponse'/> + </message> + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='echo'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml 2007-02-28 00:40:40 UTC (rev 2479) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml 2007-03-01 18:47:56 UTC (rev 2493) @@ -1,116 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' 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.tools.jbws1538</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1538/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.tools.jbws1538.LevelOne</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelOne</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>fieldOne</java-variable-name> - <xml-element-name>fieldOne</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.tools.jbws1538.LevelTwo</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelTwo</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>fieldOne</java-variable-name> - <xml-element-name>fieldOne</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>fieldTwo</java-variable-name> - <xml-element-name>fieldTwo</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.tools.jbws1538.LevelThree</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelThree</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>fieldOne</java-variable-name> - <xml-element-name>fieldOne</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>fieldTwo</java-variable-name> - <xml-element-name>fieldTwo</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>fieldThree</java-variable-name> - <xml-element-name>fieldThree</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.tools.jbws1538.LevelFour</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelFour</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>fieldOne</java-variable-name> - <xml-element-name>fieldOne</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>fieldTwo</java-variable-name> - <xml-element-name>fieldTwo</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>fieldThree</java-variable-name> - <xml-element-name>fieldThree</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>fieldFour</java-variable-name> - <xml-element-name>fieldFour</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_RequestStruct</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echo</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>levelFour_1</java-variable-name> - <xml-element-name>LevelFour_1</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_ResponseStruct</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echoResponse</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>result</java-variable-name> - <xml-element-name>result</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.tools.jbws1538.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1538'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.tools.jbws1538.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1538'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1538'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echo</java-method-name> - <wsdl-operation>echo</wsdl-operation> - <wrapped-element/> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.tools.jbws1538.LevelFour</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echo</wsdl-message> - <wsdl-message-part-name>LevelFour_1</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.tools.jbws1538.LevelFour</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echoResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml 2007-03-01 18:47:56 UTC (rev 2493) @@ -0,0 +1,116 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' 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.tools.jbws1538</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1538/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.tools.jbws1538.LevelOne</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelOne</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>fieldOne</java-variable-name> + <xml-element-name>fieldOne</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.tools.jbws1538.LevelTwo</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelTwo</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>fieldOne</java-variable-name> + <xml-element-name>fieldOne</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>fieldTwo</java-variable-name> + <xml-element-name>fieldTwo</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.tools.jbws1538.LevelThree</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelThree</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>fieldOne</java-variable-name> + <xml-element-name>fieldOne</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>fieldTwo</java-variable-name> + <xml-element-name>fieldTwo</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>fieldThree</java-variable-name> + <xml-element-name>fieldThree</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.tools.jbws1538.LevelFour</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelFour</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>fieldOne</java-variable-name> + <xml-element-name>fieldOne</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>fieldTwo</java-variable-name> + <xml-element-name>fieldTwo</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>fieldThree</java-variable-name> + <xml-element-name>fieldThree</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>fieldFour</java-variable-name> + <xml-element-name>fieldFour</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_RequestStruct</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echo</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>levelFour_1</java-variable-name> + <xml-element-name>LevelFour_1</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_ResponseStruct</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echoResponse</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>result</java-variable-name> + <xml-element-name>result</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.tools.jbws1538.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1538'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestEndpointPort</port-name> + <java-port-name>TestEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.tools.jbws1538.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1538'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1538'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echo</java-method-name> + <wsdl-operation>echo</wsdl-operation> + <wrapped-element/> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.tools.jbws1538.LevelFour</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echo</wsdl-message> + <wsdl-message-part-name>LevelFour_1</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.tools.jbws1538.LevelFour</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echoResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml 2007-02-28 00:40:40 UTC (rev 2479) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml 2007-03-01 18:47:56 UTC (rev 2493) @@ -1,14 +0,0 @@ -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <java-wsdl> - <service name="TestService" - endpoint="org.jboss.test.ws.tools.jbws1538.TestEndpoint" style="document" /> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1538" - type-namespace="http://org.jboss.test.ws/jbws1538/types" /> - <mapping file="jaxrpc-mapping.xml" /> - <webservices servlet-link="TestService"/> - </java-wsdl> - -</configuration> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml 2007-03-01 18:47:56 UTC (rev 2493) @@ -0,0 +1,14 @@ +<configuration xmlns="http://www.jboss.org/jbossws-tools" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <java-wsdl> + <service name="TestService" + endpoint="org.jboss.test.ws.tools.jbws1538.TestEndpoint" style="document" /> + <namespaces target-namespace="http://org.jboss.test.ws/jbws1538" + type-namespace="http://org.jboss.test.ws/jbws1538/types" /> + <mapping file="jaxrpc-mapping.xml" /> + <webservices servlet-link="TestService"/> + </java-wsdl> + +</configuration> \ No newline at end of file