geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r509808 [9/9] - in /geronimo/server/trunk/modules/geronimo-axis2: ./ src/main/generated/org/apache/axis2/jaxws/javaee/ src/main/java/org/apache/geronimo/axis2/ src/main/java/org/apache/geronimo/axis2/client/ src/test/java/org/apache/geronim...
Date Tue, 20 Feb 2007 23:32:48 GMT
Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdQNameType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdQNameType.java?view=diff&rev=509808&r1=509807&r2=509808
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdQNameType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdQNameType.java Tue Feb 20 15:32:43 2007
@@ -1,106 +1,106 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2006.10.31 at 10:25:50 AM GMT+08:00 
-//
-
-
-package org.apache.axis2.jaxws.javaee;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-
-/**
- * 
- * 
- * 	This type adds an "id" attribute to xsd:QName.
- * 
- *       
- * 
- * <p>Java class for xsdQNameType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="xsdQNameType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>QName">
- *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "xsdQNameType", propOrder = {
-    "value"
-})
-public class XsdQNameType {
-
-    @XmlValue
-    protected QName value;
-    @XmlAttribute
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected java.lang.String id;
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link QName }
-     *     
-     */
-    public QName getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link QName }
-     *     
-     */
-    public void setValue(QName value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link java.lang.String }
-     *     
-     */
-    public java.lang.String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link java.lang.String }
-     *     
-     */
-    public void setId(java.lang.String value) {
-        this.id = value;
-    }
-
-}
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2006.10.31 at 10:25:50 AM GMT+08:00 
+//
+
+
+package org.apache.axis2.jaxws.javaee;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+
+/**
+ * 
+ * 
+ * 	This type adds an "id" attribute to xsd:QName.
+ * 
+ *       
+ * 
+ * <p>Java class for xsdQNameType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="xsdQNameType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>QName">
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "xsdQNameType", propOrder = {
+    "value"
+})
+public class XsdQNameType {
+
+    @XmlValue
+    protected QName value;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected java.lang.String id;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link QName }
+     *     
+     */
+    public QName getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link QName }
+     *     
+     */
+    public void setValue(QName value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link java.lang.String }
+     *     
+     */
+    public java.lang.String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link java.lang.String }
+     *     
+     */
+    public void setId(java.lang.String value) {
+        this.id = value;
+    }
+
+}

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdQNameType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdStringType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdStringType.java?view=diff&rev=509808&r1=509807&r2=509808
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdStringType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdStringType.java Tue Feb 20 15:32:43 2007
@@ -1,105 +1,105 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2006.10.31 at 10:25:50 AM GMT+08:00 
-//
-
-
-package org.apache.axis2.jaxws.javaee;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * 
- * 
- * 	This type adds an "id" attribute to xsd:string.
- * 
- *       
- * 
- * <p>Java class for xsdStringType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="xsdStringType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
- *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "xsdStringType", propOrder = {
-    "value"
-})
-public class XsdStringType {
-
-    @XmlValue
-    protected java.lang.String value;
-    @XmlAttribute
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    protected java.lang.String id;
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link java.lang.String }
-     *     
-     */
-    public java.lang.String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link java.lang.String }
-     *     
-     */
-    public void setValue(java.lang.String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link java.lang.String }
-     *     
-     */
-    public java.lang.String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link java.lang.String }
-     *     
-     */
-    public void setId(java.lang.String value) {
-        this.id = value;
-    }
-
-}
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2006.10.31 at 10:25:50 AM GMT+08:00 
+//
+
+
+package org.apache.axis2.jaxws.javaee;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * 
+ * 
+ * 	This type adds an "id" attribute to xsd:string.
+ * 
+ *       
+ * 
+ * <p>Java class for xsdStringType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="xsdStringType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "xsdStringType", propOrder = {
+    "value"
+})
+public class XsdStringType {
+
+    @XmlValue
+    protected java.lang.String value;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected java.lang.String id;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link java.lang.String }
+     *     
+     */
+    public java.lang.String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link java.lang.String }
+     *     
+     */
+    public void setValue(java.lang.String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link java.lang.String }
+     *     
+     */
+    public java.lang.String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link java.lang.String }
+     *     
+     */
+    public void setId(java.lang.String value) {
+        this.id = value;
+    }
+
+}

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdStringType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/package-info.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/package-info.java?view=diff&rev=509808&r1=509807&r2=509808
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/package-info.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/package-info.java Tue Feb 20 15:32:43 2007
@@ -1,9 +1,9 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2006.10.31 at 10:25:50 AM GMT+08:00 
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://java.sun.com/xml/ns/javaee", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.axis2.jaxws.javaee;
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.3-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2006.10.31 at 10:25:50 AM GMT+08:00 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://java.sun.com/xml/ns/javaee", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.axis2.jaxws.javaee;

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/package-info.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java?view=diff&rev=509808&r1=509807&r2=509808
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java Tue Feb 20 15:32:43 2007
@@ -1,196 +1,196 @@
-/**
- * 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.geronimo.axis2;
-
-import org.apache.axis2.jaxws.javaee.HandlerChainType;
-import org.apache.axis2.jaxws.javaee.HandlerChainsType;
-import org.apache.axis2.jaxws.javaee.PortComponentHandlerType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.jws.HandlerChain;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.Handler;
-import javax.xml.ws.handler.LogicalHandler;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-public class AnnotationHandlerChainBuilder {
-
-    private static final Log log = LogFactory.getLog(AnnotationHandlerChainBuilder.class);
-
-    public AnnotationHandlerChainBuilder() {
-    }
-
-    /**
-     * @param clz
-     * @param existingHandlers
-     * @return
-     */
-    public List<Handler> buildHandlerChainFromClass(Class<?> clz, List<Handler> existingHandlers) {
-        log.debug("building handler chain");
-        HandlerChainAnnotation hcAnn = findHandlerChainAnnotation(clz);
-        List<Handler> chain = null;
-        if (hcAnn == null) {
-            log.debug("no HandlerChain annotation on " + clz);
-            chain = new ArrayList<Handler>();
-        } else {
-            hcAnn.validate();
-
-            HandlerChainType hc = null;
-            try {
-                JAXBContext jc = JAXBContext
-                        .newInstance(org.apache.axis2.jaxws.javaee.ObjectFactory.class);
-                Unmarshaller u = jc.createUnmarshaller();
-                URL handlerFileURL = clz.getResource(hcAnn.getFileName());
-                JAXBElement<?> o = (JAXBElement<?>) u.unmarshal(handlerFileURL);
-
-                HandlerChainsType handlerChainsType = (HandlerChainsType) o.getValue();
-
-                if (null == handlerChainsType || handlerChainsType.getHandlerChain().size() == 0) {
-                    throw new WebServiceException("Chain not specified");
-                }
-                //We expect only one HandlerChainType here
-                hc = (HandlerChainType) handlerChainsType.getHandlerChain().iterator().next();
-            } catch (Exception e) {
-                e.printStackTrace();
-                throw new WebServiceException("Chain not specified", e);
-            }
-
-            chain = buildHandlerChain(hc, clz.getClassLoader());
-        }
-        assert chain != null;
-        if (existingHandlers != null) {
-            chain.addAll(existingHandlers);
-        }
-        return sortHandlers(chain);
-    }
-
-    public List<Handler> buildHandlerChainFromClass(Class<?> clz) {
-        return buildHandlerChainFromClass(clz, null);
-    }
-
-    private HandlerChainAnnotation findHandlerChainAnnotation(Class<?> clz) {
-
-        HandlerChain ann = clz.getAnnotation(HandlerChain.class);
-        Class<?> declaringClass = clz;
-
-        if (ann == null) {
-            for (Class<?> iface : clz.getInterfaces()) {
-                if (log.isDebugEnabled()) {
-                    log.debug("checking for HandlerChain annotation on " + iface.getName());
-                }
-                ann = iface.getAnnotation(HandlerChain.class);
-                if (ann != null) {
-                    declaringClass = iface;
-                    break;
-                }
-            }
-        }
-        if (ann != null) {
-            return new HandlerChainAnnotation(ann, declaringClass);
-        } else {
-            return null;
-        }
-    }
-
-    protected List<Handler> buildHandlerChain(HandlerChainType hc, ClassLoader classLoader) {
-        List<Handler> handlerChain = new ArrayList<Handler>();
-        for (PortComponentHandlerType ht : hc.getHandler()) {
-            try {
-                log.debug("loading handler :" + trimString(ht.getHandlerName().getValue()));
-
-                Class<? extends Handler> handlerClass = Class.forName(
-                        trimString(ht.getHandlerClass()
-                                .getValue()), true, classLoader)
-                        .asSubclass(Handler.class);
-
-                Handler handler = handlerClass.newInstance();
-                log.debug("adding handler to chain: " + handler);
-                handlerChain.add(handler);
-            } catch (Exception e) {
-                throw new WebServiceException("Failed to instantiate handler", e);
-            }
-        }
-        return handlerChain;
-    }
-
-    private String trimString(String str) {
-        return str != null ? str.trim() : null;
-    }
-
-    /**
-     * sorts the handlers into correct order. All of the logical handlers first
-     * followed by the protocol handlers
-     *
-     * @param handlers
-     * @return sorted list of handlers
-     */
-    public List<Handler> sortHandlers(List<Handler> handlers) {
-
-        List<LogicalHandler> logicalHandlers = new ArrayList<LogicalHandler>();
-        List<Handler> protocolHandlers = new ArrayList<Handler>();
-
-        for (Handler handler : handlers) {
-            if (handler instanceof LogicalHandler) {
-                logicalHandlers.add((LogicalHandler) handler);
-            } else {
-                protocolHandlers.add(handler);
-            }
-        }
-
-        List<Handler> sortedHandlers = new ArrayList<Handler>();
-        sortedHandlers.addAll(logicalHandlers);
-        sortedHandlers.addAll(protocolHandlers);
-        return sortedHandlers;
-    }
-
-    private static class HandlerChainAnnotation {
-        private final Class<?> declaringClass;
-        private final HandlerChain ann;
-
-        HandlerChainAnnotation(HandlerChain hc, Class<?> clz) {
-            ann = hc;
-            declaringClass = clz;
-        }
-
-        public Class<?> getDeclaringClass() {
-            return declaringClass;
-        }
-
-        public String getFileName() {
-            return ann.file();
-        }
-
-        public void validate() {
-            if (null == ann.file() || "".equals(ann.file())) {
-                throw new WebServiceException("@HandlerChain annotation does not contain a file name or url.");
-            }
-        }
-
-        public String toString() {
-            return "[" + declaringClass + "," + ann + "]";
-        }
-    }
-}
+/**
+ * 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.geronimo.axis2;
+
+import org.apache.axis2.jaxws.javaee.HandlerChainType;
+import org.apache.axis2.jaxws.javaee.HandlerChainsType;
+import org.apache.axis2.jaxws.javaee.PortComponentHandlerType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.jws.HandlerChain;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.LogicalHandler;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+public class AnnotationHandlerChainBuilder {
+
+    private static final Log log = LogFactory.getLog(AnnotationHandlerChainBuilder.class);
+
+    public AnnotationHandlerChainBuilder() {
+    }
+
+    /**
+     * @param clz
+     * @param existingHandlers
+     * @return
+     */
+    public List<Handler> buildHandlerChainFromClass(Class<?> clz, List<Handler> existingHandlers) {
+        log.debug("building handler chain");
+        HandlerChainAnnotation hcAnn = findHandlerChainAnnotation(clz);
+        List<Handler> chain = null;
+        if (hcAnn == null) {
+            log.debug("no HandlerChain annotation on " + clz);
+            chain = new ArrayList<Handler>();
+        } else {
+            hcAnn.validate();
+
+            HandlerChainType hc = null;
+            try {
+                JAXBContext jc = JAXBContext
+                        .newInstance(org.apache.axis2.jaxws.javaee.ObjectFactory.class);
+                Unmarshaller u = jc.createUnmarshaller();
+                URL handlerFileURL = clz.getResource(hcAnn.getFileName());
+                JAXBElement<?> o = (JAXBElement<?>) u.unmarshal(handlerFileURL);
+
+                HandlerChainsType handlerChainsType = (HandlerChainsType) o.getValue();
+
+                if (null == handlerChainsType || handlerChainsType.getHandlerChain().size() == 0) {
+                    throw new WebServiceException("Chain not specified");
+                }
+                //We expect only one HandlerChainType here
+                hc = (HandlerChainType) handlerChainsType.getHandlerChain().iterator().next();
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new WebServiceException("Chain not specified", e);
+            }
+
+            chain = buildHandlerChain(hc, clz.getClassLoader());
+        }
+        assert chain != null;
+        if (existingHandlers != null) {
+            chain.addAll(existingHandlers);
+        }
+        return sortHandlers(chain);
+    }
+
+    public List<Handler> buildHandlerChainFromClass(Class<?> clz) {
+        return buildHandlerChainFromClass(clz, null);
+    }
+
+    private HandlerChainAnnotation findHandlerChainAnnotation(Class<?> clz) {
+
+        HandlerChain ann = clz.getAnnotation(HandlerChain.class);
+        Class<?> declaringClass = clz;
+
+        if (ann == null) {
+            for (Class<?> iface : clz.getInterfaces()) {
+                if (log.isDebugEnabled()) {
+                    log.debug("checking for HandlerChain annotation on " + iface.getName());
+                }
+                ann = iface.getAnnotation(HandlerChain.class);
+                if (ann != null) {
+                    declaringClass = iface;
+                    break;
+                }
+            }
+        }
+        if (ann != null) {
+            return new HandlerChainAnnotation(ann, declaringClass);
+        } else {
+            return null;
+        }
+    }
+
+    protected List<Handler> buildHandlerChain(HandlerChainType hc, ClassLoader classLoader) {
+        List<Handler> handlerChain = new ArrayList<Handler>();
+        for (PortComponentHandlerType ht : hc.getHandler()) {
+            try {
+                log.debug("loading handler :" + trimString(ht.getHandlerName().getValue()));
+
+                Class<? extends Handler> handlerClass = Class.forName(
+                        trimString(ht.getHandlerClass()
+                                .getValue()), true, classLoader)
+                        .asSubclass(Handler.class);
+
+                Handler handler = handlerClass.newInstance();
+                log.debug("adding handler to chain: " + handler);
+                handlerChain.add(handler);
+            } catch (Exception e) {
+                throw new WebServiceException("Failed to instantiate handler", e);
+            }
+        }
+        return handlerChain;
+    }
+
+    private String trimString(String str) {
+        return str != null ? str.trim() : null;
+    }
+
+    /**
+     * sorts the handlers into correct order. All of the logical handlers first
+     * followed by the protocol handlers
+     *
+     * @param handlers
+     * @return sorted list of handlers
+     */
+    public List<Handler> sortHandlers(List<Handler> handlers) {
+
+        List<LogicalHandler> logicalHandlers = new ArrayList<LogicalHandler>();
+        List<Handler> protocolHandlers = new ArrayList<Handler>();
+
+        for (Handler handler : handlers) {
+            if (handler instanceof LogicalHandler) {
+                logicalHandlers.add((LogicalHandler) handler);
+            } else {
+                protocolHandlers.add(handler);
+            }
+        }
+
+        List<Handler> sortedHandlers = new ArrayList<Handler>();
+        sortedHandlers.addAll(logicalHandlers);
+        sortedHandlers.addAll(protocolHandlers);
+        return sortedHandlers;
+    }
+
+    private static class HandlerChainAnnotation {
+        private final Class<?> declaringClass;
+        private final HandlerChain ann;
+
+        HandlerChainAnnotation(HandlerChain hc, Class<?> clz) {
+            ann = hc;
+            declaringClass = clz;
+        }
+
+        public Class<?> getDeclaringClass() {
+            return declaringClass;
+        }
+
+        public String getFileName() {
+            return ann.file();
+        }
+
+        public void validate() {
+            if (null == ann.file() || "".equals(ann.file())) {
+                throw new WebServiceException("@HandlerChain annotation does not contain a file name or url.");
+            }
+        }
+
+        public String toString() {
+            return "[" + declaringClass + "," + ann + "]";
+        }
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2HandlerResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2HandlerResolver.java?view=diff&rev=509808&r1=509807&r2=509808
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2HandlerResolver.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2HandlerResolver.java Tue Feb 20 15:32:43 2007
@@ -1,64 +1,64 @@
-package org.apache.geronimo.axis2;
-
-import org.apache.axis2.jaxws.javaee.HandlerChainType;
-import org.apache.axis2.jaxws.javaee.HandlerChainsType;
-import org.apache.geronimo.jaxws.annotations.AnnotationException;
-import org.apache.geronimo.jaxws.annotations.AnnotationProcessor;
-
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.Handler;
-import javax.xml.ws.handler.HandlerResolver;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Axis2HandlerResolver implements HandlerResolver {
-
-    private HandlerChainsType handlerChains;
-
-    private ClassLoader classLoader;
-
-    private Class serviceClass;
-
-    private AnnotationProcessor annotationProcessor;
-
-    public Axis2HandlerResolver(ClassLoader classLoader,
-                                Class serviceClass,
-                                HandlerChainsType handlerChains,
-                                AnnotationProcessor annotationProcessor) {
-        this.classLoader = classLoader;
-        this.serviceClass = serviceClass;
-        this.handlerChains = handlerChains;
-        this.annotationProcessor = annotationProcessor;
-    }
-
-    public List<Handler> getHandlerChain(javax.xml.ws.handler.PortInfo portInfo) {
-
-        GeronimoHandlerChainBuilder builder =
-                new GeronimoHandlerChainBuilder(this.classLoader, portInfo);
-
-        List<Handler> handlers = null;
-        if (this.handlerChains == null) {
-            handlers = builder.buildHandlerChainFromClass(this.serviceClass);
-        } else {
-            handlers = new ArrayList<Handler>();
-            for (HandlerChainType handlerChain : this.handlerChains.getHandlerChain()) {
-                handlers.addAll(builder.buildHandlerChainFromConfiguration(handlerChain));
-            }
-            handlers = builder.sortHandlers(handlers);
-        }
-
-        if (this.annotationProcessor != null) {
-            try {
-                for (Handler handler : handlers) {
-                    this.annotationProcessor.processAnnotations(handler);
-                    this.annotationProcessor.invokePostConstruct(handler);
-                }
-            } catch (AnnotationException e) {
-                throw new WebServiceException("Handler annotation failed", e);
-            }
-        }
-
-        return handlers;
-    }
-
-}
+package org.apache.geronimo.axis2;
+
+import org.apache.axis2.jaxws.javaee.HandlerChainType;
+import org.apache.axis2.jaxws.javaee.HandlerChainsType;
+import org.apache.geronimo.jaxws.annotations.AnnotationException;
+import org.apache.geronimo.jaxws.annotations.AnnotationProcessor;
+
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.HandlerResolver;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Axis2HandlerResolver implements HandlerResolver {
+
+    private HandlerChainsType handlerChains;
+
+    private ClassLoader classLoader;
+
+    private Class serviceClass;
+
+    private AnnotationProcessor annotationProcessor;
+
+    public Axis2HandlerResolver(ClassLoader classLoader,
+                                Class serviceClass,
+                                HandlerChainsType handlerChains,
+                                AnnotationProcessor annotationProcessor) {
+        this.classLoader = classLoader;
+        this.serviceClass = serviceClass;
+        this.handlerChains = handlerChains;
+        this.annotationProcessor = annotationProcessor;
+    }
+
+    public List<Handler> getHandlerChain(javax.xml.ws.handler.PortInfo portInfo) {
+
+        GeronimoHandlerChainBuilder builder =
+                new GeronimoHandlerChainBuilder(this.classLoader, portInfo);
+
+        List<Handler> handlers = null;
+        if (this.handlerChains == null) {
+            handlers = builder.buildHandlerChainFromClass(this.serviceClass);
+        } else {
+            handlers = new ArrayList<Handler>();
+            for (HandlerChainType handlerChain : this.handlerChains.getHandlerChain()) {
+                handlers.addAll(builder.buildHandlerChainFromConfiguration(handlerChain));
+            }
+            handlers = builder.sortHandlers(handlers);
+        }
+
+        if (this.annotationProcessor != null) {
+            try {
+                for (Handler handler : handlers) {
+                    this.annotationProcessor.processAnnotations(handler);
+                    this.annotationProcessor.invokePostConstruct(handler);
+                }
+            } catch (AnnotationException e) {
+                throw new WebServiceException("Handler annotation failed", e);
+            }
+        }
+
+        return handlers;
+    }
+
+}

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2HandlerResolver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainerFactoryGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContext.java?view=diff&rev=509808&r1=509807&r2=509808
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContext.java Tue Feb 20 15:32:43 2007
@@ -1,42 +1,42 @@
-package org.apache.geronimo.axis2;
-
-import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.jaxws.handler.LogicalMessageContext;
-
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-import javax.servlet.http.HttpServletRequest;
-import java.security.Principal;
-
-/**
- * Implementation of WebServiceContext for POJO WS to ensure that getUserPrincipal()
- * and isUserInRole() are properly handled.
- */
-public class Axis2WebServiceContext implements WebServiceContext {
-
-    private MessageContext ctx;
-
-    public Axis2WebServiceContext(org.apache.axis2.context.MessageContext ctx) {
-        this.ctx = new LogicalMessageContext(new org.apache.axis2.jaxws.core.MessageContext(ctx));
-    }
-    
-    public final MessageContext getMessageContext() {
-        return ctx;
-    }
-
-    private HttpServletRequest getHttpServletRequest() {
-        MessageContext ctx = getMessageContext();
-        return (ctx != null) ? (HttpServletRequest)ctx.get(HTTPConstants.MC_HTTP_SERVLETREQUEST) : null;
-    }
-
-    public final Principal getUserPrincipal() {
-        HttpServletRequest request = getHttpServletRequest();
-        return (request != null) ? request.getUserPrincipal() : null;
-    }
-
-    public final boolean isUserInRole(String user) {
-        HttpServletRequest request = getHttpServletRequest();
-        return (request != null) ? request.isUserInRole(user) : false;
-    }
-
-}
+package org.apache.geronimo.axis2;
+
+import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.jaxws.handler.LogicalMessageContext;
+
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+import javax.servlet.http.HttpServletRequest;
+import java.security.Principal;
+
+/**
+ * Implementation of WebServiceContext for POJO WS to ensure that getUserPrincipal()
+ * and isUserInRole() are properly handled.
+ */
+public class Axis2WebServiceContext implements WebServiceContext {
+
+    private MessageContext ctx;
+
+    public Axis2WebServiceContext(org.apache.axis2.context.MessageContext ctx) {
+        this.ctx = new LogicalMessageContext(new org.apache.axis2.jaxws.core.MessageContext(ctx));
+    }
+    
+    public final MessageContext getMessageContext() {
+        return ctx;
+    }
+
+    private HttpServletRequest getHttpServletRequest() {
+        MessageContext ctx = getMessageContext();
+        return (ctx != null) ? (HttpServletRequest)ctx.get(HTTPConstants.MC_HTTP_SERVLETREQUEST) : null;
+    }
+
+    public final Principal getUserPrincipal() {
+        HttpServletRequest request = getHttpServletRequest();
+        return (request != null) ? request.getUserPrincipal() : null;
+    }
+
+    public final boolean isUserInRole(String user) {
+        HttpServletRequest request = getHttpServletRequest();
+        return (request != null) ? request.isUserInRole(user) : false;
+    }
+
+}

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java?view=diff&rev=509808&r1=509807&r2=509808
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java Tue Feb 20 15:32:43 2007
@@ -1,101 +1,101 @@
-package org.apache.geronimo.axis2;
-
-import org.apache.axis2.jaxws.javaee.HandlerChainType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.handler.Handler;
-import javax.xml.ws.handler.PortInfo;
-import java.util.Collections;
-import java.util.List;
-
-public class GeronimoHandlerChainBuilder extends AnnotationHandlerChainBuilder {
-    private static final Log log = LogFactory.getLog(GeronimoHandlerChainBuilder.class);
-
-    private ClassLoader classLoader = null;
-    private javax.xml.ws.handler.PortInfo portInfo;
-
-    public GeronimoHandlerChainBuilder(ClassLoader classloader,
-                                       PortInfo portInfo) {
-        this.classLoader = classloader;
-        this.portInfo = portInfo;
-    }
-
-    public ClassLoader getHandlerClassLoader() {
-        return this.classLoader;
-    }
-
-    protected List<Handler> buildHandlerChain(HandlerChainType hc,
-                                              ClassLoader classLoader) {
-        if (matchServiceName(portInfo, hc.getServiceNamePattern())
-                && matchPortName(portInfo, hc.getPortNamePattern())
-                && matchBinding(portInfo, hc.getProtocolBindings())) {
-            return super.buildHandlerChain(hc, classLoader);
-        } else {
-            return Collections.EMPTY_LIST;
-        }
-    }
-
-    private boolean matchServiceName(PortInfo info, String namePattern) {
-        return match((info == null ? null : info.getServiceName()), namePattern);
-    }
-
-    private boolean matchPortName(PortInfo info, String namePattern) {
-        return match((info == null ? null : info.getPortName()), namePattern);
-    }
-
-    private boolean matchBinding(PortInfo info, List bindings) {
-        return match((info == null ? null : info.getBindingID()), bindings);
-    }
-
-    private boolean match(String binding, List bindings) {
-        if (binding == null) {
-            return (bindings == null || bindings.isEmpty());
-        } else {
-            return (bindings == null || bindings.isEmpty()) ? true : bindings.contains(binding);
-        }
-    }
-
-    public List<Handler> buildHandlerChainFromConfiguration(HandlerChainType hc) {
-        if (null == hc) {
-            return null;
-        }
-        return sortHandlers(buildHandlerChain(hc, getHandlerClassLoader()));
-    }
-
-    /*
-     * Performs basic localName matching, namespaces are not checked!
-     */
-    private boolean match(QName name, String namePattern) {
-        if (name == null) {
-            return (namePattern == null || namePattern.equals("*"));
-        } else {
-            if (namePattern == null) {
-                return true;
-            } else {
-                String localNamePattern;
-
-                // get the local name from pattern
-                int pos = namePattern.indexOf(':');
-                localNamePattern = (pos == -1) ? namePattern : namePattern
-                        .substring(pos + 1);
-                localNamePattern = localNamePattern.trim();
-
-                if (localNamePattern.equals("*")) {
-                    // matches anything
-                    return true;
-                } else if (localNamePattern.endsWith("*")) {
-                    // match start
-                    localNamePattern = localNamePattern.substring(0,
-                            localNamePattern.length() - 1);
-                    return name.getLocalPart().startsWith(localNamePattern);
-                } else {
-                    // match exact
-                    return name.getLocalPart().equals(localNamePattern);
-                }
-            }
-        }
-    }
-
-}
+package org.apache.geronimo.axis2;
+
+import org.apache.axis2.jaxws.javaee.HandlerChainType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.PortInfo;
+import java.util.Collections;
+import java.util.List;
+
+public class GeronimoHandlerChainBuilder extends AnnotationHandlerChainBuilder {
+    private static final Log log = LogFactory.getLog(GeronimoHandlerChainBuilder.class);
+
+    private ClassLoader classLoader = null;
+    private javax.xml.ws.handler.PortInfo portInfo;
+
+    public GeronimoHandlerChainBuilder(ClassLoader classloader,
+                                       PortInfo portInfo) {
+        this.classLoader = classloader;
+        this.portInfo = portInfo;
+    }
+
+    public ClassLoader getHandlerClassLoader() {
+        return this.classLoader;
+    }
+
+    protected List<Handler> buildHandlerChain(HandlerChainType hc,
+                                              ClassLoader classLoader) {
+        if (matchServiceName(portInfo, hc.getServiceNamePattern())
+                && matchPortName(portInfo, hc.getPortNamePattern())
+                && matchBinding(portInfo, hc.getProtocolBindings())) {
+            return super.buildHandlerChain(hc, classLoader);
+        } else {
+            return Collections.EMPTY_LIST;
+        }
+    }
+
+    private boolean matchServiceName(PortInfo info, String namePattern) {
+        return match((info == null ? null : info.getServiceName()), namePattern);
+    }
+
+    private boolean matchPortName(PortInfo info, String namePattern) {
+        return match((info == null ? null : info.getPortName()), namePattern);
+    }
+
+    private boolean matchBinding(PortInfo info, List bindings) {
+        return match((info == null ? null : info.getBindingID()), bindings);
+    }
+
+    private boolean match(String binding, List bindings) {
+        if (binding == null) {
+            return (bindings == null || bindings.isEmpty());
+        } else {
+            return (bindings == null || bindings.isEmpty()) ? true : bindings.contains(binding);
+        }
+    }
+
+    public List<Handler> buildHandlerChainFromConfiguration(HandlerChainType hc) {
+        if (null == hc) {
+            return null;
+        }
+        return sortHandlers(buildHandlerChain(hc, getHandlerClassLoader()));
+    }
+
+    /*
+     * Performs basic localName matching, namespaces are not checked!
+     */
+    private boolean match(QName name, String namePattern) {
+        if (name == null) {
+            return (namePattern == null || namePattern.equals("*"));
+        } else {
+            if (namePattern == null) {
+                return true;
+            } else {
+                String localNamePattern;
+
+                // get the local name from pattern
+                int pos = namePattern.indexOf(':');
+                localNamePattern = (pos == -1) ? namePattern : namePattern
+                        .substring(pos + 1);
+                localNamePattern = localNamePattern.trim();
+
+                if (localNamePattern.equals("*")) {
+                    // matches anything
+                    return true;
+                } else if (localNamePattern.endsWith("*")) {
+                    // match start
+                    localNamePattern = localNamePattern.substring(0,
+                            localNamePattern.length() - 1);
+                    return name.getLocalPart().startsWith(localNamePattern);
+                } else {
+                    // match exact
+                    return name.getLocalPart().equals(localNamePattern);
+                }
+            }
+        }
+    }
+
+}

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/PortInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java?view=diff&rev=509808&r1=509807&r2=509808
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java Tue Feb 20 15:32:43 2007
@@ -1,52 +1,52 @@
-package org.apache.geronimo.axis2.client;
-
-import org.apache.axis2.jaxws.context.WebServiceContextImpl;
-import org.apache.axis2.jaxws.javaee.HandlerChainsType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.axis2.Axis2HandlerResolver;
-import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.jaxws.HandlerChainsUtils;
-import org.apache.geronimo.jaxws.JAXWSAnnotationProcessor;
-import org.apache.geronimo.jaxws.JNDIResolver;
-import org.apache.geronimo.jaxws.client.EndpointInfo;
-import org.apache.geronimo.jaxws.client.JAXWSServiceReference;
-
-import javax.xml.bind.JAXBException;
-import javax.xml.namespace.QName;
-import javax.xml.ws.handler.HandlerResolver;
-import java.net.URI;
-import java.util.Map;
-
-public class Axis2ServiceReference extends JAXWSServiceReference {
-
-    private static final Log log = LogFactory.getLog(Axis2ServiceReference.class);
-
-    public Axis2ServiceReference(String serviceClassName,
-                                 String referenceClassName,
-                                 URI wsdlURI,
-                                 QName serviceQName,
-                                 AbstractName name,
-                                 String handlerChainsXML,
-                                 Map<Object, EndpointInfo> seiInfoMap) {
-        super(handlerChainsXML, seiInfoMap, name, serviceQName, wsdlURI, referenceClassName, serviceClassName);
-    }
-
-    protected HandlerChainsType getHandlerChains() {
-        try {
-            return HandlerChainsUtils.toHandlerChains(this.handlerChainsXML, HandlerChainsType.class);
-        } catch (JAXBException e) {
-            // this should not happen
-            log.warn("Failed to deserialize handler chains", e);
-            return null;
-        }
-    }
-
-    protected HandlerResolver getHandlerResolver(Class serviceClass) {
-        JAXWSAnnotationProcessor annotationProcessor =
-                new JAXWSAnnotationProcessor(new JNDIResolver(), new WebServiceContextImpl());
-        Axis2HandlerResolver handlerResolver =
-                new Axis2HandlerResolver(classLoader, serviceClass, getHandlerChains(), annotationProcessor);
-        return handlerResolver;
-    }
-}
+package org.apache.geronimo.axis2.client;
+
+import org.apache.axis2.jaxws.context.WebServiceContextImpl;
+import org.apache.axis2.jaxws.javaee.HandlerChainsType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.axis2.Axis2HandlerResolver;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.jaxws.HandlerChainsUtils;
+import org.apache.geronimo.jaxws.JAXWSAnnotationProcessor;
+import org.apache.geronimo.jaxws.JNDIResolver;
+import org.apache.geronimo.jaxws.client.EndpointInfo;
+import org.apache.geronimo.jaxws.client.JAXWSServiceReference;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.namespace.QName;
+import javax.xml.ws.handler.HandlerResolver;
+import java.net.URI;
+import java.util.Map;
+
+public class Axis2ServiceReference extends JAXWSServiceReference {
+
+    private static final Log log = LogFactory.getLog(Axis2ServiceReference.class);
+
+    public Axis2ServiceReference(String serviceClassName,
+                                 String referenceClassName,
+                                 URI wsdlURI,
+                                 QName serviceQName,
+                                 AbstractName name,
+                                 String handlerChainsXML,
+                                 Map<Object, EndpointInfo> seiInfoMap) {
+        super(handlerChainsXML, seiInfoMap, name, serviceQName, wsdlURI, referenceClassName, serviceClassName);
+    }
+
+    protected HandlerChainsType getHandlerChains() {
+        try {
+            return HandlerChainsUtils.toHandlerChains(this.handlerChainsXML, HandlerChainsType.class);
+        } catch (JAXBException e) {
+            // this should not happen
+            log.warn("Failed to deserialize handler chains", e);
+            return null;
+        }
+    }
+
+    protected HandlerResolver getHandlerResolver(Class serviceClass) {
+        JAXWSAnnotationProcessor annotationProcessor =
+                new JAXWSAnnotationProcessor(new JNDIResolver(), new WebServiceContextImpl());
+        Axis2HandlerResolver handlerResolver =
+                new Axis2HandlerResolver(classLoader, serviceClass, getHandlerChains(), annotationProcessor);
+        return handlerResolver;
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2AbstractTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2HandlerResolverTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2Request.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2Response.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/TestHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/testdata/HelloWorld.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/ObjectFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/ObjectFactory.java?view=diff&rev=509808&r1=509807&r2=509808
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/ObjectFactory.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/ObjectFactory.java Tue Feb 20 15:32:43 2007
@@ -1,55 +1,55 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2007.02.20 at 06:26:22 PM EST 
-//
-
-
-package org.apache.hello_control.types;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the org.apache.hello_control.types package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.hello_control.types
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link SayHelloResponse }
-     * 
-     */
-    public SayHelloResponse createSayHelloResponse() {
-        return new SayHelloResponse();
-    }
-
-    /**
-     * Create an instance of {@link SayHello }
-     * 
-     */
-    public SayHello createSayHello() {
-        return new SayHello();
-    }
-
-}
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.02.20 at 06:26:22 PM EST 
+//
+
+
+package org.apache.hello_control.types;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the org.apache.hello_control.types package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.hello_control.types
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link SayHelloResponse }
+     * 
+     */
+    public SayHelloResponse createSayHelloResponse() {
+        return new SayHelloResponse();
+    }
+
+    /**
+     * Create an instance of {@link SayHello }
+     * 
+     */
+    public SayHello createSayHello() {
+        return new SayHello();
+    }
+
+}

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/ObjectFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/SayHello.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/SayHello.java?view=diff&rev=509808&r1=509807&r2=509808
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/SayHello.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/SayHello.java Tue Feb 20 15:32:43 2007
@@ -1,71 +1,71 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2007.02.20 at 06:26:22 PM EST 
-//
-
-
-package org.apache.hello_control.types;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="requestType" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "requestType"
-})
-@XmlRootElement(name = "sayHello")
-public class SayHello {
-
-    @XmlElement(required = true)
-    protected String requestType;
-
-    /**
-     * Gets the value of the requestType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRequestType() {
-        return requestType;
-    }
-
-    /**
-     * Sets the value of the requestType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRequestType(String value) {
-        this.requestType = value;
-    }
-
-}
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.02.20 at 06:26:22 PM EST 
+//
+
+
+package org.apache.hello_control.types;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="requestType" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "requestType"
+})
+@XmlRootElement(name = "sayHello")
+public class SayHello {
+
+    @XmlElement(required = true)
+    protected String requestType;
+
+    /**
+     * Gets the value of the requestType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRequestType() {
+        return requestType;
+    }
+
+    /**
+     * Sets the value of the requestType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRequestType(String value) {
+        this.requestType = value;
+    }
+
+}

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/SayHello.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/SayHelloResponse.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/SayHelloResponse.java?view=diff&rev=509808&r1=509807&r2=509808
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/SayHelloResponse.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/SayHelloResponse.java Tue Feb 20 15:32:43 2007
@@ -1,71 +1,71 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2007.02.20 at 06:26:22 PM EST 
-//
-
-
-package org.apache.hello_control.types;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="responseType" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "responseType"
-})
-@XmlRootElement(name = "sayHelloResponse")
-public class SayHelloResponse {
-
-    @XmlElement(required = true)
-    protected String responseType;
-
-    /**
-     * Gets the value of the responseType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getResponseType() {
-        return responseType;
-    }
-
-    /**
-     * Sets the value of the responseType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setResponseType(String value) {
-        this.responseType = value;
-    }
-
-}
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.02.20 at 06:26:22 PM EST 
+//
+
+
+package org.apache.hello_control.types;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="responseType" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "responseType"
+})
+@XmlRootElement(name = "sayHelloResponse")
+public class SayHelloResponse {
+
+    @XmlElement(required = true)
+    protected String responseType;
+
+    /**
+     * Gets the value of the responseType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getResponseType() {
+        return responseType;
+    }
+
+    /**
+     * Sets the value of the responseType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setResponseType(String value) {
+        this.responseType = value;
+    }
+
+}

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/SayHelloResponse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/package-info.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/package-info.java?view=diff&rev=509808&r1=509807&r2=509808
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/package-info.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/package-info.java Tue Feb 20 15:32:43 2007
@@ -1,9 +1,9 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2007.02.20 at 06:26:22 PM EST 
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://apache.org/hello_control/types", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.hello_control.types;
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2007.02.20 at 06:26:22 PM EST 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://apache.org/hello_control/types", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.hello_control.types;

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/hello_control/types/package-info.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-axis2/src/test/resources/test_service_doc_lit.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message