cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes ac823a775 -> 3bd30f7aa


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/3bd30f7a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3bd30f7a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3bd30f7a

Branch: refs/heads/3.0.x-fixes
Commit: 3bd30f7aa60f5ce3e05854260f29a1c7b074dcfc
Parents: ac823a7
Author: Colm O hEigeartaigh 
Authored: Tue May 31 16:10:43 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue May 31 16:10:43 2016 +0100

--
 .gitmergeinfo | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3bd30f7a/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index cdfd3cd..7734aa8 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -224,6 +224,7 @@ B 3d373ea991a8415f6161468f36947143411e2cf1
 B 3d747fa0847db2798f6662a2540d4f3a79d83edd
 B 3e393ef377af21a0385cb0943aae248a22d1fc1f
 B 3ea1c784f248e29dcda46b16b82ad0e923c4b6e1
+B 3ec5957b01821138129cc29acb88430fa278d28e
 B 3ee69e9404d3ffed74e84b223d7d284c081f7fb4
 B 40c9bfd5ee0ba7cccd7abc7e7d19db531e212c97
 B 40e31a9f14bb9e494c9240463e17ed232e201876
@@ -231,6 +232,7 @@ B 411dff107d089001ffa836bc196f91ab873f76cf
 B 42b3ae5ec3ae398082e892d6c37acb0809876894
 B 42e6fde997a3b7e7408414e79e2003ec067910f3
 B 42eba2f948a967d62dc0257a920715ae47ae4310
+B 42f6750b3690a19d906c2d9fb146d8fafbcb7620
 B 4306144c1704d2cf085d387cf0be8d9cbdd5f5b8
 B 431db5275e3a056d6cedf4608533197580cb6073
 B 434dd09df50479fea2408826bc04603cb8b8eb58
@@ -773,6 +775,7 @@ B d4f3d88802137d285cc3290884c2683ba5e74d33
 B d4f9674baa811936429271cbf64c4a558282c764
 B d50ffd09c30e606524fb6ed92119d85ccfa13491
 B d54a21628143bc15f51cbe5d63fa42c09d0ab8ac
+B d55039341b000375256c5db9e79cfad5f8b4c3fb
 B d58695e24fa0cc7f951ba4894f0dc946fdfb27f6
 B d5b502a60d2934a42e32cb6225224ff75c66aa37
 B d5cbce1303076be91f66340e42e0218cdef3e954

[2/2] cxf git commit: CXF-6925 - Make per-realm crypto configuration as flexible as the static one

[coheigea]

CXF-6925 - Make per-realm crypto configuration as flexible as the static one


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

Branch: refs/heads/3.1.x-fixes
Commit: d55039341b000375256c5db9e79cfad5f8b4c3fb
Parents: 3ec5957
Author: Colm O hEigeartaigh 
Authored: Tue May 31 16:02:44 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue May 31 16:05:39 2016 +0100

--
 .../cxf/sts/token/realm/RealmProperties.java| 22 ++--
 .../apache/cxf/sts/token/realm/SAMLRealm.java   |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d5503934/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java
