ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1798364 - in /webservices/axiom/trunk: ./ axiom-api/ axiom-compat/ axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/ buildutils/ implementations/axiom-impl/ third_party/
Date Sun, 11 Jun 2017 13:11:56 GMT
Author: veithen
Date: Sun Jun 11 13:11:56 2017
New Revision: 1798364

URL: http://svn.apache.org/viewvc?rev=1798364&view=rev
Log:
Execute tests from Spring-WS in the Bazel build.

Added:
    webservices/axiom/trunk/axiom-compat/BUILD
    webservices/axiom/trunk/buildutils/workspace.bzl
    webservices/axiom/trunk/third_party/spring-ws.BUILD
    webservices/axiom/trunk/third_party/spring-ws.patch
Modified:
    webservices/axiom/trunk/WORKSPACE
    webservices/axiom/trunk/axiom-api/BUILD
    webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
    webservices/axiom/trunk/buildutils/test.bzl
    webservices/axiom/trunk/implementations/axiom-impl/BUILD

Modified: webservices/axiom/trunk/WORKSPACE
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/WORKSPACE?rev=1798364&r1=1798363&r2=1798364&view=diff
==============================================================================
--- webservices/axiom/trunk/WORKSPACE (original)
+++ webservices/axiom/trunk/WORKSPACE Sun Jun 11 13:11:56 2017
@@ -17,6 +17,10 @@
 # under the License.
 #
 
