svn commit: r1445394 - in /axis/axis2/java/core/branches/1_6/modules/transport/jms/src: main/java/org/apache/axis2/transport/jms/ main/java/org/apache/axis2/transport/jms/ctype/ test/java/org/apache/axis2/transport/jms/

[veithen]

Author: veithen
Date: Tue Feb 12 21:29:04 2013
New Revision: 1445394

URL: http://svn.apache.org/r1445394
Log:
AXIS2-5434: Removed r1371374 and r1384723 from the 1.6 branch. These changes 
are only applicable to 1.7.

Modified:
    
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
    
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/ctype/ContentTypeRuleFactory.java
    
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportDescriptionFactory.java

Modified: 
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java?rev=1445394&r1=1445393&r2=1445394&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
 Tue Feb 12 21:29:04 2013
@@ -20,6 +20,7 @@ import org.apache.commons.logging.LogFac
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.ParameterIncludeImpl;
 import org.apache.axis2.AxisFault;
+import org.apache.axiom.om.OMElement;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -75,7 +76,7 @@ public class JMSConnectionFactory {
         ParameterIncludeImpl pi = new ParameterIncludeImpl();
 
         try {
-            pi.deserializeParameters(parameter.getParameterElement());
+            pi.deserializeParameters((OMElement) parameter.getValue());
         } catch (AxisFault axisFault) {
             handleException("Error reading parameters for JMS connection 
factory" + name, axisFault);
         }

Modified: 
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/ctype/ContentTypeRuleFactory.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/ctype/ContentTypeRuleFactory.java?rev=1445394&r1=1445393&r2=1445394&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/ctype/ContentTypeRuleFactory.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/ctype/ContentTypeRuleFactory.java
 Tue Feb 12 21:29:04 2013
@@ -51,6 +51,14 @@ public class ContentTypeRuleFactory {
         Object value = param.getValue();
         if (value instanceof OMElement) {
             OMElement element = (OMElement)value;
+            
+            // DescriptionBuilder#processParameters actually sets the 
parameter element
+            // itself as the value. We need to support this case.
+            // TODO: seems like a bug in Axis2 and is inconsistent with 
Synapse's way of parsing parameter in proxy definitions
+            if (element == param.getParameterElement()) {
+                element = element.getFirstElement();
+            }
+            
             if (element.getLocalName().equals("rules")) {
                 for (Iterator it = element.getChildElements(); it.hasNext(); ) 
{
                     ruleSet.addRule(parse((OMElement)it.next()));

Modified: 
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportDescriptionFactory.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportDescriptionFactory.java?rev=1445394&r1=1445393&r2=1445394&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportDescriptionFactory.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportDescriptionFactory.java
 Tue Feb 12 21:29:04 2013
@@ -117,10 +117,7 @@ public class JMSTransportDescriptionFact
         }
         
element.addChild(createParameterElement(JMSConstants.PARAM_CONCURRENT_CONSUMERS,
             Integer.toString(concurrentConsumers)));
-        Parameter parameter = new Parameter();
-        parameter.setName(name);
-        parameter.setParameterElement(element);
-        trpDesc.addParameter(parameter);
+        trpDesc.addParameter(new Parameter(name, element));
     }
     
     private void setupTransport(ParameterInclude trpDesc) throws AxisFault {