axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prad...@apache.org
Subject svn commit: r564235 [6/9] - in /webservices/axis2/branches/java/jaxws21: ./ legal/ modules/adb-codegen/src/org/apache/axis2/schema/template/ modules/adb/src/org/apache/axis2/databinding/utils/ modules/addressing/src/org/apache/axis2/handlers/addressing...
Date Thu, 09 Aug 2007 15:15:50 GMT
Modified: webservices/axis2/branches/java/jaxws21/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl Thu Aug  9 08:14:52 2007
@@ -1,311 +1,326 @@
-<!--
-  ~ 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.
-  -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output method="text"/>
-<!-- #################################################################################  -->
-    <!-- ############################   JiBX template   ##############################  -->
-    <xsl:template match="databinders[@dbtype='jaxbri']">
-
-        <xsl:variable name="base64"><xsl:value-of select="base64Elements/name"/></xsl:variable>
-        <xsl:if test="$base64">
-            private static javax.xml.namespace.QName[] qNameArray = {
-            <xsl:for-each select="base64Elements/name">
-                <xsl:if test="position()>1">,</xsl:if>new javax.xml.namespace.QName("<xsl:value-of select="@ns-url"/>","<xsl:value-of select="@localName"/>")
-            </xsl:for-each>
-            };
-        </xsl:if>
-
-        <xsl:variable name="firstType"><xsl:value-of select="param[1]/@type"/></xsl:variable>
-
-        <xsl:for-each select="param[not(@type = preceding-sibling::param/@type)]">
-            <xsl:if test="@type!=''">
-                private static final javax.xml.bind.JAXBContext _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
-            </xsl:if>
-        </xsl:for-each>
-
-        private static final java.util.HashMap&lt;Class,javax.xml.bind.JAXBContext&gt; classContextMap = new java.util.HashMap&lt;Class,javax.xml.bind.JAXBContext&gt;();
-
-        static {
-            javax.xml.bind.JAXBContext jc;
-            <xsl:for-each select="param[not(@type = preceding-sibling::param/@type)]">
-                <xsl:if test="@type!=''">
-                    jc = null;
-                    try {
-                        jc = javax.xml.bind.JAXBContext.newInstance(<xsl:value-of select="@type"/>.class);
-                    }
-                    catch ( javax.xml.bind.JAXBException ex ) {
-                        System.err.println("Unable to create JAXBContext for class: <xsl:value-of select='@type'/>");
-                        Runtime.getRuntime().exit(-1);
-                    }
-                    finally {
-                        _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/> = jc;
-                        classContextMap.put(<xsl:value-of select="@type"/>.class, jc);
-                    }
-                </xsl:if>
-            </xsl:for-each>
-        }
-
-        <xsl:for-each select="param[not(@type = preceding-sibling::param/@type)]">
-            <xsl:if test="@type!=''">
-
-                private org.apache.axiom.om.OMElement toOM(<xsl:value-of select="@type"/> param, boolean optimizeContent)
-                throws org.apache.axis2.AxisFault {
-                    try {
-                        javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
-                        javax.xml.bind.Marshaller marshaller = context.createMarshaller();
-                        marshaller.setProperty(javax.xml.bind.Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
-
-                        org.apache.axiom.om.OMFactory factory = org.apache.axiom.om.OMAbstractFactory.getOMFactory();
-
-                        JaxbRIDataSource source = new JaxbRIDataSource( <xsl:value-of select="@type"/>.class,
-                                                                        param,
-                                                                        marshaller,
-                                                                        "<xsl:value-of select="qname/@nsuri"/>",
-                                                                        "<xsl:value-of select="qname/@localname"/>");
-                        org.apache.axiom.om.OMNamespace namespace = factory.createOMNamespace("<xsl:value-of select="qame/@nsuri"/>",
-                                                                           null);
-                        return factory.createOMElement(source, "<xsl:value-of select="qname/@localname"/>", namespace);
-                    } catch (javax.xml.bind.JAXBException bex){
-                        throw org.apache.axis2.AxisFault.makeFault(bex);
-                    }
-                }
-
-                private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of select="@type"/> param, boolean optimizeContent)
-                throws org.apache.axis2.AxisFault {
-                    org.apache.axiom.soap.SOAPEnvelope envelope = factory.getDefaultEnvelope();
-                    envelope.getBody().addChild(toOM(param, optimizeContent));
-                    return envelope;
-                }
-
-                <xsl:variable name="propertyType" select="@type"/>
-                <xsl:choose>
-                    <xsl:when test="$propertyType='byte'">
-                        private byte toByte (
-                            org.apache.axiom.om.OMElement param,
-                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
-                            try {
-                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
-                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
-
-                                java.lang.Byte ret = (java.lang.Integer)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), byte.class).getValue();
-                                return ret.byteValue();
-                            } catch (javax.xml.bind.JAXBException bex){
-                                throw org.apache.axis2.AxisFault.makeFault(bex);
-                            }
-                        }
-                    </xsl:when>
-                    <xsl:when test="$propertyType='char'">
-                        private char toChar (
-                            org.apache.axiom.om.OMElement param,
-                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
-                            try {
-                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
-                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
-
-                                java.lang.Character ret = (java.lang.Character)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), char.class).getValue();
-                                return ret.charValue();
-                            } catch (javax.xml.bind.JAXBException bex){
-                                throw org.apache.axis2.AxisFault.makeFault(bex);
-                            }
-                        }
-                    </xsl:when>
-                    <xsl:when test="$propertyType='double'">
-                        private double toDouble (
-                            org.apache.axiom.om.OMElement param,
-                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
-                            try {
-                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
-                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
-
-                                java.lang.Double ret = (java.lang.Double)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), double.class).getValue();
-                                return ret.doubleValue();
-                            } catch (javax.xml.bind.JAXBException bex){
-                                throw org.apache.axis2.AxisFault.makeFault(bex);
-                            }
-                        }
-                    </xsl:when>
-                    <xsl:when test="$propertyType='float'">
-                        private float toFloat (
-                            org.apache.axiom.om.OMElement param,
-                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
-                            try {
-                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
-                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
-
-                                java.lang.Float ret = (java.lang.Float)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), float.class).getValue();
-                                return ret.floatValue();
-                            } catch (javax.xml.bind.JAXBException bex){
-                                throw org.apache.axis2.AxisFault.makeFault(bex);
-                            }
-                        }
-                    </xsl:when>
-                    <xsl:when test="$propertyType='int'">
-                        private int toInt (
-                            org.apache.axiom.om.OMElement param,
-                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
-                            try {
-                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
-                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
-
-                                java.lang.Integer ret = (java.lang.Integer)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), int.class).getValue();
-                                return ret.intValue();
-                            } catch (javax.xml.bind.JAXBException bex){
-                                throw org.apache.axis2.AxisFault.makeFault(bex);
-                            }
-                        }
-                    </xsl:when>
-                    <xsl:when test="$propertyType='long'">
-                        private long toLong (
-                            org.apache.axiom.om.OMElement param,
-                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
-                            try {
-                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
-                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
-
-                                java.lang.Long ret = (java.lang.Long)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), long.class).getValue();
-                                return ret.longValue();
-                            } catch (javax.xml.bind.JAXBException bex){
-                                throw org.apache.axis2.AxisFault.makeFault(bex);
-                            }
-                        }
-                    </xsl:when>
-                    <xsl:when test="$propertyType='short'">
-                        private short toShort (
-                            org.apache.axiom.om.OMElement param,
-                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
-                            try {
-                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
-                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
-
-                                java.lang.Short ret = (java.lang.Short)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), short.class).getValue();
-                                return ret.shortValue();
-                            } catch (javax.xml.bind.JAXBException bex){
-                                throw org.apache.axis2.AxisFault.makeFault(bex);
-                            }
-                        }
-                    </xsl:when>
-                </xsl:choose>
-            </xsl:if>
-        </xsl:for-each>
-
-        /**
-        *  get the default envelope
-        */
-        private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory) {
-            return factory.getDefaultEnvelope();
-        }
-
-        private java.lang.Object fromOM (
-            org.apache.axiom.om.OMElement param,
-            java.lang.Class type,
-            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
-            try {
-                javax.xml.bind.JAXBContext context = classContextMap.get(type);
-                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
-
-                return unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), type).getValue();
-            } catch (javax.xml.bind.JAXBException bex){
-                throw org.apache.axis2.AxisFault.makeFault(bex);
-            }
-        }
-
-        class JaxbRIDataSource implements org.apache.axiom.om.OMDataSource {
-            /**
-             * Bound object for output.
-             */
-            private final Object outObject;
-
-            /**
-             * Bound class for output.
-             */
-            private final Class outClazz;
-
-            /**
-             * Marshaller.
-             */
-            private final javax.xml.bind.Marshaller marshaller;
-
-            /**
-             * Namespace
-             */
-            private String nsuri;
-
-            /**
-             * Local name
-             */
-            private String name;
-
-            /**
-             * Constructor from object and marshaller.
-             *
-             * @param obj
-             * @param marshaller
-             */
-            public JaxbRIDataSource(Class clazz, Object obj, javax.xml.bind.Marshaller marshaller, String nsuri, String name) {
-                this.outClazz = clazz;
-                this.outObject = obj;
-                this.marshaller = marshaller;
-                this.nsuri = nsuri;
-                this.name = name;
-            }
-
-            public void serialize(java.io.OutputStream output, org.apache.axiom.om.OMOutputFormat format) throws javax.xml.stream.XMLStreamException {
-                try {
-                    marshaller.marshal(new javax.xml.bind.JAXBElement(
-                            new javax.xml.namespace.QName(nsuri, name), outObject.getClass(), outObject), output);
-                } catch (javax.xml.bind.JAXBException e) {
-                    throw new javax.xml.stream.XMLStreamException("Error in JAXB marshalling", e);
-                }
-            }
-
-            public void serialize(java.io.Writer writer, org.apache.axiom.om.OMOutputFormat format) throws javax.xml.stream.XMLStreamException {
-                try {
-                    marshaller.marshal(new javax.xml.bind.JAXBElement(
-                            new javax.xml.namespace.QName(nsuri, name), outObject.getClass(), outObject), writer);
-                } catch (javax.xml.bind.JAXBException e) {
-                    throw new javax.xml.stream.XMLStreamException("Error in JAXB marshalling", e);
-                }
-            }
-
-            public void serialize(javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
-                try {
-                    marshaller.marshal(new javax.xml.bind.JAXBElement(
-                            new javax.xml.namespace.QName(nsuri, name), outObject.getClass(), outObject), xmlWriter);
-                } catch (javax.xml.bind.JAXBException e) {
-                    throw new javax.xml.stream.XMLStreamException("Error in JAXB marshalling", e);
-                }
-            }
-
-            public javax.xml.stream.XMLStreamReader getReader() throws javax.xml.stream.XMLStreamException {
-                try {
-                    javax.xml.bind.JAXBContext context = classContextMap.get(outClazz);
-                    org.apache.axiom.om.impl.builder.SAXOMBuilder builder = new org.apache.axiom.om.impl.builder.SAXOMBuilder();
-                    javax.xml.bind.Marshaller marshaller = context.createMarshaller();
-                    marshaller.marshal(new javax.xml.bind.JAXBElement(
-                            new javax.xml.namespace.QName(nsuri, name), outObject.getClass(), outObject), builder);
-
-                    return builder.getRootElement().getXMLStreamReader();
-                } catch (javax.xml.bind.JAXBException e) {
-                    throw new javax.xml.stream.XMLStreamException("Error in JAXB marshalling", e);
-                }
-            }
-        }
-        
-    </xsl:template>
+<!--
+  ~ 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.
+  -->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output method="text"/>
+<!-- #################################################################################  -->
+    <!-- ############################   JiBX template   ##############################  -->
+    <xsl:template match="databinders[@dbtype='jaxbri']">
+
+        <xsl:variable name="base64"><xsl:value-of select="base64Elements/name"/></xsl:variable>
+        <xsl:if test="$base64">
+            private static javax.xml.namespace.QName[] qNameArray = {
+            <xsl:for-each select="base64Elements/name">
+                <xsl:if test="position()>1">,</xsl:if>new javax.xml.namespace.QName("<xsl:value-of select="@ns-url"/>","<xsl:value-of select="@localName"/>")
+            </xsl:for-each>
+            };
+        </xsl:if>
+
+        <xsl:variable name="firstType"><xsl:value-of select="param[1]/@type"/></xsl:variable>
+
+        <xsl:for-each select="param[not(@type = preceding-sibling::param/@type)]">
+            <xsl:if test="@type!=''">
+                private static final javax.xml.bind.JAXBContext _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+            </xsl:if>
+        </xsl:for-each>
+
+        private static final java.util.HashMap&lt;Class,javax.xml.bind.JAXBContext&gt; classContextMap = new java.util.HashMap&lt;Class,javax.xml.bind.JAXBContext&gt;();
+
+        static {
+            javax.xml.bind.JAXBContext jc;
+            <xsl:for-each select="param[not(@type = preceding-sibling::param/@type)]">
+                <xsl:if test="@type!=''">
+                    jc = null;
+                    try {
+                        jc = javax.xml.bind.JAXBContext.newInstance(<xsl:value-of select="@type"/>.class);
+                    }
+                    catch ( javax.xml.bind.JAXBException ex ) {
+                        System.err.println("Unable to create JAXBContext for class: <xsl:value-of select='@type'/>");
+                        Runtime.getRuntime().exit(-1);
+                    }
+                    finally {
+                        _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/> = jc;
+                        classContextMap.put(<xsl:value-of select="@type"/>.class, jc);
+                    }
+                </xsl:if>
+            </xsl:for-each>
+        }
+
+        <xsl:for-each select="param[not(@type = preceding-sibling::param/@type)]">
+            <xsl:if test="@type!=''">
+
+                private org.apache.axiom.om.OMElement toOM(<xsl:value-of select="@type"/> param, boolean optimizeContent)
+                throws org.apache.axis2.AxisFault {
+                    try {
+                        javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                        javax.xml.bind.Marshaller marshaller = context.createMarshaller();
+                        marshaller.setProperty(javax.xml.bind.Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
+
+                        org.apache.axiom.om.OMFactory factory = org.apache.axiom.om.OMAbstractFactory.getOMFactory();
+
+                        JaxbRIDataSource source = new JaxbRIDataSource( <xsl:value-of select="@type"/>.class,
+                                                                        param,
+                                                                        marshaller,
+                                                                        "<xsl:value-of select="qname/@nsuri"/>",
+                                                                        "<xsl:value-of select="qname/@localname"/>");
+                        org.apache.axiom.om.OMNamespace namespace = factory.createOMNamespace("<xsl:value-of select="qame/@nsuri"/>",
+                                                                           null);
+                        return factory.createOMElement(source, "<xsl:value-of select="qname/@localname"/>", namespace);
+                    } catch (javax.xml.bind.JAXBException bex){
+                        throw org.apache.axis2.AxisFault.makeFault(bex);
+                    }
+                }
+
+                private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of select="@type"/> param, boolean optimizeContent)
+                throws org.apache.axis2.AxisFault {
+                    org.apache.axiom.soap.SOAPEnvelope envelope = factory.getDefaultEnvelope();
+                    envelope.getBody().addChild(toOM(param, optimizeContent));
+                    return envelope;
+                }
+
+                <xsl:variable name="propertyType" select="@type"/>
+                <xsl:choose>
+                    <xsl:when test="$propertyType='byte'">
+                        private byte toByte (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Byte ret = (java.lang.Integer)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), byte.class).getValue();
+                                return ret.byteValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                    <xsl:when test="$propertyType='char'">
+                        private char toChar (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Character ret = (java.lang.Character)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), char.class).getValue();
+                                return ret.charValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                    <xsl:when test="$propertyType='double'">
+                        private double toDouble (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Double ret = (java.lang.Double)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), double.class).getValue();
+                                return ret.doubleValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                    <xsl:when test="$propertyType='float'">
+                        private float toFloat (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Float ret = (java.lang.Float)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), float.class).getValue();
+                                return ret.floatValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                    <xsl:when test="$propertyType='int'">
+                        private int toInt (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Integer ret = (java.lang.Integer)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), int.class).getValue();
+                                return ret.intValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                    <xsl:when test="$propertyType='long'">
+                        private long toLong (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Long ret = (java.lang.Long)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), long.class).getValue();
+                                return ret.longValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                    <xsl:when test="$propertyType='short'">
+                        private short toShort (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Short ret = (java.lang.Short)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), short.class).getValue();
+                                return ret.shortValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                    <xsl:when test="$propertyType='boolean'">
+                        private boolean toBoolean (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Boolean ret = (java.lang.Boolean)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), boolean.class).getValue();
+                                return ret.booleanValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>                    
+                </xsl:choose>
+            </xsl:if>
+        </xsl:for-each>
+
+        /**
+        *  get the default envelope
+        */
+        private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory) {
+            return factory.getDefaultEnvelope();
+        }
+
+        private java.lang.Object fromOM (
+            org.apache.axiom.om.OMElement param,
+            java.lang.Class type,
+            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+            try {
+                javax.xml.bind.JAXBContext context = classContextMap.get(type);
+                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                return unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), type).getValue();
+            } catch (javax.xml.bind.JAXBException bex){
+                throw org.apache.axis2.AxisFault.makeFault(bex);
+            }
+        }
+
+        class JaxbRIDataSource implements org.apache.axiom.om.OMDataSource {
+            /**
+             * Bound object for output.
+             */
+            private final Object outObject;
+
+            /**
+             * Bound class for output.
+             */
+            private final Class outClazz;
+
+            /**
+             * Marshaller.
+             */
+            private final javax.xml.bind.Marshaller marshaller;
+
+            /**
+             * Namespace
+             */
+            private String nsuri;
+
+            /**
+             * Local name
+             */
+            private String name;
+
+            /**
+             * Constructor from object and marshaller.
+             *
+             * @param obj
+             * @param marshaller
+             */
+            public JaxbRIDataSource(Class clazz, Object obj, javax.xml.bind.Marshaller marshaller, String nsuri, String name) {
+                this.outClazz = clazz;
+                this.outObject = obj;
+                this.marshaller = marshaller;
+                this.nsuri = nsuri;
+                this.name = name;
+            }
+
+            public void serialize(java.io.OutputStream output, org.apache.axiom.om.OMOutputFormat format) throws javax.xml.stream.XMLStreamException {
+                try {
+                    marshaller.marshal(new javax.xml.bind.JAXBElement(
+                            new javax.xml.namespace.QName(nsuri, name), outObject.getClass(), outObject), output);
+                } catch (javax.xml.bind.JAXBException e) {
+                    throw new javax.xml.stream.XMLStreamException("Error in JAXB marshalling", e);
+                }
+            }
+
+            public void serialize(java.io.Writer writer, org.apache.axiom.om.OMOutputFormat format) throws javax.xml.stream.XMLStreamException {
+                try {
+                    marshaller.marshal(new javax.xml.bind.JAXBElement(
+                            new javax.xml.namespace.QName(nsuri, name), outObject.getClass(), outObject), writer);
+                } catch (javax.xml.bind.JAXBException e) {
+                    throw new javax.xml.stream.XMLStreamException("Error in JAXB marshalling", e);
+                }
+            }
+
+            public void serialize(javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+                try {
+                    marshaller.marshal(new javax.xml.bind.JAXBElement(
+                            new javax.xml.namespace.QName(nsuri, name), outObject.getClass(), outObject), xmlWriter);
+                } catch (javax.xml.bind.JAXBException e) {
+                    throw new javax.xml.stream.XMLStreamException("Error in JAXB marshalling", e);
+                }
+            }
+
+            public javax.xml.stream.XMLStreamReader getReader() throws javax.xml.stream.XMLStreamException {
+                try {
+                    javax.xml.bind.JAXBContext context = classContextMap.get(outClazz);
+                    org.apache.axiom.om.impl.builder.SAXOMBuilder builder = new org.apache.axiom.om.impl.builder.SAXOMBuilder();
+                    javax.xml.bind.Marshaller marshaller = context.createMarshaller();
+                    marshaller.marshal(new javax.xml.bind.JAXBElement(
+                            new javax.xml.namespace.QName(nsuri, name), outObject.getClass(), outObject), builder);
+
+                    return builder.getRootElement().getXMLStreamReader();
+                } catch (javax.xml.bind.JAXBException e) {
+                    throw new javax.xml.stream.XMLStreamException("Error in JAXB marshalling", e);
+                }
+            }
+        }
+        
+    </xsl:template>
     </xsl:stylesheet>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java Thu Aug  9 08:14:52 2007