index 3f5112f..dfe65c6 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java
@@ -45,7 +45,7 @@ public class RealmProperties {
 private String signatureAlias;
 private Crypto signatureCrypto;
 private SignatureProperties signatureProperties;
-private String signaturePropertiesFile;
+private Object signatureCryptoProperties;
 private String callbackHandlerClass;
 private CallbackHandler callbackHandler;
 
@@ -93,10 +93,20 @@ public class RealmProperties {
  * Set the String corresponding to the signature Properties class
  * @param signaturePropertiesFile the String corresponding to the 
signature properties file
  */
+@Deprecated
 public void setSignaturePropertiesFile(String signaturePropertiesFile) {
-this.signaturePropertiesFile = signaturePropertiesFile;
+setSignatureCryptoProperties(signaturePropertiesFile);
+}
+
+/**
+ * Set the Object corresponding to the signature Properties class. It can 
be a String
+ * corresponding to a filename, a Properties object, or a URL.
+ * @param signatureCryptoProperties the object corresponding to the 
signature properties
+ */
+public void setSignatureCryptoProperties(Object signatureCryptoProperties) 
{
+this.signatureCryptoProperties = signatureCryptoProperties;
 if (LOG.isLoggable(Level.FINE)) {
-LOG.fine("Setting signature properties: " + 
signaturePropertiesFile);
+LOG.fine("Setting signature crypto properties: " + 
signatureCryptoProperties);
 }
 }
 
@@ -122,10 +132,10 @@ public class RealmProperties {
  * @return the signature Crypto object
  */
 public Crypto getSignatureCrypto() {
-if (signatureCrypto == null && signaturePropertiesFile != null) {
-Properties sigProperties = 
SecurityUtils.loadProperties(signaturePropertiesFile);
+if (signatureCrypto == null && signatureCryptoProperties != null) {
+Properties sigProperties = 
SecurityUtils.loadProperties(signatureCryptoProperties);
 if (sigProperties == null) {
-LOG.fine("Cannot load signature properties using: " + 
signaturePropertiesFile);
+LOG.fine("Cannot load signature properties using: " + 
signatureCryptoProperties);
 throw new STSException("Configuration error: cannot load 
signature properties");
 }
 try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/d5503934/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java
index fe2be74..c4a1b40 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java
@@ -20,7 +20,7 @@
 package org.apache.cxf.sts.token.realm;
 
 /**
- * Use RealmProperties intead
+ * Use RealmProperties instead
  */
 @Deprecated
 public class SAMLRealm extends RealmProperties {

[1/2] cxf git commit: [CXF-6926] - StaticSTSProperties does not allow initialization of crypto from Properties object

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master e824784db -> 4a0664250


[CXF-6926] - StaticSTSProperties does not allow initialization of crypto from 
Properties object


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

Branch: refs/heads/master
Commit: 6ee177cc53142ad69589950af1e29077fb034449
Parents: e824784
Author: Colm O hEigeartaigh 
Authored: Tue May 31 15:57:27 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue May 31 15:57:27 2016 +0100

--
 .../java/org/apache/cxf/rt/security/utils/SecurityUtils.java  | 6 +-
 .../src/main/java/org/apache/cxf/sts/StaticSTSProperties.java | 7 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6ee177cc/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java
--
diff --git 
a/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java 
b/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java
index 046b7c5..b679edb 100644
--- 
a/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java
+++ 
b/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java
@@ -135,13 +135,17 @@ public final class SecurityUtils {
 }
 
 public static Properties loadProperties(Object o) {
+return loadProperties(null, o);
+}
+
+public static Properties loadProperties(ResourceManager manager, Object o) 
{
 if (o instanceof Properties) {
 return (Properties)o;
 } 
 
 URL url = null;
 if (o instanceof String) {
-url = SecurityUtils.loadResource(o);
+url = SecurityUtils.loadResource(manager, o);
 } else if (o instanceof URL) {
 url = (URL)o;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/6ee177cc/services/sts/sts-core/src/main/java/org/apache/cxf/sts/StaticSTSProperties.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/StaticSTSProperties.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/StaticSTSProperties.java
index c02bf93..0399575 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/StaticSTSProperties.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/StaticSTSProperties.java
@@ -18,7 +18,6 @@
  */
 package org.apache.cxf.sts;
 
-import java.net.URL;
 import java.util.List;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -73,8 +72,7 @@ public class StaticSTSProperties implements 
STSPropertiesMBean {
 public void configureProperties() throws STSException {
 if (signatureCrypto == null && signatureCryptoProperties != null) {
 ResourceManager resourceManager = getResourceManager();
-URL url = SecurityUtils.loadResource(resourceManager, 
signatureCryptoProperties);
-Properties sigProperties = SecurityUtils.loadProperties(url);
+Properties sigProperties = 
SecurityUtils.loadProperties(resourceManager, signatureCryptoProperties);
 if (sigProperties == null) {
 LOG.fine("Cannot load signature properties using: " + 
signatureCryptoProperties);
 throw new STSException("Configuration error: cannot load 
signature properties");
@@ -89,8 +87,7 @@ public class StaticSTSProperties implements 
STSPropertiesMBean {
 
 if (encryptionCrypto == null && encryptionCryptoProperties != null) {
 ResourceManager resourceManager = getResourceManager();
-URL url = SecurityUtils.loadResource(resourceManager, 
encryptionCryptoProperties);
-Properties encrProperties = SecurityUtils.loadProperties(url);
+Properties encrProperties = 
SecurityUtils.loadProperties(resourceManager, encryptionCryptoProperties);
 if (encrProperties == null) {
 LOG.fine("Cannot load encryption properties using: " + 
encryptionCryptoProperties);
 throw new STSException("Configuration error: cannot load 
encryption properties");

[2/2] cxf git commit: CXF-6925 - Make per-realm crypto configuration as flexible as the static one

[coheigea]

CXF-6925 - Make per-realm crypto configuration as flexible as the static one


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

Branch: refs/heads/master
Commit: 4a066425084878cf92e968fde608fc4da1b7343c
Parents: 6ee177c
Author: Colm O hEigeartaigh 
Authored: Tue May 31 16:02:44 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue May 31 16:02:44 2016 +0100

--
 .../cxf/sts/token/realm/RealmProperties.java| 22 ++--
 .../apache/cxf/sts/token/realm/SAMLRealm.java   |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4a066425/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java
index 3f5112f..dfe65c6 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java
@@ -45,7 +45,7 @@ public class RealmProperties {
 private String signatureAlias;
 private Crypto signatureCrypto;
 private SignatureProperties signatureProperties;
-private String signaturePropertiesFile;
+private Object signatureCryptoProperties;
 private String callbackHandlerClass;
 private CallbackHandler callbackHandler;
 
@@ -93,10 +93,20 @@ public class RealmProperties {
  * Set the String corresponding to the signature Properties class
  * @param signaturePropertiesFile the String corresponding to the 
signature properties file
  */
+@Deprecated
 public void setSignaturePropertiesFile(String signaturePropertiesFile) {
-this.signaturePropertiesFile = signaturePropertiesFile;
+setSignatureCryptoProperties(signaturePropertiesFile);
+}
+
+/**
+ * Set the Object corresponding to the signature Properties class. It can 
be a String
+ * corresponding to a filename, a Properties object, or a URL.
+ * @param signatureCryptoProperties the object corresponding to the 
signature properties
+ */
+public void setSignatureCryptoProperties(Object signatureCryptoProperties) 
{
+this.signatureCryptoProperties = signatureCryptoProperties;
 if (LOG.isLoggable(Level.FINE)) {
-LOG.fine("Setting signature properties: " + 
signaturePropertiesFile);
+LOG.fine("Setting signature crypto properties: " + 
signatureCryptoProperties);
 }
 }
 
@@ -122,10 +132,10 @@ public class RealmProperties {
  * @return the signature Crypto object
  */
 public Crypto getSignatureCrypto() {
-if (signatureCrypto == null && signaturePropertiesFile != null) {
-Properties sigProperties = 
SecurityUtils.loadProperties(signaturePropertiesFile);
+if (signatureCrypto == null && signatureCryptoProperties != null) {
+Properties sigProperties = 
SecurityUtils.loadProperties(signatureCryptoProperties);
 if (sigProperties == null) {
-LOG.fine("Cannot load signature properties using: " + 
signaturePropertiesFile);
+LOG.fine("Cannot load signature properties using: " + 
signatureCryptoProperties);
 throw new STSException("Configuration error: cannot load 
signature properties");
 }
 try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/4a066425/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java
index fe2be74..c4a1b40 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java
@@ -20,7 +20,7 @@
 package org.apache.cxf.sts.token.realm;
 
 /**
- * Use RealmProperties intead
+ * Use RealmProperties instead
  */
 @Deprecated
 public class SAMLRealm extends RealmProperties {

cxf git commit: Moving security code to use java.util.Base64

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 847e00fe7 -> e824784db


Moving security code to use java.util.Base64


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

Branch: refs/heads/master
Commit: e824784db1bda81c68aaa407f471588acea38865
Parents: 847e00f
Author: Colm O hEigeartaigh 
Authored: Tue May 31 15:34:00 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue May 31 15:34:26 2016 +0100

--
 .../cxf/rs/security/saml/sso/MetadataWriter.java |  4 ++--
 .../security/saml/sso/SamlRedirectBindingFilter.java |  4 ++--
 .../cxf/rs/security/xml/XmlEncOutInterceptor.java|  7 +++
 .../cxf/ws/security/kerberos/KerberosClient.java |  4 ++--
 .../KerberosTokenInterceptorProvider.java|  4 ++--
 .../ws/security/policy/interceptors/STSInvoker.java  |  6 +++---
 .../SecureConversationInInterceptor.java |  4 ++--
 .../SpnegoContextTokenInInterceptor.java |  6 +++---
 .../SpnegoContextTokenOutInterceptor.java|  5 +++--
 .../cxf/ws/security/trust/AbstractSTSClient.java | 10 +-
 .../ws/security/wss4j/TokenStoreCallbackHandler.java |  4 ++--
 .../ws/security/wss4j/UsernameTokenInterceptor.java  |  6 +++---
 .../policyhandlers/SymmetricBindingHandler.java  |  4 ++--
 .../KerberosTokenPolicyValidator.java|  4 ++--
 .../cxf/sts/claims/LdapGroupClaimsHandler.java   |  2 +-
 .../sts/token/validator/UsernameTokenValidator.java  | 11 +--
 .../apache/cxf/sts/operation/IssueSamlUnitTest.java  |  4 ++--
 .../cxf/sts/operation/ValidateX509TokenUnitTest.java |  4 ++--
 .../sts/token/validator/X509TokenValidatorTest.java  |  6 +++---
 .../cxf/systest/sts/batch/SimpleBatchSTSClient.java  | 15 +++
 .../sts/deployment/CustomBSTTokenValidator.java  |  5 +++--
 21 files changed, 59 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e824784d/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
index d85b9e5..b081bed 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
@@ -25,6 +25,7 @@ import java.security.Key;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
 
@@ -50,7 +51,6 @@ import org.w3c.dom.Document;
 import org.apache.cxf.staxutils.W3CDOMStreamWriter;
 import org.apache.wss4j.common.util.DOM2Writer;
 import org.apache.xml.security.stax.impl.util.IDGenerator;
-import org.apache.xml.security.utils.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -176,7 +176,7 @@ public class MetadataWriter {
 
 // Write the Base-64 encoded certificate
 byte data[] = signingCert.getEncoded();
-String encodedCertificate = Base64.encode(data);
+String encodedCertificate = 
Base64.getMimeEncoder().encodeToString(data);
 writer.writeCharacters(encodedCertificate);
 
 writer.writeEndElement(); // X509Certificate

http://git-wip-us.apache.org/repos/asf/cxf/blob/e824784d/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
index ebfc7b8..485f6d5 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
@@ -24,6 +24,7 @@ import java.nio.charset.StandardCharsets;
 import java.security.PrivateKey;
 import java.security.Signature;
 import java.security.cert.X509Certificate;
+import java.util.Base64;
 import java.util.logging.Level;
 
 import javax.security.auth.callback.CallbackHandler;
@@ -42,7 +43,6 @@ import org.apache.wss4j.common.crypto.Crypto;
 import 

cxf git commit: Updating WADLGenerator to check BeanParam fields too

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 0dd5e0b88 -> 0fee635ae


Updating WADLGenerator to check BeanParam fields too


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

Branch: refs/heads/3.1.x-fixes
Commit: 0fee635ae9a9e6ddcb74485e2a5eb3ce24005892
Parents: 0dd5e0b
Author: Sergey Beryozkin 
Authored: Tue May 31 12:57:28 2016 +0100
Committer: Sergey Beryozkin 
Committed: Tue May 31 13:12:23 2016 +0100

--
 .../apache/cxf/jaxrs/utils/InjectionUtils.java  | 12 
 .../cxf/jaxrs/client/ClientProxyImpl.java   | 13 +
 .../cxf/jaxrs/model/wadl/WadlGenerator.java | 29 +++-
 .../apache/cxf/jaxrs/model/wadl/BookStore.java  |  2 +-
 4 files changed, 42 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0fee635a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index fa42c6f..2414476 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -72,6 +72,7 @@ import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.ClassHelper;
 import org.apache.cxf.common.util.PrimitiveUtils;
 import org.apache.cxf.common.util.ProxyClassLoader;
+import org.apache.cxf.common.util.ReflectionUtil;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxrs.ext.MessageContext;
@@ -113,6 +114,17 @@ public final class InjectionUtils {
 
 }
 
+public static Field getDeclaredField(Class cls, String fieldName) {
+if (cls == null || cls == Object.class) {
+return null;
+}
+Field f = ReflectionUtil.getDeclaredField(cls, fieldName);
+if (f != null) {
+return f;
+}
+return getDeclaredField(cls.getSuperclass(), fieldName);
+}
+
 public static boolean isConcreteClass(Class cls) {
 return !cls.isInterface() && !Modifier.isAbstract(cls.getModifiers());
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/0fee635a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
index 4f25895..4f56836 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
@@ -534,7 +534,7 @@ public class ClientProxyImpl extends AbstractClient 
implements
 }
 } else {
 String fieldName = 
StringUtils.uncapitalize(propertyName);
-Field f = getDeclaredField(bean.getClass(), fieldName);
+Field f = 
InjectionUtils.getDeclaredField(bean.getClass(), fieldName);
 if (f == null) {
 continue;
 }
@@ -560,17 +560,6 @@ public class ClientProxyImpl extends AbstractClient 
implements
 return values;
 }
 
-private static Field getDeclaredField(Class cls, String fieldName) {
-if (cls == null || cls == Object.class) {
-return null;
-}
-Field f = ReflectionUtil.getDeclaredField(cls, fieldName);
-if (f != null) {
-return f;
-}
-return getDeclaredField(cls.getSuperclass(), fieldName);
-}
-
 private void handleMatrixes(Method m,
 Object[] params,
 MultivaluedMap map,

http://git-wip-us.apache.org/repos/asf/cxf/blob/0fee635a/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 02f03b2..14d323b 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ 

cxf git commit: Updating WADLGenerator to check BeanParam fields too

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 32ca72653 -> 847e00fe7


Updating WADLGenerator to check BeanParam fields too


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

Branch: refs/heads/master
Commit: 847e00fe7b438a70f25694d02bca614ad6c0ec55
Parents: 32ca726
Author: Sergey Beryozkin 
Authored: Tue May 31 12:57:28 2016 +0100
Committer: Sergey Beryozkin 
Committed: Tue May 31 12:57:28 2016 +0100

--
 .../apache/cxf/jaxrs/utils/InjectionUtils.java  | 12 
 .../cxf/jaxrs/client/ClientProxyImpl.java   | 13 +
 .../cxf/jaxrs/model/wadl/WadlGenerator.java | 29 +++-
 .../apache/cxf/jaxrs/model/wadl/BookStore.java  |  2 +-
 4 files changed, 42 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/847e00fe/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index fa42c6f..2414476 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -72,6 +72,7 @@ import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.ClassHelper;
 import org.apache.cxf.common.util.PrimitiveUtils;
 import org.apache.cxf.common.util.ProxyClassLoader;
+import org.apache.cxf.common.util.ReflectionUtil;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxrs.ext.MessageContext;
@@ -113,6 +114,17 @@ public final class InjectionUtils {
 
 }
 
+public static Field getDeclaredField(Class cls, String fieldName) {
+if (cls == null || cls == Object.class) {
+return null;
+}
+Field f = ReflectionUtil.getDeclaredField(cls, fieldName);
+if (f != null) {
+return f;
+}
+return getDeclaredField(cls.getSuperclass(), fieldName);
+}
+
 public static boolean isConcreteClass(Class cls) {
 return !cls.isInterface() && !Modifier.isAbstract(cls.getModifiers());
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/847e00fe/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
index 4f25895..4f56836 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
@@ -534,7 +534,7 @@ public class ClientProxyImpl extends AbstractClient 
implements
 }
 } else {
 String fieldName = 
StringUtils.uncapitalize(propertyName);
-Field f = getDeclaredField(bean.getClass(), fieldName);
+Field f = 
InjectionUtils.getDeclaredField(bean.getClass(), fieldName);
 if (f == null) {
 continue;
 }
@@ -560,17 +560,6 @@ public class ClientProxyImpl extends AbstractClient 
implements
 return values;
 }
 
-private static Field getDeclaredField(Class cls, String fieldName) {
-if (cls == null || cls == Object.class) {
-return null;
-}
-Field f = ReflectionUtil.getDeclaredField(cls, fieldName);
-if (f != null) {
-return f;
-}
-return getDeclaredField(cls.getSuperclass(), fieldName);
-}
-
 private void handleMatrixes(Method m,
 Object[] params,
 MultivaluedMap map,

http://git-wip-us.apache.org/repos/asf/cxf/blob/847e00fe/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 02f03b2..14d323b 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ 

[1/2] cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes a22bfffb6 -> ac823a775


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/ac823a77
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ac823a77
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ac823a77

Branch: refs/heads/3.0.x-fixes
Commit: ac823a7756ba05903abb985e0d12142a87929f3c
Parents: 64eee13
Author: Colm O hEigeartaigh 
Authored: Tue May 31 12:42:36 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue May 31 12:42:36 2016 +0100

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ac823a77/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 8dd34d8..cdfd3cd 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -162,6 +162,7 @@ B 2dd91b898f58e99000711810ac0d179a3614d15d
 B 2e19b7549462aa8aafc9df7684327375fd4cd673
 B 2e221ea50c22d528b6b23dd0c0f0cc862e2d0fa4
 B 2e7338a15df3b313997be4700cccba9ac6294d02
+B 2e89c38ccfddf8097dbcb874b64c5b2ed8805d72
 B 2ec875978a50cd34d07bd7d3bbfc8583fd30250b
 B 2f0b3e38212674883d610cfcfbd76b901bd3d997
 B 2f164ec218a1e850d8cc4a6a9ffdb6dba248895f

[2/2] cxf git commit: Fix some non-standard security tests

[coheigea]

Fix some non-standard security tests


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

Branch: refs/heads/3.0.x-fixes
Commit: 64eee130b747c3b117e9605220ef7522beebd0bc
Parents: a22bfff
Author: Colm O hEigeartaigh 
Authored: Tue May 31 11:55:56 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue May 31 12:42:36 2016 +0100

--
 .../signed_x509_issuer_serial_encrypted.xml | 100 +--
 ...suer_serial_encrypted_missing_enc_header.xml |  93 -
 2 files changed, 46 insertions(+), 147 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/64eee130/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
--
diff --git 
a/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
 
b/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
index 0e94e5b..d92ea71 100644
--- 
a/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
+++ 
b/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
@@ -1,76 +1,24 @@
-http://schemas.xmlsoap.org/soap/envelope/; 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
-  http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd;>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary;
 
ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3;
 wsu:Id="3C9D721BD2968813B1126585766558324" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd;>MIIBmDCCAQECBEZu1OowDQYJKoZIhvcNAQEEBQAwEjEQMA4GA1UEAxMHbXlBbGlhczAgFw0wNzA2MTIxNzE2MjZaGA80NzQ1MDUwOTE3MTYyNlowEjEQMA4GA1UEAxMHbXlBbGlhczCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeOd8EfprmTD+6/nOe3nK3eXFlPsaiRnz5+R3gA6xz4WOOOQX7l1Pa4S65TZmVOxkfPzP+rFvbOJ4sn7ct0EtMiAYuqwnDiHVkqYIhz5WkoPBQet6J7dtcPIAEI9i5Mmf5gsiIMTo8UxqXnsrjCNX6MSrLFr2yspdR/xFYK5IqkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQB/nqtFF6u4FJI90JS+RogSTYFc9mngpvXv8WJsfdR+IQovdFjzqCufOAGPctuq6olgW1A5DRNLIQwr7sIPUhHBFZssuggwEQtF/lvJ51MGhp+pqySbpcPo31Wp
 
pQO+t4Zsu78DZO4GB3Njr1MqOnux5gPGHftujzlJh31SpkEfjA==http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>http://www.w3.org/2000/09/xmldsig#;>
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3"/>
-Gpo4d688YeGSgSQ3Oy4uYTTC/Mnc0bGvcHmBs4Gl3wesln/QaCopnEvk+WFZIAKLCHbFivBRow6I168YUY/TYlBCV1qwwii3j+v4EGI5IWzSZuEoZcrjcifRurmt3k0fzIIWIQcalGfcRF4dpciurwV/901BqmHIzi5g6e1OKaU=http://www.w3.org/2000/09/xmldsig#;>
-
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-
-
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-
-http://www.w3.org/2000/09/xmldsig#sha1"/>
-yrFltN8AySIQ4cvGezqY3dJccv0=
-
-
-
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-
-http://www.w3.org/2000/09/xmldsig#sha1"/>
-ydnnACRLT6oKf1FalVZjqOAzwTY=
-
-
-
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-
-http://www.w3.org/2000/09/xmldsig#sha1"/>
-cUw9auingZKft/aVSq/hHsZHbuQ=
-
-
-
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#STR-Transform;>
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-
-
-http://www.w3.org/2000/09/xmldsig#sha1"/>
-KcXtgDMfdhizxGV1QSk/pDNRQ1E=
-
-
-
-S+YdKOKFit57SZq5dg6BQB+gJFI2KJ1Iplw+niHWlq94uBxeSDvogcIzdvpFEE7gkg4x/oIdtXHF
-KSXJEsMaVVjFNue1Ngm0K2166WaacBK19aA6+Emiyd0G1uHxzBDXmPjmqj2LkBuAQjEDH5H5FDaM
-Kya1pvGwCAojkzwEnS0=
-
-
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd;>
-
-CN=myAlias
-1181668586
-
-
-
-
-http://www.w3.org/2001/04/xmlenc#Element;>http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>http://www.w3.org/2000/09/xmldsig#;>
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd;>
-ZdbSNeAwbw117jLDkuha7yzRnhKyHadOjuD1+Urtl6bM5/BM+jrVmuGrC47sLoM+WRDDzShjwosZ
-GOa53xGX/K8r1wdV/k09ZAuK8eTxddaIwQu5tSvaM+eoAiBE4WmWiIxb0ik5iajkYdufkM4ZL0S1
-ikmPgrSIcq5ppCjn9oN4Gf5OcXaykm6BXQ7U7RUC6awx62T0MekwIxuD4KQx1kEXz4ebLylCBH2Y
-cibUSo0=
-http://www.w3.org/2001/04/xmlenc#Element;>http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>http://www.w3.org/2000/09/xmldsig#;>
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd;>
-h2LK+Qfqqawey8zSU/6YSbXaQVbxleqa7TKhOD3j+kIKtFTwb/9EPpCJdxVG3boKJsXlfYOJOBDQ

cxf git commit: Fix some non-standard security tests

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes ffdd8830b -> 0dd5e0b88


Fix some non-standard security tests


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

Branch: refs/heads/3.1.x-fixes
Commit: 0dd5e0b889e8c54bb9e92561b7f9a4327894c492
Parents: ffdd883
Author: Colm O hEigeartaigh 
Authored: Tue May 31 11:55:56 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue May 31 12:39:04 2016 +0100

--
 .../signed_x509_issuer_serial_encrypted.xml | 100 +--
 ...suer_serial_encrypted_missing_enc_header.xml |  93 -
 2 files changed, 46 insertions(+), 147 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0dd5e0b8/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
--
diff --git 
a/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
 
b/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
index 0e94e5b..d92ea71 100644
--- 
a/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
+++ 
b/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
@@ -1,76 +1,24 @@
-http://schemas.xmlsoap.org/soap/envelope/; 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
-  http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd;>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary;
 
ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3;
 wsu:Id="3C9D721BD2968813B1126585766558324" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd;>MIIBmDCCAQECBEZu1OowDQYJKoZIhvcNAQEEBQAwEjEQMA4GA1UEAxMHbXlBbGlhczAgFw0wNzA2MTIxNzE2MjZaGA80NzQ1MDUwOTE3MTYyNlowEjEQMA4GA1UEAxMHbXlBbGlhczCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeOd8EfprmTD+6/nOe3nK3eXFlPsaiRnz5+R3gA6xz4WOOOQX7l1Pa4S65TZmVOxkfPzP+rFvbOJ4sn7ct0EtMiAYuqwnDiHVkqYIhz5WkoPBQet6J7dtcPIAEI9i5Mmf5gsiIMTo8UxqXnsrjCNX6MSrLFr2yspdR/xFYK5IqkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQB/nqtFF6u4FJI90JS+RogSTYFc9mngpvXv8WJsfdR+IQovdFjzqCufOAGPctuq6olgW1A5DRNLIQwr7sIPUhHBFZssuggwEQtF/lvJ51MGhp+pqySbpcPo31Wp
 
pQO+t4Zsu78DZO4GB3Njr1MqOnux5gPGHftujzlJh31SpkEfjA==http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>http://www.w3.org/2000/09/xmldsig#;>
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3"/>
-Gpo4d688YeGSgSQ3Oy4uYTTC/Mnc0bGvcHmBs4Gl3wesln/QaCopnEvk+WFZIAKLCHbFivBRow6I168YUY/TYlBCV1qwwii3j+v4EGI5IWzSZuEoZcrjcifRurmt3k0fzIIWIQcalGfcRF4dpciurwV/901BqmHIzi5g6e1OKaU=http://www.w3.org/2000/09/xmldsig#;>
-
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-
-
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-
-http://www.w3.org/2000/09/xmldsig#sha1"/>
-yrFltN8AySIQ4cvGezqY3dJccv0=
-
-
-
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-
-http://www.w3.org/2000/09/xmldsig#sha1"/>
-ydnnACRLT6oKf1FalVZjqOAzwTY=
-
-
-
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-
-http://www.w3.org/2000/09/xmldsig#sha1"/>
-cUw9auingZKft/aVSq/hHsZHbuQ=
-
-
-
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#STR-Transform;>
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-
-
-http://www.w3.org/2000/09/xmldsig#sha1"/>
-KcXtgDMfdhizxGV1QSk/pDNRQ1E=
-
-
-
-S+YdKOKFit57SZq5dg6BQB+gJFI2KJ1Iplw+niHWlq94uBxeSDvogcIzdvpFEE7gkg4x/oIdtXHF
-KSXJEsMaVVjFNue1Ngm0K2166WaacBK19aA6+Emiyd0G1uHxzBDXmPjmqj2LkBuAQjEDH5H5FDaM
-Kya1pvGwCAojkzwEnS0=
-
-
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd;>
-
-CN=myAlias
-1181668586
-
-
-
-
-http://www.w3.org/2001/04/xmlenc#Element;>http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>http://www.w3.org/2000/09/xmldsig#;>
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd;>
-ZdbSNeAwbw117jLDkuha7yzRnhKyHadOjuD1+Urtl6bM5/BM+jrVmuGrC47sLoM+WRDDzShjwosZ
-GOa53xGX/K8r1wdV/k09ZAuK8eTxddaIwQu5tSvaM+eoAiBE4WmWiIxb0ik5iajkYdufkM4ZL0S1
-ikmPgrSIcq5ppCjn9oN4Gf5OcXaykm6BXQ7U7RUC6awx62T0MekwIxuD4KQx1kEXz4ebLylCBH2Y
-cibUSo0=
-http://www.w3.org/2001/04/xmlenc#Element;>http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>http://www.w3.org/2000/09/xmldsig#;>
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd;>

cxf git commit: Fix some non-standard security tests

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master bc2ac254d -> 32ca72653


Fix some non-standard security tests


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

Branch: refs/heads/master
Commit: 32ca72653eda450230d4ab6f9db44ce3de436e51
Parents: bc2ac25
Author: Colm O hEigeartaigh 
Authored: Tue May 31 11:55:56 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue May 31 11:55:56 2016 +0100

--
 .../signed_x509_issuer_serial_encrypted.xml | 100 +--
 ...suer_serial_encrypted_missing_enc_header.xml |  93 -
 2 files changed, 46 insertions(+), 147 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/32ca7265/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
--
diff --git 
a/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
 
b/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
index 0e94e5b..d92ea71 100644
--- 
a/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
+++ 
b/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_encrypted.xml
@@ -1,76 +1,24 @@
-http://schemas.xmlsoap.org/soap/envelope/; 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
-  http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd;>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary;
 
ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3;
 wsu:Id="3C9D721BD2968813B1126585766558324" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd;>MIIBmDCCAQECBEZu1OowDQYJKoZIhvcNAQEEBQAwEjEQMA4GA1UEAxMHbXlBbGlhczAgFw0wNzA2MTIxNzE2MjZaGA80NzQ1MDUwOTE3MTYyNlowEjEQMA4GA1UEAxMHbXlBbGlhczCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeOd8EfprmTD+6/nOe3nK3eXFlPsaiRnz5+R3gA6xz4WOOOQX7l1Pa4S65TZmVOxkfPzP+rFvbOJ4sn7ct0EtMiAYuqwnDiHVkqYIhz5WkoPBQet6J7dtcPIAEI9i5Mmf5gsiIMTo8UxqXnsrjCNX6MSrLFr2yspdR/xFYK5IqkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQB/nqtFF6u4FJI90JS+RogSTYFc9mngpvXv8WJsfdR+IQovdFjzqCufOAGPctuq6olgW1A5DRNLIQwr7sIPUhHBFZssuggwEQtF/lvJ51MGhp+pqySbpcPo31Wp
 
pQO+t4Zsu78DZO4GB3Njr1MqOnux5gPGHftujzlJh31SpkEfjA==http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>http://www.w3.org/2000/09/xmldsig#;>
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3"/>
-Gpo4d688YeGSgSQ3Oy4uYTTC/Mnc0bGvcHmBs4Gl3wesln/QaCopnEvk+WFZIAKLCHbFivBRow6I168YUY/TYlBCV1qwwii3j+v4EGI5IWzSZuEoZcrjcifRurmt3k0fzIIWIQcalGfcRF4dpciurwV/901BqmHIzi5g6e1OKaU=http://www.w3.org/2000/09/xmldsig#;>
-
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-
-
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-
-http://www.w3.org/2000/09/xmldsig#sha1"/>
-yrFltN8AySIQ4cvGezqY3dJccv0=
-
-
-
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-
-http://www.w3.org/2000/09/xmldsig#sha1"/>
-ydnnACRLT6oKf1FalVZjqOAzwTY=
-
-
-
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-
-http://www.w3.org/2000/09/xmldsig#sha1"/>
-cUw9auingZKft/aVSq/hHsZHbuQ=
-
-
-
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#STR-Transform;>
-http://www.w3.org/2001/10/xml-exc-c14n#"/>
-
-
-http://www.w3.org/2000/09/xmldsig#sha1"/>
-KcXtgDMfdhizxGV1QSk/pDNRQ1E=
-
-
-
-S+YdKOKFit57SZq5dg6BQB+gJFI2KJ1Iplw+niHWlq94uBxeSDvogcIzdvpFEE7gkg4x/oIdtXHF
-KSXJEsMaVVjFNue1Ngm0K2166WaacBK19aA6+Emiyd0G1uHxzBDXmPjmqj2LkBuAQjEDH5H5FDaM
-Kya1pvGwCAojkzwEnS0=
-
-
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd;>
-
-CN=myAlias
-1181668586
-
-
-
-
-http://www.w3.org/2001/04/xmlenc#Element;>http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>http://www.w3.org/2000/09/xmldsig#;>
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd;>
-ZdbSNeAwbw117jLDkuha7yzRnhKyHadOjuD1+Urtl6bM5/BM+jrVmuGrC47sLoM+WRDDzShjwosZ
-GOa53xGX/K8r1wdV/k09ZAuK8eTxddaIwQu5tSvaM+eoAiBE4WmWiIxb0ik5iajkYdufkM4ZL0S1
-ikmPgrSIcq5ppCjn9oN4Gf5OcXaykm6BXQ7U7RUC6awx62T0MekwIxuD4KQx1kEXz4ebLylCBH2Y
-cibUSo0=
-http://www.w3.org/2001/04/xmlenc#Element;>http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>http://www.w3.org/2000/09/xmldsig#;>
-http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd;>

cxf git commit: [CXF-6927]check if msv is available in Stax2ValidationUtils to avoid the NCDFE when use IBM JDK

[ffang]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes ac671d508 -> a22bfffb6


[CXF-6927]check if msv is available in Stax2ValidationUtils to avoid the NCDFE 
when use IBM JDK

(cherry picked from commit bc2ac254d4f780d2443962adcdaf0a8db5b30280)
(cherry picked from commit ffdd8830bf625fcb55a76342281819d59ea79fe6)


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

Branch: refs/heads/3.0.x-fixes
Commit: a22bfffb63ed69efbeb0dedca18e2f81ec472e74
Parents: ac671d5
Author: Freeman Fang 
Authored: Tue May 31 15:51:04 2016 +0800
Committer: Freeman Fang 
Committed: Tue May 31 15:54:48 2016 +0800

--
 .../org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a22bfffb/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
 
b/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
index 87915c0..56e060b 100644
--- 
a/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
@@ -57,6 +57,7 @@ class Stax2ValidationUtils {
 static {
 boolean hasw = false;
 try {
+new ResolvingGrammarReaderController(null, null); // will throw if 
msv isn't available
 new W3CMultiSchemaFactory(); // will throw if wrong woodstox.
 hasw = true;
 } catch (Throwable t) {

cxf git commit: [CXF-6927]check if msv is available in Stax2ValidationUtils to avoid the NCDFE when use IBM JDK

[ffang]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes c8ffc4a42 -> ffdd8830b


[CXF-6927]check if msv is available in Stax2ValidationUtils to avoid the NCDFE 
when use IBM JDK

(cherry picked from commit bc2ac254d4f780d2443962adcdaf0a8db5b30280)


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

Branch: refs/heads/3.1.x-fixes
Commit: ffdd8830bf625fcb55a76342281819d59ea79fe6
Parents: c8ffc4a
Author: Freeman Fang 
Authored: Tue May 31 15:51:04 2016 +0800
Committer: Freeman Fang 
Committed: Tue May 31 15:51:40 2016 +0800

--
 .../org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ffdd8830/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
 
b/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
index 3a9d609..6cde540 100644
--- 
a/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
@@ -57,6 +57,7 @@ class Stax2ValidationUtils {
 static {
 boolean hasw = false;
 try {
+new ResolvingGrammarReaderController(null, null); // will throw if 
msv isn't available
 new W3CMultiSchemaFactory(); // will throw if wrong woodstox.
 hasw = true;
 } catch (Throwable t) {

cxf git commit: [CXF-6927]check if msv is available in Stax2ValidationUtils to avoid the NCDFE when use IBM JDK

[ffang]

Repository: cxf
Updated Branches:
  refs/heads/master 63c20e889 -> bc2ac254d


[CXF-6927]check if msv is available in Stax2ValidationUtils to avoid the NCDFE 
when use IBM JDK


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

Branch: refs/heads/master
Commit: bc2ac254d4f780d2443962adcdaf0a8db5b30280
Parents: 63c20e8
Author: Freeman Fang 
Authored: Tue May 31 15:51:04 2016 +0800
Committer: Freeman Fang 
Committed: Tue May 31 15:51:04 2016 +0800

--
 .../org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bc2ac254/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
 
b/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
index 3a9d609..6cde540 100644
--- 
a/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
@@ -57,6 +57,7 @@ class Stax2ValidationUtils {
 static {
 boolean hasw = false;
 try {
+new ResolvingGrammarReaderController(null, null); // will throw if 
msv isn't available
 new W3CMultiSchemaFactory(); // will throw if wrong woodstox.
 hasw = true;
 } catch (Throwable t) {

[1/3] cxf git commit: [CXF-6923] Handle org.omg.CORBA.SystemException for Jacorb correctly

[ffang]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c528de6c7 -> ac671d508


[CXF-6923] Handle org.omg.CORBA.SystemException for Jacorb correctly

(cherry picked from commit 0759f57a0786ef71a25e03c4d65c58632be3a18a)


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

Branch: refs/heads/3.0.x-fixes
Commit: 99036e5f1f36d3fe7851e49513a410c324d8d60c
Parents: c528de6
Author: Grzegorz Grzybek 
Authored: Mon May 30 16:49:06 2016 +0200
Committer: Freeman Fang 
Committed: Tue May 31 14:28:18 2016 +0800

--
 .../apache/cxf/binding/corba/CorbaConduit.java  |  5 +
 systests/uncategorized/pom.xml  |  6 ++
 .../systest/corba/BaseGreeterTimeoutImpl.java   | 96 
 .../cxf/systest/corba/CorbaTimeoutTest.java | 85 +
 .../apache/cxf/systest/corba/ServerTimeout.java | 51 +++
 5 files changed, 243 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/99036e5f/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
--
diff --git 
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
 
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
index a30b205..7741949 100644
--- 
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
+++ 
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
@@ -198,6 +198,11 @@ public class CorbaConduit implements Conduit {
 }
 Exception ex = request.env().exception();
 if (ex != null) {
+if (ex instanceof SystemException) {
+message.setContent(Exception.class, new Fault(ex));
+message.setSystemException((SystemException) ex);
+return;
+}
 if (ex instanceof UnknownUserException) {
 UnknownUserException userEx = (UnknownUserException) ex;
 Any except = userEx.except;

http://git-wip-us.apache.org/repos/asf/cxf/blob/99036e5f/systests/uncategorized/pom.xml
--
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index 5e74804..48cbd99 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -374,6 +374,12 @@
 
 test
 
+
+org.jacorb
+jacorb
+3.7
+test
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/99036e5f/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
--
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
new file mode 100644
index 000..efa0503
--- /dev/null
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
@@ -0,0 +1,96 @@
+/**
+ * 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.systest.corba;
+
+import java.util.ResourceBundle;
+
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.hello_world_corba.Greeter;
+import org.apache.cxf.hello_world_corba.PingMeFault;
+import org.apache.cxf.hello_world_corba.types.FaultDetail;
+import org.apache.cxf.interceptor.Fault;
+import org.junit.Assert;
+
+/**
+ * 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, 

[3/3] cxf git commit: [CXF-6923]make checkstyle happy

[ffang]

[CXF-6923]make checkstyle happy

(cherry picked from commit c8ffc4a42111dc711452a260b4d4a632c4351c1e)


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

Branch: refs/heads/3.0.x-fixes
Commit: ac671d5085b07f475208f205bf5125bdd5ba6489
Parents: 2557864
Author: Freeman Fang 
Authored: Tue May 31 14:05:26 2016 +0800
Committer: Freeman Fang 
Committed: Tue May 31 14:28:40 2016 +0800

--
 .../test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ac671d50/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
--
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
index a52c0d8..55ad459 100644
--- 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
@@ -77,7 +77,8 @@ public class CorbaTimeoutTest extends 
AbstractBusClientServerTestBase {
 new 
SpringBusFactory().createBus("org/apache/cxf/systest/corba/hello_world_client.xml");
 
 GreeterCORBAService gcs = new GreeterCORBAService(wsdlUrl, 
SERVICE_NAME);
-Greeter port = gcs.getPort(new 
QName("http://cxf.apache.org/hello_world_corba;, "GreeterTimeoutCORBAPort"), 
GreeterCORBAService.GreeterProxy.class);
+Greeter port = gcs.getPort(new 
QName("http://cxf.apache.org/hello_world_corba;, "GreeterTimeoutCORBAPort"), 
+ GreeterCORBAService.GreeterProxy.class);
 
 try {
 port.greetMe("Betty");

[2/3] cxf git commit: [CXF-6923] Fix test execution for different ORB implementations

[ffang]

[CXF-6923] Fix test execution for different ORB implementations

(cherry picked from commit 08c2c22439dcd85c19b21e555d45692135faae43)


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

Branch: refs/heads/3.0.x-fixes
Commit: 25578641211049fcf65705eabbddc179a09313d0
Parents: 99036e5
Author: Grzegorz Grzybek 
Authored: Mon May 30 20:57:15 2016 +0200
Committer: Freeman Fang 
Committed: Tue May 31 14:28:29 2016 +0800

--
 .../systest/corba/BaseGreeterTimeoutImpl.java   |  25 +--
 .../cxf/systest/corba/CorbaTimeoutTest.java |  24 ++-
 .../apache/cxf/systest/corba/ServerTimeout.java |   2 +-
 .../wsdl_systest/hello_world_corba_timeout.wsdl | 191 +++
 4 files changed, 214 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/25578641/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
--
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
index efa0503..b89b993 100644
--- 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
@@ -18,13 +18,8 @@
  */
 package org.apache.cxf.systest.corba;
 
-import java.util.ResourceBundle;
-
-import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.hello_world_corba.Greeter;
 import org.apache.cxf.hello_world_corba.PingMeFault;
-import org.apache.cxf.hello_world_corba.types.FaultDetail;
-import org.apache.cxf.interceptor.Fault;
 import org.junit.Assert;
 
 /**
@@ -46,14 +41,13 @@ import org.junit.Assert;
  * under the License.
  */
 
-@javax.jws.WebService(portName = "GreeterCORBAPort",
-serviceName = "GreeterCORBAService",
+@javax.jws.WebService(portName = "GreeterTimeoutCORBAPort",
+serviceName = "GreeterTimeoutCORBAService",
 targetNamespace = "http://cxf.apache.org/hello_world_corba;,
-wsdlLocation = "classpath:/wsdl_systest/hello_world_corba.wsdl",
+wsdlLocation = 
"classpath:/wsdl_systest/hello_world_corba_timeout.wsdl",
 endpointInterface = "org.apache.cxf.hello_world_corba.Greeter")
 
 public class BaseGreeterTimeoutImpl extends Assert implements Greeter {
-public static final String GREETME_IN = "test in";
 public static final String GREETME_OUT = "test out";
 static final String EX_STRING = "CXF RUNTIME EXCEPTION";
 
@@ -72,7 +66,6 @@ public class BaseGreeterTimeoutImpl extends Assert implements 
Greeter {
 }
 
 public void greetMeOneWay(String me) {
-assertEquals("William", me);
 }
 
 public String sayHi() {
@@ -80,17 +73,5 @@ public class BaseGreeterTimeoutImpl extends Assert 
implements Greeter {
 }
 
 public void pingMe(String faultType) throws PingMeFault {
-if ("USER".equals(faultType)) {
-
-FaultDetail detail = new FaultDetail();
-detail.setMajor((short)1);
-detail.setMinor((short)2);
-throw new PingMeFault("USER FAULT TEST", detail);
-} else if ("SYSTEM".equals(faultType)) {
-throw new Fault(new Message(EX_STRING, (ResourceBundle)null,
-new Object[]{"FAULT TEST"}));
-} else {
-throw new IllegalArgumentException(EX_STRING);
-}
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/25578641/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
--
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
index db7fb34..a52c0d8 100644
--- 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
@@ -20,10 +20,12 @@
 package org.apache.cxf.systest.corba;
 
 import java.io.File;
+import java.lang.reflect.Field;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import javax.xml.ws.WebServiceException;
 
+import org.apache.cxf.binding.corba.utils.CorbaBindingHelper;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.hello_world_corba.Greeter;
 import org.apache.cxf.hello_world_corba.GreeterCORBAService;
@@ -34,7 +36,7 @@ import 

[3/3] cxf git commit: [CXF-6923]make checkstyle happy

[ffang]

[CXF-6923]make checkstyle happy

(cherry picked from commit c8ffc4a42111dc711452a260b4d4a632c4351c1e)


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

Branch: refs/heads/master
Commit: 63c20e8898b7ef3695990a6a4e53cc7ad2dcc787
Parents: 76f7fad
Author: Freeman Fang 
Authored: Tue May 31 14:05:26 2016 +0800
Committer: Freeman Fang 
Committed: Tue May 31 14:23:15 2016 +0800

--
 .../test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/63c20e88/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
--
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
index a52c0d8..55ad459 100644
--- 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
@@ -77,7 +77,8 @@ public class CorbaTimeoutTest extends 
AbstractBusClientServerTestBase {
 new 
SpringBusFactory().createBus("org/apache/cxf/systest/corba/hello_world_client.xml");
 
 GreeterCORBAService gcs = new GreeterCORBAService(wsdlUrl, 
SERVICE_NAME);
-Greeter port = gcs.getPort(new 
QName("http://cxf.apache.org/hello_world_corba;, "GreeterTimeoutCORBAPort"), 
GreeterCORBAService.GreeterProxy.class);
+Greeter port = gcs.getPort(new 
QName("http://cxf.apache.org/hello_world_corba;, "GreeterTimeoutCORBAPort"), 
+ GreeterCORBAService.GreeterProxy.class);
 
 try {
 port.greetMe("Betty");

[1/3] cxf git commit: [CXF-6923] Handle org.omg.CORBA.SystemException for Jacorb correctly

[ffang]

Repository: cxf
Updated Branches:
  refs/heads/master 3615f2099 -> 63c20e889


[CXF-6923] Handle org.omg.CORBA.SystemException for Jacorb correctly

(cherry picked from commit 0759f57a0786ef71a25e03c4d65c58632be3a18a)

Conflicts:
systests/uncategorized/pom.xml


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

Branch: refs/heads/master
Commit: 0865c3a85b9687f857b51d1ae56c8f8e97bdbf5b
Parents: 3615f20
Author: Grzegorz Grzybek 
Authored: Mon May 30 16:49:06 2016 +0200
Committer: Freeman Fang 
Committed: Tue May 31 14:22:32 2016 +0800

--
 .../apache/cxf/binding/corba/CorbaConduit.java  |  5 +
 systests/uncategorized/pom.xml  |  5 +
 .../systest/corba/BaseGreeterTimeoutImpl.java   | 96 
 .../cxf/systest/corba/CorbaTimeoutTest.java | 85 +
 .../apache/cxf/systest/corba/ServerTimeout.java | 51 +++
 5 files changed, 242 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0865c3a8/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
--
diff --git 
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
 
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
index 91758e9..7518ece 100644
--- 
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
+++ 
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
@@ -198,6 +198,11 @@ public class CorbaConduit implements Conduit {
 }
 Exception ex = request.env().exception();
 if (ex != null) {
+if (ex instanceof SystemException) {
+message.setContent(Exception.class, new Fault(ex));
+message.setSystemException((SystemException) ex);
+return;
+}
 if (ex instanceof UnknownUserException) {
 UnknownUserException userEx = (UnknownUserException) ex;
 Any except = userEx.except;

http://git-wip-us.apache.org/repos/asf/cxf/blob/0865c3a8/systests/uncategorized/pom.xml
--
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index c9fd693..5110143 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -377,6 +377,11 @@
 
 org.qi4j.library
 org.qi4j.library.circuitbreaker
+
+
+org.jacorb
+jacorb
+3.7
 test
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/0865c3a8/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
--
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
new file mode 100644
index 000..efa0503
--- /dev/null
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
@@ -0,0 +1,96 @@
+/**
+ * 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.systest.corba;
+
+import java.util.ResourceBundle;
+
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.hello_world_corba.Greeter;
+import org.apache.cxf.hello_world_corba.PingMeFault;
+import org.apache.cxf.hello_world_corba.types.FaultDetail;
+import org.apache.cxf.interceptor.Fault;
+import org.junit.Assert;
+
+/**
+ * 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 

[2/3] cxf git commit: [CXF-6923] Fix test execution for different ORB implementations

[ffang]

[CXF-6923] Fix test execution for different ORB implementations

(cherry picked from commit 08c2c22439dcd85c19b21e555d45692135faae43)


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

Branch: refs/heads/master
Commit: 76f7fad3558a129e1e34352b0188eced086d8c36
Parents: 0865c3a
Author: Grzegorz Grzybek 
Authored: Mon May 30 20:57:15 2016 +0200
Committer: Freeman Fang 
Committed: Tue May 31 14:22:46 2016 +0800

--
 .../systest/corba/BaseGreeterTimeoutImpl.java   |  25 +--
 .../cxf/systest/corba/CorbaTimeoutTest.java |  24 ++-
 .../apache/cxf/systest/corba/ServerTimeout.java |   2 +-
 .../wsdl_systest/hello_world_corba_timeout.wsdl | 191 +++
 4 files changed, 214 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/76f7fad3/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
--
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
index efa0503..b89b993 100644
--- 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
@@ -18,13 +18,8 @@
  */
 package org.apache.cxf.systest.corba;
 
-import java.util.ResourceBundle;
-
-import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.hello_world_corba.Greeter;
 import org.apache.cxf.hello_world_corba.PingMeFault;
-import org.apache.cxf.hello_world_corba.types.FaultDetail;
-import org.apache.cxf.interceptor.Fault;
 import org.junit.Assert;
 
 /**
@@ -46,14 +41,13 @@ import org.junit.Assert;
  * under the License.
  */
 
-@javax.jws.WebService(portName = "GreeterCORBAPort",
-serviceName = "GreeterCORBAService",
+@javax.jws.WebService(portName = "GreeterTimeoutCORBAPort",
+serviceName = "GreeterTimeoutCORBAService",
 targetNamespace = "http://cxf.apache.org/hello_world_corba;,
-wsdlLocation = "classpath:/wsdl_systest/hello_world_corba.wsdl",
+wsdlLocation = 
"classpath:/wsdl_systest/hello_world_corba_timeout.wsdl",
 endpointInterface = "org.apache.cxf.hello_world_corba.Greeter")
 
 public class BaseGreeterTimeoutImpl extends Assert implements Greeter {
-public static final String GREETME_IN = "test in";
 public static final String GREETME_OUT = "test out";
 static final String EX_STRING = "CXF RUNTIME EXCEPTION";
 
@@ -72,7 +66,6 @@ public class BaseGreeterTimeoutImpl extends Assert implements 
Greeter {
 }
 
 public void greetMeOneWay(String me) {
-assertEquals("William", me);
 }
 
 public String sayHi() {
@@ -80,17 +73,5 @@ public class BaseGreeterTimeoutImpl extends Assert 
implements Greeter {
 }
 
 public void pingMe(String faultType) throws PingMeFault {
-if ("USER".equals(faultType)) {
-
-FaultDetail detail = new FaultDetail();
-detail.setMajor((short)1);
-detail.setMinor((short)2);
-throw new PingMeFault("USER FAULT TEST", detail);
-} else if ("SYSTEM".equals(faultType)) {
-throw new Fault(new Message(EX_STRING, (ResourceBundle)null,
-new Object[]{"FAULT TEST"}));
-} else {
-throw new IllegalArgumentException(EX_STRING);
-}
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/76f7fad3/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
--
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
index db7fb34..a52c0d8 100644
--- 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
@@ -20,10 +20,12 @@
 package org.apache.cxf.systest.corba;
 
 import java.io.File;
+import java.lang.reflect.Field;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import javax.xml.ws.WebServiceException;
 
+import org.apache.cxf.binding.corba.utils.CorbaBindingHelper;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.hello_world_corba.Greeter;
 import org.apache.cxf.hello_world_corba.GreeterCORBAService;
@@ -34,7 +36,7 @@ import 

[2/3] cxf git commit: [CXF-6923] Fix test execution for different ORB implementations

[ffang]

[CXF-6923] Fix test execution for different ORB implementations


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

Branch: refs/heads/3.1.x-fixes
Commit: 08c2c22439dcd85c19b21e555d45692135faae43
Parents: 0759f57
Author: Grzegorz Grzybek 
Authored: Mon May 30 20:57:15 2016 +0200
Committer: Grzegorz Grzybek 
Committed: Mon May 30 21:06:34 2016 +0200

--
 .../systest/corba/BaseGreeterTimeoutImpl.java   |  25 +--
 .../cxf/systest/corba/CorbaTimeoutTest.java |  24 ++-
 .../apache/cxf/systest/corba/ServerTimeout.java |   2 +-
 .../wsdl_systest/hello_world_corba_timeout.wsdl | 191 +++
 4 files changed, 214 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/08c2c224/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
--
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
index efa0503..b89b993 100644
--- 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
@@ -18,13 +18,8 @@
  */
 package org.apache.cxf.systest.corba;
 
-import java.util.ResourceBundle;
-
-import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.hello_world_corba.Greeter;
 import org.apache.cxf.hello_world_corba.PingMeFault;
-import org.apache.cxf.hello_world_corba.types.FaultDetail;
-import org.apache.cxf.interceptor.Fault;
 import org.junit.Assert;
 
 /**
@@ -46,14 +41,13 @@ import org.junit.Assert;
  * under the License.
  */
 
-@javax.jws.WebService(portName = "GreeterCORBAPort",
-serviceName = "GreeterCORBAService",
+@javax.jws.WebService(portName = "GreeterTimeoutCORBAPort",
+serviceName = "GreeterTimeoutCORBAService",
 targetNamespace = "http://cxf.apache.org/hello_world_corba;,
-wsdlLocation = "classpath:/wsdl_systest/hello_world_corba.wsdl",
+wsdlLocation = 
"classpath:/wsdl_systest/hello_world_corba_timeout.wsdl",
 endpointInterface = "org.apache.cxf.hello_world_corba.Greeter")
 
 public class BaseGreeterTimeoutImpl extends Assert implements Greeter {
-public static final String GREETME_IN = "test in";
 public static final String GREETME_OUT = "test out";
 static final String EX_STRING = "CXF RUNTIME EXCEPTION";
 
@@ -72,7 +66,6 @@ public class BaseGreeterTimeoutImpl extends Assert implements 
Greeter {
 }
 
 public void greetMeOneWay(String me) {
-assertEquals("William", me);
 }
 
 public String sayHi() {
@@ -80,17 +73,5 @@ public class BaseGreeterTimeoutImpl extends Assert 
implements Greeter {
 }
 
 public void pingMe(String faultType) throws PingMeFault {
-if ("USER".equals(faultType)) {
-
-FaultDetail detail = new FaultDetail();
-detail.setMajor((short)1);
-detail.setMinor((short)2);
-throw new PingMeFault("USER FAULT TEST", detail);
-} else if ("SYSTEM".equals(faultType)) {
-throw new Fault(new Message(EX_STRING, (ResourceBundle)null,
-new Object[]{"FAULT TEST"}));
-} else {
-throw new IllegalArgumentException(EX_STRING);
-}
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/08c2c224/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
--
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
index db7fb34..a52c0d8 100644
--- 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
@@ -20,10 +20,12 @@
 package org.apache.cxf.systest.corba;
 
 import java.io.File;
+import java.lang.reflect.Field;
 import java.net.URL;
 import javax.xml.namespace.QName;
 import javax.xml.ws.WebServiceException;
 
+import org.apache.cxf.binding.corba.utils.CorbaBindingHelper;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.hello_world_corba.Greeter;
 import org.apache.cxf.hello_world_corba.GreeterCORBAService;
@@ -34,7 +36,7 @@ import org.junit.Test;
 import org.omg.CORBA.TIMEOUT;
 
 /**
- *
+ * This 

[1/3] cxf git commit: [CXF-6923] Handle org.omg.CORBA.SystemException for Jacorb correctly

[ffang]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 92cfeea1e -> c8ffc4a42


[CXF-6923] Handle org.omg.CORBA.SystemException for Jacorb correctly


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

Branch: refs/heads/3.1.x-fixes
Commit: 0759f57a0786ef71a25e03c4d65c58632be3a18a
Parents: 92cfeea
Author: Grzegorz Grzybek 
Authored: Mon May 30 16:49:06 2016 +0200
Committer: Grzegorz Grzybek 
Committed: Mon May 30 16:49:06 2016 +0200

--
 .../apache/cxf/binding/corba/CorbaConduit.java  |  5 +
 systests/uncategorized/pom.xml  |  6 ++
 .../systest/corba/BaseGreeterTimeoutImpl.java   | 96 
 .../cxf/systest/corba/CorbaTimeoutTest.java | 85 +
 .../apache/cxf/systest/corba/ServerTimeout.java | 51 +++
 5 files changed, 243 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0759f57a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
--
diff --git 
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
 
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
index 91758e9..7518ece 100644
--- 
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
+++ 
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
@@ -198,6 +198,11 @@ public class CorbaConduit implements Conduit {
 }
 Exception ex = request.env().exception();
 if (ex != null) {
+if (ex instanceof SystemException) {
+message.setContent(Exception.class, new Fault(ex));
+message.setSystemException((SystemException) ex);
+return;
+}
 if (ex instanceof UnknownUserException) {
 UnknownUserException userEx = (UnknownUserException) ex;
 Any except = userEx.except;

http://git-wip-us.apache.org/repos/asf/cxf/blob/0759f57a/systests/uncategorized/pom.xml
--
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index 2930e5e..a3c1eeb 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -374,6 +374,12 @@
 
 test
 
+
+org.jacorb
+jacorb
+3.7
+test
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/0759f57a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
--
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
new file mode 100644
index 000..efa0503
--- /dev/null
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
@@ -0,0 +1,96 @@
+/**
+ * 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.systest.corba;
+
+import java.util.ResourceBundle;
+
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.hello_world_corba.Greeter;
+import org.apache.cxf.hello_world_corba.PingMeFault;
+import org.apache.cxf.hello_world_corba.types.FaultDetail;
+import org.apache.cxf.interceptor.Fault;
+import org.junit.Assert;
+
+/**
+ * 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 

[3/3] cxf git commit: [CXF-6923]make checkstyle happy

[ffang]

[CXF-6923]make checkstyle happy


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

Branch: refs/heads/3.1.x-fixes
Commit: c8ffc4a42111dc711452a260b4d4a632c4351c1e
Parents: 08c2c22
Author: Freeman Fang 
Authored: Tue May 31 14:05:26 2016 +0800
Committer: Freeman Fang 
Committed: Tue May 31 14:05:26 2016 +0800

--
 .../test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c8ffc4a4/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
--
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
index a52c0d8..55ad459 100644
--- 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
@@ -77,7 +77,8 @@ public class CorbaTimeoutTest extends 
AbstractBusClientServerTestBase {
 new 
SpringBusFactory().createBus("org/apache/cxf/systest/corba/hello_world_client.xml");
 
 GreeterCORBAService gcs = new GreeterCORBAService(wsdlUrl, 
SERVICE_NAME);
-Greeter port = gcs.getPort(new 
QName("http://cxf.apache.org/hello_world_corba;, "GreeterTimeoutCORBAPort"), 
GreeterCORBAService.GreeterProxy.class);
+Greeter port = gcs.getPort(new 
QName("http://cxf.apache.org/hello_world_corba;, "GreeterTimeoutCORBAPort"), 
+ GreeterCORBAService.GreeterProxy.class);
 
 try {
 port.greetMe("Betty");