June 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3489 - in branches/jbossws-1.2.1.GA_JBWS-1703: jbossws-core/src/java/org/jboss/ws/tools and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 09:50:41 -0400 (Thu, 07 Jun 2007) New Revision: 3489 Added: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/HolderWriter.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml Removed: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/XSDToJava.java Log: JBWS-1703 - WSDL To Java - Create Custom Holders for Custom types that define INOUT parameters and OUT parameters. Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2007-06-07 13:47:44 UTC (rev 3488) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,24 +1,24 @@ /* -* 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.ws.metadata.wsdl; import java.io.File; @@ -92,10 +92,10 @@ private final Map primitiveMap = new HashMap(); - private final static Map<String,Class> schemaBasicTypes = new HashMap<String,Class>(); + private final static Map<String, Class> schemaBasicTypes = new HashMap<String, Class>(); - private final static Map<Class,Class> holderTypes = new HashMap<Class,Class>(); - private final static Map<Class,Class> reverseHolderTypes = new HashMap<Class,Class>(); + private final static Map<Class, Class> holderTypes = new HashMap<Class, Class>(); + private final static Map<Class, Class> reverseHolderTypes = new HashMap<Class, Class>(); // Skip these methods when generating wsdl operations private List<String> ignoredMethods; @@ -119,55 +119,54 @@ static { - holderTypes.put(BigDecimal.class,BigDecimalHolder.class); - holderTypes.put(BigInteger.class,BigIntegerHolder.class); - holderTypes.put(boolean.class,BooleanHolder.class); - holderTypes.put(Boolean.class,BooleanWrapperHolder.class); - holderTypes.put(byte.class,ByteHolder.class); - holderTypes.put(Byte.class,ByteWrapperHolder.class); - holderTypes.put(Byte[].class,ByteArrayHolder.class); - holderTypes.put(Calendar.class,CalendarHolder.class); - holderTypes.put(double.class,DoubleHolder.class); - holderTypes.put(Double.class,DoubleWrapperHolder.class); + holderTypes.put(BigDecimal.class, BigDecimalHolder.class); + holderTypes.put(BigInteger.class, BigIntegerHolder.class); + holderTypes.put(boolean.class, BooleanHolder.class); + holderTypes.put(Boolean.class, BooleanWrapperHolder.class); + holderTypes.put(byte.class, ByteHolder.class); + holderTypes.put(Byte.class, ByteWrapperHolder.class); + holderTypes.put(Byte[].class, ByteArrayHolder.class); + holderTypes.put(Calendar.class, CalendarHolder.class); + holderTypes.put(double.class, DoubleHolder.class); + holderTypes.put(Double.class, DoubleWrapperHolder.class); holderTypes.put(float.class, FloatHolder.class); holderTypes.put(Float.class, FloatWrapperHolder.class); - holderTypes.put(int.class,IntHolder.class); - holderTypes.put(Integer.class,IntegerWrapperHolder.class); - holderTypes.put(long.class,LongHolder.class); - holderTypes.put(Long.class,LongWrapperHolder.class); - holderTypes.put(Object.class,ObjectHolder.class); - holderTypes.put(QName.class,QNameHolder.class); - holderTypes.put(short.class,ShortHolder.class); - holderTypes.put(Short.class,ShortWrapperHolder.class); - holderTypes.put(String.class,StringHolder.class); + holderTypes.put(int.class, IntHolder.class); + holderTypes.put(Integer.class, IntegerWrapperHolder.class); + holderTypes.put(long.class, LongHolder.class); + holderTypes.put(Long.class, LongWrapperHolder.class); + holderTypes.put(Object.class, ObjectHolder.class); + holderTypes.put(QName.class, QNameHolder.class); + holderTypes.put(short.class, ShortHolder.class); + holderTypes.put(Short.class, ShortWrapperHolder.class); + holderTypes.put(String.class, StringHolder.class); } static { - reverseHolderTypes.put(BigDecimalHolder.class , BigDecimal.class); - reverseHolderTypes.put(BigIntegerHolder.class , BigInteger.class); - reverseHolderTypes.put(BooleanHolder.class , boolean.class); + reverseHolderTypes.put(BigDecimalHolder.class, BigDecimal.class); + reverseHolderTypes.put(BigIntegerHolder.class, BigInteger.class); + reverseHolderTypes.put(BooleanHolder.class, boolean.class); reverseHolderTypes.put(BooleanWrapperHolder.class, Boolean.class); reverseHolderTypes.put(ByteArrayHolder.class, Byte[].class); reverseHolderTypes.put(ByteHolder.class, byte.class); - reverseHolderTypes.put(ByteWrapperHolder.class,Byte.class ); - reverseHolderTypes.put(CalendarHolder.class,Calendar.class); - reverseHolderTypes.put(DoubleHolder.class,double.class ); - reverseHolderTypes.put(DoubleWrapperHolder.class,Double.class); - reverseHolderTypes.put(FloatHolder.class,float.class); + reverseHolderTypes.put(ByteWrapperHolder.class, Byte.class); + reverseHolderTypes.put(CalendarHolder.class, Calendar.class); + reverseHolderTypes.put(DoubleHolder.class, double.class); + reverseHolderTypes.put(DoubleWrapperHolder.class, Double.class); + reverseHolderTypes.put(FloatHolder.class, float.class); reverseHolderTypes.put(FloatWrapperHolder.class, Float.class); - reverseHolderTypes.put(IntHolder.class,int.class ); - reverseHolderTypes.put(IntegerWrapperHolder.class,Integer.class ); + reverseHolderTypes.put(IntHolder.class, int.class); + reverseHolderTypes.put(IntegerWrapperHolder.class, Integer.class); reverseHolderTypes.put(LongHolder.class, long.class); - reverseHolderTypes.put(LongWrapperHolder.class,Long.class); - reverseHolderTypes.put(ObjectHolder.class,Object.class); - reverseHolderTypes.put(QNameHolder.class,QName.class); - reverseHolderTypes.put(ShortHolder.class,short.class); - reverseHolderTypes.put(ShortWrapperHolder.class,Short.class); - reverseHolderTypes.put(StringHolder.class,String.class); + reverseHolderTypes.put(LongWrapperHolder.class, Long.class); + reverseHolderTypes.put(ObjectHolder.class, Object.class); + reverseHolderTypes.put(QNameHolder.class, QName.class); + reverseHolderTypes.put(ShortHolder.class, short.class); + reverseHolderTypes.put(ShortWrapperHolder.class, Short.class); + reverseHolderTypes.put(StringHolder.class, String.class); } - /** * Singleton - Only way to get an instance * @return @@ -220,8 +219,7 @@ //Check baseType is xsd:anyType if (baseType != null) { - if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD && - baseType.getName().equals("anyType")) + if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD && baseType.getName().equals("anyType")) bool = true; //Ignore this baseType } if (XSComplexTypeDefinition.CONTENTTYPE_SIMPLE == t.getContentType()) @@ -233,7 +231,6 @@ } - /** * Check if the class is a Java standard class * @param cls @@ -241,13 +238,14 @@ */ public boolean checkIgnoreClass(Class cls) { - if(cls == null) + if (cls == null) throw new IllegalArgumentException("Illegal null argument:cls"); //if (cls.isArray()) cls = cls.getComponentType(); if (!cls.isArray()) { String pkgname = cls.getPackage() != null ? cls.getPackage().getName() : null; - if (pkgname != null && pkgname.startsWith("java")) return true; + if (pkgname != null && pkgname.startsWith("java")) + return true; if (ParameterWrapping.WrapperType.class.isAssignableFrom(cls)) return true; @@ -256,7 +254,6 @@ return false; } - /** Check if this method should be ignored */ public boolean checkIgnoreMethod(Method method) @@ -287,7 +284,6 @@ return ignoreMethod; } - /** * Chop "PortType" at the end of the String * @param name @@ -296,7 +292,8 @@ public String chopPortType(String name) { int index = name.lastIndexOf("PortType"); - if (index > 0) return name.substring(0, index); + if (index > 0) + return name.substring(0, index); return name; } @@ -310,7 +307,8 @@ public String chop(String name, String chopstr) { int index = name.lastIndexOf(chopstr); - if (index > 0) return name.substring(0, index); + if (index > 0) + return name.substring(0, index); return name; } @@ -321,9 +319,9 @@ */ public File createPackage(String path, String packageName) { - if(packageName == null ) + if (packageName == null) throw new IllegalArgumentException("Illegal Null Argument: packageName"); - if(path == null) + if (path == null) throw new IllegalArgumentException("Illegal Null Argument: path"); String pac = packageName.replace('.', '/'); File dir = new File(path + "/" + pac); @@ -338,23 +336,22 @@ * @return * @throws IOException Problem creating the file */ - public File createPhysicalFile(File loc, String fname) - throws IOException + public File createPhysicalFile(File loc, String fname) throws IOException { - if(loc == null ) + if (loc == null) throw new IllegalArgumentException("Illegal Null Argument: loc"); - if(fname == null) + if (fname == null) throw new IllegalArgumentException("Illegal Null Argument: fname"); - File sei = new File(loc.getAbsolutePath() + "/" + fname + ".java"); - //Delete the sei if already exists - if (sei.exists()) sei.delete(); - boolean boolCreate = sei.createNewFile(); + File javaFile = new File(loc.getAbsolutePath() + "/" + fname + ".java"); + //Delete the javaFile if already exists + if (javaFile.exists()) + javaFile.delete(); + boolean boolCreate = javaFile.createNewFile(); if (!boolCreate) - throw new WSException("SEI " + fname + ".java cannot be created"); - return sei; + throw new WSException(fname + ".java cannot be created"); + return javaFile; } - /** * Create the basic template of a class * @param pkgname Package Name @@ -363,10 +360,7 @@ * @param importList Strings representing imports * @return */ - public StringBuilder createClassBasicStructure(String pkgname, - String fname, - XSTypeDefinition type, - List importList, String baseName) + public StringBuilder createClassBasicStructure(String pkgname, String fname, XSTypeDefinition type, List importList, String baseName) { StringBuilder buf = new StringBuilder(); writeJbossHeader(buf); @@ -393,8 +387,7 @@ //Check baseType is xsd:anyType if (baseType != null) { - if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD && - baseType.getName().equals("anyType")) + if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD && baseType.getName().equals("anyType")) baseType = null; //Ignore this baseType } if (XSComplexTypeDefinition.CONTENTTYPE_SIMPLE == t.getContentType()) @@ -404,9 +397,9 @@ } buf.append("public class " + fname); - if(baseName == null && baseType != null) + if (baseName == null && baseType != null) baseName = baseType.getName(); - if(baseName != null) + if (baseName != null) buf.append(" extends " + baseName); buf.append(newline); buf.append("{"); @@ -421,7 +414,7 @@ * @param name Field name to check * @return true - if public field exists, false-otherwise */ - public boolean doesPublicFieldExist( Class javaType, String name) + public boolean doesPublicFieldExist(Class javaType, String name) { Field fld = null; try @@ -442,7 +435,6 @@ return false; } - /** * Ensure that the first alphabet is uppercase * @param fname @@ -470,10 +462,11 @@ */ public int getArrayDimension(Class arr) { - if(arr == null || arr.isArray() == false) + if (arr == null || arr.isArray() == false) throw new IllegalArgumentException("Illegal null or array arg:arr"); int counter = 0; - while(arr.isArray()) { + while (arr.isArray()) + { counter += 1; arr = arr.getComponentType(); } @@ -499,14 +492,12 @@ */ public Class getJavaTypeForHolder(Class cls) { - if(Holder.class.isAssignableFrom(cls)) + if (Holder.class.isAssignableFrom(cls)) return HolderUtils.getValueType(cls); - else - return cls; + else return cls; //return reverseHolderTypes.get(cls); } - /** * An input of "HelloObjArray" is converted into arrayOfHelloObj * Applied in the input part for WSDL 1.1 Messages @@ -536,7 +527,8 @@ public static String getJustClassName(Class cls) { - if (cls == null) return null; + if (cls == null) + return null; if (cls.isArray()) { Class c = cls.getComponentType(); @@ -557,8 +549,7 @@ int index = classname.lastIndexOf("."); if (index < 0) index = 0; - else - index = index + 1; + else index = index + 1; return classname.substring(index); } @@ -619,7 +610,8 @@ */ public Class getJavaType(QName xmlType) { - if (xmlType == null) return null; + if (xmlType == null) + return null; String localPart = xmlType.getLocalPart(); return (Class)schemaBasicTypes.get(localPart); } @@ -634,14 +626,13 @@ if (str == null || str.length() == 0) throw new IllegalArgumentException("String passed to WSDLUtils.getMixedCase is null"); - if (str.length() == 1) return str.toUpperCase(); + if (str.length() == 1) + return str.toUpperCase(); char[] charr = str.toCharArray(); charr[0] = Character.toUpperCase(charr[0]); return new String(charr); } - - /** * Given a QName, provide a string that is prefix:localpart * @param qn @@ -654,7 +645,8 @@ StringBuilder sb = new StringBuilder(); String prefix = qn.getPrefix(); String localpart = qn.getLocalPart(); - if (prefix == null || prefix == "") prefix = Constants.PREFIX_TNS; + if (prefix == null || prefix == "") + prefix = Constants.PREFIX_TNS; sb.append(prefix + ":"); sb.append(localpart); @@ -666,23 +658,22 @@ * @param formattedStr string that is prefix:localpart * @return QName */ - public QName getQName( String formattedStr) + public QName getQName(String formattedStr) { QName qn = null; int ind = formattedStr.lastIndexOf(":"); - if(ind < 0) + if (ind < 0) throw new IllegalArgumentException("Formatted String is not of format prefix:localpart"); - String prefix = formattedStr.substring(0,ind); + String prefix = formattedStr.substring(0, ind); String nsuri = null; - if(Constants.PREFIX_XSD.equals(prefix)) nsuri = Constants.NS_SCHEMA_XSD; - if(nsuri == null) - qn = new QName( formattedStr.substring(ind+1) ); - else - qn = new QName( nsuri,formattedStr.substring(ind+1),prefix); + if (Constants.PREFIX_XSD.equals(prefix)) + nsuri = Constants.NS_SCHEMA_XSD; + if (nsuri == null) + qn = new QName(formattedStr.substring(ind + 1)); + else qn = new QName(nsuri, formattedStr.substring(ind + 1), prefix); return qn; } - /** * Return the primitive for a wrapper equivalent (Integer -> int) * @param str @@ -718,19 +709,20 @@ StringBuilder sb = new StringBuilder("http://"); //Generate tokens with '.' as delimiter - StringTokenizer st = new StringTokenizer(packageName,"."); + StringTokenizer st = new StringTokenizer(packageName, "."); //Have a LIFO queue for the tokens Stack<String> stk = new Stack<String>(); - while(st != null && st.hasMoreTokens()) + while (st != null && st.hasMoreTokens()) { stk.push(st.nextToken()); } String next; - while(!stk.isEmpty() && (next=stk.pop())!=null) + while (!stk.isEmpty() && (next = stk.pop()) != null) { - if(sb.toString().equals("http://") == false) sb.append("."); + if (sb.toString().equals("http://") == false) + sb.append("."); sb.append(next); } @@ -751,26 +743,25 @@ WSDLInterface wi = wsdl.getInterfaces()[0]; WSDLInterfaceOperation wio = wi.getOperations()[0]; String style = wio.getStyle(); - if(style == null || style.equals(Constants.URI_STYLE_RPC) || "rpc".equalsIgnoreCase(style)) + if (style == null || style.equals(Constants.URI_STYLE_RPC) || "rpc".equalsIgnoreCase(style)) return Constants.RPC_LITERAL; - else - return Constants.DOCUMENT_LITERAL; + else return Constants.DOCUMENT_LITERAL; } public static JBossXSModel getSchemaModel(WSDLTypes types) { if (types instanceof XSModelTypes) - return ((XSModelTypes) types).getSchemaModel(); + return ((XSModelTypes)types).getSchemaModel(); throw new WSException("WSDLTypes is not an XSModelTypes"); } public static void addSchemaModel(WSDLTypes types, String namespace, JBossXSModel model) { - if (! (types instanceof XSModelTypes)) + if (!(types instanceof XSModelTypes)) throw new WSException("WSDLTypes is not an XSModelTypes"); - XSModelTypes modelTypes = (XSModelTypes) types; + XSModelTypes modelTypes = (XSModelTypes)types; modelTypes.addSchemaModel(namespace, model); } @@ -782,10 +773,10 @@ */ public boolean isStandardHolder(Class cls) { - if(Holder.class.isAssignableFrom(cls) == false) - return false; //Not even a holder + if (Holder.class.isAssignableFrom(cls) == false) + return false; //Not even a holder //It is a holder. Is it a standard holder? - if(cls.getPackage().getName().startsWith("javax.xml.rpc")) + if (cls.getPackage().getName().startsWith("javax.xml.rpc")) return true; return false; } @@ -861,8 +852,10 @@ switch (outputs.length) { - case 0: return null; - case 1: return outputs[0]; + case 0: + return null; + case 1: + return outputs[0]; } throw new WSException("Only Request-Only and Request-Response MEPs are allowed"); @@ -876,8 +869,10 @@ switch (inputs.length) { - case 0: return null; - case 1: return inputs[0]; + case 0: + return null; + case 1: + return inputs[0]; } throw new WSException("Only Request-Only and Request-Response MEPs are allowed"); Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/HolderWriter.java (from rev 2966, branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/HolderWriter.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/HolderWriter.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/HolderWriter.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,121 @@ +/* + * 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.ws.tools; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.HashMap; + +import javax.xml.rpc.holders.Holder; + +import org.jboss.ws.WSException; +import org.jboss.ws.metadata.wsdl.WSDLUtils; + +/** + * Utility class to write JAX-RPC holders. + * + * @author darran.lofthouse(a)jboss.com + * @since 11 Apr 2007 + */ +public class HolderWriter +{ + + private static final WSDLUtils utils = WSDLUtils.getInstance(); + + private static final String newline = "\n"; + + /** + * HashMap of the holders already generated so they do not need to be + * generated again. + */ + private HashMap<String, String> createdHolders = new HashMap<String, String>(); + + String getOrCreateHolder(final String type, final File pkgLoc) + { + + String fullHolderName = createdHolders.get(type); + if (fullHolderName == null) + { + StringBuilder buf = new StringBuilder(); + fullHolderName = writeHolder(type, buf); + + createdHolders.put(type, fullHolderName); + + String holderName = fullHolderName.substring(fullHolderName.lastIndexOf('.') + 1); + + try + { + File sei = utils.createPhysicalFile(pkgLoc, holderName); + FileWriter writer = new FileWriter(sei); + writer.write(buf.toString()); + writer.flush(); + writer.close(); + } + catch (IOException e) + { + throw new WSException("Unable to create JAX-RPC holder.", e); + } + } + + return fullHolderName; + } + + private String writeHolder(final String type, final StringBuilder buf) + { + String pkg = type.substring(0, type.lastIndexOf('.')); + String typeName = type.substring(type.lastIndexOf('.') + 1); + String holderName = typeName + "Holder"; + + utils.writeJbossHeader(buf); + buf.append(newline); + buf.append("package ").append(pkg).append(";").append(newline); + + buf.append(newline); + buf.append("public class ").append(holderName).append(" implements ").append(Holder.class.getName()); + buf.append(newline).append("{").append(newline); + + // Add the public member variable. + buf.append(newline); + buf.append(" public ").append(type).append(" value;"); + buf.append(newline); + + // Add the default constructor. + buf.append(newline); + buf.append(" ").append("public ").append(holderName).append("()").append(newline); + buf.append(" {").append(newline); + buf.append(" this.value = new ").append(type).append("();").append(newline); + buf.append(" }").append(newline); + + // Add the second constructor. + buf.append(newline); + buf.append(" ").append("public ").append(holderName).append("(final ").append(type).append(" value)").append(newline); + buf.append(" {").append(newline); + buf.append(" this.value = value;").append(newline); + buf.append(" }").append(newline); + buf.append(newline); + + buf.append("}").append(newline); + return pkg + "." + holderName; + } + +} Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 13:47:44 UTC (rev 3488) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -80,7 +80,6 @@ { private String newline = "\n"; - //protected LiteralTypeMapping typeMapping = new LiteralTypeMapping(); protected LiteralTypeMapping typeMapping = null; protected WSDLDefinitions wsdl = null; @@ -90,14 +89,12 @@ */ protected WSDLUtils utils = WSDLUtils.getInstance(); - //protected XSDToJavaIntf xsdJava = new XSDToJava(); - //Feature Set protected boolean annotate = false; protected Map<String, String> namespacePackageMap = null; - //private String wsdlStyle = Constants.RPC_LITERAL; + protected HolderWriter holderWriter = new HolderWriter(); private String seiPkgName = ""; @@ -378,12 +375,12 @@ boolean holder = false; if (input != null && input.getElement() != null) { - QName xmlName = input.getElement(); + QName xmlName = input.getElement(); holder = output != null && xmlName.equals(output.getElement()); - + appendParameters(paramBuffer, input, output, xmlName.getLocalPart()); } - + if (!holder && output != null && output.getElement() != null) { QName xmlName = output.getElement(); @@ -569,8 +566,15 @@ if (className.charAt(0) == '>') className = className.substring(1); className = utils.firstLetterUpperCase(className); - buf.append(seiPkgName + "." + className + arraySuffix); + className = seiPkgName + "." + className + arraySuffix; + if (holder) + { + className = holderWriter.getOrCreateHolder(className, getLocationForJavaGeneration()); + } + + buf.append(className); + if (xt instanceof XSComplexTypeDefinition) generateJavaSource((XSComplexTypeDefinition)xt, xsmodel, containingElement); } Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/XSDToJava.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/XSDToJava.java 2007-06-07 13:47:44 UTC (rev 3488) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/XSDToJava.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -134,7 +134,7 @@ String nsuri = elmtype.getNamespace(); String tname = elmtype.getName(); if (tname != null) continue; //Consider only anon complex types - //xsdJava.createJavaFile(ctype, dirloc, packageName, xsmodel, elmname); + createJavaFile(ctype, dirloc, packageName, xsmodel, elmname); } } @@ -159,7 +159,6 @@ throw new IllegalArgumentException(str); checkXSDTypeToJava(); xsdJava.createJavaFile(type,outerElementName, loc,pkgname,schema, false); - //createJavaFile(type, schema); } private void checkXSDTypeToJava() Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429 (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,131 +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.jbws429; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.WSToolsTest; -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; - -/** - * Test case for http://jira.jboss.com/jira/browse/JBWS-429 - * - * WSDL to Java, generation of custom holders. - * - * @author darran.lofthouse(a)jboss.com - * @since 11 Apr 2007 - */ -public class JBWS429TestCase extends WSToolsTest -{ - - /** - * Test WSDL to Java with the a document/literal endpoint - * where the message part is the same for both the input - * and output message. - * - */ - public void testGenerateDocLitInOut() throws Exception - { - generateScenario("doclit_inout"); - } - - /** - * Test WSDL to Java with a rpc/literal endpoint - * where a matching message part is in the request - * and response messages. - * - */ - public void testGenerateRpcLitInOut() throws Exception - { - generateScenario("rpclit_inout"); - } - - /** - * Test WSDL to Java with a rpc/literal endpoint - * where there are multiple parts in the response - * message so a holder is required. - * - */ - public void testGenerateRpcLitOut() throws Exception - { - generateScenario("rpclit_out"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws429/" + scenario; - String toolsDir = "tools/jbws429/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws429/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws429"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,131 @@ +/* + * 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.jbws429; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; + +/** + * Test case for http://jira.jboss.com/jira/browse/JBWS-429 + * + * WSDL to Java, generation of custom holders. + * + * @author darran.lofthouse(a)jboss.com + * @since 11 Apr 2007 + */ +public class JBWS429TestCase extends WSToolsTest +{ + + /** + * Test WSDL to Java with the a document/literal endpoint + * where the message part is the same for both the input + * and output message. + * + */ + public void testGenerateDocLitInOut() throws Exception + { + generateScenario("doclit_inout"); + } + + /** + * Test WSDL to Java with a rpc/literal endpoint + * where a matching message part is in the request + * and response messages. + * + */ + public void testGenerateRpcLitInOut() throws Exception + { + generateScenario("rpclit_inout"); + } + + /** + * Test WSDL to Java with a rpc/literal endpoint + * where there are multiple parts in the response + * message so a holder is required. + * + */ + public void testGenerateRpcLitOut() throws Exception + { + generateScenario("rpclit_out"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws429/" + scenario; + String toolsDir = "tools/jbws429/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws429/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws429"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } +} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429 (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429) Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 23:01:45 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws429; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 23:01:45 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws429; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,28 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 23:01:45 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws429; - -public class PersonHolder implements javax.xml.rpc.holders.Holder -{ - - public org.jboss.test.ws.jbws429.Person value; - - public PersonHolder() - { - this.value = new org.jboss.test.ws.jbws429.Person(); - } - - public PersonHolder(final org.jboss.test.ws.jbws429.Person value) - { - this.value = value; - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,28 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 23:01:45 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws429; + +public class PersonHolder implements javax.xml.rpc.holders.Holder +{ + + public org.jboss.test.ws.jbws429.Person value; + + public PersonHolder() + { + this.value = new org.jboss.test.ws.jbws429.Person(); + } + + public PersonHolder(final org.jboss.test.ws.jbws429.Person value) + { + this.value = value; + } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws429' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws429/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws429' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws429/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws429/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='lookup'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookup' name='lookup'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws429' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws429/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws429' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws429/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws429/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='lookup'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookup' name='lookup'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 23:01:45 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws429; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public void lookup(org.jboss.test.ws.jbws429.PersonHolder lookup) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 23:01:45 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws429; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public void lookup(org.jboss.test.ws.jbws429.PersonHolder lookup) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,49 +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 xmlns='http://java.sun.com/xml/ns/j2ee'> - <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type> - <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429/types</namespaceURI> - </package-mapping> - <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type> - <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429</namespaceURI> - </package-mapping> - <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Person</root-type-qname> - <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> - <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</java-variable-name> - <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</xml-element-name> - </variable-mapping> - <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</java-variable-name> - <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name> - <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name> - <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation> - <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position> - <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</param-type> - <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-message-part-name> - <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,49 @@ +<?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 xmlns='http://java.sun.com/xml/ns/j2ee'> + <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type> + <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429/types</namespaceURI> + </package-mapping> + <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type> + <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429</namespaceURI> + </package-mapping> + <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Person</root-type-qname> + <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> + <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</java-variable-name> + <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</xml-element-name> + </variable-mapping> + <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</java-variable-name> + <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name> + <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name> + <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation> + <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position> + <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</param-type> + <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-message-part-name> + <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws429/doclit_inout/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws429/doclit_inout/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 23:58:44 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws429; - - -public class Account -{ - -protected java.lang.String accountNumber; -public Account(){} - -public Account(java.lang.String accountNumber){ -this.accountNumber=accountNumber; -} -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 23:58:44 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws429; + + +public class Account +{ + +protected java.lang.String accountNumber; +public Account(){} + +public Account(java.lang.String accountNumber){ +this.accountNumber=accountNumber; +} +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,28 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 23:58:44 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws429; - -public class AccountHolder implements javax.xml.rpc.holders.Holder -{ - - public org.jboss.test.ws.jbws429.Account value; - - public AccountHolder() - { - this.value = new org.jboss.test.ws.jbws429.Account(); - } - - public AccountHolder(final org.jboss.test.ws.jbws429.Account value) - { - this.value = value; - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,28 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 23:58:44 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws429; + +public class AccountHolder implements javax.xml.rpc.holders.Holder +{ + + public org.jboss.test.ws.jbws429.Account value; + + public AccountHolder() + { + this.value = new org.jboss.test.ws.jbws429.Account(); + } + + public AccountHolder(final org.jboss.test.ws.jbws429.Account value) + { + this.value = value; + } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 23:58:44 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws429; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 23:58:44 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws429; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws429' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws429/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws429' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - - <types xmlns='http://schemas.xmlsoap.org/wsdl/'> - <schema targetNamespace='http://test.jboss.org/ws/jbws429/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws429/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person' xmlns='http://www.w3.org/2001/XMLSchema'> - <sequence xmlns='http://www.w3.org/2001/XMLSchema'> - <element name='firstName' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> - <element name='surname' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber' xmlns='http://www.w3.org/2001/XMLSchema'> - <sequence xmlns='http://www.w3.org/2001/XMLSchema'> - <element name='areaCode' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> - <element name='number' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> - </sequence> - </complexType> - - <complexType name='Account' xmlns='http://www.w3.org/2001/XMLSchema'> - <sequence xmlns='http://www.w3.org/2001/XMLSchema'> - <element name='accountNumber' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> - </sequence> - </complexType> - - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='Person_1' type='ns1:Person' xmlns='http://schemas.xmlsoap.org/wsdl/'/> - <part name='Account' type='ns1:Account' xmlns='http://schemas.xmlsoap.org/wsdl/'/> - </message> - <message name='PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='result' type='ns1:TelephoneNumber' xmlns='http://schemas.xmlsoap.org/wsdl/'/> - <part name='Account' type='ns1:Account' xmlns='http://schemas.xmlsoap.org/wsdl/'/> - </message> - - <portType name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <operation name='lookup' parameterOrder='Person_1 Account' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <input message='tns:PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'/> - <output message='tns:PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <soap:operation soapAction=''/> - <input xmlns='http://schemas.xmlsoap.org/wsdl/'> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> - </input> - <output xmlns='http://schemas.xmlsoap.org/wsdl/'> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws429' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws429/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws429' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <types xmlns='http://schemas.xmlsoap.org/wsdl/'> + <schema targetNamespace='http://test.jboss.org/ws/jbws429/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws429/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person' xmlns='http://www.w3.org/2001/XMLSchema'> + <sequence xmlns='http://www.w3.org/2001/XMLSchema'> + <element name='firstName' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> + <element name='surname' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber' xmlns='http://www.w3.org/2001/XMLSchema'> + <sequence xmlns='http://www.w3.org/2001/XMLSchema'> + <element name='areaCode' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> + <element name='number' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> + </sequence> + </complexType> + + <complexType name='Account' xmlns='http://www.w3.org/2001/XMLSchema'> + <sequence xmlns='http://www.w3.org/2001/XMLSchema'> + <element name='accountNumber' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> + </sequence> + </complexType> + + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='Person_1' type='ns1:Person' xmlns='http://schemas.xmlsoap.org/wsdl/'/> + <part name='Account' type='ns1:Account' xmlns='http://schemas.xmlsoap.org/wsdl/'/> + </message> + <message name='PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='result' type='ns1:TelephoneNumber' xmlns='http://schemas.xmlsoap.org/wsdl/'/> + <part name='Account' type='ns1:Account' xmlns='http://schemas.xmlsoap.org/wsdl/'/> + </message> + + <portType name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <operation name='lookup' parameterOrder='Person_1 Account' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <input message='tns:PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'/> + <output message='tns:PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <soap:operation soapAction=''/> + <input xmlns='http://schemas.xmlsoap.org/wsdl/'> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> + </input> + <output xmlns='http://schemas.xmlsoap.org/wsdl/'> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 23:58:44 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws429; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws429.TelephoneNumber lookup(org.jboss.test.ws.jbws429.Person person_1, org.jboss.test.ws.jbws429.AccountHolder account) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 23:58:44 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws429; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws429.TelephoneNumber lookup(org.jboss.test.ws.jbws429.Person person_1, org.jboss.test.ws.jbws429.AccountHolder account) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 23:58:44 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws429; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 23:58:44 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws429; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,85 +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 xmlns='http://java.sun.com/xml/ns/j2ee'> - <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type> - <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429/types</namespaceURI> - </package-mapping> - <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type> - <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429</namespaceURI> - </package-mapping> - <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Person</root-type-qname> - <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> - <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</java-variable-name> - <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</xml-element-name> - </variable-mapping> - <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</java-variable-name> - <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Account</root-type-qname> - <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> - <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</java-variable-name> - <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> - <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</java-variable-name> - <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</java-variable-name> - <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name> - <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name> - <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation> - <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position> - <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</param-type> - <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Person_1</wsdl-message-part-name> - <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>1</param-position> - <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</param-type> - <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Account</wsdl-message-part-name> - <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <method-return-value xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,85 @@ +<?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 xmlns='http://java.sun.com/xml/ns/j2ee'> + <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type> + <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429/types</namespaceURI> + </package-mapping> + <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type> + <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429</namespaceURI> + </package-mapping> + <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Person</root-type-qname> + <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> + <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</java-variable-name> + <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</xml-element-name> + </variable-mapping> + <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</java-variable-name> + <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Account</root-type-qname> + <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> + <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</java-variable-name> + <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> + <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</java-variable-name> + <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</java-variable-name> + <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name> + <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name> + <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation> + <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position> + <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</param-type> + <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Person_1</wsdl-message-part-name> + <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>1</param-position> + <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</param-type> + <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Account</wsdl-message-part-name> + <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <method-return-value xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 23:58:44 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws429; - - -public class Account -{ - -protected java.lang.String accountNumber; -public Account(){} - -public Account(java.lang.String accountNumber){ -this.accountNumber=accountNumber; -} -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 23:58:44 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws429; + + +public class Account +{ + +protected java.lang.String accountNumber; +public Account(){} + +public Account(java.lang.String accountNumber){ +this.accountNumber=accountNumber; +} +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,28 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 23:58:44 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws429; - -public class AccountHolder implements javax.xml.rpc.holders.Holder -{ - - public org.jboss.test.ws.jbws429.Account value; - - public AccountHolder() - { - this.value = new org.jboss.test.ws.jbws429.Account(); - } - - public AccountHolder(final org.jboss.test.ws.jbws429.Account value) - { - this.value = value; - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,28 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 23:58:44 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws429; + +public class AccountHolder implements javax.xml.rpc.holders.Holder +{ + + public org.jboss.test.ws.jbws429.Account value; + + public AccountHolder() + { + this.value = new org.jboss.test.ws.jbws429.Account(); + } + + public AccountHolder(final org.jboss.test.ws.jbws429.Account value) + { + this.value = value; + } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 23:58:44 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws429; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 23:58:44 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws429; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws429' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws429/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws429' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - - <types xmlns='http://schemas.xmlsoap.org/wsdl/'> - <schema targetNamespace='http://test.jboss.org/ws/jbws429/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws429/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person' xmlns='http://www.w3.org/2001/XMLSchema'> - <sequence xmlns='http://www.w3.org/2001/XMLSchema'> - <element name='firstName' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> - <element name='surname' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber' xmlns='http://www.w3.org/2001/XMLSchema'> - <sequence xmlns='http://www.w3.org/2001/XMLSchema'> - <element name='areaCode' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> - <element name='number' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> - </sequence> - </complexType> - - <complexType name='Account' xmlns='http://www.w3.org/2001/XMLSchema'> - <sequence xmlns='http://www.w3.org/2001/XMLSchema'> - <element name='accountNumber' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> - </sequence> - </complexType> - - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='Person_1' type='ns1:Person' xmlns='http://schemas.xmlsoap.org/wsdl/'/> - </message> - <message name='PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='result' type='ns1:TelephoneNumber' xmlns='http://schemas.xmlsoap.org/wsdl/'/> - <part name='Account' type='ns1:Account' xmlns='http://schemas.xmlsoap.org/wsdl/'/> - </message> - - <portType name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <operation name='lookup' parameterOrder='Person_1 Account' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <input message='tns:PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'/> - <output message='tns:PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <soap:operation soapAction=''/> - <input xmlns='http://schemas.xmlsoap.org/wsdl/'> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> - </input> - <output xmlns='http://schemas.xmlsoap.org/wsdl/'> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws429' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws429/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws429' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <types xmlns='http://schemas.xmlsoap.org/wsdl/'> + <schema targetNamespace='http://test.jboss.org/ws/jbws429/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws429/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person' xmlns='http://www.w3.org/2001/XMLSchema'> + <sequence xmlns='http://www.w3.org/2001/XMLSchema'> + <element name='firstName' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> + <element name='surname' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber' xmlns='http://www.w3.org/2001/XMLSchema'> + <sequence xmlns='http://www.w3.org/2001/XMLSchema'> + <element name='areaCode' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> + <element name='number' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> + </sequence> + </complexType> + + <complexType name='Account' xmlns='http://www.w3.org/2001/XMLSchema'> + <sequence xmlns='http://www.w3.org/2001/XMLSchema'> + <element name='accountNumber' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/> + </sequence> + </complexType> + + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='Person_1' type='ns1:Person' xmlns='http://schemas.xmlsoap.org/wsdl/'/> + </message> + <message name='PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='result' type='ns1:TelephoneNumber' xmlns='http://schemas.xmlsoap.org/wsdl/'/> + <part name='Account' type='ns1:Account' xmlns='http://schemas.xmlsoap.org/wsdl/'/> + </message> + + <portType name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <operation name='lookup' parameterOrder='Person_1 Account' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <input message='tns:PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'/> + <output message='tns:PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <soap:operation soapAction=''/> + <input xmlns='http://schemas.xmlsoap.org/wsdl/'> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> + </input> + <output xmlns='http://schemas.xmlsoap.org/wsdl/'> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 23:58:44 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws429; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws429.TelephoneNumber lookup(org.jboss.test.ws.jbws429.Person person_1, org.jboss.test.ws.jbws429.AccountHolder account) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 23:58:44 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws429; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws429.TelephoneNumber lookup(org.jboss.test.ws.jbws429.Person person_1, org.jboss.test.ws.jbws429.AccountHolder account) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 23:58:44 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws429; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 23:58:44 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws429; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,85 +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 xmlns='http://java.sun.com/xml/ns/j2ee'> - <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type> - <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429/types</namespaceURI> - </package-mapping> - <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type> - <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429</namespaceURI> - </package-mapping> - <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Person</root-type-qname> - <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> - <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</java-variable-name> - <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</xml-element-name> - </variable-mapping> - <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</java-variable-name> - <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> - <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</java-variable-name> - <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</java-variable-name> - <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Account</root-type-qname> - <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> - <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</java-variable-name> - <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name> - <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name> - <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation> - <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position> - <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</param-type> - <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Person_1</wsdl-message-part-name> - <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>1</param-position> - <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</param-type> - <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Account</wsdl-message-part-name> - <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>OUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <method-return-value xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,85 @@ +<?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 xmlns='http://java.sun.com/xml/ns/j2ee'> + <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type> + <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429/types</namespaceURI> + </package-mapping> + <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type> + <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429</namespaceURI> + </package-mapping> + <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Person</root-type-qname> + <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> + <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</java-variable-name> + <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</xml-element-name> + </variable-mapping> + <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</java-variable-name> + <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> + <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</java-variable-name> + <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</java-variable-name> + <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Account</root-type-qname> + <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope> + <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</java-variable-name> + <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name> + <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name> + <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation> + <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position> + <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</param-type> + <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Person_1</wsdl-message-part-name> + <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>1</param-position> + <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</param-type> + <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Account</wsdl-message-part-name> + <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>OUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <method-return-value xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml 2007-05-04 20:46:21 UTC (rev 2966) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml 2007-06-07 13:50:41 UTC (rev 3489) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws429/rpclit_out/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml (from rev 2966, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml 2007-06-07 13:50:41 UTC (rev 3489) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws429/rpclit_out/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3488 - in branches/jbossws-1.2.1.GA_JBWS-1703: jbossws-core/src/java/org/jboss/ws/tools/helpers and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 09:47:44 -0400 (Thu, 07 Jun 2007) New Revision: 3488 Added: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml Removed: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: JBWS-1703 - WSDL To Java - document/literal, IN OUT parameter incorectly used as return type. Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 12:45:57 UTC (rev 3487) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 13:47:44 UTC (rev 3488) @@ -378,13 +378,12 @@ boolean holder = false; if (input != null && input.getElement() != null) { - QName xmlName = input.getElement(); - QName xmlType = input.getXMLType(); - JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); - + QName xmlName = input.getElement(); + holder = output != null && xmlName.equals(output.getElement()); + appendParameters(paramBuffer, input, output, xmlName.getLocalPart()); } + if (!holder && output != null && output.getElement() != null) { QName xmlName = output.getElement(); Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-07 12:45:57 UTC (rev 3487) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-07 13:47:44 UTC (rev 3488) @@ -227,8 +227,13 @@ private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop) { WSDLInterfaceOperationInput win = WSDLUtils.getWsdl11Input(wiop); + WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(wiop); + JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); MethodParamPartsMapping mpin = null; + + boolean holder = false; + if (win != null) { QName xmlName = win.getElement(); @@ -248,14 +253,19 @@ { if (xt instanceof XSSimpleTypeDefinition) xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + String paramMode = "IN"; + holder = output != null && xmlName.equals(output.getElement()); + if (holder == true) + { + paramMode = "INOUT"; + } - mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, 0, wsdlMessageName, "IN", partName, false, true); + mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, 0, wsdlMessageName, paramMode, partName, false, true); semm.addMethodParamPartsMapping(mpin); } } - WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(wiop); - if (output != null) + if (holder == false && output != null) { QName xmlName = output.getElement(); QName xmlType = output.getXMLType(); @@ -755,8 +765,10 @@ if (javaType == null) { - if(log.isDebugEnabled()) log.debug("Typemapping lookup failed for " + xmlName); - if(log.isDebugEnabled()) log.debug("Falling back to identifier generation"); + if (log.isDebugEnabled()) + log.debug("Typemapping lookup failed for " + xmlName); + if (log.isDebugEnabled()) + log.debug("Falling back to identifier generation"); String className = xmlType.getLocalPart(); if (className.charAt(0) == '>') className = className.substring(1); Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607 (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2007-05-04 20:18:42 UTC (rev 2965) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2007-06-07 13:47:44 UTC (rev 3488) @@ -1,107 +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.jbws1607; - -import java.io.File; -import java.io.FilenameFilter; - -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; - -/** - * Test case for http://jira.jboss.com/jira/browse/JBWS-1607 - * - * WSDL to Java, If an INOUT parameter has been mapped to a - * JAX-RPC holder it should not also be mapped to the return - * type. - * - * @author darran.lofthouse(a)jboss.com - * @since 11 Apr 2007 - */ -public class JBWS1607TestCase extends JBossWSTest -{ - - /** - * Test generation of the SEI. - * - * @throws Exception - */ - public void testGenerate() throws Exception - { - String resourceDir = "resources/tools/jbws1607"; - String toolsDir = "tools/jbws1607"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1607/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1607"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2007-06-07 13:47:44 UTC (rev 3488) @@ -0,0 +1,107 @@ +/* + * 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.jbws1607; + +import java.io.File; +import java.io.FilenameFilter; + +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; + +/** + * Test case for http://jira.jboss.com/jira/browse/JBWS-1607 + * + * WSDL to Java, If an INOUT parameter has been mapped to a + * JAX-RPC holder it should not also be mapped to the return + * type. + * + * @author darran.lofthouse(a)jboss.com + * @since 11 Apr 2007 + */ +public class JBWS1607TestCase extends JBossWSTest +{ + + /** + * Test generation of the SEI. + * + * @throws Exception + */ + public void testGenerate() throws Exception + { + String resourceDir = "resources/tools/jbws1607"; + String toolsDir = "tools/jbws1607"; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1607/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1607"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } +} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607 (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl 2007-05-04 20:18:42 UTC (rev 2965) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl 2007-06-07 13:47:44 UTC (rev 3488) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1607' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1607/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1607' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1607/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1607/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <element name='lookup' type='string'/> - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='lookup'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookup' name='lookup'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl 2007-06-07 13:47:44 UTC (rev 3488) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1607' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1607/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1607' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1607/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1607/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <element name='lookup' type='string'/> + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='lookup'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookup' name='lookup'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java 2007-05-04 20:18:42 UTC (rev 2965) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java 2007-06-07 13:47:44 UTC (rev 3488) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 17:06:28 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1607; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public void lookup(javax.xml.rpc.holders.StringHolder lookup) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java 2007-06-07 13:47:44 UTC (rev 3488) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 17:06:28 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1607; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public void lookup(javax.xml.rpc.holders.StringHolder lookup) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml 2007-05-04 20:18:42 UTC (rev 2965) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml 2007-06-07 13:47:44 UTC (rev 3488) @@ -1,32 +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 xmlns='http://java.sun.com/xml/ns/j2ee'> - <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws1607</package-type> - <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws1607</namespaceURI> - </package-mapping> - <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws1607.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name> - <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws1607.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name> - <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation> - <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position> - <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>java.lang.String</param-type> - <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-message-part-name> - <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml 2007-06-07 13:47:44 UTC (rev 3488) @@ -0,0 +1,32 @@ +<?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 xmlns='http://java.sun.com/xml/ns/j2ee'> + <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws1607</package-type> + <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws1607</namespaceURI> + </package-mapping> + <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws1607.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name> + <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws1607.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name> + <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation> + <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position> + <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>java.lang.String</param-type> + <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-message-part-name> + <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml 2007-05-04 20:18:42 UTC (rev 2965) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml 2007-06-07 13:47:44 UTC (rev 3488) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1607/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml 2007-06-07 13:47:44 UTC (rev 3488) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1607/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3487 - branches.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 08:45:57 -0400 (Thu, 07 Jun 2007) New Revision: 3487 Added: branches/jbossws-1.2.1.GA_JBWS-1703/ Log: Branch for JBWS-1703 Patch. Copied: branches/jbossws-1.2.1.GA_JBWS-1703 (from rev 3486, tags/jbossws-1.2.1.GA)

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3486 - branches/jbossws-2.0.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 08:29:44 -0400 (Thu, 07 Jun 2007) New Revision: 3486 Modified: branches/jbossws-2.0/mergeinfo.txt Log: Added merge for JBWS-1691 Modified: branches/jbossws-2.0/mergeinfo.txt =================================================================== --- branches/jbossws-2.0/mergeinfo.txt 2007-06-07 12:29:17 UTC (rev 3485) +++ branches/jbossws-2.0/mergeinfo.txt 2007-06-07 12:29:44 UTC (rev 3486) @@ -15,3 +15,5 @@ svn merge -r 3465:3466 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0 . svn merge -r 3469:3470 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0 . +darran.lofthouse(a)jboss.com 07-Jun-2007 +svn merge -r 3483:3484 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0 .

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3485 - in trunk/jbossws-core/src: main/java/org/jboss/ws/tools/client and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 08:29:17 -0400 (Thu, 07 Jun 2007) New Revision: 3485 Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java trunk/jbossws-core/src/test/resources/tools/jbws1691/ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml Removed: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java Log: JBWS-1691 - WSDL To Java - Initial Character of Service and SEI names should be upper case. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -183,7 +183,6 @@ File dirloc = utils.createPackage(dir.getAbsolutePath(), packageName); createSEI(dirloc, wsdl); - //xsdJava.generateJavaSource(wsdl.getTypes().getSchemaModel(), dir, packageName, true); } public Map<String, String> getNamespacePackageMap() @@ -665,7 +664,9 @@ //Check if the portType name conflicts with a service name if (wsdl.getService(seiName) != null) seiName += "_PortType"; - + + seiName = JavaUtils.capitalize(seiName); + return seiName; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,24 +1,24 @@ /* -* 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.ws.tools.client; import java.io.File; @@ -34,6 +34,7 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.interfaces.ServiceCreatorIntf; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Creates the Service Interface<br> @@ -50,17 +51,17 @@ */ public class ServiceCreator implements ServiceCreatorIntf -{ +{ /** * The Package Name */ protected String packageName = null; - + /** * Directory Location where the service file has to be created */ - protected File dirLocation = null; - + protected File dirLocation = null; + /** * Root object of the WSDL Object Graph */ @@ -68,26 +69,26 @@ /** Singleton class that handles many utility functions */ private WSDLUtils utils = WSDLUtils.getInstance(); - + /** * Constructor */ public ServiceCreator() - { + { } - + /** * Constructor * @param serviceName Service Name * @param portName Port Name of the endpoint * @param packageName Package Name of the Service interface */ - public ServiceCreator( WSDLDefinitions wsdl, String packageName) - { + public ServiceCreator(WSDLDefinitions wsdl, String packageName) + { this.wsdl = wsdl; this.packageName = packageName; - } - + } + /** * Constructor * WebServices Layer uses this @@ -96,12 +97,12 @@ * @param packageName Package Name of the Service interface * @param location Directory Location where the Service File has to be created */ - public ServiceCreator( WSDLDefinitions wsdl, String packageName, File location ) + public ServiceCreator(WSDLDefinitions wsdl, String packageName, File location) { - this( wsdl, packageName); + this(wsdl, packageName); this.dirLocation = location; - } - + } + /** * @return Returns the dirLocation. */ @@ -132,12 +133,12 @@ public void setPackageName(String packageName) { this.packageName = packageName; - } - + } + /** * @see #wsdl * @return - */ + */ public WSDLDefinitions getWsdl() { return wsdl; @@ -158,23 +159,23 @@ * */ public void createServiceDescriptor() throws IOException - { - if( packageName == null) - throw new WSException("package name is null"); - if(dirLocation == null) - throw new WSException("dir location is null"); - if(wsdl == null) - throw new WSException("wsdl definitions is null"); - + { + if (packageName == null) + throw new WSException("package name is null"); + if (dirLocation == null) + throw new WSException("dir location is null"); + if (wsdl == null) + throw new WSException("wsdl definitions is null"); + WSDLService[] services = wsdl.getServices(); - int len = services != null ? services.length : 0; - for(int i = 0 ; i < len ; i++) + int len = services != null ? services.length : 0; + for (int i = 0; i < len; i++) { generateServiceFile(services[i]); - } + } } - + //PRIVATE METHODS private void generateHeader(StringBuilder buf) { @@ -184,78 +185,77 @@ buf.append("*/" + newLine(2)); buf.append("//Auto Generated by jbossws - Please do not edit!!!"); buf.append(newLine(2)); - } + } private void generatePackageNameAndImport(StringBuilder buf) { - buf.append("package " + packageName + ";" + newLine(3)); + buf.append("package " + packageName + ";" + newLine(3)); buf.append("import javax.xml.rpc.*; " + newLine(3)); } - - + private String getReturnType(WSDLBinding wbind) { String portType = wbind.getInterface().getName().getLocalPart(); portType = utils.chopPortType(portType); - + //Check if it conflicts with a service name - if(wsdl.getService(portType) != null) + if (wsdl.getService(portType) != null) portType += "_PortType"; - return packageName + "." + portType ; + return packageName + "." + JavaUtils.capitalize(portType); } - - private void generateServiceFile(WSDLService wsdlService) throws IOException - { + { String serviceName = wsdlService.getName().getLocalPart(); if (serviceName.endsWith("Service") == false) serviceName = serviceName + "Service"; - + //Check if the serviceName conflicts with a portType or interface name - if(wsdl.getInterface(new QName(wsdl.getTargetNamespace(), serviceName)) != null ) + if (wsdl.getInterface(new QName(wsdl.getTargetNamespace(), serviceName)) != null) serviceName = new StringBuilder(serviceName).insert(serviceName.lastIndexOf("Service"), '_').toString(); - + + serviceName = JavaUtils.capitalize(serviceName); + StringBuilder buf = new StringBuilder(); generateHeader(buf); - generatePackageNameAndImport(buf); - - buf.append("public interface " + serviceName + " extends javax.xml.rpc.Service" + newLine(1)); + generatePackageNameAndImport(buf); + + buf.append("public interface " + serviceName + " extends javax.xml.rpc.Service" + newLine(1)); buf.append("{" + newLine(2)); - + WSDLEndpoint[] endpts = wsdlService.getEndpoints(); - int len = endpts != null ? endpts.length : 0; - - for( int i = 0 ; i < len ; i++) + int len = endpts != null ? endpts.length : 0; + + for (int i = 0; i < len; i++) buf.append(generateServiceMethodForWSDLEndpoint(endpts[i])).append(newLine(1)); - + buf.append("}" + newLine(1)); - + File loc = utils.createPackage(dirLocation.getAbsolutePath(), packageName); File sei = utils.createPhysicalFile(loc, serviceName); FileWriter writer = new FileWriter(sei); writer.write(buf.toString()); writer.flush(); writer.close(); - } - + } + private String generateServiceMethodForWSDLEndpoint(WSDLEndpoint endpt) { StringBuilder buf = new StringBuilder(" public "); QName bindName = endpt.getBinding(); WSDLBinding wbind = wsdl.getBinding(bindName); - - buf.append(getReturnType(wbind)).append(" get"); + + buf.append(getReturnType(wbind)).append(" get"); buf.append(endpt.getName().getLocalPart()).append("()").append(" throws ServiceException;").append(newLine(1)); return buf.toString(); } - + private String newLine(int times) - { + { String newline = "\n"; StringBuilder buf = new StringBuilder(newline); - for(int i = 0; i < times -1 ; i++) + for (int i = 0; i < times - 1; i++) buf.append(newline); return buf.toString(); } -} \ No newline at end of file +} \ No newline at end of file Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691 (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691) Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,105 +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.jbws1691; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.WSToolsTest; -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; - -/** - * Test case for http://jira.jboss.com/jira/browse/JBWS-1691 - * - * WSDL To Java should ensure the first charachter in the - * Service and SEI name are upper case. - * - * @author darran.lofthouse(a)jboss.com - * @since Jun 7, 2007 - */ -public class JBWS1691TestCase extends WSToolsTest -{ - - public void testGenerateLowerCase() throws Exception - { - generateScenario("lowercase"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1691/" + scenario; - String toolsDir = "tools/jbws1691/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1691/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1691"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = false; - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -0,0 +1,105 @@ +/* + * 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.jbws1691; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; + +/** + * Test case for http://jira.jboss.com/jira/browse/JBWS-1691 + * + * WSDL To Java should ensure the first charachter in the + * Service and SEI name are upper case. + * + * @author darran.lofthouse(a)jboss.com + * @since Jun 7, 2007 + */ +public class JBWS1691TestCase extends WSToolsTest +{ + + public void testGenerateLowerCase() throws Exception + { + generateScenario("lowercase"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1691/" + scenario; + String toolsDir = "tools/jbws1691/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1691/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1691"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = false; + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1691 (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691) Copied: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase) Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1691' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1691/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1691' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1691/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1691/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <element name='lookup' type='string'/> - <element name='lookupResponse' type='string'/> - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part element='ns1:lookup' name='lookup'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='lookupResponse'/> - </message> - <portType name='phoneBook'> - <operation name='lookup' parameterOrder='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:phoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='phoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl 2007-06-07 12:29:17 UTC (rev 3485) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1691' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1691/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1691' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1691/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1691/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <element name='lookup' type='string'/> + <element name='lookupResponse' type='string'/> + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part element='ns1:lookup' name='lookup'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='lookupResponse'/> + </message> + <portType name='phoneBook'> + <operation name='lookup' parameterOrder='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:phoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='phoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,19 +0,0 @@ -/* -* JBoss, the OpenSource EJB server -* Distributable under LGPL license. See terms of license at gnu.org. -*/ - -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jbws1691; - - -import javax.xml.rpc.*; - - -public interface PhoneBookService extends javax.xml.rpc.Service -{ - - public org.jboss.test.ws.jbws1691.PhoneBook_PortType getPhoneBookPort() throws ServiceException; - -} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -0,0 +1,19 @@ +/* +* JBoss, the OpenSource EJB server +* Distributable under LGPL license. See terms of license at gnu.org. +*/ + +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jbws1691; + + +import javax.xml.rpc.*; + + +public interface PhoneBookService extends javax.xml.rpc.Service +{ + + public org.jboss.test.ws.jbws1691.PhoneBook_PortType getPhoneBookPort() throws ServiceException; + +} Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jun 07 13:52:44 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1691; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public java.lang.String lookup(java.lang.String lookup) throws java.rmi.RemoteException; -} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jun 07 13:52:44 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1691; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public java.lang.String lookup(java.lang.String lookup) throws java.rmi.RemoteException; +} Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,37 +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.jbws1691</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1691</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1691.phoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1691'>serviceNS:phoneBook</wsdl-service-name> - <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.jbws1691.phoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1691'>portTypeNS:phoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1691'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <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/jbws1691'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>lookup</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/jbws1691'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>lookupResponse</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-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2007-06-07 12:29:17 UTC (rev 3485) @@ -0,0 +1,37 @@ +<?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.jbws1691</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1691</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1691.phoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1691'>serviceNS:phoneBook</wsdl-service-name> + <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.jbws1691.phoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1691'>portTypeNS:phoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1691'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <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/jbws1691'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>lookup</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/jbws1691'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>lookupResponse</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-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1691/lowercase/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml 2007-06-07 12:29:17 UTC (rev 3485) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1691/lowercase/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3484 - in branches/jbossws-2.0/jbossws-core/src: main/java/org/jboss/ws/tools/client and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 08:20:41 -0400 (Thu, 07 Jun 2007) New Revision: 3484 Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java Log: JBWS-1691 - WSDL To Java - Initial Character of Service and SEI names should be upper case. Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 11:59:36 UTC (rev 3483) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 12:20:41 UTC (rev 3484) @@ -183,7 +183,6 @@ File dirloc = utils.createPackage(dir.getAbsolutePath(), packageName); createSEI(dirloc, wsdl); - //xsdJava.generateJavaSource(wsdl.getTypes().getSchemaModel(), dir, packageName, true); } public Map<String, String> getNamespacePackageMap() @@ -665,7 +664,9 @@ //Check if the portType name conflicts with a service name if (wsdl.getService(seiName) != null) seiName += "_PortType"; - + + seiName = JavaUtils.capitalize(seiName); + return seiName; } Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-06-07 11:59:36 UTC (rev 3483) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-06-07 12:20:41 UTC (rev 3484) @@ -1,24 +1,24 @@ /* -* 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.ws.tools.client; import java.io.File; @@ -34,6 +34,7 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.interfaces.ServiceCreatorIntf; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Creates the Service Interface<br> @@ -50,17 +51,17 @@ */ public class ServiceCreator implements ServiceCreatorIntf -{ +{ /** * The Package Name */ protected String packageName = null; - + /** * Directory Location where the service file has to be created */ - protected File dirLocation = null; - + protected File dirLocation = null; + /** * Root object of the WSDL Object Graph */ @@ -68,26 +69,26 @@ /** Singleton class that handles many utility functions */ private WSDLUtils utils = WSDLUtils.getInstance(); - + /** * Constructor */ public ServiceCreator() - { + { } - + /** * Constructor * @param serviceName Service Name * @param portName Port Name of the endpoint * @param packageName Package Name of the Service interface */ - public ServiceCreator( WSDLDefinitions wsdl, String packageName) - { + public ServiceCreator(WSDLDefinitions wsdl, String packageName) + { this.wsdl = wsdl; this.packageName = packageName; - } - + } + /** * Constructor * WebServices Layer uses this @@ -96,12 +97,12 @@ * @param packageName Package Name of the Service interface * @param location Directory Location where the Service File has to be created */ - public ServiceCreator( WSDLDefinitions wsdl, String packageName, File location ) + public ServiceCreator(WSDLDefinitions wsdl, String packageName, File location) { - this( wsdl, packageName); + this(wsdl, packageName); this.dirLocation = location; - } - + } + /** * @return Returns the dirLocation. */ @@ -132,12 +133,12 @@ public void setPackageName(String packageName) { this.packageName = packageName; - } - + } + /** * @see #wsdl * @return - */ + */ public WSDLDefinitions getWsdl() { return wsdl; @@ -158,23 +159,23 @@ * */ public void createServiceDescriptor() throws IOException - { - if( packageName == null) - throw new WSException("package name is null"); - if(dirLocation == null) - throw new WSException("dir location is null"); - if(wsdl == null) - throw new WSException("wsdl definitions is null"); - + { + if (packageName == null) + throw new WSException("package name is null"); + if (dirLocation == null) + throw new WSException("dir location is null"); + if (wsdl == null) + throw new WSException("wsdl definitions is null"); + WSDLService[] services = wsdl.getServices(); - int len = services != null ? services.length : 0; - for(int i = 0 ; i < len ; i++) + int len = services != null ? services.length : 0; + for (int i = 0; i < len; i++) { generateServiceFile(services[i]); - } + } } - + //PRIVATE METHODS private void generateHeader(StringBuilder buf) { @@ -184,78 +185,77 @@ buf.append("*/" + newLine(2)); buf.append("//Auto Generated by jbossws - Please do not edit!!!"); buf.append(newLine(2)); - } + } private void generatePackageNameAndImport(StringBuilder buf) { - buf.append("package " + packageName + ";" + newLine(3)); + buf.append("package " + packageName + ";" + newLine(3)); buf.append("import javax.xml.rpc.*; " + newLine(3)); } - - + private String getReturnType(WSDLBinding wbind) { String portType = wbind.getInterface().getName().getLocalPart(); portType = utils.chopPortType(portType); - + //Check if it conflicts with a service name - if(wsdl.getService(portType) != null) + if (wsdl.getService(portType) != null) portType += "_PortType"; - return packageName + "." + portType ; + return packageName + "." + JavaUtils.capitalize(portType); } - - private void generateServiceFile(WSDLService wsdlService) throws IOException - { + { String serviceName = wsdlService.getName().getLocalPart(); if (serviceName.endsWith("Service") == false) serviceName = serviceName + "Service"; - + //Check if the serviceName conflicts with a portType or interface name - if(wsdl.getInterface(new QName(wsdl.getTargetNamespace(), serviceName)) != null ) + if (wsdl.getInterface(new QName(wsdl.getTargetNamespace(), serviceName)) != null) serviceName = new StringBuilder(serviceName).insert(serviceName.lastIndexOf("Service"), '_').toString(); - + + serviceName = JavaUtils.capitalize(serviceName); + StringBuilder buf = new StringBuilder(); generateHeader(buf); - generatePackageNameAndImport(buf); - - buf.append("public interface " + serviceName + " extends javax.xml.rpc.Service" + newLine(1)); + generatePackageNameAndImport(buf); + + buf.append("public interface " + serviceName + " extends javax.xml.rpc.Service" + newLine(1)); buf.append("{" + newLine(2)); - + WSDLEndpoint[] endpts = wsdlService.getEndpoints(); - int len = endpts != null ? endpts.length : 0; - - for( int i = 0 ; i < len ; i++) + int len = endpts != null ? endpts.length : 0; + + for (int i = 0; i < len; i++) buf.append(generateServiceMethodForWSDLEndpoint(endpts[i])).append(newLine(1)); - + buf.append("}" + newLine(1)); - + File loc = utils.createPackage(dirLocation.getAbsolutePath(), packageName); File sei = utils.createPhysicalFile(loc, serviceName); FileWriter writer = new FileWriter(sei); writer.write(buf.toString()); writer.flush(); writer.close(); - } - + } + private String generateServiceMethodForWSDLEndpoint(WSDLEndpoint endpt) { StringBuilder buf = new StringBuilder(" public "); QName bindName = endpt.getBinding(); WSDLBinding wbind = wsdl.getBinding(bindName); - - buf.append(getReturnType(wbind)).append(" get"); + + buf.append(getReturnType(wbind)).append(" get"); buf.append(endpt.getName().getLocalPart()).append("()").append(" throws ServiceException;").append(newLine(1)); return buf.toString(); } - + private String newLine(int times) - { + { String newline = "\n"; StringBuilder buf = new StringBuilder(newline); - for(int i = 0; i < times -1 ; i++) + for (int i = 0; i < times - 1; i++) buf.append(newline); return buf.toString(); } -} \ No newline at end of file +} \ No newline at end of file Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2007-06-07 12:20:41 UTC (rev 3484) @@ -0,0 +1,105 @@ +/* + * 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.jbws1691; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; + +/** + * Test case for http://jira.jboss.com/jira/browse/JBWS-1691 + * + * WSDL To Java should ensure the first charachter in the + * Service and SEI name are upper case. + * + * @author darran.lofthouse(a)jboss.com + * @since Jun 7, 2007 + */ +public class JBWS1691TestCase extends WSToolsTest +{ + + public void testGenerateLowerCase() throws Exception + { + generateScenario("lowercase"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1691/" + scenario; + String toolsDir = "tools/jbws1691/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1691/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1691"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = false; + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl 2007-06-07 12:20:41 UTC (rev 3484) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1691' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1691/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1691' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1691/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1691/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <element name='lookup' type='string'/> + <element name='lookupResponse' type='string'/> + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part element='ns1:lookup' name='lookup'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='lookupResponse'/> + </message> + <portType name='phoneBook'> + <operation name='lookup' parameterOrder='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:phoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='phoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java 2007-06-07 12:20:41 UTC (rev 3484) @@ -0,0 +1,19 @@ +/* +* JBoss, the OpenSource EJB server +* Distributable under LGPL license. See terms of license at gnu.org. +*/ + +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jbws1691; + + +import javax.xml.rpc.*; + + +public interface PhoneBookService extends javax.xml.rpc.Service +{ + + public org.jboss.test.ws.jbws1691.PhoneBook_PortType getPhoneBookPort() throws ServiceException; + +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java 2007-06-07 12:20:41 UTC (rev 3484) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jun 07 13:52:44 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1691; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public java.lang.String lookup(java.lang.String lookup) throws java.rmi.RemoteException; +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2007-06-07 12:20:41 UTC (rev 3484) @@ -0,0 +1,37 @@ +<?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.jbws1691</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1691</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1691.phoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1691'>serviceNS:phoneBook</wsdl-service-name> + <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.jbws1691.phoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1691'>portTypeNS:phoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1691'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <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/jbws1691'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>lookup</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/jbws1691'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>lookupResponse</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 Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml 2007-06-07 12:20:41 UTC (rev 3484) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1691/lowercase/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3483 - branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 07:59:36 -0400 (Thu, 07 Jun 2007) New Revision: 3483 Removed: branches/dlofthouse/JBWS-1697/ Log: No longer required.

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3482 - in branches/jbossws-2.0/jbossws-core: src/test/java/org/jboss/test/ws/jaxws and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-06 12:23:07 -0400 (Wed, 06 Jun 2007) New Revision: 3482 Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml Log: Fix JBWS-1566 Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-06 16:17:23 UTC (rev 3481) +++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-06 16:23:07 UTC (rev 3482) @@ -206,6 +206,13 @@ </classes> </war> +  + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/> + </fileset> + </jar> +  <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java 2007-06-06 16:23:07 UTC (rev 3482) @@ -0,0 +1,12 @@ +package org.jboss.test.ws.jaxws.jbws1566.a; + +public class AClass { + int a; + + public int getA() { + return a; + } + public void setA(int testInt) { + this.a = testInt; + } +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java 2007-06-06 16:23:07 UTC (rev 3482) @@ -0,0 +1,17 @@ +package org.jboss.test.ws.jaxws.jbws1566.a; + +public class AException extends Exception { + int ae; + + public AException() { + super(); + } + public int getAe() { + return ae; + } + + public void setAe(int parentInt) { + this.ae = parentInt; + } + +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java 2007-06-06 16:23:07 UTC (rev 3482) @@ -0,0 +1,5 @@ +package org.jboss.test.ws.jaxws.jbws1566.a; + +public enum TestEnumeration { + A,B,C; +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java 2007-06-06 16:23:07 UTC (rev 3482) @@ -0,0 +1,3 @@ +(a)javax.xml.bind.annotation.XmlSchema( + namespace = "http://test.org/wsclient/a" ) +package org.jboss.test.ws.jaxws.jbws1566.a; Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java 2007-06-06 16:23:07 UTC (rev 3482) @@ -0,0 +1,12 @@ +package org.jboss.test.ws.jaxws.jbws1566.b; + +public class BClass extends org.jboss.test.ws.jaxws.jbws1566.a.AClass { + String b; + + public String getB() { + return b; + } + public void setB(String testString) { + this.b = testString; + } +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java 2007-06-06 16:23:07 UTC (rev 3482) @@ -0,0 +1,14 @@ +package org.jboss.test.ws.jaxws.jbws1566.b; + +import org.jboss.test.ws.jaxws.jbws1566.a.AException; + +public class BException extends AException { + int be; + + public int getBe() { + return be; + } + public void setBe(int testInt) { + this.be = testInt; + } +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java 2007-06-06 16:23:07 UTC (rev 3482) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://test.org/wsclient/b" ) +package org.jboss.test.ws.jaxws.jbws1566.b; Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java 2007-06-06 16:23:07 UTC (rev 3482) @@ -0,0 +1,38 @@ +package org.jboss.test.ws.jaxws.jbws1566.c; + +import java.rmi.RemoteException; + +import org.jboss.test.ws.jaxws.jbws1566.b.BClass; +import org.jboss.test.ws.jaxws.jbws1566.b.BException; + +import org.jboss.test.ws.jaxws.jbws1566.a.TestEnumeration; +import org.jboss.wsf.spi.annotation.WebContext; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +@Stateless +@WebService( + endpointInterface = "org.jboss.test.ws.jaxws.jbws1566.c.Jaxb20TestWSInterface", + targetNamespace = "http://org.jboss.ws/samples/c", + serviceName = "WebServiceTestService", + portName = "WebServiceTestPort" +) +@WebContext( + contextRoot = "/jaxwstest" + , urlPattern="/Jaxb20StatelessTestBean/*" + , secureWSDLAccess=false +) +public class Jaxb20StatelessTestBean implements Jaxb20TestWSInterface { + + public TestEnumeration testMethod(BClass input) throws BException, RemoteException { + System.out.println("Got input: "+input +": a="+input.getA()+", b="+input.getB()); + if (input.getA()==0) { + BException ex = new BException(); + ex.setAe(11); + ex.setBe(13); + throw ex; + } + return TestEnumeration.A; + } +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java 2007-06-06 16:23:07 UTC (rev 3482) @@ -0,0 +1,55 @@ +package org.jboss.test.ws.jaxws.jbws1566.c; + +import java.net.URL; +import java.rmi.RemoteException; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + +import org.jboss.test.ws.jaxws.jbws1566.a.*; +import org.jboss.test.ws.jaxws.jbws1566.b.*; + +public class Jaxb20TestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxwstest/Jaxb20StatelessTestBean"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(Jaxb20TestCase.class, "jaxws-jbws1566.jar"); + } + + public void testWebService() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS+"?wsdl"); + System.out.println("wsdl URL:"+wsdlURL); + + QName serviceName = new QName("http://org.jboss.ws/samples/c", "WebServiceTestService"); + Service service = Service.create(wsdlURL, serviceName); + Jaxb20TestWSInterface port = service.getPort(Jaxb20TestWSInterface.class); + + BindingProvider bindingProvider = (BindingProvider)port; + Map<String, Object> reqContext = bindingProvider.getRequestContext(); + reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, TARGET_ENDPOINT_ADDRESS); + + TestEnumeration res=null; + BClass input = new BClass(); + input.setA(1); + input.setB("hello service"); + try { + res = port.testMethod(input); + assertEquals(res, TestEnumeration.A); + } catch (BException e) { + fail("Caught unexpeced TestException: "+e); + } catch (RemoteException e) { + fail("Caught unexpeced RemoteException: "+e); + } + assertNotNull(res); + } +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java 2007-06-06 16:23:07 UTC (rev 3482) @@ -0,0 +1,25 @@ +package org.jboss.test.ws.jaxws.jbws1566.c; + +import java.rmi.RemoteException; + +import org.jboss.test.ws.jaxws.jbws1566.b.BClass; +import org.jboss.test.ws.jaxws.jbws1566.b.BException; + +import org.jboss.test.ws.jaxws.jbws1566.a.TestEnumeration; + +(a)javax.jws.WebService( + targetNamespace = "http://org.jboss.ws/samples/c" +) +(a)javax.jws.soap.SOAPBinding( + style = javax.jws.soap.SOAPBinding.Style.DOCUMENT, + use = javax.jws.soap.SOAPBinding.Use.LITERAL, + parameterStyle = javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED) +public interface Jaxb20TestWSInterface extends java.rmi.Remote { + + @javax.jws.WebMethod(operationName = "TestMethod") + public @javax.jws.WebResult(name="result") TestEnumeration testMethod( + @javax.jws.WebParam(name="input", mode=javax.jws.WebParam.Mode.IN) + BClass input + ) throws BException, RemoteException; + +} \ No newline at end of file Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3481 - in trunk/jbossws-core: src/test/java/org/jboss/test/ws/jaxws and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-06 12:17:23 -0400 (Wed, 06 Jun 2007) New Revision: 3481 Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml Log: Fix JBWS-1566 Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-06 16:16:33 UTC (rev 3480) +++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-06 16:17:23 UTC (rev 3481) @@ -206,7 +206,14 @@ </classes> </war> -  +  + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/> + </fileset> + </jar> + +  <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/> Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java 2007-06-06 16:17:23 UTC (rev 3481) @@ -0,0 +1,12 @@ +package org.jboss.test.ws.jaxws.jbws1566.a; + +public class AClass { + int a; + + public int getA() { + return a; + } + public void setA(int testInt) { + this.a = testInt; + } +} Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java 2007-06-06 16:17:23 UTC (rev 3481) @@ -0,0 +1,17 @@ +package org.jboss.test.ws.jaxws.jbws1566.a; + +public class AException extends Exception { + int ae; + + public AException() { + super(); + } + public int getAe() { + return ae; + } + + public void setAe(int parentInt) { + this.ae = parentInt; + } + +} Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java 2007-06-06 16:17:23 UTC (rev 3481) @@ -0,0 +1,5 @@ +package org.jboss.test.ws.jaxws.jbws1566.a; + +public enum TestEnumeration { + A,B,C; +} Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java 2007-06-06 16:17:23 UTC (rev 3481) @@ -0,0 +1,3 @@ +(a)javax.xml.bind.annotation.XmlSchema( + namespace = "http://test.org/wsclient/a" ) +package org.jboss.test.ws.jaxws.jbws1566.a; Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java 2007-06-06 16:17:23 UTC (rev 3481) @@ -0,0 +1,12 @@ +package org.jboss.test.ws.jaxws.jbws1566.b; + +public class BClass extends org.jboss.test.ws.jaxws.jbws1566.a.AClass { + String b; + + public String getB() { + return b; + } + public void setB(String testString) { + this.b = testString; + } +} Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java 2007-06-06 16:17:23 UTC (rev 3481) @@ -0,0 +1,14 @@ +package org.jboss.test.ws.jaxws.jbws1566.b; + +import org.jboss.test.ws.jaxws.jbws1566.a.AException; + +public class BException extends AException { + int be; + + public int getBe() { + return be; + } + public void setBe(int testInt) { + this.be = testInt; + } +} Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java 2007-06-06 16:17:23 UTC (rev 3481) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://test.org/wsclient/b" ) +package org.jboss.test.ws.jaxws.jbws1566.b; Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java 2007-06-06 16:17:23 UTC (rev 3481) @@ -0,0 +1,38 @@ +package org.jboss.test.ws.jaxws.jbws1566.c; + +import java.rmi.RemoteException; + +import org.jboss.test.ws.jaxws.jbws1566.b.BClass; +import org.jboss.test.ws.jaxws.jbws1566.b.BException; + +import org.jboss.test.ws.jaxws.jbws1566.a.TestEnumeration; +import org.jboss.wsf.spi.annotation.WebContext; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +@Stateless +@WebService( + endpointInterface = "org.jboss.test.ws.jaxws.jbws1566.c.Jaxb20TestWSInterface", + targetNamespace = "http://org.jboss.ws/samples/c", + serviceName = "WebServiceTestService", + portName = "WebServiceTestPort" +) +@WebContext( + contextRoot = "/jaxwstest" + , urlPattern="/Jaxb20StatelessTestBean/*" + , secureWSDLAccess=false +) +public class Jaxb20StatelessTestBean implements Jaxb20TestWSInterface { + + public TestEnumeration testMethod(BClass input) throws BException, RemoteException { + System.out.println("Got input: "+input +": a="+input.getA()+", b="+input.getB()); + if (input.getA()==0) { + BException ex = new BException(); + ex.setAe(11); + ex.setBe(13); + throw ex; + } + return TestEnumeration.A; + } +} Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java 2007-06-06 16:17:23 UTC (rev 3481) @@ -0,0 +1,55 @@ +package org.jboss.test.ws.jaxws.jbws1566.c; + +import java.net.URL; +import java.rmi.RemoteException; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + +import org.jboss.test.ws.jaxws.jbws1566.a.*; +import org.jboss.test.ws.jaxws.jbws1566.b.*; + +public class Jaxb20TestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxwstest/Jaxb20StatelessTestBean"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(Jaxb20TestCase.class, "jaxws-jbws1566.jar"); + } + + public void testWebService() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS+"?wsdl"); + System.out.println("wsdl URL:"+wsdlURL); + + QName serviceName = new QName("http://org.jboss.ws/samples/c", "WebServiceTestService"); + Service service = Service.create(wsdlURL, serviceName); + Jaxb20TestWSInterface port = service.getPort(Jaxb20TestWSInterface.class); + + BindingProvider bindingProvider = (BindingProvider)port; + Map<String, Object> reqContext = bindingProvider.getRequestContext(); + reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, TARGET_ENDPOINT_ADDRESS); + + TestEnumeration res=null; + BClass input = new BClass(); + input.setA(1); + input.setB("hello service"); + try { + res = port.testMethod(input); + assertEquals(res, TestEnumeration.A); + } catch (BException e) { + fail("Caught unexpeced TestException: "+e); + } catch (RemoteException e) { + fail("Caught unexpeced RemoteException: "+e); + } + assertNotNull(res); + } +} Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java 2007-06-06 16:17:23 UTC (rev 3481) @@ -0,0 +1,25 @@ +package org.jboss.test.ws.jaxws.jbws1566.c; + +import java.rmi.RemoteException; + +import org.jboss.test.ws.jaxws.jbws1566.b.BClass; +import org.jboss.test.ws.jaxws.jbws1566.b.BException; + +import org.jboss.test.ws.jaxws.jbws1566.a.TestEnumeration; + +(a)javax.jws.WebService( + targetNamespace = "http://org.jboss.ws/samples/c" +) +(a)javax.jws.soap.SOAPBinding( + style = javax.jws.soap.SOAPBinding.Style.DOCUMENT, + use = javax.jws.soap.SOAPBinding.Use.LITERAL, + parameterStyle = javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED) +public interface Jaxb20TestWSInterface extends java.rmi.Remote { + + @javax.jws.WebMethod(operationName = "TestMethod") + public @javax.jws.WebResult(name="result") TestEnumeration testMethod( + @javax.jws.WebParam(name="input", mode=javax.jws.WebParam.Mode.IN) + BClass input + ) throws BException, RemoteException; + +} \ No newline at end of file Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3480 - trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-06 12:16:33 -0400 (Wed, 06 Jun 2007) New Revision: 3480 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java Log: Align with branch 2.0 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-06-06 15:03:36 UTC (rev 3479) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-06-06 16:16:33 UTC (rev 3480) @@ -173,6 +173,7 @@ { paramResult.setIndex(index); results.add(paramResult); + } } }

18 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits June 2007