@@ -172,6 +172,31 @@
                 if (log.isDebugEnabled()) {
                     log.debug("Task submitted to Executor");
                 }
+                
+                /*
+                 * TODO:  review
+                 * A thread switch will occur immediately after going out of scope
+                 * on this method.  This is ok, except on some platforms this will
+                 * prompt the JVM to clean up the old thread, thus cleaning up any
+                 * InputStreams there.  If that's the case, and we have not fully
+                 * read the InputStreams, we will likely get a NullPointerException
+                 * coming from the parser, which has a reference to the InputStream
+                 * that got nulled out from under it.  Make sure to do the
+                 * cft.notifyAll() in the right place.  CallbackFutureTask.call()
+                 * is the right place since at that point, the parser has fully read
+                 * the InputStream.
+                 */
+                try {
+                    synchronized (cft) {
+                        cft.wait(180000);  // 3 minutes
+                    }
+                } catch (InterruptedException e) {
+                    if (debug) {
+                        log.debug("cft.wait() was interrupted");
+                        log.debug("Exception: " + e.getMessage());
+                    }
+                }
+                
             } else {
                 if (log.isDebugEnabled()) {
                     log.info(
@@ -239,6 +264,10 @@
             if (debug) {
                 log.debug("An error occured while invoking the callback object.");
                 log.debug("Error: " + t.getMessage());
+            }
+        } finally {
+            synchronized(this) {
+                this.notifyAll();
             }
         }
 

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java Thu Aug  9 08:14:52 2007
@@ -419,7 +419,7 @@
         }       
     }
     
