Author: klape Date: 2013-01-11 18:52:05 -0500 (Fri, 11 Jan 2013) New Revision: 17235 Added: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java Removed: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java Modified: thirdparty/cxf/branches/cxf-2.2.12/ thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java Log: [JBPAPP-10564] Add ways to modify ordering of property types on exception classes. Merged from -r17225:17233 of https://svn.jboss.org/repos/jbossws/thirdparty/cxf/branches/cxf-2.2.12-pa... Property changes on: thirdparty/cxf/branches/cxf-2.2.12 ___________________________________________________________________ Modified: svn:mergeinfo - /thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129:16821-17225 + /thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129:16821-17233 Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java 2013-01-11 23:08:57 UTC (rev 17234) +++ thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java 2013-01-11 23:52:05 UTC (rev 17235) @@ -38,7 +38,6 @@ import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; import javax.xml.namespace.QName; @@ -291,12 +290,10 @@ } } XmlJavaTypeAdapter xjta = cls.getAnnotation(XmlJavaTypeAdapter.class); - if (xjta != null) { - Type t = Utils.getTypeFromXmlAdapter(xjta); - if (t != null) { + if (xjta != null && Utils.getTypeFromXmlAdapter(xjta) != null) { + Type t = Utils.getTypeFromXmlAdapter(xjta); addType(t); - } - return; + return; } } else if (classes.contains(cls)) { return; @@ -314,7 +311,8 @@ adapter = f.getType().getAnnotation(XmlJavaTypeAdapter.class); } if (adapter == null) { - XmlJavaTypeAdapters adapters = f.getDeclaringClass().getPackage().getAnnotation(XmlJavaTypeAdapters.class); + XmlJavaTypeAdapters adapters = + f.getDeclaringClass().getPackage().getAnnotation(XmlJavaTypeAdapters.class); if (adapters != null) { for (XmlJavaTypeAdapter candidate : adapters.value()) { if (candidate != null && candidate.type().equals(f.getType())) { @@ -441,4 +439,4 @@ } return false; } -} \ No newline at end of file +} Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java 2013-01-11 23:08:57 UTC (rev 17234) +++ thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java 2013-01-11 23:52:05 UTC (rev 17235) @@ -48,11 +48,8 @@ import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.adapters.HexBinaryAdapter; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.attachment.AttachmentMarshaller; import javax.xml.bind.attachment.AttachmentUnmarshaller; import javax.xml.namespace.NamespaceContext; @@ -373,7 +370,7 @@ } else { Object o = Utils.getMethodValue(m, elValue); writeObject(marshaller, writer, new JAXBElement(mname, String.class, o)); - } + } } writer.writeEndElement(); writer.flush(); @@ -447,9 +444,9 @@ reader.nextTag(); while (reader.getEventType() == XMLStreamReader.START_ELEMENT) { QName q = reader.getName(); - String fieldName = q.getLocalPart(); - Field f = Utils.getField(cls, accessType, fieldName); - if (f != null) { + String fieldName = q.getLocalPart(); + Field f = Utils.getField(cls, accessType, fieldName); + if (f != null) { Type type = f.getGenericType(); f.setAccessible(true); if (JAXBSchemaInitializer.isArray(type)) { @@ -461,18 +458,16 @@ o = java.lang.reflect.Array.newInstance(compType, ret.size()); for (int x = 0; x < ret.size(); x++) { Array.set(o, x, ret.get(x)); - } + } } else { o = ret.toArray((Object[]) Array.newInstance(compType, ret.size())); - } } - - f.set(obj, o); - } else { - Object o = getElementValue(u.unmarshal(reader, Utils.getFieldType(f))); - Utils.setFieldValue(f, obj, o); } - + f.set(obj, o); + } else { + Object o = getElementValue(u.unmarshal(reader, Utils.getFieldType(f))); + Utils.setFieldValue(f, obj, o); + } } else { String s = Character.toUpperCase(q.getLocalPart().charAt(0)) + q.getLocalPart().substring(1); @@ -507,10 +502,10 @@ Utils.setMethodValue(m, m2, obj, o); } } - } - return (Exception)obj; + } + return (Exception)obj; } catch (Exception e) { - throw new Fault(new Message("MARSHAL_ERROR", LOG, e.getMessage()), e); + throw new Fault(new Message("MARSHAL_ERROR", LOG, e.getMessage()), e); } } Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java 2013-01-11 23:08:57 UTC (rev 17234) +++ thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java 2013-01-11 23:52:05 UTC (rev 17235) @@ -26,12 +26,22 @@ import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; import java.util.Iterator; +import java.util.List; +import java.util.logging.Level; import java.util.logging.Logger; import javax.xml.bind.JAXBContext; +import javax.xml.bind.annotation.XmlAccessOrder; import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorOrder; +import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlList; +import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; @@ -367,7 +377,7 @@ MessagePartInfo part = fault.getMessageParts().get(0); Class<?> cls = part.getTypeClass(); Class<?> cl2 = (Class)fault.getProperty(Class.class.getName()); - if (cls != cl2) { + if (cls != cl2) { QName name = (QName)fault.getProperty("elementName"); part.setElementQName(name); JAXBBeanInfo beanInfo = getBeanInfo(cls); @@ -426,6 +436,8 @@ XmlSchemaSequence seq = new XmlSchemaSequence(); ct.setParticle(seq); + List<XmlSchemaElement> elementList = new ArrayList<XmlSchemaElement>(); + Method methods[] = cls.getMethods(); for (Method m : methods) { if (m.getName().startsWith("get") @@ -453,15 +465,38 @@ el.setSchemaTypeName(typeName); } - seq.getItems().add(el); + elementList.add(el); } catch (Exception e) { //not mappable } } } + XmlAccessorOrder xmlAccessorOrder = cls.getAnnotation(XmlAccessorOrder.class); + XmlType xmlTypeAnno = cls.getAnnotation(XmlType.class); + String[] propertyOrder = null; + + if (xmlTypeAnno != null && xmlTypeAnno.propOrder().length > 0) { + propertyOrder = xmlTypeAnno.propOrder(); + //TODO: handle @XmlAccessOrder + } + + if (propertyOrder != null && propertyOrder.length == elementList.size()) { + sortItems(elementList, propertyOrder); + } else if (propertyOrder != null && propertyOrder.length != elementList.size()) { + LOG.log(Level.WARNING, "propOrder in @XmlType doesn't define all schema elements: " + + Arrays.toString(propertyOrder)); + } + + if (xmlAccessorOrder != null && xmlAccessorOrder.value().equals(XmlAccessOrder.ALPHABETICAL) + && propertyOrder == null) { + sort(elementList); + } + + for (XmlSchemaElement elem : elementList) { + seq.getItems().add(elem); + } } } - private void buildExceptionType(MessagePartInfo part, Class<?> cls) { SchemaInfo schemaInfo = null; @@ -471,6 +506,15 @@ break; } } + XmlAccessorOrder xmlAccessorOrder = cls.getAnnotation(XmlAccessorOrder.class); + XmlType xmlTypeAnno = cls.getAnnotation(XmlType.class); + String[] propertyOrder = null; + + if (xmlTypeAnno != null && xmlTypeAnno.propOrder().length > 0) { + propertyOrder = xmlTypeAnno.propOrder(); + //TODO: handle @XmlAccessOrder + } + XmlSchema schema; if (schemaInfo == null) { schema = schemas.newXmlSchemaInCollection(part.getElementQName().getNamespaceURI()); @@ -516,14 +560,22 @@ ct.setParticle(seq); String namespace = part.getElementQName().getNamespaceURI(); + XmlAccessorType accessorType = cls.getAnnotation(XmlAccessorType.class); + if (accessorType == null && cls.getPackage() != null) { + accessorType = cls.getPackage().getAnnotation(XmlAccessorType.class); + } + XmlAccessType accessType = Utils.getXmlAccessType(cls); + + List<XmlSchemaElement> elementList = new ArrayList<XmlSchemaElement>(); + for (Field f : Utils.getFields(cls, accessType)) { //map field Type type = Utils.getFieldType(f); JAXBBeanInfo beanInfo = getBeanInfo(type); if (beanInfo != null) { - addElement(schema, seq, beanInfo, new QName(namespace, f.getName()), isArray(type)); - } + addElement(elementList, beanInfo, new QName(namespace, f.getName()), isArray(type)); + } } for (Method m : Utils.getGetters(cls, accessType)) { //map method @@ -533,9 +585,26 @@ int idx = m.getName().startsWith("get") ? 3 : 2; String name = m.getName().substring(idx); name = Character.toLowerCase(name.charAt(0)) + name.substring(1); - addElement(schema, seq, beanInfo, new QName(namespace, name), isArray(type)); - } + addElement(elementList, beanInfo, new QName(namespace, name), isArray(type)); + } } + + if (propertyOrder != null && propertyOrder.length == elementList.size()) { + sortItems(elementList, propertyOrder); + } else if (propertyOrder != null && propertyOrder.length != elementList.size()) { + LOG.log(Level.WARNING, "propOrder in @XmlType doesn't define all schema elements: " + + Arrays.toString(propertyOrder)); + } + + if (xmlAccessorOrder != null && xmlAccessorOrder.value().equals(XmlAccessOrder.ALPHABETICAL) + && propertyOrder == null) { + sort(elementList); + } + + for (XmlSchemaElement elem : elementList) { + seq.getItems().add(elem); + } + part.setProperty(JAXBDataBinding.class.getName() + ".CUSTOM_EXCEPTION", Boolean.TRUE); } @@ -550,8 +619,7 @@ return false; } - public void addElement(XmlSchema schema, - XmlSchemaSequence seq, JAXBBeanInfo beanInfo, + public void addElement(List<XmlSchemaElement> elementList, JAXBBeanInfo beanInfo, QName name, boolean isArray) { XmlSchemaElement el = new XmlSchemaElement(); el.setName(name.getLocalPart()); @@ -581,7 +649,7 @@ el.setSchemaTypeName(typeName); } - seq.getItems().add(el); + elementList.add(el); } @@ -599,4 +667,25 @@ } return isExist; } + + //sort to Alphabetical order + private void sort(final List<XmlSchemaElement> elementList) { + Collections.sort(elementList, new Comparator<XmlSchemaElement>() { + public int compare(XmlSchemaElement e1, XmlSchemaElement e2) { + return e1.getName().compareTo(e2.getName()); + } + }); + } + + private void sortItems(List<XmlSchemaElement> elementList, String[] propOrder) { + final List<String> propList = Arrays.asList(propOrder); + + Collections.sort(elementList, new Comparator<XmlSchemaElement>() { + public int compare(XmlSchemaElement el1, XmlSchemaElement el2) { + int index1 = propList.indexOf(el1.getName()); + int index2 = propList.indexOf(el2.getName()); + return index1 - index2; + } + }); + } } Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java 2013-01-11 23:08:57 UTC (rev 17234) +++ thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java 2013-01-11 23:52:05 UTC (rev 17235) @@ -72,7 +72,8 @@ return fields; } - private static Collection<Method> getMethods(Class<?> cls, XmlAccessType accessType, boolean acceptSetters) { + private static Collection<Method> getMethods(Class<?> cls, + XmlAccessType accessType, boolean acceptSetters) { return getMethodsInternal(cls, accessType, acceptSetters); } @@ -147,7 +148,9 @@ } private static boolean isGetter(Method m) { - if (m.getReturnType() != Void.class && m.getReturnType() != Void.TYPE && m.getParameterTypes().length == 0) { + if (m.getReturnType() != Void.class + && m.getReturnType() != Void.TYPE + && m.getParameterTypes().length == 0) { Method setter = getSetter(m); if (setter != null) { return !setter.isAnnotationPresent(XmlTransient.class); @@ -251,7 +254,8 @@ adapter = f.getType().getAnnotation(XmlJavaTypeAdapter.class); } if (adapter == null) { - XmlJavaTypeAdapters adapters = f.getDeclaringClass().getPackage().getAnnotation(XmlJavaTypeAdapters.class); + XmlJavaTypeAdapters adapters = + f.getDeclaringClass().getPackage().getAnnotation(XmlJavaTypeAdapters.class); if (adapters != null) { for (XmlJavaTypeAdapter candidate : adapters.value()) { if (candidate != null && candidate.type().equals(f.getType())) { @@ -274,7 +278,8 @@ adapter = m.getReturnType().getAnnotation(XmlJavaTypeAdapter.class); } if (adapter == null) { - XmlJavaTypeAdapters adapters = m.getDeclaringClass().getPackage().getAnnotation(XmlJavaTypeAdapters.class); + XmlJavaTypeAdapters adapters = + m.getDeclaringClass().getPackage().getAnnotation(XmlJavaTypeAdapters.class); if (adapters != null) { for (XmlJavaTypeAdapter candidate : adapters.value()) { if (candidate != null && candidate.type().equals(m.getGenericReturnType())) { Deleted: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java 2013-01-11 21:19:36 UTC (rev 17233) +++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java 2013-01-11 23:52:05 UTC (rev 17235) @@ -1,26 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cxf.tools.fortest.exception; - -import javax.jws.WebService; - -@WebService(targetNamespace = "http://cxf.apache.org/test/HelloService", name = "HelloService") -public interface Echo { - String echo(String request) throws MyException; -} Copied: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java (from rev 17233, thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java) =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java 2013-01-11 23:52:05 UTC (rev 17235) @@ -0,0 +1,26 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.tools.fortest.exception; + +import javax.jws.WebService; + +@WebService(targetNamespace = "http://cxf.apache.org/test/HelloService", name = "HelloService") +public interface Echo { + String echo(String request) throws MyException; +} Deleted: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java 2013-01-11 21:19:36 UTC (rev 17233) +++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java 2013-01-11 23:52:05 UTC (rev 17235) @@ -1,33 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cxf.tools.fortest.exception; - -import javax.jws.WebService; - -@WebService(serviceName = "HelloService", - portName = "HelloPort", - endpointInterface = "org.apache.cxf.tools.fortest.exception.Echo", - targetNamespace = "http://cxf.apache.org/test/HelloService") -public class EchoImpl { - public String echo(String request) throws MyException { - return "Response"; - - } - -} Copied: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java (from rev 17233, thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java) =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java 2013-01-11 23:52:05 UTC (rev 17235) @@ -0,0 +1,33 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.tools.fortest.exception; + +import javax.jws.WebService; + +@WebService(serviceName = "HelloService", + portName = "HelloPort", + endpointInterface = "org.apache.cxf.tools.fortest.exception.Echo", + targetNamespace = "http://cxf.apache.org/test/HelloService") +public class EchoImpl { + public String echo(String request) throws MyException { + return "Response"; + + } + +} Deleted: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java 2013-01-11 21:19:36 UTC (rev 17233) +++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java 2013-01-11 23:52:05 UTC (rev 17235) @@ -1,52 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cxf.tools.fortest.exception; - -import javax.xml.bind.annotation.XmlType; - -(a)javax.xml.ws.WebFault -@XmlType(namespace = "http://cxf.apache.org/test/HelloService", - name = "MyException", - propOrder = { "summary", "from", "id" }) -public class MyException extends SuperException { - private static final long serialVersionUID = 8575109064272599936L; - private String summary; - private String from; - - public MyException(String message) { - super(message); - } - - public void setSummary(String summary) { - this.summary = summary; - } - - public void setFrom(String from) { - this.from = from; - } - - public String getSummary() { - return summary; - } - - public String getFrom() { - return from; - } - -} Copied: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java (from rev 17233, thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java) =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java 2013-01-11 23:52:05 UTC (rev 17235) @@ -0,0 +1,52 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.tools.fortest.exception; + +import javax.xml.bind.annotation.XmlType; + +(a)javax.xml.ws.WebFault +@XmlType(namespace = "http://cxf.apache.org/test/HelloService", + name = "MyException", + propOrder = { "summary", "from", "id" }) +public class MyException extends SuperException { + private static final long serialVersionUID = 8575109064272599936L; + private String summary; + private String from; + + public MyException(String message) { + super(message); + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getSummary() { + return summary; + } + + public String getFrom() { + return from; + } + +} Deleted: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java 2013-01-11 21:19:36 UTC (rev 17233) +++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java 2013-01-11 23:52:05 UTC (rev 17235) @@ -1,36 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cxf.tools.fortest.exception; - -public class SuperException extends Exception { - private static final long serialVersionUID = 1L; - private int id; - - public SuperException(String message) { - super(message); - } - - public void setId(int id) { - this.id = id; - } - - public int getId() { - return id; - } -} Copied: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java (from rev 17233, thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java) =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java 2013-01-11 23:52:05 UTC (rev 17235) @@ -0,0 +1,36 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.tools.fortest.exception; + +public class SuperException extends Exception { + private static final long serialVersionUID = 1L; + private int id; + + public SuperException(String message) { + super(message); + } + + public void setId(int id) { + this.id = id; + } + + public int getId() { + return id; + } +}