+workspace(name = "axiom")
+
+load("//buildutils:workspace.bzl", "new_patched_http_archive")
+
 maven_jar(
     name = "asm",
     artifact = "org.ow2.asm:asm:5.2",
@@ -72,6 +76,18 @@ maven_jar(
 )
 
 maven_jar(
+    name = "dom4j",
+    artifact = "dom4j:dom4j:1.6.1",
+    sha1 = "5d3ccc056b6f056dbf0dddfdf43894b9065a8f94",
+)
+
+maven_jar(
+    name = "easymock",
+    artifact = "org.easymock:easymock:3.1",
+    sha1 = "3e127311a86fc2e8f550ef8ee4abe094bbcf7e7e",
+)
+
+maven_jar(
     name = "felix",
     artifact = "org.apache.felix:org.apache.felix.framework:5.0.0",
     sha1 = "9fabb10642ca45792b0041d5a660b131282869db"
@@ -90,6 +106,24 @@ maven_jar(
 )
 
 maven_jar(
+    name = "httpclient",
+    artifact = "org.apache.httpcomponents:httpclient:4.3.4",
+    sha1 = "a9a1fef2faefed639ee0d0fba5b3b8e4eb2ff2d8",
+)
+
+maven_jar(
+    name = "httpclient3",
+    artifact = "commons-httpclient:commons-httpclient:3.1",
+    sha1 = "964cd74171f427720480efdec40a7c7f6e58426a",
+)
+
+maven_jar(
+    name = "httpcore",
+    artifact = "org.apache.httpcomponents:httpcore:4.3.2",
+    sha1 = "31fbbff1ddbf98f3aa7377c94d33b0447c646b6e",
+)
+
+maven_jar(
     name = "jacoco_agent",
     artifact = "org.jacoco:org.jacoco.agent:0.7.9",
     sha1 = "4a936caab50b117a14d9ca3a725fc9b54d0cc3d1",
@@ -108,12 +142,36 @@ maven_jar(
 )
 
 maven_jar(
+    name = "jdom2",
+    artifact = "org.jdom:jdom2:2.0.5",
+    sha1 = "2001db51c131e555bafdb77fc52af6a9408c505e",
+)
+
+maven_jar(
+    name = "jetty",
+    artifact = "org.mortbay.jetty:jetty:6.1.26",
+    sha1 = "2f546e289fddd5b1fab1d4199fbb6e9ef43ee4b0",
+)
+
+maven_jar(
+    name = "jetty_util",
+    artifact = "org.mortbay.jetty:jetty-util:6.1.26",
+    sha1 = "e5642fe0399814e1687d55a3862aa5a3417226a9",
+)
+
+maven_jar(
     name = "junit",
     artifact = "junit:junit:4.12",
     sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec",
 )
 
 maven_jar(
+    name = "log4j",
+    artifact = "log4j:log4j:1.2.17",
+    sha1 = "5af35056b4d257e4b64b9e8069c0746e8b08629f",
+)
+
+maven_jar(
     name = "mime4j_core",
     artifact = "org.apache.james:apache-mime4j-core:0.8.0",
     sha1 = "d54f45fca44a2f210569656b4ca3574b42911c95",
@@ -228,6 +286,12 @@ maven_jar(
 )
 
 maven_jar(
+    name = "servlet",
+    artifact = "javax.servlet:javax.servlet-api:3.1.0",
+    sha1 = "3cd63d075497751784b2fa84be59432f4905bf7c",
+)
+
+maven_jar(
     name = "slf4j_api",
     artifact = "org.slf4j:slf4j-api:1.5.11",
     sha1 = "d6a855b608971025b4fbb0970f829391cc6f727a",
@@ -240,6 +304,63 @@ maven_jar(
 )
 
 maven_jar(
+    name = "spring_aop",
+    artifact = "org.springframework:spring-aop:4.3.9.RELEASE",
+    sha1 = "95f5f5cf3cae64266a89dc1bc9e0484425cd8358",
+)
+
+maven_jar(
+    name = "spring_beans",
+    artifact = "org.springframework:spring-beans:4.3.9.RELEASE",
+    sha1 = "daa5abf3779c8cad1a2910e1ea08e4272489d8ae",
+)
+
+maven_jar(
+    name = "spring_context",
+    artifact = "org.springframework:spring-context:4.3.9.RELEASE",
+    sha1 = "a186823724f03b98becd5f93b1fa107fe6f7a7ff",
+)
+
+maven_jar(
+    name = "spring_core",
+    artifact = "org.springframework:spring-core:4.3.9.RELEASE",
+    sha1 = "430b7298bfb85d66fb61e19ca8f06231b911e9f5",
+)
+
+maven_jar(
+    name = "spring_oxm",
+    artifact = "org.springframework:spring-oxm:4.3.9.RELEASE",
+    sha1 = "73ada2015865c0aaff419c4ed28bac7257f1bc85",
+)
+
+maven_jar(
+    name = "spring_test",
+    artifact = "org.springframework:spring-test:4.3.9.RELEASE",
+    sha1 = "35bf4c38c9245f5baeeda4bea7c41f4f33c5daf3",
+)
+
+maven_jar(
+    name = "spring_web",
+    artifact = "org.springframework:spring-web:4.3.9.RELEASE",
+    sha1 = "91dae64c4280093ad5fb4736a10913c9233479c1",
+)
+
+maven_jar(
+    name = "spring_webmvc",
+    artifact = "org.springframework:spring-webmvc:4.3.9.RELEASE",
+    sha1 = "ca80b4a00abc388d8046bf372099f35564371c47",
+)
+
+new_patched_http_archive(
+    name = "spring_ws",
+    urls = ["https://github.com/spring-projects/spring-ws/archive/v2.4.0.RELEASE.tar.gz"],
+    sha256 = "83fe955ae3fc0e437e460164bb942ad3307d3942fe01b8e93a7c5335618dbb67",
+    build_file = "//third_party:spring-ws.BUILD",
+    strip_prefix = "spring-ws-2.4.0.RELEASE",
+    patch = "//third_party:spring-ws.patch",
+)
+
+maven_jar(
     name = "stax2_api",
     artifact = "org.codehaus.woodstox:stax2-api:3.1.1",
     sha1 = "0466eab062e9d1a3ce2c4631b6d09b5e5c0cbd1b",
@@ -258,6 +379,12 @@ maven_jar(
 )
 
 maven_jar(
+    name = "wsdl4j",
+    artifact = "wsdl4j:wsdl4j:1.6.3",
+    sha1 = "6d106a6845a3d3477a1560008479312888e94f2f",
+)
+
+maven_jar(
     name = "xalan",
     artifact = "xalan:xalan:2.7.1",
     sha1 = "75f1d83ce27bab5f29fff034fc74aa9f7266f22a",
@@ -286,3 +413,21 @@ maven_jar(
     artifact = "org.apache.xmlbeans:xmlbeans:2.3.0",
     sha1 = "8704dcf5c9f10265a08f5020b0fab70eb64ac3c4",
 )
+
+maven_jar(
+    name = "xmlschema",
+    artifact = "org.apache.ws.xmlschema:xmlschema-core:2.1.0",
+    sha1 = "93415557e2867469c33be98ab330655dd714297d",
+)
+
+maven_jar(
+    name = "xmlunit",
+    artifact = "xmlunit:xmlunit:1.5",
+    sha1 = "7789cef5caffdecab50fd6099535ad2bc2e98044",
+)
+
+maven_jar(
+    name = "xom",
+    artifact = "xom:xom:1.2.5",
+    sha1 = "4166493b9f04e91b858ba4150b28b4d197f8f8ea",
+)

Modified: webservices/axiom/trunk/axiom-api/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/BUILD?rev=1798364&r1=1798363&r2=1798364&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/BUILD (original)
+++ webservices/axiom/trunk/axiom-api/BUILD Sun Jun 11 13:11:56 2017
@@ -215,6 +215,7 @@ bundle(
     activation_policy = "lazy",
     deps = [
         ":locator",
+        ":util-base64",
         ":util-sax",
     ],
 )

Added: webservices/axiom/trunk/axiom-compat/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/BUILD?rev=1798364&view=auto
==============================================================================
--- webservices/axiom/trunk/axiom-compat/BUILD (added)
+++ webservices/axiom/trunk/axiom-compat/BUILD Sun Jun 11 13:11:56 2017
@@ -0,0 +1,43 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+package(default_visibility = ["//visibility:public"])
+
+java_library(
+    name = "axiom-compat",
+    srcs = glob(["src/main/java/**/*.java"]),
+    deps = [
+        "@commons_logging//jar",
+        "@javamail//jar",
+        "//axiom-api",
+        "//axiom-api:ext-activation",
+        "//axiom-api:ext-io",
+        "//axiom-api:ext-stax",
+        "//axiom-api:mime",
+        "//axiom-api:stax",
+        "//axiom-api:util",
+        "//axiom-api:util-base64",
+        "//axiom-api:util-namespace",
+        "//axiom-api:util-sax",
+        "//axiom-api:util-stax",
+        "//axiom-api:util-stax-wrapper",
+        "//axiom-api:util-activation",
+        "//components/base64-utils",
+    ],
+)

Modified: webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java?rev=1798364&r1=1798363&r2=1798364&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
(original)
+++ webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
Sun Jun 11 13:11:56 2017
@@ -45,8 +45,12 @@ public class StAXSOAPModelBuilder implem
         validateSOAPVersion(factory, soapVersion);
     }
     
-    public StAXSOAPModelBuilder(XMLStreamReader parser, String soapVersion) {
+    public StAXSOAPModelBuilder(XMLStreamReader parser) {
         this(OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMAbstractFactory.getMetaFactory(),
parser));
+    }
+    
+    public StAXSOAPModelBuilder(XMLStreamReader parser, String soapVersion) {
+        this(parser);
         validateSOAPVersion(null, soapVersion);
     }
     

Modified: webservices/axiom/trunk/buildutils/test.bzl
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/test.bzl?rev=1798364&r1=1798363&r2=1798364&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/test.bzl (original)
+++ webservices/axiom/trunk/buildutils/test.bzl Sun Jun 11 13:11:56 2017
@@ -62,11 +62,11 @@ _jacoco = rule(
     },
 )
 
-def test(name, srcs, test_class, deps=[], runtime_deps=[], data=[]):
+def test(name, test_class, srcs=[], deps=[], runtime_deps=[], data=[]):
   native.java_library(
       name = "%s_lib" % name,
       srcs = srcs,
-      deps = deps + ["//third_party:junit"],
+      deps = deps + ["//third_party:junit"] if deps else None,
       runtime_deps = runtime_deps,
       data = data,
   )

Added: webservices/axiom/trunk/buildutils/workspace.bzl
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/workspace.bzl?rev=1798364&view=auto
==============================================================================
--- webservices/axiom/trunk/buildutils/workspace.bzl (added)
+++ webservices/axiom/trunk/buildutils/workspace.bzl Sun Jun 11 13:11:56 2017
@@ -0,0 +1,49 @@
+#
+# 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.
+#
+
+def _new_patched_http_archive_impl(rctx):
+  # Download the archive and extract it
+  rctx.download_and_extract(
+      url=rctx.attr.urls,
+      output=rctx.path(""),
+      stripPrefix=rctx.attr.strip_prefix,
+      type=rctx.attr.type,
+      sha256=rctx.attr.sha256)
+
+  # Now patch the repository
+  patch_file = str(rctx.path(rctx.attr.patch).realpath)
+  result = rctx.execute(["bash", "-c", "patch -p0 < " + patch_file])
+  if result.return_code != 0:
+    fail("Failed to patch (%s): %s" % (result.return_code, result.stderr))
+
+  # And finally add the build file
+  rctx.symlink(rctx.attr.build_file, "BUILD.bazel")
+
+
+new_patched_http_archive = repository_rule(
+    implementation=_new_patched_http_archive_impl,
+    attrs={
+        "urls": attr.string_list(mandatory=True),
+        "patch": attr.label(mandatory=True),
+        "sha256": attr.string(mandatory=True),
+        "strip_prefix": attr.string(mandatory=False, default=""),
+        "type": attr.string(mandatory=False, default=""),
+        "build_file": attr.label(mandatory=True),
+    })
+

Modified: webservices/axiom/trunk/implementations/axiom-impl/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/BUILD?rev=1798364&r1=1798363&r2=1798364&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/BUILD (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/BUILD Sun Jun 11 13:11:56 2017
@@ -95,3 +95,36 @@ test(
     ],
 )
 
+[test(
+    name = "spring-ws-%s" % name.replace(".", "-"),
+    test_class = "org.springframework.ws.%s" % name,
+    runtime_deps = [
+        "@spring_ws//:core-tests",
+        ":axiom-impl",
+        "//axiom-api:locator",
+    ],
+) for name in [
+    "soap.axiom.AxiomHandlerTest",
+    "soap.axiom.AxiomSoap11BodyTest",
+    "soap.axiom.AxiomSoap11EnvelopeTest",
+    "soap.axiom.AxiomSoap11HeaderTest",
+    "soap.axiom.AxiomSoap11MessageFactoryTest",
+    "soap.axiom.AxiomSoap11MessageTest",
+    "soap.axiom.AxiomSoap11NonCachingBodyTest",
+    "soap.axiom.AxiomSoap11NonCachingMessageTest",
+    "soap.axiom.AxiomSoap12BodyTest",
+    "soap.axiom.AxiomSoap12EnvelopeTest",
+    "soap.axiom.AxiomSoap12HeaderTest",
+    "soap.axiom.AxiomSoap12MessageFactoryTest",
+    "soap.axiom.AxiomSoap12MessageTest",
+    "soap.axiom.AxiomSoap12NonCachingBodyTest",
+    "soap.axiom.AxiomSoap12NonCachingMessageTest",
+    "soap.axiom.AxiomSoapFaultDetailTest",
+    "soap.axiom.NonCachingPayloadTest",
+    # TODO: this one doesn't work
+#    "soap.axiom.support.AxiomUtilsTest",
+    "client.core.AxiomStreamingSoap11WebServiceTemplateIntegrationTest",
+    "client.core.AxiomNonStreamingSoap11WebServiceTemplateIntegrationTest",
+    "client.core.AxiomStreamingSoap12WebServiceTemplateIntegrationTest",
+    "client.core.AxiomNonStreamingSoap12WebServiceTemplateIntegrationTest",
+]]

Added: webservices/axiom/trunk/third_party/spring-ws.BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/third_party/spring-ws.BUILD?rev=1798364&view=auto
==============================================================================
--- webservices/axiom/trunk/third_party/spring-ws.BUILD (added)
+++ webservices/axiom/trunk/third_party/spring-ws.BUILD Sun Jun 11 13:11:56 2017
@@ -0,0 +1,97 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+package(default_visibility = ["//visibility:public"])
+
+java_library(
+    name = "xml",
+    srcs = glob(["spring-xml/src/main/java/**/*.java"]),
+    deps = [
+        "@commons_logging//jar",
+        "@jaxen//jar",
+        "@spring_beans//jar",
+        "@spring_context//jar",
+        "@spring_core//jar",
+        "@xmlschema//jar",
+    ],
+)
+
+java_library(
+    name = "core",
+    srcs = glob(["spring-ws-core/src/main/java/**/*.java"]),
+    resources = glob(["spring-ws-core/src/main/resources/**"]),
+    deps = [
+        "@axiom//axiom-api",
+        "@axiom//axiom-api:stax",
+        "@axiom//axiom-compat",
+        "@commons_logging//jar",
+        "@dom4j//jar",
+        "@httpclient//jar",
+        "@httpclient3//jar",
+        "@httpcore//jar",
+        "@jdom2//jar",
+        "@servlet//jar",
+        "@spring_aop//jar",
+        "@spring_beans//jar",
+        "@spring_context//jar",
+        "@spring_core//jar",
+        "@spring_oxm//jar",
+        "@spring_web//jar",
+        "@spring_webmvc//jar",
+        "@wsdl4j//jar",
+        "@xom//jar",
+        ":xml",
+    ],
+)
+
+java_library(
+    name = "core-tests",
+    srcs = glob(["spring-ws-core/src/test/java/**/*.java"]),
+    resources = glob(["spring-ws-core/src/test/resources/**"]),
+    deps = [
+        "@aspectj_runtime//jar",
+        "@axiom//axiom-api",
+        "@axiom//axiom-compat",
+        "@commons_logging//jar",
+        "@dom4j//jar",
+        "@easymock//jar",
+        "@hamcrest//jar",
+        "@httpclient//jar",
+        "@httpclient3//jar",
+        "@httpcore//jar",
+        "@javamail//jar",
+        "@jdom2//jar",
+        "@jetty//jar",
+        "@jetty_util//jar",
+        "@junit//jar",
+        "@log4j//jar",
+        "@servlet//jar",
+        "@spring_beans//jar",
+        "@spring_context//jar",
+        "@spring_core//jar",
+        "@spring_oxm//jar",
+        "@spring_test//jar",
+        "@spring_web//jar",
+        "@wsdl4j//jar",
+        "@xmlunit//jar",
+        "@xom//jar",
+        ":core",
+        ":xml",
+    ],
+)

Added: webservices/axiom/trunk/third_party/spring-ws.patch
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/third_party/spring-ws.patch?rev=1798364&view=auto
==============================================================================
--- webservices/axiom/trunk/third_party/spring-ws.patch (added)
+++ webservices/axiom/trunk/third_party/spring-ws.patch Sun Jun 11 13:11:56 2017
@@ -0,0 +1,51 @@
+diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Header.java
b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Header.java
+index 9ec4a7b..a132272 100644
+--- spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Header.java
++++ spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Header.java
+@@ -48,7 +48,7 @@ class AxiomSoap11Header extends AxiomSoapHeader implements Soap11Header
{
+ 		if (!ObjectUtils.isEmpty(actors)) {
+ 			rolePlayer = new RolePlayer() {
+ 
+-				public List<?> getRoles() {
++				public List<String> getRoles() {
+ 					return Arrays.asList(actors);
+ 				}
+ 
+diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Header.java
b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Header.java
+index b8e2049..92882a8 100644
+--- spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Header.java
++++ spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Header.java
+@@ -88,7 +88,7 @@ class AxiomSoap12Header extends AxiomSoapHeader implements Soap12Header
{
+ 		if (!ObjectUtils.isEmpty(roles)) {
+ 			rolePlayer = new RolePlayer() {
+ 
+-				public List<?> getRoles() {
++				public List<String> getRoles() {
+ 					return Arrays.asList(roles);
+ 				}
+ 
+diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeader.java
b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeader.java
+index f88c902..7e70a95 100644
+--- spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeader.java
++++ spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeader.java
+@@ -114,9 +114,9 @@ abstract class AxiomSoapHeader extends AxiomSoapElement implements SoapHeader
{
+ 
+ 	protected class AxiomSoapHeaderElementIterator implements Iterator<SoapHeaderElement>
{
+ 
+-		private final Iterator<SOAPHeaderBlock> axiomIterator;
++		private final Iterator<? extends OMElement> axiomIterator;
+ 
+-		protected AxiomSoapHeaderElementIterator(Iterator<SOAPHeaderBlock> axiomIterator)
{
++		protected AxiomSoapHeaderElementIterator(Iterator<? extends OMElement> axiomIterator)
{
+ 			this.axiomIterator = axiomIterator;
+ 		}
+ 
+@@ -128,7 +128,7 @@ abstract class AxiomSoapHeader extends AxiomSoapElement implements SoapHeader
{
+ 		@Override
+ 		public SoapHeaderElement next() {
+ 			try {
+-				SOAPHeaderBlock axiomHeaderBlock = axiomIterator.next();
++				SOAPHeaderBlock axiomHeaderBlock = (SOAPHeaderBlock)axiomIterator.next();
+ 				return new AxiomSoapHeaderElement(axiomHeaderBlock, getAxiomFactory());
+ 			}
+ 			catch (OMException ex) {



Mime
View raw message