From java-commitsjonathansmith@example.com Thu Feb 25 16:04:22 2010
Return-Path: <java-commitsjonathansmith@example.com>
Delivered-To: jonathansmith@example.com
Received: (qmail 8174 invoked from network); 25 Feb 2010 16:04:22 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 25 Feb 2010 16:04:22 -0000
Received: (qmail 67320 invoked by uid 500); 25 Feb 2010 16:04:22 -0000
Delivered-To: jonathansmith@example.com
Received: (qmail 67305 invoked by uid 500); 25 Feb 2010 16:04:22 -0000
Mailing-List: contact jonathansmith@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:jonathansmith@example.com>
List-Unsubscribe: <mailto:jonathansmith@example.com>
List-Post: <mailto:jonathansmith@example.com>
List-Id: <java-commits.axis.apache.org>
Reply-To: jonathansmith@example.com
Delivered-To: mailing list jonathansmith@example.com
Received: (qmail 67298 invoked by uid 99); 25 Feb 2010 16:04:22 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2010 16:04:22 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2010 16:04:21 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 46D2723889CB; Thu, 25 Feb 2010 16:04:01 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r916333 - in /axis/axis2/java/core/trunk/modules:
 jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
 kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java
 kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
Date: Thu, 25 Feb 2010 16:04:01 -0000
To: jonathansmith@example.com
From: jonathansmith@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <jonathansmith@example.com>

Author: nagy
Date: Thu Feb 25 16:04:00 2010
New Revision: 916333

URL: http://svn.apache.org/viewvc?rev=916333&view=rev
Log:
AXIS2-4574

Update WSDL Instance namespace on wsdlLocation Metadata attribute to make it match the example in the WS-A Metadata Spec and be compliant with the new WSDL 2.0 spec.

Contributor: Katherine Sanders


Modified:
    axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
    axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java
    axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java

Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java?rev=916333&r1=916332&r2=916333&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java Thu Feb 25 16:04:00 2010
@@ -26,6 +26,8 @@
 import org.apache.axis2.jaxws.addressing.util.EndpointReferenceUtils;
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.axis2.jaxws.server.endpoint.EndpointImpl;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Element;
 
 import javax.xml.namespace.QName;