-    public void testOneWayWithException() {
+    public void testOneWayWithProtocolException() {
         try {
             TestLogger.logger.debug("----------------------------------");
             TestLogger.logger.debug("test: " + getName());
@@ -450,6 +450,39 @@
         }
         TestLogger.logger.debug("----------------------------------");
     }
+    
+    public void testOneWayWithRuntimeException() {
+        try {
+            TestLogger.logger.debug("----------------------------------");
+            TestLogger.logger.debug("test: " + getName());
+
+            AddNumbersHandlerService service = new AddNumbersHandlerService();
+            AddNumbersHandlerPortType proxy = service.getAddNumbersHandlerPort();
+
+            BindingProvider p = (BindingProvider) proxy;
+
+            p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
+            p.getRequestContext().put("myClientKey", "myClientVal");
+
+            List<Handler> handlers = p.getBinding().getHandlerChain();
+            if (handlers == null)
+                handlers = new ArrayList<Handler>();
+            handlers.add(new AddNumbersClientLogicalHandler());
+            handlers.add(new AddNumbersClientProtocolHandler());
+            p.getBinding().setHandlerChain(handlers);
+            
+            BindingProvider bp = (BindingProvider) proxy;
+            bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
+            // value 99 will trigger exception from AddNumbersClientLogicalHandler
+            proxy.oneWayInt(999);
+            fail("Should have got an exception, but did not.");
+        } catch (Exception e) {
+            e.printStackTrace();
+            assertEquals(e.getMessage(), "I don't like the value 999");
+        }
+        TestLogger.logger.debug("----------------------------------");
+    }
+
 
     /*
      * A callback implementation that can be used to collect the exceptions

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientLogicalHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientLogicalHandler.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientLogicalHandler.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientLogicalHandler.java Thu Aug  9 08:14:52 2007
@@ -23,6 +23,11 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFault;
+import javax.xml.soap.SOAPMessage;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
@@ -32,9 +37,14 @@
 import javax.xml.ws.LogicalMessage;
 import javax.xml.ws.ProtocolException;
 import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.soap.SOAPFaultException;
 
 import org.apache.axis2.jaxws.handler.AttachmentsAdapter;
 import org.apache.axis2.jaxws.handler.LogicalMessageContext;
+import org.apache.axis2.jaxws.marshaller.impl.alt.MethodMarshallerUtils;
+import org.apache.axis2.jaxws.message.XMLFault;
+import org.apache.axis2.jaxws.message.util.XMLFaultUtils;
+import org.apache.axis2.jaxws.utility.SAAJFactory;
 
 /*
  * You can't actually specify whether a handler is for client or server,
@@ -128,6 +138,17 @@
             String st = getStringFromSourcePayload(msg.getPayload());
             if (st.contains("<arg0>99</arg0>")) {
                 throw new ProtocolException("I don't like the value 99");
+            } else if (st.contains("<arg0>999</arg0>")) {
+                XMLFault xmlFault = MethodMarshallerUtils.createXMLFaultFromSystemException(new RuntimeException("I don't like the value 999"));
+                try {
+                    javax.xml.soap.MessageFactory mf = SAAJFactory.createMessageFactory(SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE);
+                    SOAPMessage message = mf.createMessage();
+                    SOAPBody body = message.getSOAPBody();
+                    SOAPFault soapFault = XMLFaultUtils.createSAAJFault(xmlFault, body);
+                    throw new SOAPFaultException(soapFault);
+                } catch (SOAPException soape) {
+                    throw new RuntimeException("Got SOAPException.  That's bad.");
+                }
             }
             
             // Check for the presences of the attachment property

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/conf/commons-logging.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/conf/commons-logging.properties?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/conf/commons-logging.properties (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/conf/commons-logging.properties Thu Aug  9 08:14:52 2007
@@ -27,4 +27,4 @@
 #org.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
 
 # Uncomment the next line to enable log4j based logging
-#org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/conf/log4j.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/conf/log4j.properties?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/conf/log4j.properties (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/conf/log4j.properties Thu Aug  9 08:14:52 2007
@@ -30,7 +30,7 @@
 # CONSOLE is set to be a ConsoleAppender using a PatternLayout.
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d %-5p %c - %m%n
+log4j.appender.CONSOLE.layout.ConversionPattern=[%p] %m%n
 
 # LOGFILE is set to be a File appender using a PatternLayout.
 log4j.appender.LOGFILE=org.apache.log4j.FileAppender

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java Thu Aug  9 08:14:52 2007
@@ -670,7 +670,8 @@
         if ((charsetEncodingFromXML != null)
                 && !"".equals(charsetEncodingFromXML)
                 && (charsetEncodingFromTransport != null)
-                && !charsetEncodingFromXML.equalsIgnoreCase((String) charsetEncodingFromTransport))
+                && !charsetEncodingFromXML.equalsIgnoreCase(charsetEncodingFromTransport)
+                && !isValidPair(charsetEncodingFromXML, charsetEncodingFromTransport))
         {
             String faultCode;
 
@@ -681,8 +682,27 @@
             }
 
             throw new AxisFault("Character Set Encoding from "
-                    + "transport information do not match with "
-                    + "character set encoding in the received SOAP message", faultCode);
+                    + "transport information [" + charsetEncodingFromTransport + "] does not match with "
+                    + "character set encoding in the received SOAP message [" + charsetEncodingFromXML + "]", faultCode);
         }
+    }
+
+    /**
+     * check if the pair is [UTF-16,UTF-16LE] [UTF-32, UTF-32LE],[UTF-16,UTF-16BE] [UTF-32, UTF-32BE] etc.
+     * 
+     * @param enc1
+     * @param enc2
+     * @return
+     */
+    private static boolean isValidPair(String enc1, String enc2) {
+        enc1 = enc1.toLowerCase();
+        enc2 = enc2.toLowerCase();
+        if (enc1.endsWith("be") || enc1.endsWith("le")) {
+            enc1 = enc1.substring(0, enc1.length() - 2);
+        }
+        if (enc2.endsWith("be") || enc2.endsWith("le")) {
+            enc2 = enc2.substring(0, enc2.length() - 2);
+        }
+        return enc1.equals(enc2);
     }
 }

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/Options.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/Options.java Thu Aug  9 08:14:52 2007
@@ -193,6 +193,10 @@
     //This property can be used to specify to call the auto transport clean up
     private transient boolean callTransportCleanup ;
 
