ode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From va...@apache.org
Subject git commit: ODE-995: Upgrade to Axis 1.5.6 / Rampart 1.5.2
Date Mon, 26 Aug 2013 23:54:46 GMT
Updated Branches:
  refs/heads/master a39f8db9b -> a252b6d4e


ODE-995: Upgrade to Axis 1.5.6 / Rampart 1.5.2


Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/a252b6d4
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/a252b6d4
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/a252b6d4

Branch: refs/heads/master
Commit: a252b6d4e7f47d9dd772a826d09d7020e0b1efb3
Parents: a39f8db
Author: Tammo van Lessen <tvanlessen@gmail.com>
Authored: Tue Aug 27 01:54:14 2013 +0200
Committer: Tammo van Lessen <tvanlessen@gmail.com>
Committed: Tue Aug 27 01:54:14 2013 +0200

----------------------------------------------------------------------
 .../ode/axis2/service/ServiceClientUtil.java    | 11 +++-
 .../ode/axis2/util/SoapMessageConverter.java    | 13 +++--
 dependencies.rb                                 | 53 +++++++++++---------
 3 files changed, 47 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/a252b6d4/axis2/src/main/java/org/apache/ode/axis2/service/ServiceClientUtil.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/service/ServiceClientUtil.java b/axis2/src/main/java/org/apache/ode/axis2/service/ServiceClientUtil.java
index e73f489..4a3dad5 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/service/ServiceClientUtil.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/service/ServiceClientUtil.java
@@ -64,9 +64,16 @@ public class ServiceClientUtil {
         options.setTimeOutInMilliSeconds(timeout);
 
         ServiceClient serviceClient = new ServiceClient();
+        try {
         serviceClient.setOptions(options);
-
-        return serviceClient.sendReceive(msg);
+        
+            OMElement response = serviceClient.sendReceive(msg);
+            // build response to materialize lazy information
+            response.build();
+            return response;
+        } finally {
+            serviceClient.cleanupTransport();
+        }
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ode/blob/a252b6d4/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java b/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
index 597d2cd..b13980d 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
@@ -256,8 +256,11 @@ public class SoapMessageConverter {
         }
 
         OMElement omPart = OMUtils.toOM(srcPartEl, _soapFactory);
-        for (Iterator<OMNode> i = omPart.getChildren(); i.hasNext();)
-            soaphdr.addChild(i.next());
+        for (Iterator<OMNode> i = omPart.getChildren(); i.hasNext();) {
+            OMNode node = i.next();
+            i.remove();
+            soaphdr.addChild(node);
+        }
     }
 
     public SOAPFault createSoapFault(Element message, QName faultName, Operation op) throws
