cxf git commit: remove unused code for handling wsa-2007/05 namespace

[ay]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes e792331d7 -> c560e2814


remove unused code for handling wsa-2007/05 namespace


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

Branch: refs/heads/3.0.x-fixes
Commit: c560e281409aa0ac327690c1fcec8ad64ecd733b
Parents: e792331
Author: Akitoshi Yoshida 
Authored: Tue Jan 19 19:01:54 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Jan 20 10:37:32 2016 +0100

--
 .../apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c560e281/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
--
diff --git 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
index 15ca563..c746896 100644
--- 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
+++ 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
@@ -309,12 +309,10 @@ public class MAPAggregatorImpl extends MAPAggregator {
 
 for (QName type : types) {
 assertAssertion(aim, type);
+// ADDRESSING_ASSERTION is normalized, so check only the default 
namespace
 if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) {
 assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
 assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);
-} else if 
(type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) {
-assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705);
-assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705);
 }
 }
 }
@@ -348,18 +346,13 @@ public class MAPAggregatorImpl extends MAPAggregator {
 
 for (QName type : types) {
 assertAssertion(aim, type);
+// ADDRESSING_ASSERTION is normalized, so check only the default 
namespace
 if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) {
 if (onlyAnonymous) {
 assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
 } else if (!hasAnonymous) {
 assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);
 }
-} else if 
(type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) {
-if (onlyAnonymous) {
-assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705);
-} else if (!hasAnonymous) {
-assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705);
-}
 }
 }
 if (!MessageUtils.isRequestor(message) && 
!MessageUtils.isOutbound(message)) {

cxf git commit: remove unused code for handling wsa-2007/05 namespace

[ay]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 737202fa0 -> fe82a0366


remove unused code for handling wsa-2007/05 namespace


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

Branch: refs/heads/3.1.x-fixes
Commit: fe82a0366018080845bf4c07ccc87c56382173b0
Parents: 737202f
Author: Akitoshi Yoshida 
Authored: Tue Jan 19 19:01:54 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Jan 19 19:07:15 2016 +0100

--
 .../apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fe82a036/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
--
diff --git 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
index afa174e..7e166b2 100644
--- 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
+++ 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
@@ -301,12 +301,10 @@ public class MAPAggregatorImpl extends MAPAggregator {
 
 for (QName type : types) {
 assertAssertion(aim, type);
+// ADDRESSING_ASSERTION is normalized, so check only the default 
namespace
 if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) {
 assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
 assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);
-} else if 
(type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) {
-assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705);
-assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705);
 }
 }
 }
@@ -340,18 +338,13 @@ public class MAPAggregatorImpl extends MAPAggregator {
 
 for (QName type : types) {
 assertAssertion(aim, type);
+// ADDRESSING_ASSERTION is normalized, so check only the default 
namespace
 if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) {
 if (onlyAnonymous) {
 assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
 } else if (!hasAnonymous) {
 assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);
 }
-} else if 
(type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) {
-if (onlyAnonymous) {
-assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705);
-} else if (!hasAnonymous) {
-assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705);
-}
 }
 }
 if (!MessageUtils.isRequestor(message) && 
!MessageUtils.isOutbound(message)) {

cxf git commit: remove unused code for handling wsa-2007/05 namespace

[ay]

Repository: cxf
Updated Branches:
  refs/heads/master 656662827 -> b0227b307


remove unused code for handling wsa-2007/05 namespace


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

Branch: refs/heads/master
Commit: b0227b307c453a750215c59438a896afaccb333b
Parents: 6566628
Author: Akitoshi Yoshida 
Authored: Tue Jan 19 19:01:54 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Jan 19 19:03:56 2016 +0100

--
 .../apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b0227b30/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
--
diff --git 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
index afa174e..7e166b2 100644
--- 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
+++ 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
@@ -301,12 +301,10 @@ public class MAPAggregatorImpl extends MAPAggregator {
 
 for (QName type : types) {
 assertAssertion(aim, type);
+// ADDRESSING_ASSERTION is normalized, so check only the default 
namespace
 if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) {
 assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
 assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);
-} else if 
(type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) {
-assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705);
-assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705);
 }
 }
 }
@@ -340,18 +338,13 @@ public class MAPAggregatorImpl extends MAPAggregator {
 
 for (QName type : types) {
 assertAssertion(aim, type);
+// ADDRESSING_ASSERTION is normalized, so check only the default 
namespace
 if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) {
 if (onlyAnonymous) {
 assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
 } else if (!hasAnonymous) {
 assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);
 }
-} else if 
(type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) {
-if (onlyAnonymous) {
-assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705);
-} else if (!hasAnonymous) {
-assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705);
-}
 }
 }
 if (!MessageUtils.isRequestor(message) && 
!MessageUtils.isOutbound(message)) {