cxf git commit: Adding the missing files
Repository: cxf
Updated Branches:
refs/heads/master cc5f43b74 -> d8cf47faa
Adding the missing files
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d8cf47fa
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d8cf47fa
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d8cf47fa
Branch: refs/heads/master
Commit: d8cf47faa9409b9039ae6d991140a152282d3011
Parents: cc5f43b
Author: Sergey Beryozkin
Authored: Fri Nov 14 09:52:15 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 09:52:15 2014 +
--
.../oidc/rp/AbstractTokenValidator.java | 144 +++
.../security/oidc/rp/UserProfileValidator.java | 66 +
2 files changed, 210 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8cf47fa/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
--
diff --git
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
new file mode 100644
index 000..1553258
--- /dev/null
+++
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
@@ -0,0 +1,144 @@
+/**
+ * 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 org.apache.cxf.rs.security.oidc.rp;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.rs.security.jose.jwe.JweDecryptionProvider;
+import org.apache.cxf.rs.security.jose.jwe.JweJwtCompactConsumer;
+import org.apache.cxf.rs.security.jose.jwk.JsonWebKey;
+import org.apache.cxf.rs.security.jose.jwk.JsonWebKeys;
+import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
+import org.apache.cxf.rs.security.jose.jws.JwsSignatureVerifier;
+import org.apache.cxf.rs.security.jose.jws.JwsUtils;
+import org.apache.cxf.rs.security.jose.jwt.JwtClaims;
+import org.apache.cxf.rs.security.jose.jwt.JwtToken;
+
+public abstract class AbstractTokenValidator {
+private JweDecryptionProvider jweDecryptor;
+private JwsSignatureVerifier jwsVerifier;
+private String issuerId;
+private int issuedAtRange;
+private WebClient jwkSetClient;
+private ConcurrentHashMap keyMap = new
ConcurrentHashMap();
+
+protected JwtToken getJwtToken(String wrappedJwtToken, String clientId,
String idTokenKid,
+ boolean jweOnly) {
+if (wrappedJwtToken == null) {
+throw new SecurityException("ID Token is missing");
+}
+// Decrypt the token if needed
+if (jweDecryptor != null) {
+if (jweOnly) {
+return new
JweJwtCompactConsumer(wrappedJwtToken).decryptWith(jweDecryptor);
+}
+wrappedJwtToken =
jweDecryptor.decrypt(wrappedJwtToken).getContentText();
+} else if (jweOnly) {
+throw new SecurityException("Token can not be decrypted");
+}
+
+// validate token signature
+return getTokenValidateSignature(wrappedJwtToken, idTokenKid);
+}
+
+protected void validateJwtClaims(JwtClaims claims, String clientId,
boolean validateClaimsAlways) {
+// validate subject
+if (claims.getSubject() == null) {
+throw new SecurityException("Invalid subject");
+}
+// validate audience
+String aud = claims.getAudience();
+if (aud == null && validateClaimsAlways || aud != null &&
!clientId.equals(aud)) {
+throw new SecurityException("Invalid audience");
+}
+
+// validate the provider
+String issuer = claims.getIssuer();
+if (issuerId == null && validateClaimsAlways || issuerId != null &&
!issuerId.equals(issuer)) {
+throw new SecurityException("Invalid provider");
+}
+Long currentTimeInSecs = System.currentTimeMillis() / 1000
cxf git commit: Adding the missing files
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes a0e70fbf3 -> 9ff85bdbb
Adding the missing files
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9ff85bdb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9ff85bdb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9ff85bdb
Branch: refs/heads/3.0.x-fixes
Commit: 9ff85bdbb52a2620b7c69afc6afba16dd5d44830
Parents: a0e70fb
Author: Sergey Beryozkin
Authored: Fri Nov 14 09:52:15 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 09:53:24 2014 +
--
.../oidc/rp/AbstractTokenValidator.java | 144 +++
.../security/oidc/rp/UserProfileValidator.java | 66 +
2 files changed, 210 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/9ff85bdb/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
--
diff --git
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
new file mode 100644
index 000..1553258
--- /dev/null
+++
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
@@ -0,0 +1,144 @@
+/**
+ * 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 org.apache.cxf.rs.security.oidc.rp;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.rs.security.jose.jwe.JweDecryptionProvider;
+import org.apache.cxf.rs.security.jose.jwe.JweJwtCompactConsumer;
+import org.apache.cxf.rs.security.jose.jwk.JsonWebKey;
+import org.apache.cxf.rs.security.jose.jwk.JsonWebKeys;
+import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
+import org.apache.cxf.rs.security.jose.jws.JwsSignatureVerifier;
+import org.apache.cxf.rs.security.jose.jws.JwsUtils;
+import org.apache.cxf.rs.security.jose.jwt.JwtClaims;
+import org.apache.cxf.rs.security.jose.jwt.JwtToken;
+
+public abstract class AbstractTokenValidator {
+private JweDecryptionProvider jweDecryptor;
+private JwsSignatureVerifier jwsVerifier;
+private String issuerId;
+private int issuedAtRange;
+private WebClient jwkSetClient;
+private ConcurrentHashMap keyMap = new
ConcurrentHashMap();
+
+protected JwtToken getJwtToken(String wrappedJwtToken, String clientId,
String idTokenKid,
+ boolean jweOnly) {
+if (wrappedJwtToken == null) {
+throw new SecurityException("ID Token is missing");
+}
+// Decrypt the token if needed
+if (jweDecryptor != null) {
+if (jweOnly) {
+return new
JweJwtCompactConsumer(wrappedJwtToken).decryptWith(jweDecryptor);
+}
+wrappedJwtToken =
jweDecryptor.decrypt(wrappedJwtToken).getContentText();
+} else if (jweOnly) {
+throw new SecurityException("Token can not be decrypted");
+}
+
+// validate token signature
+return getTokenValidateSignature(wrappedJwtToken, idTokenKid);
+}
+
+protected void validateJwtClaims(JwtClaims claims, String clientId,
boolean validateClaimsAlways) {
+// validate subject
+if (claims.getSubject() == null) {
+throw new SecurityException("Invalid subject");
+}
+// validate audience
+String aud = claims.getAudience();
+if (aud == null && validateClaimsAlways || aud != null &&
!clientId.equals(aud)) {
+throw new SecurityException("Invalid audience");
+}
+
+// validate the provider
+String issuer = claims.getIssuer();
+if (issuerId == null && validateClaimsAlways || issuerId != null &&
!issuerId.equals(issuer)) {
+throw new SecurityException("Invalid provider");
+}
+Long currentTimeInSecs = System.currentTimeMilli
cxf git commit: Synchronizing an access to JAX-RS ProviderFactory injectedProviders list in 2.7.x
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 98cef3943 -> 8c34d25a2
Synchronizing an access to JAX-RS ProviderFactory injectedProviders list in
2.7.x
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8c34d25a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8c34d25a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8c34d25a
Branch: refs/heads/2.7.x-fixes
Commit: 8c34d25a25e5dbafcffa9a9062f7fa72478f6510
Parents: 98cef39
Author: Sergey Beryozkin
Authored: Fri Nov 14 10:28:15 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 10:28:15 2014 +
--
.../org/apache/cxf/jaxrs/provider/ProviderFactory.java| 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/8c34d25a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index ee91720..b9ecbd4 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -910,7 +910,9 @@ public final class ProviderFactory {
void injectContextProxiesIntoProvider(ProviderInfo pi) {
if (pi.contextsAvailable()) {
InjectionUtils.injectContextProxies(pi, pi.getProvider());
-injectedProviders.add(pi);
+synchronized (injectedProviders) {
+injectedProviders.add(pi);
+}
}
}
@@ -1153,8 +1155,10 @@ public final class ProviderFactory {
void clearProxies(Collection ...lists) {
for (Collection list : lists) {
Collection> l2 = CastUtils.cast(list);
-for (ProviderInfo pi : l2) {
-pi.clearThreadLocalProxies();
+synchronized (l2) {
+for (ProviderInfo pi : l2) {
+pi.clearThreadLocalProxies();
+}
}
}
}
cxf git commit: [CXF-6101] Updating JAXRSBinding not to set a text/xml by default
Repository: cxf
Updated Branches:
refs/heads/master d8cf47faa -> e21d8b48c
[CXF-6101] Updating JAXRSBinding not to set a text/xml by default
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e21d8b48
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e21d8b48
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e21d8b48
Branch: refs/heads/master
Commit: e21d8b48c495b5823090df838489c387c4fb7d1b
Parents: d8cf47f
Author: Sergey Beryozkin
Authored: Fri Nov 14 11:36:30 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 11:36:30 2014 +
--
.../java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java | 2 +-
.../jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java| 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e21d8b48/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
--
diff --git
a/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
b/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
index 005a494..6c0d3ce 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
@@ -122,7 +122,7 @@ public class FIStaxOutInterceptor extends
AbstractPhaseInterceptor {
Boolean.TRUE);
String s = (String)message.get(Message.CONTENT_TYPE);
-if (s.contains("application/soap+xml")) {
+if (s != null && s.contains("application/soap+xml")) {
s = s.replace("application/soap+xml",
"application/soap+fastinfoset");
message.put(Message.CONTENT_TYPE, s);
} else {
http://git-wip-us.apache.org/repos/asf/cxf/blob/e21d8b48/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
index 1f74030..92687e8 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
@@ -52,9 +52,6 @@ public class JAXRSBinding extends
AbstractBasicInterceptorProvider implements Bi
if (exchange != null) {
ct =
(String)exchange.get(org.apache.cxf.message.Message.CONTENT_TYPE);
}
-if (ct == null) {
-ct = "text/xml";
-}
m.put(org.apache.cxf.message.Message.CONTENT_TYPE, ct);
}
return m;
cxf git commit: [CXF-6101] Updating JAXRSBinding not to set a text/xml by default
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 9ff85bdbb -> 3b688a0d6
[CXF-6101] Updating JAXRSBinding not to set a text/xml by default
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3b688a0d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3b688a0d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3b688a0d
Branch: refs/heads/3.0.x-fixes
Commit: 3b688a0d6dd14b90e91a021bea0e7b7f644d4254
Parents: 9ff85bd
Author: Sergey Beryozkin
Authored: Fri Nov 14 11:36:30 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 11:37:45 2014 +
--
.../java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java | 2 +-
.../jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java| 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/3b688a0d/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
--
diff --git
a/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
b/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
index 005a494..6c0d3ce 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
@@ -122,7 +122,7 @@ public class FIStaxOutInterceptor extends
AbstractPhaseInterceptor {
Boolean.TRUE);
String s = (String)message.get(Message.CONTENT_TYPE);
-if (s.contains("application/soap+xml")) {
+if (s != null && s.contains("application/soap+xml")) {
s = s.replace("application/soap+xml",
"application/soap+fastinfoset");
message.put(Message.CONTENT_TYPE, s);
} else {
http://git-wip-us.apache.org/repos/asf/cxf/blob/3b688a0d/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
index 1f74030..92687e8 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
@@ -52,9 +52,6 @@ public class JAXRSBinding extends
AbstractBasicInterceptorProvider implements Bi
if (exchange != null) {
ct =
(String)exchange.get(org.apache.cxf.message.Message.CONTENT_TYPE);
}
-if (ct == null) {
-ct = "text/xml";
-}
m.put(org.apache.cxf.message.Message.CONTENT_TYPE, ct);
}
return m;
cxf git commit: [CXf-6104] Case insensutive comparison of charset parameters
Repository: cxf
Updated Branches:
refs/heads/master e21d8b48c -> d333c275e
[CXf-6104] Case insensutive comparison of charset parameters
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d333c275
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d333c275
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d333c275
Branch: refs/heads/master
Commit: d333c275e1dcbce56e59239f19a4db15c5a828dc
Parents: e21d8b4
Author: Sergey Beryozkin
Authored: Fri Nov 14 13:08:30 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 13:08:30 2014 +
--
.../src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java| 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d333c275/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index d9b757d..61308b0 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -160,6 +160,7 @@ public final class JAXRSUtils {
private static final String PATH_SEGMENT_SEP = "/";
private static final String REPORT_FAULT_MESSAGE_PROPERTY =
"org.apache.cxf.jaxrs.report-fault-message";
private static final String NO_CONTENT_EXCEPTION =
"javax.ws.rs.core.NoContentException";
+private static final String HTTP_CHARSET_PARAM = "charset";
private JAXRSUtils() {
}
@@ -1435,6 +1436,10 @@ public final class JAXRSUtils {
for (Map.Entry entry :
userType.getParameters().entrySet()) {
String value =
requiredType.getParameters().get(entry.getKey());
if (value != null && !value.equals(entry.getValue())) {
+if (HTTP_CHARSET_PARAM.equals(entry.getKey())
+&& value.equalsIgnoreCase(entry.getValue())) {
+continue;
+}
parametersMatched = false;
break;
}
cxf git commit: [CXf-6104] Case insensutive comparison of charset parameters
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 3b688a0d6 -> a7ced3dee
[CXf-6104] Case insensutive comparison of charset parameters
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a7ced3de
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a7ced3de
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a7ced3de
Branch: refs/heads/3.0.x-fixes
Commit: a7ced3dee45712e0ddbf000a432a838bf0fc0973
Parents: 3b688a0
Author: Sergey Beryozkin
Authored: Fri Nov 14 13:08:30 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 13:09:50 2014 +
--
.../src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java| 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/a7ced3de/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index d9b757d..61308b0 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -160,6 +160,7 @@ public final class JAXRSUtils {
private static final String PATH_SEGMENT_SEP = "/";
private static final String REPORT_FAULT_MESSAGE_PROPERTY =
"org.apache.cxf.jaxrs.report-fault-message";
private static final String NO_CONTENT_EXCEPTION =
"javax.ws.rs.core.NoContentException";
+private static final String HTTP_CHARSET_PARAM = "charset";
private JAXRSUtils() {
}
@@ -1435,6 +1436,10 @@ public final class JAXRSUtils {
for (Map.Entry entry :
userType.getParameters().entrySet()) {
String value =
requiredType.getParameters().get(entry.getKey());
if (value != null && !value.equals(entry.getValue())) {
+if (HTTP_CHARSET_PARAM.equals(entry.getKey())
+&& value.equalsIgnoreCase(entry.getValue())) {
+continue;
+}
parametersMatched = false;
break;
}
cxf git commit: [CXf-6104] Case insensutive comparison of charset parameters
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 8c34d25a2 -> f39223409
[CXf-6104] Case insensutive comparison of charset parameters
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f3922340
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f3922340
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f3922340
Branch: refs/heads/2.7.x-fixes
Commit: f39223409013ee0af6bfab4b3563ccc76d319c0d
Parents: 8c34d25
Author: Sergey Beryozkin
Authored: Fri Nov 14 13:08:30 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 13:10:42 2014 +
--
.../src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java| 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/f3922340/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index d5c9337..f7fb8b1 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -154,6 +154,7 @@ public final class JAXRSUtils {
private static final String PATH_SEGMENT_SEP = "/";
private static final String REPORT_FAULT_MESSAGE_PROPERTY =
"org.apache.cxf.jaxrs.report-fault-message";
private static final String NO_CONTENT_EXCEPTION =
"javax.ws.rs.core.NoContentException";
+private static final String HTTP_CHARSET_PARAM = "charset";
private JAXRSUtils() {
}
@@ -1370,6 +1371,10 @@ public final class JAXRSUtils {
for (Map.Entry entry :
userType.getParameters().entrySet()) {
String value =
requiredType.getParameters().get(entry.getKey());
if (value != null && !value.equals(entry.getValue())) {
+if (HTTP_CHARSET_PARAM.equals(entry.getKey())
+&& value.equalsIgnoreCase(entry.getValue())) {
+continue;
+}
parametersMatched = false;
break;
}
cxf git commit: Fixing a typo in OIDC token validator
Repository: cxf
Updated Branches:
refs/heads/master d333c275e -> 969cdb02e
Fixing a typo in OIDC token validator
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/969cdb02
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/969cdb02
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/969cdb02
Branch: refs/heads/master
Commit: 969cdb02ee1bffbf8e32c00caad9820f109230f4
Parents: d333c27
Author: Sergey Beryozkin
Authored: Fri Nov 14 13:36:46 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 13:36:46 2014 +
--
.../org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/969cdb02/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
--
diff --git
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
index 1553258..89e7fa4 100644
---
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
+++
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
@@ -115,7 +115,7 @@ public abstract class AbstractTokenValidator {
return validateToken(jwtConsumer, jwt,
JwsUtils.getSignatureVerifier(key));
}
protected JwtToken validateToken(JwsJwtCompactConsumer consumer, JwtToken
jwt, JwsSignatureVerifier jws) {
-if (consumer.verifySignatureWith(jws)) {
+if (!consumer.verifySignatureWith(jws)) {
throw new SecurityException("Invalid Signature");
}
return jwt;
cxf git commit: Fixing a typo in OIDC token validator
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes a7ced3dee -> da75a0f83
Fixing a typo in OIDC token validator
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/da75a0f8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/da75a0f8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/da75a0f8
Branch: refs/heads/3.0.x-fixes
Commit: da75a0f83e92dc46d0aa6fcb091cec5492ea48e4
Parents: a7ced3d
Author: Sergey Beryozkin
Authored: Fri Nov 14 13:36:46 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 13:38:05 2014 +
--
.../org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/da75a0f8/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
--
diff --git
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
index 1553258..89e7fa4 100644
---
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
+++
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
@@ -115,7 +115,7 @@ public abstract class AbstractTokenValidator {
return validateToken(jwtConsumer, jwt,
JwsUtils.getSignatureVerifier(key));
}
protected JwtToken validateToken(JwsJwtCompactConsumer consumer, JwtToken
jwt, JwsSignatureVerifier jws) {
-if (consumer.verifySignatureWith(jws)) {
+if (!consumer.verifySignatureWith(jws)) {
throw new SecurityException("Invalid Signature");
}
return jwt;
cxf git commit: some clean up in websocket test html pages; add a plain html test page for logbrowser sample
Repository: cxf
Updated Branches:
refs/heads/master 969cdb02e -> 2d131122c
some clean up in websocket test html pages; add a plain html test page for
logbrowser sample
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2d131122
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2d131122
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2d131122
Branch: refs/heads/master
Commit: 2d131122cdcd5b50df91b497ba55a1d9e91fb175
Parents: 969cdb0
Author: Akitoshi Yoshida
Authored: Fri Nov 14 15:47:30 2014 +0100
Committer: Akitoshi Yoshida
Committed: Fri Nov 14 15:47:51 2014 +0100
--
.../websocket/src/main/resources/index.html | 8 +-
.../samples/logbrowser-blueprint/README.txt | 7 +
.../src/test/resources/index_plain.html | 211 +++
3 files changed, 222 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/2d131122/distribution/src/main/release/samples/jax_rs/websocket/src/main/resources/index.html
--
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/resources/index.html
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/resources/index.html
index 2b1cc18..87c8eaf 100644
---
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/resources/index.html
+++
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/resources/index.html
@@ -29,18 +29,18 @@
Service Endpoint URL:
-
+
Connect
Disconnect
Request:
-GET
/customerservice/customers/123
+GET
/customerservice/customers/123
Send
-
+
Log:
Clear
log
@@ -122,7 +122,7 @@
writeToLog('ERROR' + evt.data +
'');
}
- function doSend(message) {
+ function doSend(evt) {
var reqmsg = document.getElementById("request");
writeToLog('SENT' +
createMessage(reqmsg.value) + '');
websocket.send(reqmsg.value);
http://git-wip-us.apache.org/repos/asf/cxf/blob/2d131122/distribution/src/main/release/samples/logbrowser-blueprint/README.txt
--
diff --git
a/distribution/src/main/release/samples/logbrowser-blueprint/README.txt
b/distribution/src/main/release/samples/logbrowser-blueprint/README.txt
index c7aa735..80bf7e3 100644
--- a/distribution/src/main/release/samples/logbrowser-blueprint/README.txt
+++ b/distribution/src/main/release/samples/logbrowser-blueprint/README.txt
@@ -25,6 +25,13 @@ Assuming you have a freshly intalled Apache Karaf-3.x,
4) To generate custom log entry, run some CXF scenarios that write some logs.
+Additional features
+5) Open the Log-Browser(PlainView) page by opening file
test/resources/index_plain.html in the browser.
+
+6) Click on the Connect button to open a WebSocket connection to the log
browser service.
+Once the connection is open, click on the Subscribe button to subscribe to the
logging feed.
+When there are new log entries, they will be pushed to the socket and
displayed on the Log text area.
+
*Note:
- CXF version 3.0.2 is used in this example, but any verions that include this
sample code may be used.
http://git-wip-us.apache.org/repos/asf/cxf/blob/2d131122/distribution/src/main/release/samples/logbrowser-blueprint/src/test/resources/index_plain.html
--
diff --git
a/distribution/src/main/release/samples/logbrowser-blueprint/src/test/resources/index_plain.html
b/distribution/src/main/release/samples/logbrowser-blueprint/src/test/resources/index_plain.html
new file mode 100644
index 000..f30ecf6
--- /dev/null
+++
b/distribution/src/main/release/samples/logbrowser-blueprint/src/test/resources/index_plain.html
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+CXF Log-Browser using WebSocket (PlainView)
+
+
+CXF Log-Browser using WebSocket (PlainView)
+The purpose of this page is simply show how the log-feed can be subscribed
and the log records are pushed over the WebSocket.
+
+
+Log-Browser Endpoint URL:
+
+
+Connect
+Disconnect
+
+
+Subscribe
+Unsubscribe
+
+
+Atom
+
+
+
+
+Log:
+Clear
log
+
+
+
+
+
+ var output;
+
+ var connectBut = document.getElementById("connect");
+ connectBut.onclick = doConnect;
+
+ var disconnectBut = document.getElementById("disconnect");
+ disconnectBut.onclick = doDisconnect;
+
+ var subBut = document.getElementById("subscribe");
+ subBut.onclick = doSub;
+
+ var unsubBut = document.getElementById("unsubscribe");
+ unsubBut.onclick = doUnsub;
+
+ var modeatomCB = document.getElementById("modeatom");
+
+ var consoleLog = document.getElementById("consoleLog")
cxf git commit: some clean up in websocket test html pages; add a plain html test page for logbrowser sample
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes da75a0f83 -> e292b565a
some clean up in websocket test html pages; add a plain html test page for
logbrowser sample
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e292b565
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e292b565
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e292b565
Branch: refs/heads/3.0.x-fixes
Commit: e292b565a8fdc5eb21627686504435c9c4daf497
Parents: da75a0f
Author: Akitoshi Yoshida
Authored: Fri Nov 14 15:47:30 2014 +0100
Committer: Akitoshi Yoshida
Committed: Fri Nov 14 15:48:59 2014 +0100
--
.../websocket/src/main/resources/index.html | 8 +-
.../samples/logbrowser-blueprint/README.txt | 7 +
.../src/test/resources/index_plain.html | 211 +++
3 files changed, 222 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e292b565/distribution/src/main/release/samples/jax_rs/websocket/src/main/resources/index.html
--
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/resources/index.html
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/resources/index.html
index 2b1cc18..87c8eaf 100644
---
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/resources/index.html
+++
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/resources/index.html
@@ -29,18 +29,18 @@
Service Endpoint URL:
-
+
Connect
Disconnect
Request:
-GET
/customerservice/customers/123
+GET
/customerservice/customers/123
Send
-
+
Log:
Clear
log
@@ -122,7 +122,7 @@
writeToLog('ERROR' + evt.data +
'');
}
- function doSend(message) {
+ function doSend(evt) {
var reqmsg = document.getElementById("request");
writeToLog('SENT' +
createMessage(reqmsg.value) + '');
websocket.send(reqmsg.value);
http://git-wip-us.apache.org/repos/asf/cxf/blob/e292b565/distribution/src/main/release/samples/logbrowser-blueprint/README.txt
--
diff --git
a/distribution/src/main/release/samples/logbrowser-blueprint/README.txt
b/distribution/src/main/release/samples/logbrowser-blueprint/README.txt
index c7aa735..80bf7e3 100644
--- a/distribution/src/main/release/samples/logbrowser-blueprint/README.txt
+++ b/distribution/src/main/release/samples/logbrowser-blueprint/README.txt
@@ -25,6 +25,13 @@ Assuming you have a freshly intalled Apache Karaf-3.x,
4) To generate custom log entry, run some CXF scenarios that write some logs.
+Additional features
+5) Open the Log-Browser(PlainView) page by opening file
test/resources/index_plain.html in the browser.
+
+6) Click on the Connect button to open a WebSocket connection to the log
browser service.
+Once the connection is open, click on the Subscribe button to subscribe to the
logging feed.
+When there are new log entries, they will be pushed to the socket and
displayed on the Log text area.
+
*Note:
- CXF version 3.0.2 is used in this example, but any verions that include this
sample code may be used.
http://git-wip-us.apache.org/repos/asf/cxf/blob/e292b565/distribution/src/main/release/samples/logbrowser-blueprint/src/test/resources/index_plain.html
--
diff --git
a/distribution/src/main/release/samples/logbrowser-blueprint/src/test/resources/index_plain.html
b/distribution/src/main/release/samples/logbrowser-blueprint/src/test/resources/index_plain.html
new file mode 100644
index 000..f30ecf6
--- /dev/null
+++
b/distribution/src/main/release/samples/logbrowser-blueprint/src/test/resources/index_plain.html
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+CXF Log-Browser using WebSocket (PlainView)
+
+
+CXF Log-Browser using WebSocket (PlainView)
+The purpose of this page is simply show how the log-feed can be subscribed
and the log records are pushed over the WebSocket.
+
+
+Log-Browser Endpoint URL:
+
+
+Connect
+Disconnect
+
+
+Subscribe
+Unsubscribe
+
+
+Atom
+
+
+
+
+Log:
+Clear
log
+
+
+
+
+
+ var output;
+
+ var connectBut = document.getElementById("connect");
+ connectBut.onclick = doConnect;
+
+ var disconnectBut = document.getElementById("disconnect");
+ disconnectBut.onclick = doDisconnect;
+
+ var subBut = document.getElementById("subscribe");
+ subBut.onclick = doSub;
+
+ var unsubBut = document.getElementById("unsubscribe");
+ unsubBut.onclick = doUnsub;
+
+ var modeatomCB = document.getElementById("modeatom");
+
+ var consoleLog = document.getElementById("co
cxf-xjc-utils git commit: [maven-release-plugin] prepare release xjc-utils-3.0.3
Repository: cxf-xjc-utils Updated Branches: refs/heads/master fd9a1b9f2 -> 1656dd6db [maven-release-plugin] prepare release xjc-utils-3.0.3 Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/1656dd6d Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/1656dd6d Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/1656dd6d Branch: refs/heads/master Commit: 1656dd6dbb03cdfe057a113562a640f85f4a1ab2 Parents: fd9a1b9 Author: Daniel Kulp Authored: Fri Nov 14 11:08:22 2014 -0500 Committer: Daniel Kulp Committed: Fri Nov 14 11:08:22 2014 -0500 -- boolean-test/pom.xml | 2 +- boolean/pom.xml| 2 +- bug671/pom.xml | 2 +- bug986/pom.xml | 2 +- cxf-xjc-plugin/pom.xml | 4 ++-- dv-test/pom.xml| 2 +- dv/pom.xml | 2 +- javadoc/pom.xml| 2 +- pom.xml| 4 ++-- property-listener/pom.xml | 2 +- runtime/pom.xml| 2 +- ts-test/pom.xml| 2 +- ts/pom.xml | 2 +- wsdlextension-test/pom.xml | 2 +- wsdlextension/pom.xml | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/1656dd6d/boolean-test/pom.xml -- diff --git a/boolean-test/pom.xml b/boolean-test/pom.xml index 2458b72..0894a59 100644 --- a/boolean-test/pom.xml +++ b/boolean-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils - 3.0.3-SNAPSHOT + 3.0.3 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/1656dd6d/boolean/pom.xml -- diff --git a/boolean/pom.xml b/boolean/pom.xml index a249307..fbdc9d1 100644 --- a/boolean/pom.xml +++ b/boolean/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.3-SNAPSHOT +3.0.3 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/1656dd6d/bug671/pom.xml -- diff --git a/bug671/pom.xml b/bug671/pom.xml index 97018e6..3eec24e 100644 --- a/bug671/pom.xml +++ b/bug671/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.3-SNAPSHOT +3.0.3 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/1656dd6d/bug986/pom.xml -- diff --git a/bug986/pom.xml b/bug986/pom.xml index cfa39d5..33fc4e2 100644 --- a/bug986/pom.xml +++ b/bug986/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.3-SNAPSHOT +3.0.3 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/1656dd6d/cxf-xjc-plugin/pom.xml -- diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml index 729a1d3..ec68b91 100644 --- a/cxf-xjc-plugin/pom.xml +++ b/cxf-xjc-plugin/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.3-SNAPSHOT +3.0.3 @@ -153,7 +153,7 @@ - + http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/1656dd6d/dv-test/pom.xml -- diff --git a/dv-test/pom.xml b/dv-test/pom.xml index 054b70e..a3869e1 100644 --- a/dv-test/pom.xml +++ b/dv-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.3-SNAPSHOT +3.0.3 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/1656dd6d/dv/pom.xml -- diff --git a/dv/pom.xml b/dv/pom.xml index c457d03..e07b27e 100644 --- a/dv/pom.xml +++ b/dv/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.3-SNAPSHOT +3.0.3 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/1656dd6d/javadoc/pom.xml -- diff --git a/javadoc/pom.xml b/javadoc/pom.xml index d2f
Git Push Summary
Repository: cxf-xjc-utils Updated Tags: refs/tags/xjc-utils-3.0.3 [created] ee4fafe56
cxf-xjc-utils git commit: [maven-release-plugin] prepare for next development iteration
Repository: cxf-xjc-utils Updated Branches: refs/heads/master 1656dd6db -> 48db284e9 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/48db284e Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/48db284e Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/48db284e Branch: refs/heads/master Commit: 48db284e99ab1b5e794fd45fc2b2d84ee5e3c170 Parents: 1656dd6 Author: Daniel Kulp Authored: Fri Nov 14 11:08:30 2014 -0500 Committer: Daniel Kulp Committed: Fri Nov 14 11:08:30 2014 -0500 -- boolean-test/pom.xml | 2 +- boolean/pom.xml| 2 +- bug671/pom.xml | 2 +- bug986/pom.xml | 2 +- cxf-xjc-plugin/pom.xml | 2 +- dv-test/pom.xml| 2 +- dv/pom.xml | 2 +- javadoc/pom.xml| 2 +- pom.xml| 4 ++-- property-listener/pom.xml | 2 +- runtime/pom.xml| 2 +- ts-test/pom.xml| 2 +- ts/pom.xml | 2 +- wsdlextension-test/pom.xml | 2 +- wsdlextension/pom.xml | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/48db284e/boolean-test/pom.xml -- diff --git a/boolean-test/pom.xml b/boolean-test/pom.xml index 0894a59..5eaeee1 100644 --- a/boolean-test/pom.xml +++ b/boolean-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils - 3.0.3 + 3.0.4-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/48db284e/boolean/pom.xml -- diff --git a/boolean/pom.xml b/boolean/pom.xml index fbdc9d1..7bbe83a 100644 --- a/boolean/pom.xml +++ b/boolean/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.3 +3.0.4-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/48db284e/bug671/pom.xml -- diff --git a/bug671/pom.xml b/bug671/pom.xml index 3eec24e..51b5c7c 100644 --- a/bug671/pom.xml +++ b/bug671/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.3 +3.0.4-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/48db284e/bug986/pom.xml -- diff --git a/bug986/pom.xml b/bug986/pom.xml index 33fc4e2..0fc27aa 100644 --- a/bug986/pom.xml +++ b/bug986/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.3 +3.0.4-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/48db284e/cxf-xjc-plugin/pom.xml -- diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml index ec68b91..c3ff0d1 100644 --- a/cxf-xjc-plugin/pom.xml +++ b/cxf-xjc-plugin/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.3 +3.0.4-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/48db284e/dv-test/pom.xml -- diff --git a/dv-test/pom.xml b/dv-test/pom.xml index a3869e1..1ddaa3a 100644 --- a/dv-test/pom.xml +++ b/dv-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.3 +3.0.4-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/48db284e/dv/pom.xml -- diff --git a/dv/pom.xml b/dv/pom.xml index e07b27e..20c1c3c 100644 --- a/dv/pom.xml +++ b/dv/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.3 +3.0.4-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/48db284e/javadoc/pom.xml -- diff --git a/javadoc/pom.xml b/javadoc/pom.xml index b907e08..f70a09c 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.3 +3.0.4-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/48db284e/pom.xml -- diff --git a/pom.xml b/pom.xml index 13be6de..9bc9028 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache.cxf.xjc-utils xjc-utils pom -3.0.3 +3.0.4-SNAPSHOT
[1/2] cxf git commit: Adding an OAuth2 code request preprocessor
Repository: cxf
Updated Branches:
refs/heads/master 2d131122c -> 855ab395b
Adding an OAuth2 code request preprocessor
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a1243805
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a1243805
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a1243805
Branch: refs/heads/master
Commit: a1243805cb50b6f38c2f74188d8686b1d6457255
Parents: 969cdb0
Author: Sergey Beryozkin
Authored: Fri Nov 14 16:22:30 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 16:22:30 2014 +
--
.../AuthorizationCodeRequestFilter.java | 27
.../services/AuthorizationCodeGrantService.java | 13 +-
.../services/RedirectionBasedGrantService.java | 14 +-
3 files changed, 47 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/a1243805/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AuthorizationCodeRequestFilter.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AuthorizationCodeRequestFilter.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AuthorizationCodeRequestFilter.java
new file mode 100644
index 000..d9d4442
--- /dev/null
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AuthorizationCodeRequestFilter.java
@@ -0,0 +1,27 @@
+/**
+ * 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 org.apache.cxf.rs.security.oauth2.provider;
+
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.apache.cxf.rs.security.oauth2.common.UserSubject;
+
+public interface AuthorizationCodeRequestFilter {
+MultivaluedMap process(MultivaluedMap
params, UserSubject endUser);
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a1243805/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
index d7092a5..ec2bf75 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
@@ -34,6 +34,7 @@ import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import
org.apache.cxf.rs.security.oauth2.grants.code.AuthorizationCodeDataProvider;
import
org.apache.cxf.rs.security.oauth2.grants.code.AuthorizationCodeRegistration;
import
org.apache.cxf.rs.security.oauth2.grants.code.ServerAuthorizationCodeGrant;
+import
org.apache.cxf.rs.security.oauth2.provider.AuthorizationCodeRequestFilter;
import
org.apache.cxf.rs.security.oauth2.provider.AuthorizationCodeResponseFilter;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.provider.OOBResponseDeliverer;
@@ -51,12 +52,18 @@ import
org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
public class AuthorizationCodeGrantService extends
RedirectionBasedGrantService {
private boolean canSupportPublicClients;
private OOBResponseDeliverer oobDeliverer;
+private AuthorizationCodeRequestFilter codeRequestFilter;
private AuthorizationCodeResponseFilter codeResponseFilter;
public AuthorizationCodeGrantService() {
super(OAuthConstants.CODE_RESPONSE_TYPE,
OAuthConstants.AUTHORIZATION_CODE_GRANT);
}
-
+protected Response startAuthorization(MultivaluedMap
params, UserSubject userSubject) {
+if (codeReque
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/855ab395 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/855ab395 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/855ab395 Branch: refs/heads/master Commit: 855ab395bd2916ee5d1d9cfeeea2a346a052179e Parents: a124380 2d13112 Author: Sergey Beryozkin Authored: Fri Nov 14 16:23:21 2014 + Committer: Sergey Beryozkin Committed: Fri Nov 14 16:23:21 2014 + -- .../websocket/src/main/resources/index.html | 8 +- .../samples/logbrowser-blueprint/README.txt | 7 + .../src/test/resources/index_plain.html | 211 +++ 3 files changed, 222 insertions(+), 4 deletions(-) --
cxf git commit: Adding an OAuth2 code request preprocessor
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes e292b565a -> e4d7661f3
Adding an OAuth2 code request preprocessor
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e4d7661f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e4d7661f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e4d7661f
Branch: refs/heads/3.0.x-fixes
Commit: e4d7661f368586879b8abc84782d6ca0842dc4d1
Parents: e292b56
Author: Sergey Beryozkin
Authored: Fri Nov 14 16:22:30 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 16:24:29 2014 +
--
.../AuthorizationCodeRequestFilter.java | 27
.../services/AuthorizationCodeGrantService.java | 13 +-
.../services/RedirectionBasedGrantService.java | 14 +-
3 files changed, 47 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e4d7661f/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AuthorizationCodeRequestFilter.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AuthorizationCodeRequestFilter.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AuthorizationCodeRequestFilter.java
new file mode 100644
index 000..d9d4442
--- /dev/null
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AuthorizationCodeRequestFilter.java
@@ -0,0 +1,27 @@
+/**
+ * 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 org.apache.cxf.rs.security.oauth2.provider;
+
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.apache.cxf.rs.security.oauth2.common.UserSubject;
+
+public interface AuthorizationCodeRequestFilter {
+MultivaluedMap process(MultivaluedMap
params, UserSubject endUser);
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/e4d7661f/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
index d7092a5..ec2bf75 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
@@ -34,6 +34,7 @@ import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import
org.apache.cxf.rs.security.oauth2.grants.code.AuthorizationCodeDataProvider;
import
org.apache.cxf.rs.security.oauth2.grants.code.AuthorizationCodeRegistration;
import
org.apache.cxf.rs.security.oauth2.grants.code.ServerAuthorizationCodeGrant;
+import
org.apache.cxf.rs.security.oauth2.provider.AuthorizationCodeRequestFilter;
import
org.apache.cxf.rs.security.oauth2.provider.AuthorizationCodeResponseFilter;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.provider.OOBResponseDeliverer;
@@ -51,12 +52,18 @@ import
org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
public class AuthorizationCodeGrantService extends
RedirectionBasedGrantService {
private boolean canSupportPublicClients;
private OOBResponseDeliverer oobDeliverer;
+private AuthorizationCodeRequestFilter codeRequestFilter;
private AuthorizationCodeResponseFilter codeResponseFilter;
public AuthorizationCodeGrantService() {
super(OAuthConstants.CODE_RESPONSE_TYPE,
OAuthConstants.AUTHORIZATION_CODE_GRANT);
}
-
+protected Response startAuthorization(MultivaluedMap
params, UserSubject userSubject) {
+if
[2/6] cxf git commit: Remove the netty libs from lib (but keep the CXF plugins which should now be properly optional based on presense of netty libs). Need to make sure Netty transport is not picked u
Remove the netty libs from lib (but keep the CXF plugins which should now be
properly optional based on presense of netty libs). Need to make sure Netty
transport is not picked up by default due to issues.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fcaf0032
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fcaf0032
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fcaf0032
Branch: refs/heads/3.0.x-fixes
Commit: fcaf0032840dcff8bcf363df14318e04010b9ae0
Parents: eecaebb
Author: Daniel Kulp
Authored: Thu Nov 13 11:42:39 2014 -0500
Committer: Daniel Kulp
Committed: Fri Nov 14 11:27:25 2014 -0500
--
distribution/pom.xml | 10 ++
1 file changed, 10 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/fcaf0032/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 70167e2..8c31ab2 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -173,12 +173,22 @@
org.apache.geronimo.specs
geronimo-servlet_2.5_spec
+
+io.netty
+netty-codec-http
+
${project.groupId}
cxf-rt-transports-http-netty-client
${project.version}
+
+
+io.netty
+netty-codec-http
+
+
org.slf4j
[4/6] cxf git commit: Detect if the netty libraries are there and not load teh dest factory if they aren't. Mark it optional.
Detect if the netty libraries are there and not load teh dest factory if they
aren't. Mark it optional.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8453007e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8453007e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8453007e
Branch: refs/heads/3.0.x-fixes
Commit: 8453007e9dbb6b579e0dbc1cea857d8d64b5f6d4
Parents: 224fa3c
Author: Daniel Kulp
Authored: Thu Nov 13 11:21:05 2014 -0500
Committer: Daniel Kulp
Committed: Fri Nov 14 11:27:25 2014 -0500
--
.../http/netty/server/NettyHttpDestinationFactory.java | 5 +
.../src/main/resources/META-INF/cxf/bus-extensions.txt | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/8453007e/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationFactory.java
--
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationFactory.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationFactory.java
index a086ecd..a502847 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationFactory.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationFactory.java
@@ -19,6 +19,7 @@
package org.apache.cxf.transport.http.netty.server;
+
import java.io.IOException;
import org.apache.cxf.Bus;
@@ -30,6 +31,10 @@ import org.apache.cxf.transport.http.HttpDestinationFactory;
@NoJSR250Annotations()
public class NettyHttpDestinationFactory implements HttpDestinationFactory {
+
+public NettyHttpDestinationFactory() {
+io.netty.util.Version.identify();
+}
public AbstractHTTPDestination createDestination(EndpointInfo
endpointInfo, Bus bus,
DestinationRegistry
registry) throws IOException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8453007e/rt/transports/http-netty/netty-server/src/main/resources/META-INF/cxf/bus-extensions.txt
--
diff --git
a/rt/transports/http-netty/netty-server/src/main/resources/META-INF/cxf/bus-extensions.txt
b/rt/transports/http-netty/netty-server/src/main/resources/META-INF/cxf/bus-extensions.txt
index 17b637f..d7f4cbb 100644
---
a/rt/transports/http-netty/netty-server/src/main/resources/META-INF/cxf/bus-extensions.txt
+++
b/rt/transports/http-netty/netty-server/src/main/resources/META-INF/cxf/bus-extensions.txt
@@ -1,3 +1,3 @@
org.apache.cxf.transport.http.netty.server.NettyHttpTransportFactory::true
-org.apache.cxf.transport.http.netty.server.NettyHttpDestinationFactory::true
+org.apache.cxf.transport.http.netty.server.NettyHttpDestinationFactory::true:true
org.apache.cxf.transport.http.netty.server.NettyHttpServerEngineFactory::true
[3/6] cxf git commit: If the requested extension could not be loaded, but was optional, don't add a null to the return collection or an NPE will result
If the requested extension could not be loaded, but was optional, don't add a
null to the return collection or an NPE will result
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/224fa3c6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/224fa3c6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/224fa3c6
Branch: refs/heads/3.0.x-fixes
Commit: 224fa3c6412db10a451558e67bf0a6913035fa5d
Parents: e4d7661
Author: Daniel Kulp
Authored: Thu Nov 13 11:20:37 2014 -0500
Committer: Daniel Kulp
Committed: Fri Nov 14 11:27:25 2014 -0500
--
.../java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/224fa3c6/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
--
diff --git
a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
index 620a7b9..1a5ee00 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
@@ -337,7 +337,9 @@ public class ExtensionManagerImpl implements
ExtensionManager, ConfiguredBeanLoc
if (ex.getLoadedObject() == null) {
loadAndRegister(ex);
}
-ret.add(type.cast(ex.getLoadedObject()));
+if (ex.getLoadedObject() != null) {
+ret.add(type.cast(ex.getLoadedObject()));
+}
}
}
}
[5/6] cxf git commit: Make sure the netty client is optional can can not cause failures if netty isn't found
Make sure the netty client is optional can can not cause failures if netty
isn't found
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e99a4e29
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e99a4e29
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e99a4e29
Branch: refs/heads/3.0.x-fixes
Commit: e99a4e29176f781aa6f6fd281fcf86fe4eacb0b0
Parents: fcaf003
Author: Daniel Kulp
Authored: Thu Nov 13 11:48:53 2014 -0500
Committer: Daniel Kulp
Committed: Fri Nov 14 11:27:25 2014 -0500
--
.../cxf/transport/http/netty/client/NettyHttpConduitFactory.java | 1 +
.../src/main/resources/META-INF/cxf/bus-extensions.txt | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e99a4e29/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactory.java
--
diff --git
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactory.java
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactory.java
index c07f9bb..a32c66c 100644
---
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactory.java
+++
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactory.java
@@ -67,6 +67,7 @@ public class NettyHttpConduitFactory implements
HTTPConduitFactory {
UseAsyncPolicy policy;
public NettyHttpConduitFactory() {
+io.netty.util.Version.identify();
Object st = SystemPropertyAction.getPropertyOrNull(USE_POLICY);
policy = UseAsyncPolicy.getPolicy(st);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/e99a4e29/rt/transports/http-netty/netty-client/src/main/resources/META-INF/cxf/bus-extensions.txt
--
diff --git
a/rt/transports/http-netty/netty-client/src/main/resources/META-INF/cxf/bus-extensions.txt
b/rt/transports/http-netty/netty-client/src/main/resources/META-INF/cxf/bus-extensions.txt
index 48d5cbd..b63a389 100644
---
a/rt/transports/http-netty/netty-client/src/main/resources/META-INF/cxf/bus-extensions.txt
+++
b/rt/transports/http-netty/netty-client/src/main/resources/META-INF/cxf/bus-extensions.txt
@@ -1,2 +1,2 @@
org.apache.cxf.transport.http.netty.client.NettyHttpTransportFactory::true
-org.apache.cxf.transport.http.netty.client.NettyHttpConduitFactory::true
+org.apache.cxf.transport.http.netty.client.NettyHttpConduitFactory::true:true
[1/6] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes e4d7661f3 -> 0e410548c 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/0e410548 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0e410548 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0e410548 Branch: refs/heads/3.0.x-fixes Commit: 0e410548c474d9f472a30260bdc1395ef2bf184a Parents: e99a4e2 Author: Daniel Kulp Authored: Thu Nov 13 16:01:26 2014 -0500 Committer: Daniel Kulp Committed: Fri Nov 14 11:27:25 2014 -0500 -- .gitmergeinfo | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/0e410548/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index a467367..a78b27e 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -24,6 +24,7 @@ B 384ad75433037358ea1607c4ddcb0cd978fae10c B 38bb9fea460262ff2781cbfdf85032d3f4fb9fe1 B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300 B 43aa455461fb8a33b0e5844512b263a262c2420c +B 43c65b07658b8041f6689d16a34ff98132b8a424 B 441cd2cecdd8a88d42e41324643f06a2fccf5a25 B 46838d8a346687e9f8ff2f6e279e3ba83f99c5f3 B 46f0d5fff8a4d846831b5e9d7ac0405fe06d2ccd @@ -34,6 +35,7 @@ B 481466c7a42a57c87c992a02ab560be046bf5797 B 4d49814ba85310599ee76e41742208383f3f6450 B 4f61ca801deed173c648b2d424ac231663acd704 B 4f70bdf4199a666829cf9c6c62c508d12afbe251 +B 4fe7844935f9b4ad797760613d143949f9448905 B 51f433d54a1d11eac25c32b0dd69f12fef62c060 B 5fbd407bac5af5e55bb280125405d75b7add872b B 6256b7c7c42bb01d2cc0d16d659ba1aa3042e7ae @@ -61,6 +63,7 @@ B 8e930bcfc6e68775db59957df8ee38d73499a6f4 B 8f967643447ceec89e58b079d8d8fc00cf232a02 B 90312bc48f6e564bcafdaaebc3cd596c966ee674 B 91d6630c53f222544e4bb512fb5c918d68518138 +B 92502a5e2af6e5d3c544f89396de2d05d539fd41 B 92c4738f9e6b96fe0ce8586bb36b9c6444d6e225 B 9344b093b8081a68c9f83f0c740d60508e99fd5e B 944eb0ba1043bd4daf9cf087b66bc9cab10b8ff2 @@ -69,6 +72,7 @@ B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe B 9ea935fcbf3869f5fa4fd1e75a0a2309cc780415 B 9fe4c04a1c875b3e8f402268cd9dfe18431b5cc9 B a2855695896d5084ea288b0fa47457e4b7bfac38 +B a4222c930f7d69608f826c14e4bc7bc9f670097c B a4315cb442fa31960cbd47f11e95e81b4a71441d B a5aff3e7a43274b3d47cda706aaf8108bd7a9b07 B a5f8a4dd4d9ecbfc1f8a1a8e5bcb4af17f561cc5 @@ -89,6 +93,7 @@ B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c B d391d9371d8505c7774308c4fbbb9bc57ffd34a6 B d3e9295d3acfe3c970a325bbbafdba83a0d6e83c B d54a21628143bc15f51cbe5d63fa42c09d0ab8ac +B d9f624e2eca8affa20243583ace087a8cbba3ac8 B e242307ad8bbe53788f3e03e9e2f0ca977d01340 B ea778c4f38f882dc97d23bd200683fd9d48b4718 B eba07e615684e475772a7a2d23d7e93a0b099485
[6/6] cxf git commit: Maintain the order that extensions are discovered/added and use that order when searching to allow some level of predictability and controlability.
Maintain the order that extensions are discovered/added and use that order when
searching to allow some level of predictability and controlability.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eecaebb4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eecaebb4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eecaebb4
Branch: refs/heads/3.0.x-fixes
Commit: eecaebb4b0ea89fc2aa94acb6464f0e913b8b223
Parents: 8453007
Author: Daniel Kulp
Authored: Thu Nov 13 11:37:53 2014 -0500
Committer: Daniel Kulp
Committed: Fri Nov 14 11:27:25 2014 -0500
--
.../cxf/bus/extension/ExtensionManagerImpl.java | 28 +---
1 file changed, 19 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/eecaebb4/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
--
diff --git
a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
index 1a5ee00..62d1944 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
@@ -32,6 +32,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger;
import org.apache.cxf.Bus;
@@ -56,6 +57,7 @@ public class ExtensionManagerImpl implements
ExtensionManager, ConfiguredBeanLoc
private final ClassLoader loader;
private ResourceManager resourceManager;
private Map all = new ConcurrentHashMap();
+private List ordered = new CopyOnWriteArrayList();
private final Map, Object> activated;
private final Bus bus;
@@ -91,6 +93,7 @@ public class ExtensionManagerImpl implements
ExtensionManager, ConfiguredBeanLoc
for (Map.Entry ext :
ExtensionRegistry.getRegisteredExtensions().entrySet()) {
if (!all.containsKey(ext.getKey())) {
all.put(ext.getKey(), ext.getValue());
+ordered.add(ext.getValue());
}
}
}
@@ -109,10 +112,11 @@ public class ExtensionManagerImpl implements
ExtensionManager, ConfiguredBeanLoc
}
public void add(Extension ex) {
all.put(ex.getName(), ex);
+ordered.add(ex);
}
public void initialize() {
-for (Extension e : all.values()) {
+for (Extension e : ordered) {
if (!e.isDeferred() && e.getLoadedObject() == null) {
loadAndRegister(e);
}
@@ -121,18 +125,21 @@ public class ExtensionManagerImpl implements
ExtensionManager, ConfiguredBeanLoc
public void removeBeansOfNames(List names) {
for (String s : names) {
-all.remove(s);
+Extension ex = all.remove(s);
+if (ex != null) {
+ordered.remove(ex);
+}
}
}
public void activateAll() {
-for (Extension e : all.values()) {
+for (Extension e : ordered) {
if (e.getLoadedObject() == null) {
loadAndRegister(e);
}
}
}
public void activateAllByType(Class type) {
-for (Extension e : all.values()) {
+for (Extension e : ordered) {
if (e.getLoadedObject() == null) {
Class cls = e.getClassObject(loader);
if (cls != null && type.isAssignableFrom(cls)) {
@@ -178,6 +185,7 @@ public class ExtensionManagerImpl implements
ExtensionManager, ConfiguredBeanLoc
}
if (!all.containsKey(e.getName())) {
all.put(e.getName(), e);
+ordered.add(e);
}
}
} finally {
@@ -292,7 +300,7 @@ public class ExtensionManagerImpl implements
ExtensionManager, ConfiguredBeanLoc
}
public List getBeanNamesOfType(Class type) {
List ret = new LinkedList();
-for (Extension ex : all.values()) {
+for (Extension ex : ordered) {
Class cls = ex.getClassObject(loader);
if (cls != null && type.isAssignableFrom(cls)) {
synchronized (ex) {
@@ -325,11 +333,13 @@ public class ExtensionManagerImpl implements
ExtensionManager, ConfiguredBeanLoc
if (ext.getLoadedObject() == null) {
loadAndRegister(ext);
}
-ret.add(type.cast(ext.getLoadedObject()));
+if (ext.getLoadedObject() != null) {
+ret.add(type.cast(ext.getLoadedObje
Nexus: Staging Completed
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.2.3 (Java 1.7.0_71; Mac OS X 10.10), Apache-Maven/3.2.3 (Java 1.7.0_71; Mac OS X 10.10)""userId" = "dkulp""ip" = "50.176.22.10"Details:The following artifacts have been staged/org/apache/cxf/xjc-utils/xjc-utils/3.0.3/xjc-utils-3.0.3.pom.asc(SHA1: 57d1e841493946143d9639c3f5ce690556b13b3a)/org/apache/cxf/xjc-utils/xjc-utils/3.0.3/xjc-utils-3.0.3-source-release.zip.asc(SHA1: 7eb7c18b04a39aeca6e4172ce94977dbd58670a9)/org/apache/cxf/xjc-utils/xjc-utils/3.0.3/xjc-utils-3.0.3.pom(SHA1: 67f47a37f5c419916ee3a95f61dde1f7bc2f55ce)/org/apache/cxf/xjc-utils/xjc-utils/3.0.3/xjc-utils-3.0.3-source-release.zip(SHA1: 6b51af6e812109e441b86f363a38d1a5671055fe)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.3/cxf-xjc-runtime-3.0.3-javadoc.jar(SHA1: 82e37e5f1de19c084cb252182cb9788bd121aa33)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.3/cxf-xjc-runtime-3.0.3.jar(SHA1: 2a35f7867e33ede92de3d9cbbdbab0c7df96712d)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.3/cxf-xjc-runtime-3.0.3-sources.jar(SHA1: 47a6a0be218d69aa36a23978379e3c347bd7212e)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.3/cxf-xjc-runtime-3.0.3-sources.jar.asc(SHA1: 06b9ca6509988c8557a4570b73a799e4468d7225)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.3/cxf-xjc-runtime-3.0.3-javadoc.jar.asc(SHA1: 0fb6d217354f8a0eab91dcb469a7be580b9e32b0)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.3/cxf-xjc-runtime-3.0.3.pom.asc(SHA1: 16463537c0a8761003c1516b6d4f2da3cc1fdd7c)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.3/cxf-xjc-runtime-3.0.3.pom(SHA1: 433580a63084d4078b7b2cc49ed3ed5698554c39)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.3/cxf-xjc-runtime-3.0.3.jar.asc(SHA1: cdc28574696f506df185944583c6c287fe5dcc8d)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.3/cxf-xjc-boolean-3.0.3-javadoc.jar.asc(SHA1: b7b928d863c000f3ede5ccd789323f4c7b2265c0)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.3/cxf-xjc-boolean-3.0.3.jar(SHA1: 1a563b55c34e2623c2b7ffcc36b95ba99dadf4f0)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.3/cxf-xjc-boolean-3.0.3.pom.asc(SHA1: f93769c45aea9d8d73c79d00222e44271073b60e)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.3/cxf-xjc-boolean-3.0.3.pom(SHA1: 2811109f5010dae3b5271d56fcb6b6ff32df7771)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.3/cxf-xjc-boolean-3.0.3-sources.jar(SHA1: a9aa890a22f6aa12517e1eb580d4d69ead85edc0)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.3/cxf-xjc-boolean-3.0.3-sources.jar.asc(SHA1: 1744cf22c8d78b03ae4d229520ad442acf9ff72f)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.3/cxf-xjc-boolean-3.0.3.jar.asc(SHA1: 63a66fe3c84717fca0fecc8bc965582285bb26cc)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.3/cxf-xjc-boolean-3.0.3-javadoc.jar(SHA1: f44d76bf285cfe711866ab9af0df0dfe690ea273)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.3/cxf-xjc-bug671-3.0.3.jar(SHA1: 2863587358962403c9062cc7bee6edf45609ba10)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.3/cxf-xjc-bug671-3.0.3-sources.jar(SHA1: 43b96be45b9e72c3f87af14e6346d1eeaf306a58)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.3/cxf-xjc-bug671-3.0.3-sources.jar.asc(SHA1: 22ba1451d032835769a3f7fe15b15c9224e32835)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.3/cxf-xjc-bug671-3.0.3-javadoc.jar.asc(SHA1: 5d274d3c093f86f5faeb67348617c0baee2cd652)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.3/cxf-xjc-bug671-3.0.3.jar.asc(SHA1: bcecd96382a5d77cc88290c07377dc306480b1b7)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.3/cxf-xjc-bug671-3.0.3.pom(SHA1: ec1ddb7b59cafeb24bbf9a803d7fbdc98ba6acb0)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.3/cxf-xjc-bug671-3.0.3-javadoc.jar(SHA1: 81bd74eae910fcf212f9669887dec11b9abb2ce6)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.3/cxf-xjc-bug671-3.0.3.pom.asc(SHA1: bd5170abcc4b024e0af8896d8c1e237658f97b4b)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.3/cxf-xjc-javadoc-3.0.3.jar.asc(SHA1: f937d79c7abb0a8ba9a219866ae7ff277f9e073d)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.3/cxf-xjc-javadoc-3.0.3-javadoc.jar.asc(SHA1: 9f19a48cb07584c25db7507d3e34b795e4fa13ea)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.3/cxf-xjc-javadoc-3.0.3.jar(SHA1: 2552d04809965006a1e8150d9617bcc91c1359a8)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.3/cxf-xjc-javadoc-3.0.3-sources.jar(SHA1: df883c55174b07cf401aa6e4f1438861c5ebff76)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.3/cxf-xjc-javadoc-3.0.3-javadoc.jar(SHA1: 73609749b1807ec28b67115940c7f306207ac120)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.3/cxf-xjc-javadoc-3.0.3-sources.jar.asc(SHA1: 88467af2e60fb5184d7fb52ab3584cbbd73313f2)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.3/cxf-xjc-javadoc-3.0.3.pom(SHA1: faf2101619414964793c147f411e58b001e66d22)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.3/cxf-xjc-javadoc-3.0.3.pom.asc(SHA1: 9af4af9d730bcda92dade68a4a944f4ee4edf4f6)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.0.3/cxf-xjc-bug986-3.0.3-sources.jar(SHA1: 83374cdb97fe04d6a0b31b37f6e0b20cb725b85c)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.0.3/cxf-xjc-b
cxf git commit: [CXF-6064] Making it simpler to customize WADL resource ids
Repository: cxf
Updated Branches:
refs/heads/master 855ab395b -> 2cd4f136a
[CXF-6064] Making it simpler to customize WADL resource ids
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2cd4f136
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2cd4f136
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2cd4f136
Branch: refs/heads/master
Commit: 2cd4f136a29eaf898c37d92ae0eed926874a8111
Parents: 855ab39
Author: Sergey Beryozkin
Authored: Fri Nov 14 17:12:34 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 17:12:34 2014 +
--
.../cxf/jaxrs/model/wadl/WadlGenerator.java | 61 +---
1 file changed, 41 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/2cd4f136/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
--
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 4c15480..fa9e295 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -147,7 +147,6 @@ public class WadlGenerator implements
ContainerRequestFilter {
private boolean singleResourceMultipleMethods = true;
private boolean useSingleSlashResource;
private boolean ignoreForwardSlash;
-private boolean addResourceAndMethodIds;
private boolean ignoreRequests;
private boolean linkAnyMediaTypeToXmlSchema;
private boolean useJaxbContextForQnames = true;
@@ -170,7 +169,8 @@ public class WadlGenerator implements
ContainerRequestFilter {
private MediaType defaultRepMediaType = MediaType.WILDCARD_TYPE;
private Bus bus;
private DocumentationProvider docProvider;
-
+private ResourceIdGenerator idGenerator;
+
public WadlGenerator() {
}
@@ -266,7 +266,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
Map, QName> clsMap = new IdentityHashMap, QName>();
Set visitedResources = new
LinkedHashSet();
for (ClassResourceInfo cri : cris) {
-startResourceTag(sbResources, cri.getServiceClass(),
cri.getURITemplate().getValue());
+startResourceTag(sbResources, cri,
cri.getURITemplate().getValue());
Annotation description =
AnnotationUtils.getClassAnnotation(cri.getServiceClass(), Description.class);
if (description == null) {
@@ -350,7 +350,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
Class cls = getMethod(ori).getReturnType();
ClassResourceInfo subcri = cri.findResource(cls, cls);
if (subcri != null && !visitedResources.contains(subcri)) {
-startResourceTag(sb, subcri.getServiceClass(),
ori.getURITemplate().getValue());
+startResourceTag(sb, subcri,
ori.getURITemplate().getValue());
handleDocs(subcri.getServiceClass().getAnnotations(), sb,
DocTarget.RESOURCE, true,
isJson);
handlePathAndMatrixParams(sb, ori, isJson);
@@ -380,18 +380,11 @@ public class WadlGenerator implements
ContainerRequestFilter {
return classParams;
}
-private void startResourceTag(StringBuilder sb, Class serviceClass,
String path) {
+protected void startResourceTag(StringBuilder sb, ClassResourceInfo cri,
String path) {
sb.append(", QName>(0));
-}
-String pName = jaxbQname == null ?
PackageUtils.getPackageName(serviceClass) : jaxbQname
-.getNamespaceURI();
-String localName = jaxbQname == null ?
serviceClass.getSimpleName() : jaxbQname.getLocalPart();
-String finalName = jaxbQname == null ? pName + "." : "{" + pName +
"}";
-sb.append(" id=\"").append(finalName + localName).append("\"");
+if (idGenerator != null) {
+String id = idGenerator.getClassResourceId(cri);
+sb.append(" id=\"").append(id).append("\"");
}
sb.append(">");
}
@@ -469,8 +462,9 @@ public class WadlGenerator implements
ContainerRequestFilter {
protected void startMethodTag(StringBuilder sb, OperationResourceInfo ori)
{
sb.append("");
}
@@ -620,8 +614,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
sb.append("");
}
}
-startResourceTag(sb, subcri != null ? subcri.getServiceClass() :
Object.class, ori.getURITemplate()
-.getValue());
+
cxf git commit: [CXF-6064] Making it simpler to customize WADL resource ids
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 0e410548c -> ff407cd32
[CXF-6064] Making it simpler to customize WADL resource ids
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ff407cd3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ff407cd3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ff407cd3
Branch: refs/heads/3.0.x-fixes
Commit: ff407cd321af92fa1cb7d852690a1fa640742cc6
Parents: 0e41054
Author: Sergey Beryozkin
Authored: Fri Nov 14 17:12:34 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 17:14:04 2014 +
--
.../cxf/jaxrs/model/wadl/WadlGenerator.java | 61 +---
1 file changed, 41 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ff407cd3/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
--
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 4c15480..fa9e295 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -147,7 +147,6 @@ public class WadlGenerator implements
ContainerRequestFilter {
private boolean singleResourceMultipleMethods = true;
private boolean useSingleSlashResource;
private boolean ignoreForwardSlash;
-private boolean addResourceAndMethodIds;
private boolean ignoreRequests;
private boolean linkAnyMediaTypeToXmlSchema;
private boolean useJaxbContextForQnames = true;
@@ -170,7 +169,8 @@ public class WadlGenerator implements
ContainerRequestFilter {
private MediaType defaultRepMediaType = MediaType.WILDCARD_TYPE;
private Bus bus;
private DocumentationProvider docProvider;
-
+private ResourceIdGenerator idGenerator;
+
public WadlGenerator() {
}
@@ -266,7 +266,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
Map, QName> clsMap = new IdentityHashMap, QName>();
Set visitedResources = new
LinkedHashSet();
for (ClassResourceInfo cri : cris) {
-startResourceTag(sbResources, cri.getServiceClass(),
cri.getURITemplate().getValue());
+startResourceTag(sbResources, cri,
cri.getURITemplate().getValue());
Annotation description =
AnnotationUtils.getClassAnnotation(cri.getServiceClass(), Description.class);
if (description == null) {
@@ -350,7 +350,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
Class cls = getMethod(ori).getReturnType();
ClassResourceInfo subcri = cri.findResource(cls, cls);
if (subcri != null && !visitedResources.contains(subcri)) {
-startResourceTag(sb, subcri.getServiceClass(),
ori.getURITemplate().getValue());
+startResourceTag(sb, subcri,
ori.getURITemplate().getValue());
handleDocs(subcri.getServiceClass().getAnnotations(), sb,
DocTarget.RESOURCE, true,
isJson);
handlePathAndMatrixParams(sb, ori, isJson);
@@ -380,18 +380,11 @@ public class WadlGenerator implements
ContainerRequestFilter {
return classParams;
}
-private void startResourceTag(StringBuilder sb, Class serviceClass,
String path) {
+protected void startResourceTag(StringBuilder sb, ClassResourceInfo cri,
String path) {
sb.append(", QName>(0));
-}
-String pName = jaxbQname == null ?
PackageUtils.getPackageName(serviceClass) : jaxbQname
-.getNamespaceURI();
-String localName = jaxbQname == null ?
serviceClass.getSimpleName() : jaxbQname.getLocalPart();
-String finalName = jaxbQname == null ? pName + "." : "{" + pName +
"}";
-sb.append(" id=\"").append(finalName + localName).append("\"");
+if (idGenerator != null) {
+String id = idGenerator.getClassResourceId(cri);
+sb.append(" id=\"").append(id).append("\"");
}
sb.append(">");
}
@@ -469,8 +462,9 @@ public class WadlGenerator implements
ContainerRequestFilter {
protected void startMethodTag(StringBuilder sb, OperationResourceInfo ori)
{
sb.append("");
}
@@ -620,8 +614,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
sb.append("");
}
}
-startResourceTag(sb, subcri != null ? subcri.getServiceClass() :
Object.class, ori.getURITemplate()
-.getValue()
cxf git commit: [CXF-6105] - CXF 3.x does not use the older WS-SecurityPolicy 1.1 namespace
Repository: cxf
Updated Branches:
refs/heads/master 2cd4f136a -> 2561af88d
[CXF-6105] - CXF 3.x does not use the older WS-SecurityPolicy 1.1 namespace
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2561af88
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2561af88
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2561af88
Branch: refs/heads/master
Commit: 2561af88db461b9c5480acb2a32cd0210fd79668
Parents: 2cd4f13
Author: Colm O hEigeartaigh
Authored: Fri Nov 14 17:15:46 2014 +
Committer: Colm O hEigeartaigh
Committed: Fri Nov 14 17:16:36 2014 +
--
.../wss4j/policyhandlers/AbstractBindingBuilder.java | 4 ++--
.../wss4j/policyhandlers/AsymmetricBindingHandler.java | 8
.../wss4j/policyhandlers/SymmetricBindingHandler.java| 8
.../wss4j/policyhandlers/TransportBindingHandler.java| 7 +--
4 files changed, 19 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/2561af88/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index aeec3cb..87e6cb6 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -1902,8 +1902,8 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
WSSecDKSign dkSign = new WSSecDKSign(wssConfig);
//Check whether it is security policy 1.2 and use the secure
conversation accordingly
-if (policyToken.getVersion() == SPConstants.SPVersion.SP12) {
-dkSign.setWscVersion(ConversationConstants.VERSION_05_12);
+if (policyToken.getVersion() == SPConstants.SPVersion.SP11) {
+dkSign.setWscVersion(ConversationConstants.VERSION_05_02);
}
//Check for whether the token is attached in the message or not
http://git-wip-us.apache.org/repos/asf/cxf/blob/2561af88/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index 9ea8487..36f7aba 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -44,6 +44,7 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.wss4j.AttachmentCallbackHandler;
import org.apache.wss4j.common.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
+import org.apache.wss4j.common.derivedKey.ConversationConstants;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.dom.WSConstants;
@@ -451,6 +452,9 @@ public class AsymmetricBindingHandler extends
AbstractBindingBuilder {
if (encrToken.getDerivedKeys() == DerivedKeys.RequireDerivedKeys) {
try {
WSSecDKEncrypt dkEncr = new WSSecDKEncrypt(wssConfig);
+if (recToken.getToken().getVersion() ==
SPConstants.SPVersion.SP11) {
+
dkEncr.setWscVersion(ConversationConstants.VERSION_05_02);
+}
if (encrKey == null) {
setupEncryptedKey(recToken, encrToken);
@@ -611,6 +615,10 @@ public class AsymmetricBindingHandler extends
AbstractBindingBuilder {
setupEncryptedKey(wrapper, sigToken);
WSSecDKSign dkSign = new WSSecDKSign(wssConfig);
+if (wrapper.getToken().getVersion() == SPConstants.SPVersion.SP11)
{
+dkSign.setWscVersion(ConversationConstants.VERSION_05_02);
+}
+
dkSign.setExternalKey(this.encryptedKeyValue, this.encryptedKeyId);
// Set the algo info
http://git-wip-us.apache.org/repos/asf/cxf/blob/2561af88/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
cxf git commit: [CXF-6105] - CXF 3.x does not use the older WS-SecurityPolicy 1.1 namespace
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes ff407cd32 -> 1df23fc6b
[CXF-6105] - CXF 3.x does not use the older WS-SecurityPolicy 1.1 namespace
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1df23fc6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1df23fc6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1df23fc6
Branch: refs/heads/3.0.x-fixes
Commit: 1df23fc6b70d95f9fd5b47697cd8ffacb5f45c50
Parents: ff407cd
Author: Colm O hEigeartaigh
Authored: Fri Nov 14 17:15:46 2014 +
Committer: Colm O hEigeartaigh
Committed: Fri Nov 14 17:18:05 2014 +
--
.../wss4j/policyhandlers/AbstractBindingBuilder.java | 4 ++--
.../wss4j/policyhandlers/AsymmetricBindingHandler.java | 8
.../wss4j/policyhandlers/SymmetricBindingHandler.java| 8
.../wss4j/policyhandlers/TransportBindingHandler.java| 7 +--
4 files changed, 19 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1df23fc6/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index aeec3cb..87e6cb6 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -1902,8 +1902,8 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
WSSecDKSign dkSign = new WSSecDKSign(wssConfig);
//Check whether it is security policy 1.2 and use the secure
conversation accordingly
-if (policyToken.getVersion() == SPConstants.SPVersion.SP12) {
-dkSign.setWscVersion(ConversationConstants.VERSION_05_12);
+if (policyToken.getVersion() == SPConstants.SPVersion.SP11) {
+dkSign.setWscVersion(ConversationConstants.VERSION_05_02);
}
//Check for whether the token is attached in the message or not
http://git-wip-us.apache.org/repos/asf/cxf/blob/1df23fc6/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index 9ea8487..36f7aba 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -44,6 +44,7 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.wss4j.AttachmentCallbackHandler;
import org.apache.wss4j.common.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
+import org.apache.wss4j.common.derivedKey.ConversationConstants;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.dom.WSConstants;
@@ -451,6 +452,9 @@ public class AsymmetricBindingHandler extends
AbstractBindingBuilder {
if (encrToken.getDerivedKeys() == DerivedKeys.RequireDerivedKeys) {
try {
WSSecDKEncrypt dkEncr = new WSSecDKEncrypt(wssConfig);
+if (recToken.getToken().getVersion() ==
SPConstants.SPVersion.SP11) {
+
dkEncr.setWscVersion(ConversationConstants.VERSION_05_02);
+}
if (encrKey == null) {
setupEncryptedKey(recToken, encrToken);
@@ -611,6 +615,10 @@ public class AsymmetricBindingHandler extends
AbstractBindingBuilder {
setupEncryptedKey(wrapper, sigToken);
WSSecDKSign dkSign = new WSSecDKSign(wssConfig);
+if (wrapper.getToken().getVersion() == SPConstants.SPVersion.SP11)
{
+dkSign.setWscVersion(ConversationConstants.VERSION_05_02);
+}
+
dkSign.setExternalKey(this.encryptedKeyValue, this.encryptedKeyId);
// Set the algo info
http://git-wip-us.apache.org/repos/asf/cxf/blob/1df23fc6/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHan
cxf git commit: Update to specify the import range again so it can deploy on Karaf 3.0.1
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 1df23fc6b -> 14e26574a Update to specify the import range again so it can deploy on Karaf 3.0.1 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/14e26574 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/14e26574 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/14e26574 Branch: refs/heads/3.0.x-fixes Commit: 14e26574a82629afefcda69cfd2929735b84c622 Parents: 1df23fc Author: Daniel Kulp Authored: Fri Nov 14 12:23:33 2014 -0500 Committer: Daniel Kulp Committed: Fri Nov 14 12:23:54 2014 -0500 -- osgi/karaf/commands/pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/14e26574/osgi/karaf/commands/pom.xml -- diff --git a/osgi/karaf/commands/pom.xml b/osgi/karaf/commands/pom.xml index a336a76..d09f01b 100644 --- a/osgi/karaf/commands/pom.xml +++ b/osgi/karaf/commands/pom.xml @@ -58,6 +58,7 @@ !org.apache.cxf.karaf.commands, org.apache.cxf*;version="[3,4)", org.apache.karaf.shell*;version="[2.3,5)", + org.apache.felix.gogo.commands*;version="[0.6,1)", * <_nouses>true
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes f39223409 -> 4b9289a8c 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/4b9289a8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4b9289a8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4b9289a8 Branch: refs/heads/2.7.x-fixes Commit: 4b9289a8c0ba0a8e6bc743d938b831cbbdad9fdf Parents: f392234 Author: Colm O hEigeartaigh Authored: Fri Nov 14 17:24:52 2014 + Committer: Colm O hEigeartaigh Committed: Fri Nov 14 17:24:52 2014 + -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/4b9289a8/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index e1e1a77..1cffbbe 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -189,6 +189,7 @@ B 1d72c1551a0bb5d671cde6332f5e87135326aff9 B 1d7365b33c03b44f8fa984fc1f6350469f6bb7f3 B 1d884dc801901c2f343582651fc5aca05d81f24a B 1ddf740976e130c838bc7e6a012048765eda3ee0 +B 1df23fc6b70d95f9fd5b47697cd8ffacb5f45c50 B 1e7e0eeeafa5453bfe12b24ae072044a136341ac B 1e8aba05df7f3b9a7b9b486a107a534d35e8d81a B 1ef40fca273d8d2ba3a37b91dbcf66d1f7e2dfed
cxf git commit: adding another missing file
Repository: cxf
Updated Branches:
refs/heads/master 2561af88d -> 4f570a742
adding another missing file
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4f570a74
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4f570a74
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4f570a74
Branch: refs/heads/master
Commit: 4f570a7425ef503485f94431eccd113f3be3378b
Parents: 2561af8
Author: Sergey Beryozkin
Authored: Fri Nov 14 17:46:54 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 17:46:54 2014 +
--
.../jaxrs/model/wadl/ResourceIdGenerator.java | 27
1 file changed, 27 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4f570a74/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/ResourceIdGenerator.java
--
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/ResourceIdGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/ResourceIdGenerator.java
new file mode 100644
index 000..8906b39
--- /dev/null
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/ResourceIdGenerator.java
@@ -0,0 +1,27 @@
+/**
+ * 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 org.apache.cxf.jaxrs.model.wadl;
+
+import org.apache.cxf.jaxrs.model.ClassResourceInfo;
+import org.apache.cxf.jaxrs.model.OperationResourceInfo;
+
+public interface ResourceIdGenerator {
+String getClassResourceId(ClassResourceInfo cri);
+String getMethodResourceId(OperationResourceInfo cri);
+}
cxf git commit: adding another missing file
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 14e26574a -> 53c84d714
adding another missing file
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/53c84d71
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/53c84d71
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/53c84d71
Branch: refs/heads/3.0.x-fixes
Commit: 53c84d714912349ec01e1a33e5497d2d8b1c61b9
Parents: 14e2657
Author: Sergey Beryozkin
Authored: Fri Nov 14 17:46:54 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 17:47:51 2014 +
--
.../jaxrs/model/wadl/ResourceIdGenerator.java | 27
1 file changed, 27 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/53c84d71/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/ResourceIdGenerator.java
--
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/ResourceIdGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/ResourceIdGenerator.java
new file mode 100644
index 000..8906b39
--- /dev/null
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/ResourceIdGenerator.java
@@ -0,0 +1,27 @@
+/**
+ * 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 org.apache.cxf.jaxrs.model.wadl;
+
+import org.apache.cxf.jaxrs.model.ClassResourceInfo;
+import org.apache.cxf.jaxrs.model.OperationResourceInfo;
+
+public interface ResourceIdGenerator {
+String getClassResourceId(ClassResourceInfo cri);
+String getMethodResourceId(OperationResourceInfo cri);
+}
cxf git commit: Get more of 3.0.x workign on Karaf 4 (jetty stuff won't work)
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 53c84d714 -> 4681cb3b5
Get more of 3.0.x workign on Karaf 4 (jetty stuff won't work)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4681cb3b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4681cb3b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4681cb3b
Branch: refs/heads/3.0.x-fixes
Commit: 4681cb3b58270c4ce5a58a196afffd5fe3d14321
Parents: 53c84d7
Author: Daniel Kulp
Authored: Fri Nov 14 12:54:13 2014 -0500
Committer: Daniel Kulp
Committed: Fri Nov 14 12:54:45 2014 -0500
--
osgi/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4681cb3b/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index ebc720b..5a1a703 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -125,7 +125,7 @@
cxf-core
-http-whiteboard
+http-whiteboard
mvn:org.apache.cxf/cxf-rt-transports-http/${project.version}
cxf git commit: [CXF-6103] Updating IgnoreNamespaceWriter to optionally block xsi attributes
Repository: cxf
Updated Branches:
refs/heads/master 4f570a742 -> 09d4301ac
[CXF-6103] Updating IgnoreNamespaceWriter to optionally block xsi attributes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/09d4301a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/09d4301a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/09d4301a
Branch: refs/heads/master
Commit: 09d4301ac26c0dc2d1dc575e3a6943bbf816219a
Parents: 4f570a7
Author: Sergey Beryozkin
Authored: Fri Nov 14 21:58:33 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 21:58:33 2014 +
--
.../cxf/staxutils/transform/IgnoreNamespacesWriter.java | 11 ++-
.../cxf/jaxrs/provider/aegis/AegisJSONProvider.java | 2 +-
.../cxf/jaxrs/provider/json/DataBindingJSONProvider.java | 2 +-
.../org/apache/cxf/jaxrs/provider/json/JSONProvider.java | 2 +-
.../apache/cxf/jaxrs/provider/json/utils/JSONUtils.java | 10 +-
5 files changed, 18 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/09d4301a/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
--
diff --git
a/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
b/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
index ea558ed..75d8f9a 100644
---
a/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
+++
b/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
@@ -24,13 +24,22 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.cxf.staxutils.DelegatingXMLStreamWriter;
public class IgnoreNamespacesWriter extends DelegatingXMLStreamWriter {
-
+private static final String XSI_PREFIX = "xsi";
+private boolean ignoreXsiAttributes;
public IgnoreNamespacesWriter(XMLStreamWriter writer) {
+this(writer, true);
+}
+public IgnoreNamespacesWriter(XMLStreamWriter writer, boolean
ignoreXsiAttributes) {
super(writer);
+this.ignoreXsiAttributes = ignoreXsiAttributes;
}
public void writeAttribute(String prefix, String uri,
String local, String value) throws
XMLStreamException {
+if (ignoreXsiAttributes && XSI_PREFIX.equals(prefix)
+&& ("type".equals(local) || "nil".equals(local))) {
+return;
+}
super.writeAttribute(local, value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/09d4301a/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 332f60e..3bf5894 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
@@ -136,7 +136,7 @@ public final class AegisJSONProvider extends
AegisElementProvider {
writeXsiType && !ignoreNamespaces,
false, null);
XMLStreamWriter writer = JSONUtils.createStreamWriter(os, typeQName,
writeXsiType && !ignoreNamespaces, config, serializeAsArray,
arrayKeys, dropRootElement, enc);
-return JSONUtils.createIgnoreNsWriterIfNeeded(writer,
ignoreNamespaces);
+return JSONUtils.createIgnoreNsWriterIfNeeded(writer,
ignoreNamespaces, !writeXsiType);
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/09d4301a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
--
diff --git
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
index 0768fc6..a41f577 100644
---
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
+++
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
@@ -102,7 +102,7 @@ public class DataBindingJSONProvider extends
DataBindingProvider {
XMLStreamWriter writer = JSONUtils.createStreamWriter(os, qname,
writeXsiType && !ignoreNamespaces, config, serializeAsArray,
arrayKeys, dropRootElement, enc);
writer = JSONUt
cxf git commit: [CXF-6103] IgnoreNamespaceWriter should not lose xsi attributes by default - the current behaviour
Repository: cxf
Updated Branches:
refs/heads/master 09d4301ac -> 1a0519b5f
[CXF-6103] IgnoreNamespaceWriter should not lose xsi attributes by default -
the current behaviour
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1a0519b5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1a0519b5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1a0519b5
Branch: refs/heads/master
Commit: 1a0519b5fddfa9b524f366125f786ccf2b7f7521
Parents: 09d4301
Author: Sergey Beryozkin
Authored: Fri Nov 14 22:01:22 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 22:01:22 2014 +
--
.../org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1a0519b5/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
--
diff --git
a/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
b/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
index 75d8f9a..c6187ba 100644
---
a/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
+++
b/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
@@ -27,7 +27,7 @@ public class IgnoreNamespacesWriter extends
DelegatingXMLStreamWriter {
private static final String XSI_PREFIX = "xsi";
private boolean ignoreXsiAttributes;
public IgnoreNamespacesWriter(XMLStreamWriter writer) {
-this(writer, true);
+this(writer, false);
}
public IgnoreNamespacesWriter(XMLStreamWriter writer, boolean
ignoreXsiAttributes) {
super(writer);
cxf git commit: [CXF-6103] Updating IgnoreNamespaceWriter to optionally block xsi attributes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 4681cb3b5 -> 632d7dd86
[CXF-6103] Updating IgnoreNamespaceWriter to optionally block xsi attributes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/632d7dd8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/632d7dd8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/632d7dd8
Branch: refs/heads/3.0.x-fixes
Commit: 632d7dd866f508e746f94129f8cc1e4889e2b92c
Parents: 4681cb3
Author: Sergey Beryozkin
Authored: Fri Nov 14 21:58:33 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 22:02:51 2014 +
--
.../cxf/staxutils/transform/IgnoreNamespacesWriter.java | 11 ++-
.../cxf/jaxrs/provider/aegis/AegisJSONProvider.java | 2 +-
.../cxf/jaxrs/provider/json/DataBindingJSONProvider.java | 2 +-
.../org/apache/cxf/jaxrs/provider/json/JSONProvider.java | 2 +-
.../apache/cxf/jaxrs/provider/json/utils/JSONUtils.java | 10 +-
5 files changed, 18 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/632d7dd8/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
--
diff --git
a/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
b/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
index ea558ed..75d8f9a 100644
---
a/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
+++
b/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
@@ -24,13 +24,22 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.cxf.staxutils.DelegatingXMLStreamWriter;
public class IgnoreNamespacesWriter extends DelegatingXMLStreamWriter {
-
+private static final String XSI_PREFIX = "xsi";
+private boolean ignoreXsiAttributes;
public IgnoreNamespacesWriter(XMLStreamWriter writer) {
+this(writer, true);
+}
+public IgnoreNamespacesWriter(XMLStreamWriter writer, boolean
ignoreXsiAttributes) {
super(writer);
+this.ignoreXsiAttributes = ignoreXsiAttributes;
}
public void writeAttribute(String prefix, String uri,
String local, String value) throws
XMLStreamException {
+if (ignoreXsiAttributes && XSI_PREFIX.equals(prefix)
+&& ("type".equals(local) || "nil".equals(local))) {
+return;
+}
super.writeAttribute(local, value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/632d7dd8/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 332f60e..3bf5894 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
@@ -136,7 +136,7 @@ public final class AegisJSONProvider extends
AegisElementProvider {
writeXsiType && !ignoreNamespaces,
false, null);
XMLStreamWriter writer = JSONUtils.createStreamWriter(os, typeQName,
writeXsiType && !ignoreNamespaces, config, serializeAsArray,
arrayKeys, dropRootElement, enc);
-return JSONUtils.createIgnoreNsWriterIfNeeded(writer,
ignoreNamespaces);
+return JSONUtils.createIgnoreNsWriterIfNeeded(writer,
ignoreNamespaces, !writeXsiType);
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/632d7dd8/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
--
diff --git
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
index 0768fc6..a41f577 100644
---
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
+++
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
@@ -102,7 +102,7 @@ public class DataBindingJSONProvider extends
DataBindingProvider {
XMLStreamWriter writer = JSONUtils.createStreamWriter(os, qname,
writeXsiType && !ignoreNamespaces, config, serializeAsArray,
arrayKeys, dropRootElement, enc);
write
cxf git commit: [CXF-6103] IgnoreNamespaceWriter should not lose xsi attributes by default - the current behaviour
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 632d7dd86 -> 99cdc078f
[CXF-6103] IgnoreNamespaceWriter should not lose xsi attributes by default -
the current behaviour
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/99cdc078
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/99cdc078
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/99cdc078
Branch: refs/heads/3.0.x-fixes
Commit: 99cdc078f30212f516dcf7bc2291c83bcf5475c8
Parents: 632d7dd
Author: Sergey Beryozkin
Authored: Fri Nov 14 22:01:22 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 22:03:29 2014 +
--
.../org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/99cdc078/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
--
diff --git
a/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
b/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
index 75d8f9a..c6187ba 100644
---
a/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
+++
b/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
@@ -27,7 +27,7 @@ public class IgnoreNamespacesWriter extends
DelegatingXMLStreamWriter {
private static final String XSI_PREFIX = "xsi";
private boolean ignoreXsiAttributes;
public IgnoreNamespacesWriter(XMLStreamWriter writer) {
-this(writer, true);
+this(writer, false);
}
public IgnoreNamespacesWriter(XMLStreamWriter writer, boolean
ignoreXsiAttributes) {
super(writer);
cxf git commit: [CXF-6103] Updating IgnoreNamespaceWriter to optionally block xsi attributes
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 4b9289a8c -> 917747502
[CXF-6103] Updating IgnoreNamespaceWriter to optionally block xsi attributes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/91774750
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/91774750
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/91774750
Branch: refs/heads/2.7.x-fixes
Commit: 9177475020d4bd7e211e2ec384acce7489e2deef
Parents: 4b9289a
Author: Sergey Beryozkin
Authored: Fri Nov 14 21:58:33 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 22:09:20 2014 +
--
.../cxf/staxutils/transform/IgnoreNamespacesWriter.java | 11 ++-
.../cxf/jaxrs/provider/aegis/AegisJSONProvider.java | 2 +-
.../cxf/jaxrs/provider/json/DataBindingJSONProvider.java | 2 +-
.../org/apache/cxf/jaxrs/provider/json/JSONProvider.java | 2 +-
.../apache/cxf/jaxrs/provider/json/utils/JSONUtils.java | 9 +
5 files changed, 18 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/91774750/api/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
--
diff --git
a/api/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
b/api/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
index ea558ed..75d8f9a 100644
---
a/api/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
+++
b/api/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
@@ -24,13 +24,22 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.cxf.staxutils.DelegatingXMLStreamWriter;
public class IgnoreNamespacesWriter extends DelegatingXMLStreamWriter {
-
+private static final String XSI_PREFIX = "xsi";
+private boolean ignoreXsiAttributes;
public IgnoreNamespacesWriter(XMLStreamWriter writer) {
+this(writer, true);
+}
+public IgnoreNamespacesWriter(XMLStreamWriter writer, boolean
ignoreXsiAttributes) {
super(writer);
+this.ignoreXsiAttributes = ignoreXsiAttributes;
}
public void writeAttribute(String prefix, String uri,
String local, String value) throws
XMLStreamException {
+if (ignoreXsiAttributes && XSI_PREFIX.equals(prefix)
+&& ("type".equals(local) || "nil".equals(local))) {
+return;
+}
super.writeAttribute(local, value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/91774750/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 332f60e..3bf5894 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
@@ -136,7 +136,7 @@ public final class AegisJSONProvider extends
AegisElementProvider {
writeXsiType && !ignoreNamespaces,
false, null);
XMLStreamWriter writer = JSONUtils.createStreamWriter(os, typeQName,
writeXsiType && !ignoreNamespaces, config, serializeAsArray,
arrayKeys, dropRootElement, enc);
-return JSONUtils.createIgnoreNsWriterIfNeeded(writer,
ignoreNamespaces);
+return JSONUtils.createIgnoreNsWriterIfNeeded(writer,
ignoreNamespaces, !writeXsiType);
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/91774750/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
--
diff --git
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
index 0768fc6..a41f577 100644
---
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
+++
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
@@ -102,7 +102,7 @@ public class DataBindingJSONProvider extends
DataBindingProvider {
XMLStreamWriter writer = JSONUtils.createStreamWriter(os, qname,
writeXsiType && !ignoreNamespaces, config, serializeAsArray,
arrayKeys, dropRootElement, enc);
writer = JS
cxf git commit: [CXF-6103] IgnoreNamespaceWriter should not lose xsi attributes by default - the current behaviour
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 917747502 -> 12b375608
[CXF-6103] IgnoreNamespaceWriter should not lose xsi attributes by default -
the current behaviour
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/12b37560
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/12b37560
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/12b37560
Branch: refs/heads/2.7.x-fixes
Commit: 12b375608bc9cef50b09a4d654c63484b0027483
Parents: 9177475
Author: Sergey Beryozkin
Authored: Fri Nov 14 22:01:22 2014 +
Committer: Sergey Beryozkin
Committed: Fri Nov 14 22:10:10 2014 +
--
.../org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/12b37560/api/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
--
diff --git
a/api/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
b/api/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
index 75d8f9a..c6187ba 100644
---
a/api/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
+++
b/api/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
@@ -27,7 +27,7 @@ public class IgnoreNamespacesWriter extends
DelegatingXMLStreamWriter {
private static final String XSI_PREFIX = "xsi";
private boolean ignoreXsiAttributes;
public IgnoreNamespacesWriter(XMLStreamWriter writer) {
-this(writer, true);
+this(writer, false);
}
public IgnoreNamespacesWriter(XMLStreamWriter writer, boolean
ignoreXsiAttributes) {
super(writer);
