dims 2003/03/02 12:11:59
Modified: java/src/org/apache/axis/wsdl/toJava Utils.java Added: java/src/org/apache/axis/holders DataHandlerHolder.java Log: Fix for Bug 17172 - WSDL2Java mistakenly produces javax.activation.holders.DataHandlerHolder Revision Changes Path 1.1 xml-axis/java/src/org/apache/axis/holders/DataHandlerHolder.java Index: DataHandlerHolder.java =================================================================== /* * The Apache Software License, Version 1.1 * * * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Axis" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this * software without prior written permission. For written * permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", * nor may "Apache" appear in their name, without prior written * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. */ package org.apache.axis.holders; import javax.xml.rpc.holders.Holder; import javax.activation.DataHandler; /** * Class DataHandlerHolder * * @version 1.0 */ public final class DataHandlerHolder implements Holder { /** Field _value */ public DataHandler value; /** * Constructor MimeMultipartHolder */ public DataHandlerHolder() {} /** * Constructor MimeMultipartHolder * * @param value */ public DataHandlerHolder(DataHandler value) { this.value = value; } } 1.71 +3 -0 xml-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java Index: Utils.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- Utils.java 28 Feb 2003 00:32:22 -0000 1.70 +++ Utils.java 2 Mar 2003 20:11:59 -0000 1.71 @@ -189,6 +189,9 @@ else if (typeValue.equals("javax.xml.namespace.QName")) { return "javax.xml.rpc.holders.QNameHolder"; } + else if (typeValue.equals("javax.activation.DataHandler")) { + return "org.apache.axis.holders.DataHandlerHolder"; + } // Check for Axis specific types and return their holders else if (typeValue.startsWith("org.apache.axis.types.")) { int i = typeValue.lastIndexOf('.');