@@ -40,6 +42,8 @@
 import java.util.List;
 
 public class Provider extends javax.xml.ws.spi.Provider {
+    private static final Log log = LogFactory.getLog(Provider.class);
+    
 	private static final Element[] ZERO_LENGTH_ARRAY = new Element[0];
 
     @Override
@@ -126,10 +130,17 @@
             	EndpointReferenceHelper.getWSDLLocationMetadata(axis2EPR, addressingNamespace);
             URL wsdlLocationURL = null;
             
-            if (wsdlLocation.getLocation() != null)
+            if (wsdlLocation.getLocation() != null) {
             	wsdlLocationURL = new URL(wsdlLocation.getLocation());
-            else
+                if (log.isDebugEnabled()) {
+                    log.debug("getPort: Using EPR wsdlLocationURL = " + wsdlLocationURL);
+                }
+            } else {
             	wsdlLocationURL = new URL(axis2EPR.getAddress() + "?wsdl");
+                if (log.isDebugEnabled()) {
+                    log.debug("getPort: Using default wsdlLocationURL = " + wsdlLocationURL);
+                }
+            }
             
             serviceDelegate =
             	new org.apache.axis2.jaxws.spi.ServiceDelegate(wsdlLocationURL, serviceName.getName(), Service.class);

Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java?rev=916333&r1=916332&r2=916333&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java Thu Feb 25 16:04:00 2010
@@ -23,11 +23,17 @@
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axis2.AxisFault;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import javax.xml.namespace.QName;
 
 public class WSDLLocation {
+    private static final Log log = LogFactory.getLog(WSDLLocation.class);
+    
+    // Support both WSDLI namespaces on inbound messages to allow interop with earlier versions of axis2 
     private static final QName WSDLI = new QName("http://www.w3.org/2006/01/wsdl-instance", "wsdlLocation", "wsdli");
+    private static final QName FINAL_WSDLI = new QName("http://www.w3.org/ns/wsdl-instance", "wsdlLocation", "wsdli");
     
     private String targetNamespace;
     private String wsdlURL;
@@ -55,29 +61,35 @@
     
     /**
      * Convenience method to convert an object of this type to an <code>OMAttribute</code>
+     * <p>
+     * &lt;... xmlns:wsdli="http://www.w3.org/ns/wsdl-instance" wsdli:wsdlLocation="targetNamespace wsdlURL" ...&gt
+     * </p>
      * @param factory <code>OMFactory</code> to use when generating <code>OMElement</code>s
      * 
      * @return an <code>OMAttribute</code> that can be added to an <code>EndpointReference</code>
      */
     public OMAttribute toOM(OMFactory factory) {
         String value = new StringBuffer(targetNamespace).append(" ").append(wsdlURL).toString();
-        OMNamespace wsdliNs = factory.createOMNamespace(WSDLI.getNamespaceURI(), WSDLI.getPrefix());
-        OMAttribute omAttribute = factory.createOMAttribute(WSDLI.getLocalPart(), wsdliNs, value);
-        
+        OMNamespace wsdliNs = factory.createOMNamespace(FINAL_WSDLI.getNamespaceURI(), FINAL_WSDLI.getPrefix());
+        OMAttribute omAttribute = factory.createOMAttribute(FINAL_WSDLI.getLocalPart(), wsdliNs, value);
+
         return omAttribute;
     }
     
     /**
-     * Convenience method for converting an OMAttribute to an instance of this type.
+     * Convenience method for converting an OMAttribute to an instance of either of these types.
      * <p>
      * &lt;... xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" wsdli:wsdlLocation="targetNamespace wsdlURL" ...&gt
      * </p>
+     * <p>
+     * &lt;... xmlns:wsdli="http://www.w3.org/ns/wsdl-instance" wsdli:wsdlLocation="targetNamespace wsdlURL" ...&gt
+     * </p>
      * @param omAttribute the <code>OMAttribute</code> that holds the wsdl location.
      * @throws AxisFault
      */
     public void fromOM(OMAttribute omAttribute) throws AxisFault {
         QName qname = omAttribute.getQName();
-        if (WSDLI.equals(qname)) {
+        if (WSDLI.equals(qname) || FINAL_WSDLI.equals(qname)) {
            String value = omAttribute.getAttributeValue().trim();
            String[] values = value.split("\\s", 2);
            
@@ -88,6 +100,10 @@
            
            targetNamespace = values[0];
            wsdlURL = values[1];
+           
+           if (log.isDebugEnabled()) {
+               log.debug("fromOM: Extracted WSDLLocation targetNamespace = " + targetNamespace + " and wsdlURL = " + wsdlURL + " from an OMAttribute with QName = " + qname);
+           }
         }
         else {
             throw new AxisFault("Unrecognized element.");
@@ -108,8 +124,12 @@
         boolean result = false;
         QName qname = omAttribute.getQName();
         
-        if (WSDLI.equals(qname))
+        if (WSDLI.equals(qname) || FINAL_WSDLI.equals(qname))
             result = true;
+
+        if (log.isDebugEnabled()) {
+            log.debug("isWSDLLocationAttribute: OMAttribute QName = " + qname + ", result = " + result);
+        }
         
         return result;
     }

Modified: axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java?rev=916333&r1=916332&r2=916333&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java Thu Feb 25 16:04:00 2010
@@ -25,8 +25,10 @@
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
+import org.apache.axis2.addressing.metadata.WSDLLocation;
 
 import javax.xml.namespace.QName;
+
 import java.util.ArrayList;
 import java.util.Map;
 
@@ -247,4 +249,82 @@
             //pass
         }
     }
+    
+    public void testSetAndGetWSDLLocationMetadataForFinalSpecEPR() throws Exception {
+        String address = "http://ws.apache.org/axis2";
+        String targetNamespace = "targetNamespace";
+        String location = "wsdlLocation";
+        
+        EndpointReference epr = new EndpointReference(address);
+        
+        OMFactory omf = OMAbstractFactory.getOMFactory();
+        
+        // Uses final WSDLI namespace on wsdlLocation attribute
+        EndpointReferenceHelper.setWSDLLocationMetadata(omf, epr, AddressingConstants.Final.WSA_NAMESPACE, new WSDLLocation(targetNamespace, location));
+        
+        WSDLLocation wsdlLocation = EndpointReferenceHelper.getWSDLLocationMetadata(epr, AddressingConstants.Final.WSA_NAMESPACE);
+        assertEquals(wsdlLocation.getTargetNamespace(), targetNamespace);
+        assertEquals(wsdlLocation.getLocation(), location);
+    }
+    
+    public void testSetAndGetWSDLLocationMetadataForSubmissionSpecEPR() throws Exception {
+        String address = "http://ws.apache.org/axis2";
+        String targetNamespace = "targetNamespace";
+        String location = "wsdlLocation";
+        
+        EndpointReference epr = new EndpointReference(address);
+        
+        OMFactory omf = OMAbstractFactory.getOMFactory();
+        
+        // Uses final WSDLI namespace on wsdlLocation attribute
+        EndpointReferenceHelper.setWSDLLocationMetadata(omf, epr, AddressingConstants.Submission.WSA_NAMESPACE, new WSDLLocation(targetNamespace, location));
+        
+        WSDLLocation wsdlLocation = EndpointReferenceHelper.getWSDLLocationMetadata(epr, AddressingConstants.Submission.WSA_NAMESPACE);
+        assertEquals(wsdlLocation.getTargetNamespace(), targetNamespace);
+        assertEquals(wsdlLocation.getLocation(), location);
+    }
+    
+    public void testGetWSDLLocationMetadataForFinalSpecEPRWithOldWsdliNamespace() throws Exception {
+        String address = "http://ws.apache.org/axis2";
+        String targetNamespace = "targetNamespace";
+        String location = "wsdlLocation";
+        
+        EndpointReference epr = new EndpointReference(address);
+        
+        // Uses old candidate spec WSDLI namespace on wsdlLocation attribute
+        OMFactory omf = OMAbstractFactory.getOMFactory();
+        String value = new StringBuffer(targetNamespace).append(" ").append(location).toString();
+        QName OLD_WSDLI = new QName("http://www.w3.org/2006/01/wsdl-instance", "wsdlLocation", "wsdli");
+        OMNamespace wsdliNs = omf.createOMNamespace(OLD_WSDLI.getNamespaceURI(), OLD_WSDLI.getPrefix());
+        OMAttribute attribute = omf.createOMAttribute(OLD_WSDLI.getLocalPart(), wsdliNs, value);
+        
+        ArrayList list = new ArrayList();
+        list.add(attribute);
+        epr.setMetadataAttributes(list);
+        
+        WSDLLocation wsdlLocation = EndpointReferenceHelper.getWSDLLocationMetadata(epr, AddressingConstants.Final.WSA_NAMESPACE);
+        assertEquals(wsdlLocation.getTargetNamespace(), targetNamespace);
+        assertEquals(wsdlLocation.getLocation(), location);  
+    }
+    
+    public void testGetWSDLLocationMetadataForSubmissionSpecEPRWithOldWsdliNamespace() throws Exception {
+        String address = "http://ws.apache.org/axis2";
+        String targetNamespace = "targetNamespace";
+        String location = "wsdlLocation";
+        
+        EndpointReference epr = new EndpointReference(address);
+        
+        // Uses old candidate spec WSDLI namespace on wsdlLocation attribute
+        OMFactory omf = OMAbstractFactory.getOMFactory();
+        String value = new StringBuffer(targetNamespace).append(" ").append(location).toString();
+        QName OLD_WSDLI = new QName("http://www.w3.org/2006/01/wsdl-instance", "wsdlLocation", "wsdli");
+        OMNamespace wsdliNs = omf.createOMNamespace(OLD_WSDLI.getNamespaceURI(), OLD_WSDLI.getPrefix());
+        OMAttribute attribute = omf.createOMAttribute(OLD_WSDLI.getLocalPart(), wsdliNs, value);
+        
+        epr.addAttribute(attribute);
+        
+        WSDLLocation wsdlLocation = EndpointReferenceHelper.getWSDLLocationMetadata(epr, AddressingConstants.Submission.WSA_NAMESPACE);
+        assertEquals(wsdlLocation.getTargetNamespace(), targetNamespace);
+        assertEquals(wsdlLocation.getLocation(), location);  
+    }
 }



From java-commitsjonathansmith@example.com Thu Feb 25 19:15:20 2010
Return-Path: <java-commitsjonathansmith@example.com>
Delivered-To: jonathansmith@example.com
Received: (qmail 15436 invoked from network); 25 Feb 2010 19:15:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 25 Feb 2010 19:15:20 -0000
Received: (qmail 27937 invoked by uid 500); 25 Feb 2010 19:15:20 -0000
Delivered-To: jonathansmith@example.com
Received: (qmail 27927 invoked by uid 500); 25 Feb 2010 19:15:20 -0000
Mailing-List: contact jonathansmith@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:jonathansmith@example.com>
List-Unsubscribe: <mailto:jonathansmith@example.com>
List-Post: <mailto:jonathansmith@example.com>
List-Id: <java-commits.axis.apache.org>
Reply-To: jonathansmith@example.com
Delivered-To: mailing list jonathansmith@example.com
Received: (qmail 27920 invoked by uid 99); 25 Feb 2010 19:15:20 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2010 19:15:20 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2010 19:15:18 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C3D8523889BB; Thu, 25 Feb 2010 19:14:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r916401 -
 /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
Date: Thu, 25 Feb 2010 19:14:57 -0000
To: jonathansmith@example.com
From: jonathansmith@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <jonathansmith@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ruwan
Date: Thu Feb 25 19:14:57 2010
New Revision: 916401

URL: http://svn.apache.org/viewvc?rev=916401&view=rev
Log:
Applying the patch from Rajika for WSCOMMONS-515

Modified:
    axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java

Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java?rev=916401&r1=916400&r2=916401&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java (original)
+++ axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java Thu Feb 25 19:14:57 2010
@@ -252,7 +252,7 @@
      * @return session transaction required by the clients of this?
      */
     private boolean isSessionTransacted() {
-        return parameters.get(JMSConstants.PARAM_SESSION_TRANSACTED) == null ||
+        return parameters.get(JMSConstants.PARAM_SESSION_TRANSACTED) != null &&
             Boolean.valueOf(parameters.get(JMSConstants.PARAM_SESSION_TRANSACTED));
     }
 



From java-commitsjonathansmith@example.com Thu Feb 25 19:19:53 2010
Return-Path: <java-commitsjonathansmith@example.com>
Delivered-To: jonathansmith@example.com
Received: (qmail 16610 invoked from network); 25 Feb 2010 19:19:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 25 Feb 2010 19:19:53 -0000
Received: (qmail 36454 invoked by uid 500); 25 Feb 2010 19:19:53 -0000
Delivered-To: jonathansmith@example.com
Received: (qmail 36444 invoked by uid 500); 25 Feb 2010 19:19:53 -0000
Mailing-List: contact jonathansmith@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:jonathansmith@example.com>
List-Unsubscribe: <mailto:jonathansmith@example.com>
List-Post: <mailto:jonathansmith@example.com>
List-Id: <java-commits.axis.apache.org>
Reply-To: jonathansmith@example.com
Delivered-To: mailing list jonathansmith@example.com
Received: (qmail 36437 invoked by uid 99); 25 Feb 2010 19:19:53 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2010 19:19:53 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2010 19:19:53 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id ED34023889E3; Thu, 25 Feb 2010 19:19:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r916406 -
 /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
Date: Thu, 25 Feb 2010 19:19:32 -0000
To: jonathansmith@example.com
From: jonathansmith@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <jonathansmith@example.com>

Author: ruwan
Date: Thu Feb 25 19:19:32 2010
New Revision: 916406

URL: http://svn.apache.org/viewvc?rev=916406&view=rev
Log:
Applying the patch from Rajika, for WSCOMMONS-524

Modified:
    axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java

Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java?rev=916406&r1=916405&r2=916406&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java (original)
+++ axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java Thu Feb 25 19:19:32 2010
@@ -531,9 +531,6 @@
                     }
                 }
 
