You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/01 15:32:02 UTC
[1/3] cxf git commit: Get databinding systests to run on random ports
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 33a81d35a -> 432d95179
Get databinding systests to run on random ports
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fb1c2d90
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fb1c2d90
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fb1c2d90
Branch: refs/heads/3.1.x-fixes
Commit: fb1c2d90a1ef553760674433234f1f2976b15246
Parents: 33a81d3
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Feb 1 15:25:54 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Feb 1 15:31:54 2017 +0000
----------------------------------------------------------------------
.../databinding/src/test/resources/jaxbCustomValidators.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/fb1c2d90/systests/databinding/src/test/resources/jaxbCustomValidators.xml
----------------------------------------------------------------------
diff --git a/systests/databinding/src/test/resources/jaxbCustomValidators.xml b/systests/databinding/src/test/resources/jaxbCustomValidators.xml
index 10937ed..151b268 100644
--- a/systests/databinding/src/test/resources/jaxbCustomValidators.xml
+++ b/systests/databinding/src/test/resources/jaxbCustomValidators.xml
@@ -25,11 +25,13 @@ under the License.
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
<!-- Services -->
<jaxws:server
id="testServer"
serviceClass="org.apache.cxf.systest.jaxb.validators.HelloWorld"
- address="http://localhost:9000/Hello">
+ address="http://localhost:${testutil.ports.CustomValidatorJAXBTest}/Hello">
<jaxws:serviceBean>
<bean class="org.apache.cxf.systest.jaxb.validators.HelloWorldImpl"/>
</jaxws:serviceBean>
@@ -48,7 +50,7 @@ under the License.
<jaxws:client
id="testClient"
serviceClass="org.apache.cxf.systest.jaxb.validators.HelloWorld"
- address="http://localhost:9000/Hello">
+ address="http://localhost:${testutil.ports.CustomValidatorJAXBTest}/Hello">
</jaxws:client>
[2/3] cxf git commit: Also check policies in the AssertionInfoMap for
equality
Posted by co...@apache.org.
Also check policies in the AssertionInfoMap for equality
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/08e90aba
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/08e90aba
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/08e90aba
Branch: refs/heads/3.1.x-fixes
Commit: 08e90abaabf4bbd1f3abfa3f1825dab68c86210e
Parents: fb1c2d9
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Feb 1 15:30:15 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Feb 1 15:31:56 2017 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/08e90aba/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
index bc2e0cb..fd3e848 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
@@ -102,7 +102,7 @@ public class AssertionInfoMap extends HashMap<QName, Collection<AssertionInfo>>
Collection<AssertionInfo> ail = getAssertionInfo(ass.getName());
boolean found = false;
for (AssertionInfo ai : ail) {
- if (ai.getAssertion().equal(ass)) {
+ if (ai.getAssertion().equal(ass) || ai.getAssertion().equals(ass)) {
found = true;
if (!ai.isAsserted() && !ass.isOptional()) {
errors.add(ass.getName());
[3/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/432d9517
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/432d9517
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/432d9517
Branch: refs/heads/3.1.x-fixes
Commit: 432d9517952f9d14478bff8fb8e421266f82014d
Parents: 08e90ab
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Feb 1 15:31:56 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Feb 1 15:31:56 2017 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/432d9517/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c81b41b..e47fb55 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -217,6 +217,7 @@ B ec95dfbaf9fae88d21c98305d6415c65c00fd2fa
B ecb6eba580c81d35991df66681db8dff99b1b087
B ee6ceea0d493b1b2dc6d83ca6923c3baed81885e
B ee6e9e7d037de08ebc4a017ca7525d3ca67d2adb
+B ef13d2b2f8f7b67b7351030a3a097377435371c5
B efb1f0830f5441777198737fb26e9305ab969f66
B f0e08b7bea2660542e18294d490e68c7b14aaa4b
B f12557bd4323e5bb87b4678120f367dcce4b504e