+
+    private transient String userName;
+    private transient String password;
+
     //----------------------------------------------------------------
     // end MetaData section
     //----------------------------------------------------------------
@@ -1658,5 +1662,28 @@
 
     public void setCallTransportCleanup(boolean callTransportCleanup) {
         this.callTransportCleanup = callTransportCleanup;
+    }
+
+
+    public String getUserName() {
+        if (userName == null && parent != null) {
+            return parent.getUserName();
+        }
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getPassword() {
+        if (password == null && parent != null) {
+            return parent.getPassword();
+        }
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
     }
 }

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/ServiceClient.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/ServiceClient.java Thu Aug  9 08:14:52 2007
@@ -362,7 +362,7 @@
             try {
                 axisService.disengageModule(module);
             } catch (AxisFault axisFault) {
-                log.error(axisFault);
+                log.error(axisFault.getMessage(), axisFault);
             }
         }
     }

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/Stub.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/Stub.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/Stub.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/Stub.java Thu Aug  9 08:14:52 2007
@@ -20,16 +20,8 @@
 
 package org.apache.axis2.client;
 
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPProcessingException;
+import org.apache.axiom.om.*;
+import org.apache.axiom.soap.*;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.wsdl.WSDLConstants;
@@ -42,6 +34,7 @@
 import org.apache.commons.httpclient.Header;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 
 /**
  * Base class for generated client stubs. This defines several client API
@@ -195,6 +188,25 @@
                 omFactory.createOMAttribute(SOAP12Constants.ATTR_MUSTUNDERSTAND, omNamespace,
                                             "true");
         headerElement.addAttribute(mustUnderstandAttribute);
+    }
+
+    protected void addHeader(OMElement omElementToadd,
+                             SOAPEnvelope envelop,
+                             boolean mustUnderstand){
+        SOAPHeaderBlock soapHeaderBlock =
+                envelop.getHeader().addHeaderBlock(omElementToadd.getLocalName(),omElementToadd.getNamespace());
+        soapHeaderBlock.setMustUnderstand(mustUnderstand);
+        OMNode omNode = null;
+        for (Iterator iter = omElementToadd.getChildren(); iter.hasNext();){
+             omNode = (OMNode) iter.next();
+             soapHeaderBlock.addChild(omNode);
+        }
+
+    }
+
+    protected void addHeader(OMElement omElementToadd,
+                             SOAPEnvelope envelop){
+        addHeader(omElementToadd,envelop,false);
     }
 
 }

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Thu Aug  9 08:14:52 2007
@@ -228,6 +228,8 @@
                 messageContext.setServiceGroupContext(serviceGroupContext);
                 messageContext.setServiceContext(serviceGroupContext.getServiceContext(axisService));
             } else if (Constants.SCOPE_SOAP_SESSION.equals(scope)) {
+                //cleaning the session
+                cleanupServiceGroupContexts();
                 String serviceGroupContextId = messageContext.getServiceGroupContextId();
                 if (serviceGroupContextId != null) {
                     serviceGroupContext =
@@ -454,14 +456,17 @@
 
     public ServiceGroupContext getServiceGroupContextFromSoapSessionTable(
             String serviceGroupContextId,
-            MessageContext msgContext) {
+            MessageContext msgContext) throws AxisFault {
         ServiceGroupContext serviceGroupContext =
                 (ServiceGroupContext) serviceGroupContextMap.get(serviceGroupContextId);
 
         if (serviceGroupContext != null) {
             serviceGroupContext.touch();
+            return serviceGroupContext;
+        } else {
+            throw new AxisFault("Unable to find corresponding context" +
+                    " for the serviceGroupId: " + serviceGroupContextId);
         }
-        return serviceGroupContext;
     }
 
 

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/OperationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/OperationContext.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/OperationContext.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/OperationContext.java Thu Aug  9 08:14:52 2007
@@ -993,7 +993,7 @@
         if (axisOperation != null) {
             QName qname = axisOperation.getName();
             if (qname != null) {
-                opName = qname.toString();
+                opName = qname.getLocalPart();
             }
         }
 

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java Thu Aug  9 08:14:52 2007
@@ -272,7 +272,7 @@
                 Class deployerClass = Loader.loadClass(deployerClassName);
                 deployer = (Deployer) deployerClass.newInstance();
             } catch (Exception e) {
-                log.error(e);
+                log.error(e.getMessage(), e);
                 return;
             }
             deployer.setDirectory(directory);

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Thu Aug  9 08:14:52 2007
@@ -31,6 +31,8 @@
 import org.apache.axis2.deployment.scheduler.Scheduler;
 import org.apache.axis2.deployment.scheduler.SchedulerTask;
 import org.apache.axis2.deployment.util.Utils;
+import org.apache.axis2.deployment.resolver.AARBasedWSDLLocator;
+import org.apache.axis2.deployment.resolver.AARFileBasedURIResolver;
 import org.apache.axis2.description.*;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.MessageReceiver;
@@ -186,13 +188,14 @@
                                             fileUrl.substring(0, fileUrl.indexOf(".aar")));
                     addServiceGroup(serviceGroup, servicelist, servicesURL, null, axisConfig);
                     log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_WS,
-                                                 org.apache.axis2.util.Utils.getModuleName(serviceGroup.getServiceGroupName())));
+                                                 org.apache.axis2.util.Utils.getModuleName(serviceGroup.getServiceGroupName()),
+                                                 servicesURL.toString()));
                 }
             }
         } catch (MalformedURLException e) {
-            log.error(e.getMessage());
+            log.error(e.getMessage(), e);
         } catch (IOException e) {
-            log.error(e.getMessage());
+            log.error(e.getMessage(), e);
         }
     }
 
@@ -234,7 +237,8 @@
                     addNewModule(module, axisConfig);
                     log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_MODULE,
                                                  org.apache.axis2.util.Utils.getModuleName(module.getName(),
-                                                                                           module.getVersion())));
+                                                                                           module.getVersion()),
+                                                 moduleurl.toString()));
                 }
             }
             org.apache.axis2.util.Utils.
@@ -294,7 +298,7 @@
                 String line;
                 while ((line = input.readLine()) != null) {
                     line = line.trim();
-                    if (line.length() > 0) {
+                    if (line.length() > 0 && line.charAt(0)!='#') {
                         line = metainf + "/" + line;
                         try {
                             List services = reader.getAxisServiceFromWsdl(
@@ -331,15 +335,24 @@
 
             if (TAG_SERVICE.equals(elementName)) {
                 AxisService axisService = null;
+                String wsdlLocation =  "META-INF/service.wsdl";
                 InputStream wsdlStream =
-                        serviceClassLoader.getResourceAsStream(metainf + "/service.wsdl");
+                        serviceClassLoader.getResourceAsStream(wsdlLocation);
                 if (wsdlStream == null) {
+                    wsdlLocation =  "META-INF/" + serviceName + ".wsdl";
                     wsdlStream = serviceClassLoader
-                            .getResourceAsStream(metainf + "/" + serviceName + ".wsdl");
+                            .getResourceAsStream(wsdlLocation);
                 }
                 if (wsdlStream != null) {
                     WSDL11ToAxisServiceBuilder wsdl2AxisServiceBuilder =
                             new WSDL11ToAxisServiceBuilder(wsdlStream, null, null);
+                    File file = Utils.toFile(servicesURL);
+                    if(file != null && file.exists()){
+                        wsdl2AxisServiceBuilder.setCustomWSLD4JResolver(
+                                    new AARBasedWSDLLocator(wsdlLocation, file, wsdlStream));
+                        wsdl2AxisServiceBuilder.setCustomResolver(
+                                new AARFileBasedURIResolver(file));
+                    }
                     axisService = wsdl2AxisServiceBuilder.populateService();
                     axisService.setWsdlFound(true);
                     axisService.setCustomWsdl(true);
@@ -365,26 +378,35 @@
                 Iterator serviceIterator = servicList.iterator();
                 while (serviceIterator.hasNext()) {
                     AxisService axisService = (AxisService) serviceIterator.next();
+                    String wsdlLocation =  "META-INF/service.wsdl";
                     InputStream wsdlStream =
-                            serviceClassLoader.getResourceAsStream(metainf + "/service.wsdl");
+                            serviceClassLoader.getResourceAsStream(wsdlLocation);
                     if (wsdlStream == null) {
+                        wsdlLocation =  "META-INF/" + serviceName + ".wsdl";
                         wsdlStream = serviceClassLoader
-                                .getResourceAsStream(metainf + "/" + serviceName + ".wsdl");
-                        if (wsdlStream != null) {
-                            WSDL11ToAxisServiceBuilder wsdl2AxisServiceBuilder =
-                                    new WSDL11ToAxisServiceBuilder(wsdlStream, axisService);
-                            axisService = wsdl2AxisServiceBuilder.populateService();
-                            axisService.setWsdlFound(true);
-                            axisService.setCustomWsdl(true);
-                            // Set the default message receiver for the operations that were
-                            // not listed in the services.xml
-                            Iterator operations = axisService.getOperations();
-                            while (operations.hasNext()) {
-                                AxisOperation operation = (AxisOperation) operations.next();
-                                if (operation.getMessageReceiver() == null) {
-                                    operation.setMessageReceiver(loadDefaultMessageReceiver(
-                                            operation.getMessageExchangePattern(), axisService));
-                                }
+                                .getResourceAsStream(wsdlLocation);
+                    }
+                    if (wsdlStream != null) {
+                        WSDL11ToAxisServiceBuilder wsdl2AxisServiceBuilder =
+                                new WSDL11ToAxisServiceBuilder(wsdlStream, axisService);
+                        File file = Utils.toFile(servicesURL);
+                        if(file != null && file.exists()){
+                            wsdl2AxisServiceBuilder.setCustomWSLD4JResolver(
+                                        new AARBasedWSDLLocator(wsdlLocation, file, wsdlStream));
+                            wsdl2AxisServiceBuilder.setCustomResolver(
+                                    new AARFileBasedURIResolver(file));
+                        }
+                        axisService = wsdl2AxisServiceBuilder.populateService();
+                        axisService.setWsdlFound(true);
+                        axisService.setCustomWsdl(true);
+                        // Set the default message receiver for the operations that were
+                        // not listed in the services.xml
+                        Iterator operations = axisService.getOperations();
+                        while (operations.hasNext()) {
+                            AxisOperation operation = (AxisOperation) operations.next();
+                            if (operation.getMessageReceiver() == null) {
+                                operation.setMessageReceiver(loadDefaultMessageReceiver(
+                                        operation.getMessageExchangePattern(), axisService));
                             }
                         }
                     }
@@ -849,7 +871,7 @@
             String line;
             while ((line = input.readLine()) != null) {
                 line = line.trim();
-                if (line.length() > 0) {
+                if (line.length() > 0 && line.charAt(0)!='#') {
                     fileList.add(line);
                 }
             }

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/DeploymentErrorMsgs.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/DeploymentErrorMsgs.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/DeploymentErrorMsgs.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/DeploymentErrorMsgs.java Thu Aug  9 08:14:52 2007
@@ -27,8 +27,9 @@
     public static final String BAD_PARAMETER_ARGUMENT = "badparaagu";
     public static final String CONFIG_NOT_FOUND = "confignotfound";
     public static final String CLASS_NOT_FOUND = "classnotfound";
-    public static final String DEPLOYING_MODULE = "deployeingmodule";
+    public static final String DEPLOYING_MODULE = "deployingmodule";
     public static final String DEPLOYING_WS = "deployingws";
+    public static final String DEPLOYING_POJO = "deployingpojo";
     public static final String ELEMENT_IS_NOT_ALLOWED = "elementisnotallow";
     public static final String ERROR_IN_LOADING_MESSAGE_RECEIVER = "errorinloadingmr";
     public static final String FLOWTYPE_IS_REQUIRED = "flowtypeisrequird";

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java Thu Aug  9 08:14:52 2007
@@ -34,6 +34,7 @@
 import java.io.StringWriter;
 import java.io.File;
 import java.net.MalformedURLException;
+import java.net.URL;
 
 public class ModuleDeployer implements Deployer {
 
@@ -67,11 +68,13 @@
             metaData.setModuleClassLoader(deploymentFileData.getClassLoader());
             metaData.setParent(axisConfig);
             archiveReader.readModuleArchive(deploymentFileData, metaData, isDirectory, axisConfig);
-            metaData.setFileName(deploymentFileData.getFile().toURL());
+            URL url = deploymentFileData.getFile().toURL();
+            metaData.setFileName(url);
             DeploymentEngine.addNewModule(metaData, axisConfig);
             log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_MODULE,
                                          Utils.getModuleName(metaData.getName(),
-                                                             metaData.getVersion())));
+                                                             metaData.getVersion()),
+                                         url.toString()));
         } catch (DeploymentException e) {
             log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE,
                                           deploymentFileData.getName(),

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java Thu Aug  9 08:14:52 2007
@@ -80,6 +80,11 @@
                     Thread.currentThread().setContextClassLoader(classLoader);
                     String className = file.getName();
                     className = className.replaceAll(".class", "");
+
+                    log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_POJO,
+                                                 className,
+                                                 deploymentFileData.getFile().getAbsolutePath()));
+
                     JamServiceFactory factory = JamServiceFactory.getInstance();
                     JamServiceParams jam_service_parms = factory.createServiceParams();
                     jam_service_parms.addClassLoader(classLoader);
@@ -303,11 +308,11 @@
                         operation.setMessageReceiver(inOutmessageReceiver);
                     }
                 } catch (ClassNotFoundException e) {
-                    log.error(e);
+                    log.error(e.getMessage(), e);
                 } catch (InstantiationException e) {
-                    log.error(e);
+                    log.error(e.getMessage(), e);
                 } catch (IllegalAccessException e) {
-                    log.error(e);
+                    log.error(e.getMessage(), e);
                 }
             }
         }

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java Thu Aug  9 08:14:52 2007
@@ -37,6 +37,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.net.URL;
 
 public class ServiceDeployer implements Deployer {
     private static final Log log = LogFactory.getLog(ServiceDeployer.class);
@@ -79,13 +80,15 @@
                     deploymentFileData.getAbsolutePath(), deploymentFileData,
                     serviceGroup, isDirectory, wsdlservice,
                     configCtx);
+            URL location = deploymentFileData.getFile().toURL();
             DeploymentEngine.addServiceGroup(serviceGroup,
                                              serviceList,
-                                             deploymentFileData.getFile().toURL(),
+                                             location,
                                              deploymentFileData,
                                              axisConfig);
             log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_WS,
-                                         deploymentFileData.getName()));
+                                         deploymentFileData.getName(),
+                                         location.toString()));
         } catch (DeploymentException de) {
             de.printStackTrace();
             log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_SERVICE,

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java Thu Aug  9 08:14:52 2007
@@ -154,7 +154,7 @@
             try {
                 axisConfig.addParameter(param);
             } catch (AxisFault axisFault) {
-                log.error(axisFault);
+                log.error(axisFault.getMessage(), axisFault);
             }
 
             // when the module is an unpacked war file,
@@ -234,7 +234,7 @@
             }
 
         } catch (Exception ex) {
-            log.error(ex + ": loading repository from classpath");
+            log.error(ex + ": loading repository from classpath", ex);
             loadFromClassPath();
         }
         axisConfig.setConfigurator(this);
@@ -337,7 +337,7 @@
         try {
             configContext.getAxisConfiguration().addParameter(servletConfigParam);
         } catch (AxisFault axisFault) {
-            log.error(axisFault);
+            log.error(axisFault.getMessage(), axisFault);
         }
     }
 }

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml Thu Aug  9 08:14:52 2007
@@ -136,13 +136,14 @@
         <!--<parameter name="hostname">http://myApp.com/ws</parameter>-->
     </transportReceiver>
 
-    <transportReceiver name="tcp"
+    <!--Uncomment if you want to have TCP transport support-->
+    <!--<transportReceiver name="tcp"
                        class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port">6061</parameter>
+        <parameter name="port">6061</parameter>-->
         <!--If you want to give your own host address for EPR generation-->
         <!--uncomment following parameter , and set as you required.-->
         <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
-    </transportReceiver>
+    <!--</transportReceiver>-->
 
     <!-- ================================================= -->
     <!-- Transport Outs -->

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java Thu Aug  9 08:14:52 2007
@@ -175,7 +175,12 @@
                 return false;
             }
         } else {
-            return (wsInfo.getLastModifiedDate() != file.lastModified());
+            if(wsInfo.getLastModifiedDate() != file.lastModified()) {
+                wsInfo.setLastModifiedDate(file.lastModified());
+                return true;
+            } else {
+                return false;
+            }
         }
     }
 

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Thu Aug  9 08:14:52 2007
@@ -447,7 +447,10 @@
                     input = new BufferedReader(new InputStreamReader(in));
                     String line;
                     while ((line = input.readLine()) != null) {
-                        services.add(line);
+                        line = line.trim();
+                        if (line.length() > 0 && line.charAt(0)!='#') {
+                            services.add(line);
+                        }
                     }
                     input.close();
                 } catch (IOException ex) {

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisBinding.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisBinding.java Thu Aug  9 08:14:52 2007
@@ -125,7 +125,9 @@
      */
     public OMElement toWSDL20(OMNamespace wsdl, OMNamespace tns, OMNamespace wsoap,
                               OMNamespace whttp, String interfaceName, Map nameSpaceMap,
-                              String addressingFlag, String serviceName) {
+                              String addressingFlag,
+                              String serviceName,
+                              OMNamespace wsaw) {
         String property;
         OMFactory omFactory = OMAbstractFactory.getOMFactory();
         OMElement bindingElement;
@@ -171,7 +173,7 @@
             }
 
             WSDLSerializationUtil