-                // close the consumer
-                closeConsumer(false);
-
                 // if session was transacted, commit it or rollback
                 try {
                     if (session.getTransacted()) {
@@ -574,6 +571,9 @@
                         " JTA txn for message : " + messageId + " from the session", e);
                 }
 
+                // close the consumer
+                closeConsumer(false);
+
                 closeSession(false);
                 closeConnection();
             }



From java-commitsjonathansmith@example.com Fri Feb 26 08:58:38 2010
Return-Path: <java-commitsjonathansmith@example.com>
Delivered-To: jonathansmith@example.com
Received: (qmail 60763 invoked from network); 26 Feb 2010 08:58:38 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 26 Feb 2010 08:58:38 -0000
Received: (qmail 63308 invoked by uid 500); 26 Feb 2010 08:58:38 -0000
Delivered-To: jonathansmith@example.com
Received: (qmail 63296 invoked by uid 500); 26 Feb 2010 08:58:38 -0000
Mailing-List: contact jonathansmith@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:jonathansmith@example.com>
List-Unsubscribe: <mailto:jonathansmith@example.com>
List-Post: <mailto:jonathansmith@example.com>
List-Id: <java-commits.axis.apache.org>
Reply-To: jonathansmith@example.com
Delivered-To: mailing list jonathansmith@example.com
Received: (qmail 63289 invoked by uid 99); 26 Feb 2010 08:58:38 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Feb 2010 08:58:38 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Feb 2010 08:58:36 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id BFACC23889BF; Fri, 26 Feb 2010 08:58:15 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r916623 -
 /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/AsyncHandlerProxyFactoryImpl.java