AxisFault {
@@ -361,7 +364,11 @@ public class SoapMessageConverter {
 
             OMElement omPart = OMUtils.toOM(srcPartEl, _soapFactory);
             if (_isRPC) partHolder.addChild(omPart);
-            else for (Iterator<OMNode> i = omPart.getChildren(); i.hasNext();) partHolder.addChild(i.next());
+            else for (Iterator<OMNode> i = omPart.getChildren(); i.hasNext();) {
+                OMNode node = i.next();
+                i.remove();
+                partHolder.addChild(node);
+            }
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ode/blob/a252b6d4/dependencies.rb
----------------------------------------------------------------------
diff --git a/dependencies.rb b/dependencies.rb
index 9f1aa7c..5709e31 100644
--- a/dependencies.rb
+++ b/dependencies.rb
@@ -15,16 +15,16 @@
 
 ANNONGEN            = "annogen:annogen:jar:0.1.0"
 ANT                 = "ant:ant:jar:1.6.5"
-BACKPORT            = "backport-util-concurrent:backport-util-concurrent:jar:3.0"
+BACKPORT            = "backport-util-concurrent:backport-util-concurrent:jar:3.1"
 AXIOM               = [ group("axiom-api", "axiom-impl", "axiom-dom",
-                        :under=>"org.apache.ws.commons.axiom", :version=>"1.2.8") ]
-AXIS2_ALL           = [group("axis2-kernel", "axis2-adb", "axis2-codegen", "axis2-java2wsdl",
+                        :under=>"org.apache.ws.commons.axiom", :version=>"1.2.12")
]
+AXIS2_ALL           = [group("axis2-adb", "axis2-codegen", "axis2-kernel", "axis2-java2wsdl",
                              "axis2-jibx", "axis2-saaj", "axis2-xmlbeans",
                             :under=>"org.apache.axis2",
-                            :version=>"1.5"),
+                            :version=>"1.5.6"),
                       group("woden-api", "woden-impl-dom",
                               :under=>"org.apache.woden",
-                              :version=>"1.0M8"),
+                              :version=>"1.0M9"),
                       "org.apache.axis2:axis2-transports:jar:1.0-i6",
                       "org.apache.axis2:axis2-transport-http:jar:1.5",
                       "org.apache.axis2:axis2-transport-local:jar:1.5",
@@ -32,26 +32,29 @@ AXIS2_ALL           = [group("axis2-kernel", "axis2-adb", "axis2-codegen",
"axis
                       "org.apache.axis2:axis2-transport-jms:jar:1.0.0",
                       "org.apache.httpcomponents:httpcore:jar:4.0"]
 AXIS2_MODULES        = struct(
- :mods              => ["org.apache.rampart:rampart:mar:1.4",
-                         "org.apache.rampart:rahas:mar:1.4",
-                         "org.apache.axis2:addressing:mar:1.4",
-                         "org.apache.axis2:mex:mar:1.41"],
+ :mods              => ["org.apache.rampart:rampart:mar:1.5.2",
+                         "org.apache.rampart:rahas:mar:1.5.2",
+                         "org.apache.axis2:addressing:mar:1.5.6",
+                         "org.apache.axis2:mex:mar:1.5.6"],
  :libs              => [group("rampart-core", "rampart-policy", "rampart-trust",
                               :under=>"org.apache.rampart",
-                              :version=>"1.4"),
-                        "org.apache.ws.security:wss4j:jar:1.5.4",
-                        "org.apache.santuario:xmlsec:jar:1.4.1",
-                        "org.apache.axis2:mex:jar:impl:1.41", #1.41 is not a typo!
-                        "opensaml:opensaml:jar:1.1",
-                        "bouncycastle:bcprov-jdk15:jar:133",
+                              :version=>"1.5.2"),
+                        "org.apache.ws.security:wss4j:jar:1.5.12",
+                        "org.apache.santuario:xmlsec:jar:1.4.2",
+                        "org.apache.axis2:mex:jar:impl:1.5.6",
+                        "org.opensaml:opensaml1:jar:1.1",
+                        "org.opensaml:opensaml:jar:2.2.3",
+                        "org.opensaml:openws:jar:1.4.2",
+                        "org.opensaml:xmltooling:jar:1.3.2",
+                        "bouncycastle:bcprov-jdk15:jar:140",
                         BACKPORT]
 )
-AXIS2_WAR           = "org.apache.axis2:axis2-webapp:war:1.5"
+AXIS2_WAR           = "org.apache.axis2:axis2-webapp:war:1.5.6"
 COMMONS             = struct(
   :codec            =>"commons-codec:commons-codec:jar:1.3",
   :collections      =>"commons-collections:commons-collections:jar:3.2.1",
   :dbcp             =>"commons-dbcp:commons-dbcp:jar:1.2.2",
-  :fileupload       =>"commons-fileupload:commons-fileupload:jar:1.1.1",
+  :fileupload       =>"commons-fileupload:commons-fileupload:jar:1.2",
   :httpclient       =>"commons-httpclient:commons-httpclient:jar:3.1",
   :lang             =>"commons-lang:commons-lang:jar:2.4",
   :logging          =>"commons-logging:commons-logging:jar:1.1.1",
@@ -77,7 +80,7 @@ JAVAX               = struct(
   #:activation       =>"geronimo-spec:geronimo-spec-activation:jar:1.0.2-rc4",
   :connector        =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0",
   :ejb              =>"org.apache.geronimo.specs:geronimo-ejb_2.1_spec:jar:1.1",
-  :javamail         =>"geronimo-spec:geronimo-spec-javamail:jar:1.3.1-rc5",
+  :javamail         =>"org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.7.1",
   :jms              =>"geronimo-spec:geronimo-spec-jms:jar:1.1-rc4",
   :persistence      =>"javax.persistence:persistence-api:jar:1.0",
   :servlet          =>"org.apache.geronimo.specs:geronimo-servlet_2.4_spec:jar:1.0",
@@ -85,10 +88,10 @@ JAVAX               = struct(
   :transaction      =>"org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar:1.1",
   :resource         =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0"
 )
-JAXEN               = "jaxen:jaxen:jar:1.1.1"
+JAXEN               = "jaxen:jaxen:jar:1.1.3"
 JBI                 = group("org.apache.servicemix.specs.jbi-api-1.0", :under=>"org.apache.servicemix.specs",
:version=>"1.1.0")
 JENCKS              = "org.jencks:jencks:jar:all:1.3"
-JIBX                = "jibx:jibx-run:jar:1.1-beta3"
+JIBX                = "org.jibx:jibx-run:jar:1.2.1"
 KARAF               = [
                         "org.apache.felix:org.osgi.core:jar:1.4.0",
                         "org.apache.felix:org.osgi.compendium:jar:1.4.0",
@@ -133,14 +136,14 @@ SPRING              = ["org.springframework:spring:jar:2.5.6"]
 SPRING_OSGI         = ["org.springframework.osgi:spring-osgi-core:jar:1.2.0"]
 SPRING_TEST         = ["org.springframework:spring-test:jar:2.5.6"]
 TRANQL              = [ "tranql:tranql-connector:jar:1.1", COMMONS.primitives ]
-WOODSTOX            = "woodstox:wstx-asl:jar:3.2.1"
-WSDL4J              = "wsdl4j:wsdl4j:jar:1.6.1"
+WOODSTOX            = "woodstox:wstx-asl:jar:3.2.4"
+WSDL4J              = "wsdl4j:wsdl4j:jar:1.6.2"
 XALAN               = "xalan:xalan:jar:2.7.1"
-XERCES              = "xerces:xercesImpl:jar:2.9.0"
+XERCES              = "xerces:xercesImpl:jar:2.9.1"
 WS_COMMONS          = struct(
   :axiom            =>AXIOM,
-  :neethi           =>"org.apache.neethi:neethi:jar:2.0.4",
-  :xml_schema       =>"org.apache.ws.commons.schema:XmlSchema:jar:1.3.2"
+  :neethi           =>"org.apache.neethi:neethi:jar:2.0.5",
+  :xml_schema       =>"org.apache.ws.commons.schema:XmlSchema:jar:1.4.7"
 )
 XBEAN               = [
   "org.apache.xbean:xbean-kernel:jar:3.3",


Mime
View raw message