-                    .addWSAddressingToBinding(addressingFlag, omFactory, bindingElement);
+                    .addWSAddressingToBinding(addressingFlag, omFactory, bindingElement, wsaw);
 
         } else if (WSDL2Constants.URI_WSDL2_HTTP.equals(type)) {
             // HTTP Binding specific properties

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Thu Aug  9 08:14:52 2007
@@ -192,7 +192,7 @@
             disengageModule(module);
         } catch (AxisFault axisFault) {
             // Can't do much here...
-            log.error(axisFault);
+            log.error(axisFault.getMessage(), axisFault);
         }
     }
 

Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService.java Thu Aug  9 08:14:52 2007
@@ -1593,16 +1593,16 @@
             Definition wsdlDefinition = reader.readWSDL(getBaseURI(wsdlURL.toString()), doc);
             return createClientSideAxisService(wsdlDefinition, wsdlServiceName, portName, options);
         } catch (IOException e) {
-            log.error(e);
+            log.error(e.getMessage(), e);
             throw AxisFault.makeFault(e);
         } catch (ParserConfigurationException e) {
-            log.error(e);
+            log.error(e.getMessage(), e);
             throw AxisFault.makeFault(e);
         } catch (SAXException e) {
-            log.error(e);
+            log.error(e.getMessage(), e);
             throw AxisFault.makeFault(e);
         } catch (WSDLException e) {
-            log.error(e);
+            log.error(e.getMessage(), e);
             throw AxisFault.makeFault(e);
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message