Date: Fri, 26 Feb 2010 08:58:15 -0000
To: jonathansmith@example.com
From: jonathansmith@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <jonathansmith@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: isurues
Date: Fri Feb 26 08:58:15 2010
New Revision: 916623

URL: http://svn.apache.org/viewvc?rev=916623&view=rev
Log:
removing @Override annotation

Modified:
    axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/AsyncHandlerProxyFactoryImpl.java

Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/AsyncHandlerProxyFactoryImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/AsyncHandlerProxyFactoryImpl.java?rev=916623&r1=916622&r2=916623&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/AsyncHandlerProxyFactoryImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/AsyncHandlerProxyFactoryImpl.java Fri Feb 26 08:58:15 2010
@@ -29,7 +29,6 @@
  */
 public class AsyncHandlerProxyFactoryImpl implements AsyncHandlerProxyFactory {
 
-    @Override
     public AsyncHandler createAsyncHandlerProxy(AsyncHandler ah) throws Exception {
         return ah;
     }



From java-commitsjonathansmith@example.com Fri Feb 26 13:45:20 2010
Return-Path: <java-commitsjonathansmith@example.com>
Delivered-To: jonathansmith@example.com
Received: (qmail 72278 invoked from network); 26 Feb 2010 13:45:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 26 Feb 2010 13:45:20 -0000
Received: (qmail 62727 invoked by uid 500); 26 Feb 2010 13:45:20 -0000
Delivered-To: jonathansmith@example.com
Received: (qmail 62717 invoked by uid 500); 26 Feb 2010 13:45:20 -0000
Mailing-List: contact jonathansmith@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:jonathansmith@example.com>
List-Unsubscribe: <mailto:jonathansmith@example.com>
List-Post: <mailto:jonathansmith@example.com>
List-Id: <java-commits.axis.apache.org>
Reply-To: jonathansmith@example.com
Delivered-To: mailing list jonathansmith@example.com
Received: (qmail 62710 invoked by uid 99); 26 Feb 2010 13:45:20 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Feb 2010 13:45:20 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Feb 2010 13:45:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E85832388A43; Fri, 26 Feb 2010 13:44:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r916680 -
 /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Date: Fri, 26 Feb 2010 13:44:57 -0000
To: jonathansmith@example.com
From: jonathansmith@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <jonathansmith@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: amilas
Date: Fri Feb 26 13:44:57 2010
New Revision: 916680

URL: http://svn.apache.org/viewvc?rev=916680&view=rev
Log:
isWrapped is used with the RPCMessage receiver. Its' meaning is whether the generated elements
from an POJO wrapped with the method name or not.
if we set the wrapped here based on the wsdl is rpc/lit type or not then that may cause problems if some one
put a generated wsdl into a .aar file with the rpc message receiver.

Modified:
    axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java

Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=916680&r1=916679&r2=916680&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Fri Feb 26 13:44:57 2010
@@ -688,7 +688,6 @@
                 if (isSetMessageQNames) {
                     BindingOperationEntry boe = find(wrappableBOEs, wsdl4jBindingOperation);
                     boolean isWrapped = (boe == null) ? false : boe.isWrappedInput();
-                    axisInMessage.setWrapped(isWrapped);
                     addQNameReference(axisInMessage, wsdl4jOperation,
                                       wsdl4jBindingInput,
                                       isWrapped);



From java-commitsjonathansmith@example.com Sat Feb 27 13:04:22 2010
Return-Path: <java-commitsjonathansmith@example.com>
Delivered-To: jonathansmith@example.com
Received: (qmail 60031 invoked from network); 27 Feb 2010 13:04:21 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 27 Feb 2010 13:04:21 -0000
Received: (qmail 99097 invoked by uid 500); 27 Feb 2010 13:04:21 -0000
Delivered-To: jonathansmith@example.com
Received: (qmail 99085 invoked by uid 500); 27 Feb 2010 13:04:21 -0000
Mailing-List: contact jonathansmith@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:jonathansmith@example.com>
List-Unsubscribe: <mailto:jonathansmith@example.com>
List-Post: <mailto:jonathansmith@example.com>
List-Id: <java-commits.axis.apache.org>
Reply-To: jonathansmith@example.com
Delivered-To: mailing list jonathansmith@example.com
Received: (qmail 99078 invoked by uid 99); 27 Feb 2010 13:04:21 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Feb 2010 13:04:21 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Feb 2010 13:04:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id EA96723889BF; Sat, 27 Feb 2010 13:03:58 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r916949 -
 /axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
Date: Sat, 27 Feb 2010 13:03:58 -0000
To: jonathansmith@example.com
From: jonathansmith@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <jonathansmith@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: amilas
Date: Sat Feb 27 13:03:58 2010
New Revision: 916949

URL: http://svn.apache.org/viewvc?rev=916949&view=rev
Log:
commit the patch for SANDESHA2-199

Modified:
    axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java

Modified: axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java?rev=916949&r1=916948&r2=916949&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java (original)
+++ axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java Sat Feb 27 13:03:58 2010
@@ -1079,7 +1079,20 @@
 							
 							((AxisCallback)callback).onError(fault);
 						}
-					}
+					 // this is actually to support synapse. Synpase Axis Operation does not have a callBackMessageReceiver
+                     // synapse AxisOperation always has the synapse message receiver. And also to be send in the synapse
+                     // fault mediators we need to set the SENDING_FAULT property as well.
+                    } else if (msgReceiver != null) {
+                        try {
+                            //since there is no reponse we set this message as the fault reply
+                            context.getOptions().setRelationships(new RelatesTo[]{new RelatesTo(context.getMessageID())});
+                            context.setProperty("SENDING_FAULT", Boolean.TRUE);
+                            msgReceiver.receive(context);
+                        } catch (AxisFault axisFault) {
+                            log.error(axisFault.getMessage());
+                            throw new SandeshaException("Can not invoke the message receiver ", axisFault);
+                        }
+                    }
 				}
 			}
 		}




{'source': 'Apache Software Foundation Public Mail Archives'}