You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/06/04 17:11:00 UTC
[1/7] git commit: Update building instructions to mention java6, not 5
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes d0c1bcf2f -> d18f6f41d
Update building instructions to mention java6, not 5
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e07c8f09
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e07c8f09
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e07c8f09
Branch: refs/heads/2.7.x-fixes
Commit: e07c8f09342d584068c5239a8cf174064ef2c151
Parents: d0c1bcf
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed May 14 11:47:31 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 4 10:46:47 2014 -0400
----------------------------------------------------------------------
BUILDING.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e07c8f09/BUILDING.txt
----------------------------------------------------------------------
diff --git a/BUILDING.txt b/BUILDING.txt
index 24daab4..a036001 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -6,8 +6,7 @@ Initial Setup
1) Install J2SE SDK, which can be downloaded from
http://www.oracle.com/technetwork/java/archive-139210.html#javase
- CXF supports most versions newer than 1.5.0_13 with the exception
- of Java 6 updates 1-3.
+ CXF supports most versions newer than 1.6.0_04
2) Make sure that your JAVA_HOME environment variable is set to the newly installed
JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or
@@ -33,7 +32,7 @@ Building
This will compile Apache CXF without running the tests and takes less
time to build.
Depending on the load of remote Maven repositories, you may have
- to run "mvn" several times utill the required dependencies are
+ to run "mvn" several times until the required dependencies are
all located in your local maven repository. It usually takes some time for
maven to download required dependencies in the first build.
[6/7] git commit: More race conditions fixes
Posted by dk...@apache.org.
More race conditions fixes
Conflicts:
rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a158f4fa
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a158f4fa
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a158f4fa
Branch: refs/heads/2.7.x-fixes
Commit: a158f4fa7ba073b7c6948e3172f84e89d96dd2a6
Parents: 5eea933
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Jun 4 10:12:35 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 4 10:55:46 2014 -0400
----------------------------------------------------------------------
.../cxf/ws/policy/EndpointPolicyImpl.java | 47 +++++++++++---------
1 file changed, 27 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a158f4fa/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
index 3f68e98..3ff6c62 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
@@ -50,9 +50,9 @@ public class EndpointPolicyImpl implements EndpointPolicy {
private Policy policy;
private Collection<Assertion> chosenAlternative;
- private Collection<Assertion> vocabulary;
+ private volatile Collection<Assertion> vocabulary;
private Collection<Assertion> faultVocabulary;
- private List<Interceptor<? extends Message>> interceptors;
+ private volatile List<Interceptor<? extends Message>> interceptors;
private List<Interceptor<? extends Message>> faultInterceptors;
private EndpointInfo ei;
@@ -107,28 +107,28 @@ public class EndpointPolicyImpl implements EndpointPolicy {
return chosenAlternative;
}
- public synchronized Collection<Assertion> getVocabulary() {
+ public Collection<Assertion> getVocabulary() {
if (vocabulary == null) {
initializeVocabulary();
}
return vocabulary;
}
- public synchronized Collection<Assertion> getFaultVocabulary() {
+ public Collection<Assertion> getFaultVocabulary() {
if (vocabulary == null) {
initializeVocabulary();
}
return faultVocabulary;
}
- public synchronized List<Interceptor<? extends Message>> getInterceptors() {
+ public List<Interceptor<? extends Message>> getInterceptors() {
if (interceptors == null) {
initializeInterceptors();
}
return interceptors;
}
- public synchronized List<Interceptor<? extends Message>> getFaultInterceptors() {
+ public List<Interceptor<? extends Message>> getFaultInterceptors() {
if (interceptors == null) {
initializeInterceptors();
}
@@ -194,9 +194,10 @@ public class EndpointPolicyImpl implements EndpointPolicy {
return;
}
- vocabulary = new ArrayList<Assertion>();
+ List<Assertion> v = new ArrayList<Assertion>();
+ List<Assertion> fv = null;
if (requestor) {
- faultVocabulary = new ArrayList<Assertion>();
+ fv = new ArrayList<Assertion>();
}
// vocabulary of alternative chosen for endpoint
@@ -205,9 +206,9 @@ public class EndpointPolicyImpl implements EndpointPolicy {
if (a.isOptional()) {
continue;
}
- vocabulary.add(a);
- if (null != faultVocabulary) {
- faultVocabulary.add(a);
+ v.add(a);
+ if (null != fv) {
+ fv.add(a);
}
}
}
@@ -220,28 +221,32 @@ public class EndpointPolicyImpl implements EndpointPolicy {
p = engine.getEffectiveServerRequestPolicy(ei, boi);
Collection<Assertion> c = engine.getAssertions(p, false);
if (c != null) {
- addAll(vocabulary, c);
+ addAll(v, c);
}
} else {
p = engine.getEffectiveClientResponsePolicy(ei, boi);
Collection<Assertion> c = engine.getAssertions(p, false);
if (c != null) {
- addAll(vocabulary, c);
- if (null != faultVocabulary) {
- addAll(faultVocabulary, c);
+ addAll(v, c);
+ if (null != fv) {
+ addAll(fv, c);
}
}
- if (boi.getFaults() != null && null != faultVocabulary) {
+ if (boi.getFaults() != null && null != fv) {
for (BindingFaultInfo bfi : boi.getFaults()) {
p = engine.getEffectiveClientFaultPolicy(ei, boi, bfi);
c = engine.getAssertions(p, false);
if (c != null) {
- addAll(faultVocabulary, c);
+ addAll(fv, c);
}
}
}
}
}
+ if (requestor) {
+ faultVocabulary = fv;
+ }
+ vocabulary = v;
}
Collection<Assertion> getSupportedAlternatives(Policy p) {
@@ -292,8 +297,9 @@ public class EndpointPolicyImpl implements EndpointPolicy {
}
}
+ List<Interceptor<? extends Message>> tmp = null;
if (requestor) {
- interceptors = new ArrayList<Interceptor<? extends Message>>(out);
+ tmp = new ArrayList<Interceptor<? extends Message>>(out);
out.clear();
for (Assertion a : getChosenAlternative()) {
initializeInterceptors(reg, out, a, true);
@@ -313,10 +319,11 @@ public class EndpointPolicyImpl implements EndpointPolicy {
}
}
}
- interceptors = new ArrayList<Interceptor<? extends Message>>(out);
+ tmp = new ArrayList<Interceptor<? extends Message>>(out);
} else {
- interceptors = new ArrayList<Interceptor<? extends Message>>(out);
+ tmp = new ArrayList<Interceptor<? extends Message>>(out);
}
+ interceptors = tmp;
}
// for test
[3/7] git commit: Update a couple deps
Posted by dk...@apache.org.
Update a couple deps
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aa7d417f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aa7d417f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aa7d417f
Branch: refs/heads/2.7.x-fixes
Commit: aa7d417f0ed28fac57a8e9ad6ebd9995c1eb13ec
Parents: 0aafe46
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu May 29 11:34:24 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 4 10:49:02 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/aa7d417f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4820bc7..1f77210 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -153,7 +153,7 @@
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.swagger.version>1.3.0</cxf.swagger.version>
<cxf.velocity.version>1.7</cxf.velocity.version>
- <cxf.woodstox.core.version>4.3.0</cxf.woodstox.core.version>
+ <cxf.woodstox.core.version>4.4.0</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
<cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
<cxf.wss4j.version>1.6.15</cxf.wss4j.version>
@@ -177,7 +177,7 @@
<cxf.servicemix.specs.version>2.2.0</cxf.servicemix.specs.version>
<cxf.javax.mail.version>1.4.4</cxf.javax.mail.version>
<cxf.jaxb.bundle.version>2.2.1.1_2</cxf.jaxb.bundle.version>
- <cxf.saaj-impl.bundle.version>1.3.21_1</cxf.saaj-impl.bundle.version>
+ <cxf.saaj-impl.bundle.version>1.3.23_1</cxf.saaj-impl.bundle.version>
<cxf.wsdl4j.bundle.version>1.6.3_1</cxf.wsdl4j.bundle.version>
<cxf.xmlsec.bundle.version>1.5.6</cxf.xmlsec.bundle.version>
<cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
[2/7] git commit: Update buildnumber plugin to latest to work better
with git
Posted by dk...@apache.org.
Update buildnumber plugin to latest to work better with git
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0aafe463
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0aafe463
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0aafe463
Branch: refs/heads/2.7.x-fixes
Commit: 0aafe4633f1f64500f45b61401e71595124827cd
Parents: e07c8f0
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed May 14 14:05:40 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 4 10:47:37 2014 -0400
----------------------------------------------------------------------
api/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0aafe463/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 3e3ccd4..3c02916 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -169,7 +169,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
<executions>
<execution>
<id>create-noncanonicalrev</id>
[5/7] git commit: Fix some race conditions in the EndpointPolicyImpl
Posted by dk...@apache.org.
Fix some race conditions in the EndpointPolicyImpl
Conflicts:
rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5eea9332
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5eea9332
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5eea9332
Branch: refs/heads/2.7.x-fixes
Commit: 5eea93321f5e6041df90ebf8f11ef055c112a31d
Parents: 6346140
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Jun 4 09:59:24 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 4 10:54:13 2014 -0400
----------------------------------------------------------------------
.../org/apache/cxf/ws/policy/EndpointPolicyImpl.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5eea9332/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
index f9a6bf9..3f68e98 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
@@ -189,7 +189,11 @@ public class EndpointPolicyImpl implements EndpointPolicy {
}
}
- void initializeVocabulary() {
+ synchronized void initializeVocabulary() {
+ if (vocabulary != null) {
+ return;
+ }
+
vocabulary = new ArrayList<Assertion>();
if (requestor) {
faultVocabulary = new ArrayList<Assertion>();
@@ -269,7 +273,11 @@ public class EndpointPolicyImpl implements EndpointPolicy {
}
}
- void initializeInterceptors() {
+ synchronized void initializeInterceptors() {
+ if (interceptors != null) {
+ return;
+ }
+
if (engine == null || engine.getBus() == null
|| engine.getBus().getExtension(PolicyInterceptorProviderRegistry.class) == null) {
return;
[7/7] git commit: Recording .gitmergeinfo Changes
Posted by dk...@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/d18f6f41
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d18f6f41
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d18f6f41
Branch: refs/heads/2.7.x-fixes
Commit: d18f6f41d5bf89f899b8c40d5d3fa698533e9860
Parents: a158f4f
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Jun 4 10:55:46 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 4 10:55:46 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d18f6f41/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e49eb2c..ef21c35 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -23,6 +23,7 @@ B 02f690f7daee782ba51495d66dacfe222b13ac15
B 02fe28753987ad8a2e47f1ce30b5de546357676b
B 035df3e5199f02906cb3e0fc375b987f712e5adf
B 037abfeb72fcedc4178bc3788f18562446960306
+B 037cc952b89b82db0a58e1008b0de2d83e4b281a
B 03a0a7e6f5f475e203489b9a03102c5ae77633f8
B 04483ebcf4a4f603449fbc89fcaf394ca03f106a
B 04a3c603e46f529e9f2a3602168a051db96e1657
@@ -30,6 +31,7 @@ B 04b535bbb4667e43492515718a061553d50644d8
B 0646fdbf971885ca605cd27d5b46a413bc0e8f84
B 06bb3853d7e5998dbebd8d042114a06f4827d76f
B 0709775589ac5310bf6a68689f89db8f33463645
+B 070c8eb6a4871b78568045703eac9dffadb32db1
B 07108f9a1f81eee219bfab33fc90391e8b9edc44
B 0739807fbc6f3b3e24aca2b517e34f1b9354d34e
B 076b258c21ab784322b7231718efba6e0f941fae
@@ -88,6 +90,8 @@ B 1419bea39cbfadca226db7a54d0a2f5d114b2ef9
B 1429dd09caa3d0e0637669dbbf2b512f4c8bed24
B 14585ed2de2c51a7683e392523db1a5c8c2621d5
B 148bbc8f4a30ecd801e87db7b6621c5d39deb478
+B 14949c37fc9ac90a410137721c5ab46ff71367c1
+B 149dcf004a4d095fbfee6f12ed048de2257a5b57
B 14a29e1f411ff362f8899d3e9276d8239faf33cd
B 14be17bff7941e358189b7058792ada4dbe3c7eb
B 14c241f0ba605176509620bc2517bec2bd351e4a
@@ -126,6 +130,7 @@ B 1bdcc6c08ebd79dff682e69d3141737a5d953597
B 1c1441f3b3cfc8726862b3486c62ccf9171d9443
B 1c5deac261d13e7f2baf5a13fd8379992ed6b48a
B 1cb3c15b49d53d391e2e6ab403ba7ecea0954d29
+B 1cbfd0ca62076f2231f41d986bf44f95696800be
B 1d6438784fc0fee6e00f3492b2920953ed6354fe
B 1d72c1551a0bb5d671cde6332f5e87135326aff9
B 1d7365b33c03b44f8fa984fc1f6350469f6bb7f3
@@ -357,6 +362,7 @@ B 4ff319c6e46e9570003632fe96908ebd03ee9768
B 501a9ff767f4bdd4183412116f2b45ffa6a1f9b9
B 5027baf5e5f453c7ff92c525c5db48cb3e2e5617
B 5065d9b57a1d5a1fb511190598e40d6683d4b174
+B 5093b5b3e04e0c67ff6ff14e7e7fa3947673a4e8
B 50ac1ba3e518d9bd01aeca98ac4a142c9fed756c
B 51053aa2fecbc9620b88f7d25e6f2319c7a4dc04
B 514aebf5b5ae19ec2a844282f4c12e5d65e46c46
@@ -419,6 +425,7 @@ B 6096d78999d8fced697a29a02c62ddab98d25a3a
B 60ced92f740f2f88dd75457e22e8775de88d1a09
B 60e756d2dc7507716d8b8fa2bfd9b99fc3e2ce73
B 60fec6d7fddaa8324fc9652c6b7cbc100fa31822
+B 61125f0665fff8d0d93ba99b85ce9bf7dc8557d2
B 61145ca9fe23be1c9a88570926308e30b276c5c1
B 6155656f80e827b0f366c0b18dd4fb27f76330a9
B 6166f14fd666e8c499a789b4dd18a02a67121059
@@ -613,6 +620,7 @@ B 8b697ed365227feedd97ae394bc3ef3dce57092d
B 8ba62afd77c74af7599b8a16442eaf8d15fc2359
B 8bbb1b06740d9fb47173632395be3b465f5637d8
B 8be9f4b6a780a36f949c05aaafcfb664cabe5b13
+B 8c138e03557e85601a5f2a4a10905eda5673590f
B 8c585b792fc4acaf1c9c51e22a4b04ba606da612
B 8c6f01701bbc06b6958b6105b181acab3301082c
B 8c96713d169619bd3f7790110523113fd7ff6e7b
@@ -701,6 +709,7 @@ B 9dd62509e232269afac7a6567fbcc568a3f91f0e
B 9e17d8a99e634fa9ce507afb61c1a9306255fa90
B 9e27007895d269fb3e2c47e39f65286d29a7896b
B 9e745da46f1535afecb11d3f24f21b41bfc2abd3
+B 9ef02595b1bb92326110b350c9eda1884dff04da
B 9f935ad983d883b0727b47af96761106c7a408ee
B 9fcf83d1bba27babaac6ed9efbb1f8876137df17
B 9ffaa4d40cc724feeb49356d7337d9057d69364a
@@ -927,6 +936,7 @@ B d512d5273b747e970448730bcb10b867bc3abdaa
B d5c72f876b1c34a41d93f07da546b906d1ed0d3a
B d5e5211301d67aeaf81d078cb2fc9b76478e555f
B d5f4ca8a34a1f52f89bdc7f2cc886d6ad1ee7819
+B d6a28f1100bafbcb5f962af59f36209b4f4323b0
B d6b4d3f2666cce8a751738c4a9e48899bbc0dca8
B d711d7523901b5b14f4af265710a1c997708a808
B d78f8c6576086db2baa5d467ff8c506466ce3859
@@ -968,6 +978,7 @@ B df3aa9d613db902539ebef5b0ef47122c86df034
B df457e9b8f456cc571a5a136ffa6f9bc06219588
B dfbe1e515a3aa4283655b422b4f717d05cc77415
B e01fc4aae66285c5567eb34d01f8ebc41274424c
+B e036bbd0c595514677ef1c28eb47bed3e427b709
B e046c38c9d8569f4a6fa2bc3cfa4bccb38e9f71f
B e05f429384cd199dd8aae19afc0079027f0c98b6
B e0618b670df78b8326f205af76888c28db734e3c
@@ -1010,6 +1021,7 @@ B e67ec6fd6a34d089de726c5ff6db6236659759d2
B e68bd71f0145ee6719d80328366209a07b984df5
B e759be97a6b81c18efb442411e0a56e9d4931455
B e7a542708da68bedecc87ecb031c3c484dbd42a7
+B e7b4edb1f402b1fe398e94767e14cd0b8d13b906
B e7fe2b7ec6a4df1e0b9d27ebdd9ff74ac8ad267d
B e82847091d5a4776ce2cd9d6ebf3d98f4ebc3558
B e87711abf86054a8fee51d1a33399ad26c878a67
@@ -1096,6 +1108,7 @@ B fc6fb5c01c78c933d0f0a30658cee49116db43db
B fc7e8229088afa5ba7f97e79f0fe62baa52c6053
B fcc19c3ddd36f3a55ae2675e2ebbf853cbd3d9f7
B fcef06bdf510d58544357bd71ae1e7221caa5b47
+B fd92c807e8773c363df37cfaf946971f5bac763b
B fdbdbbd2802b40d97cc64cce6eeecd9c5393887f
B fe125043f9ea03b9e5222f8a0f3e014b45158607
B fec6f70589dba07d780d6beac81e3e3ed8caa7b1
@@ -1114,6 +1127,7 @@ M 021f781caab5e7fd82844f0ea734ec23729592ec
M 023872e3024af7bf283031372fc0340d9560f51c
M 02848d574a92a861503f636decef33c5a5e1c45e
M 03630b26abad154d953a217ee7a822a8dac3a4ac
+M 037da2d9693ff7de7fd85b9d1fc85550831a2133
M 03f31aedfaf53d808e88e9262c5ee3232b023a67
M 0400b946bcd06736b6d951ec61990d6b4967367e
M 0415f4685fcb7c95a3c7cedb57aaf6e19abb7562
@@ -1252,6 +1266,7 @@ M 3cdef913f730e9682f64de9869e2e9effba2fa85
M 3cebf4150a69f9bbaa3541e47a32714fc948e5bc
M 3d210220f02839cd8388e36f2ae9e6bf645cbdd7
M 3d370cd3d37d222d6e6021e107d408d7cb6d7a2b
+M 3e3d4b800e7ce26c32028c1e661a15095a900a04
M 3f927d153e06b47c5e3462a632dc308915af814f
M 4052ba50657b9814a991b4c4b18ab31beea88fc2
M 412fcccef8cebaf94b8eebb827672add984ff47c
@@ -1506,6 +1521,7 @@ M b4b9a010bb23059251400455afabddee15b46127
M b5162d492c586e3f1abf42e2a9ae09322543bc97
M b5c38cc0e779ce45e3e2c03e0c62c8a5a767d986
M b5db68a487f727f5c0c37ce8053524664f6b25f3
+M b7ad1f3c5014a3e8ca6af8b91ed26252fb1b8a61
M b9a7d7dd2247c9532cabd7b7696772af471bde5d
M baa6132a0cc4e51421536d89b2f2c245abe5272d
M bb987094284a59f3cf4c99755ca7b46ce396709a
@@ -1611,6 +1627,7 @@ M e4fa39ff9008b6502a836adfb91ea4d16a3bd139
M e50e87ddb80061749d3c306d8d511de72e4e5e77
M e557d6f2cccd2222c93ed6ccadfc229ef6346770
M e560cfeee66f238d232e7d7073b6adea991c66fc
+M e5bc06da70826fedb75805a0b3a81add449f5e2e
M e5e491a6b47798aafa6c24fe0c57e2fd1e4c902a
M e5eb148d3a45de96ab7bf4082d1b0a8bb292ae8f
M e6cb482393a5dc4e27d034f414772bbce4dcef57
[4/7] git commit: Fix how a "default" prefix is added to the provider
to avoid two namespaces with the same prefix
Posted by dk...@apache.org.
Fix how a "default" prefix is added to the provider to avoid two namespaces with the same prefix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/63461405
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/63461405
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/63461405
Branch: refs/heads/2.7.x-fixes
Commit: 63461405e88c07d2df784706183fcff2e3ebaa42
Parents: aa7d417
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri May 30 12:42:35 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 4 10:49:53 2014 -0400
----------------------------------------------------------------------
.../apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/63461405/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java
index 5f82c5c..332f60e 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java
@@ -144,7 +144,13 @@ public final class AegisJSONProvider<T> extends AegisElementProvider<T> {
// the namespace map. Oh, the namespace map.
// This is wrong, but might make unit tests pass until we redesign.
if (typeToRead != null) {
- namespaceMap.putIfAbsent(typeToRead.getSchemaType().getNamespaceURI(), "ns1");
+ String pfx = "ns1";
+ int count = 1;
+ while (namespaceMap.containsValue(pfx)) {
+ count++;
+ pfx = "ns" + count;
+ }
+ namespaceMap.putIfAbsent(typeToRead.getSchemaType().getNamespaceURI(), pfx);
}
return JSONUtils.createStreamReader(is, readXsiType, namespaceMap);
}