git commit: Adding support for WS-Security kerberos credential delegation + a system test
Repository: cxf
Updated Branches:
refs/heads/master 88adfaf2a - b9c91a78a
Adding support for WS-Security kerberos credential delegation + a system test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b9c91a78
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b9c91a78
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b9c91a78
Branch: refs/heads/master
Commit: b9c91a78a2b5af9789e542708c0a64e5854230be
Parents: 88adfaf
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Aug 6 12:21:20 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 12:21:51 2014 +0100
--
.../cxf/ws/security/SecurityConstants.java | 10 +-
.../ws/security/kerberos/KerberosClient.java| 45 +-
.../ws/security/wss4j/WSS4JInInterceptor.java | 4 +
.../sts/kerberos/DoubleItPortTypeImpl.java | 50 +++
.../cxf/systest/sts/kerberos/Intermediary.java | 46 ++
.../sts/kerberos/IntermediaryPortTypeImpl.java | 90
.../kerberos/KerberosDelegationTokenTest.java | 113 +++
.../systest/sts/kerberos/KerberosTokenTest.java | 2 +-
.../sts/kerberos/DoubleItIntermediary.wsdl | 142 +++
.../sts/kerberos/cxf-intermediary-client.xml| 48 +++
.../systest/sts/kerberos/cxf-intermediary.xml | 102 +
.../cxf/systest/sts/kerberos/cxf-service.xml| 2 +-
12 files changed, 650 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b9c91a78/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index 7938889..2aa04e0 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -548,6 +548,13 @@ public final class SecurityConstants {
* The default value is true.
*/
public static final String SC_FROM_JAAS_SUBJECT =
ws-security.sc.jaas-subject;
+
+/**
+ * A delegated credential to use for WS-Security. Currently only a
Kerberos GSSCredential
+ * Object is supported. This is used to retrieve a service ticket instead
of using the
+ * client credentials.
+ */
+public static final String DELEGATED_CREDENTIAL =
ws-security.delegated.credential;
//
// Internal tags
@@ -578,7 +585,8 @@ public final class SecurityConstants {
TOKEN, TOKEN_ID, SUBJECT_ROLE_CLASSIFIER,
SUBJECT_ROLE_CLASSIFIER_TYPE, MUST_UNDERSTAND,
ASYMMETRIC_SIGNATURE_ALGORITHM, PASSWORD_ENCRYPTOR_INSTANCE,
ENABLE_SAML_ONE_TIME_USE_CACHE,
SAML_ONE_TIME_USE_CACHE_INSTANCE, ENABLE_STREAMING_SECURITY,
RETURN_SECURITY_ERROR,
-CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG
+CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
+DELEGATED_CREDENTIAL
}));
ALL_PROPERTIES = Collections.unmodifiableSet(s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/b9c91a78/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
index a3b56ee..9317940 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
@@ -29,11 +29,15 @@ import org.apache.cxf.Bus;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.Configurable;
import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.PhaseInterceptorChain;
+import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.wss4j.dom.WSSConfig;
import org.apache.wss4j.dom.message.token.KerberosSecurity;
import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.apache.xml.security.utils.Base64;
+import org.ietf.jgss.GSSCredential;
/**
* A class that obtains a ticket from a KDC and wraps it in a SecurityToken
object.
@@ -47,6 +51,9 @@ public class KerberosClient implements Configurable {
private CallbackHandler callbackHandler;
private String contextName;
private WSSConfig wssConfig =
git commit: Adding support for WS-Security kerberos credential delegation + a system test
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 9bc81ab1d - 6e6c13909
Adding support for WS-Security kerberos credential delegation + a system test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6e6c1390
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6e6c1390
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6e6c1390
Branch: refs/heads/3.0.x-fixes
Commit: 6e6c139095a694011f8a115f5d74cb68ee87f89d
Parents: 9bc81ab
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Aug 6 12:21:20 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 12:29:22 2014 +0100
--
.../cxf/ws/security/SecurityConstants.java | 10 +-
.../ws/security/kerberos/KerberosClient.java| 45 +-
.../ws/security/wss4j/WSS4JInInterceptor.java | 4 +
.../sts/kerberos/DoubleItPortTypeImpl.java | 50 +++
.../cxf/systest/sts/kerberos/Intermediary.java | 46 ++
.../sts/kerberos/IntermediaryPortTypeImpl.java | 90
.../kerberos/KerberosDelegationTokenTest.java | 113 +++
.../systest/sts/kerberos/KerberosTokenTest.java | 2 +-
.../sts/kerberos/DoubleItIntermediary.wsdl | 142 +++
.../sts/kerberos/cxf-intermediary-client.xml| 48 +++
.../systest/sts/kerberos/cxf-intermediary.xml | 102 +
.../cxf/systest/sts/kerberos/cxf-service.xml| 2 +-
12 files changed, 650 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/6e6c1390/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index 7938889..2aa04e0 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -548,6 +548,13 @@ public final class SecurityConstants {
* The default value is true.
*/
public static final String SC_FROM_JAAS_SUBJECT =
ws-security.sc.jaas-subject;
+
+/**
+ * A delegated credential to use for WS-Security. Currently only a
Kerberos GSSCredential
+ * Object is supported. This is used to retrieve a service ticket instead
of using the
+ * client credentials.
+ */
+public static final String DELEGATED_CREDENTIAL =
ws-security.delegated.credential;
//
// Internal tags
@@ -578,7 +585,8 @@ public final class SecurityConstants {
TOKEN, TOKEN_ID, SUBJECT_ROLE_CLASSIFIER,
SUBJECT_ROLE_CLASSIFIER_TYPE, MUST_UNDERSTAND,
ASYMMETRIC_SIGNATURE_ALGORITHM, PASSWORD_ENCRYPTOR_INSTANCE,
ENABLE_SAML_ONE_TIME_USE_CACHE,
SAML_ONE_TIME_USE_CACHE_INSTANCE, ENABLE_STREAMING_SECURITY,
RETURN_SECURITY_ERROR,
-CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG
+CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
+DELEGATED_CREDENTIAL
}));
ALL_PROPERTIES = Collections.unmodifiableSet(s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/6e6c1390/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
index a3b56ee..9317940 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
@@ -29,11 +29,15 @@ import org.apache.cxf.Bus;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.Configurable;
import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.PhaseInterceptorChain;
+import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.wss4j.dom.WSSConfig;
import org.apache.wss4j.dom.message.token.KerberosSecurity;
import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.apache.xml.security.utils.Base64;
+import org.ietf.jgss.GSSCredential;
/**
* A class that obtains a ticket from a KDC and wraps it in a SecurityToken
object.
@@ -47,6 +51,9 @@ public class KerberosClient implements Configurable {
private CallbackHandler callbackHandler;
private String contextName;
private WSSConfig wssConfig =
git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 6726f0bd8 - 04667dbc9 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/04667dbc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/04667dbc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/04667dbc Branch: refs/heads/2.7.x-fixes Commit: 04667dbc9904bb0a6162acbef181d12cba791984 Parents: 6726f0b Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Aug 6 15:01:40 2014 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Aug 6 15:01:40 2014 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/04667dbc/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 74cc0ca..e3a1788 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1357,6 +1357,7 @@ M 044067d50e6f35e39216d19a6d184296dac0b74a M 0455e7be2b1e8ba32bc0bb03ec1cf06af0309217 M 045f6d10f748323d7298491bff368fdf970bcdc0 M 048db1165053b29d1d2337106ec20082a26f6d90 +M 04bd702322b4efcf05b65af515c09c6e9a7cc764 M 05ea22e281fcd638ee782e3096c76c84f4cb5aa9 M 070bde423e1b7f0544be1ae1f408cbc0e507825f M 0739099f15a76e983d19ed3c09e897e27022cd0f
[1/3] git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 04667dbc9 - 24c140d81 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/60e2a98d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/60e2a98d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/60e2a98d Branch: refs/heads/2.7.x-fixes Commit: 60e2a98d3756f8500885aefa311152dae1e1f280 Parents: 009e15f Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Aug 6 15:04:01 2014 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Aug 6 15:04:01 2014 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/60e2a98d/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index e3a1788..e8b5253 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1625,6 +1625,7 @@ M 6b0adb6d7d897bd5afb651a537737ad828baad3a M 6bba3466149c95c53f35a01393f1dd16127e0301 M 6d272301503bf6e74866b3e6f5c024c1447e0e2a M 6d5598ccdc46eaf748d78af092cef88368055410 +M 6e6c139095a694011f8a115f5d74cb68ee87f89d M 6e9405c6d55e92f2047215918f64b8e1147d7450 M 70634720de808c18adafe5c1b9ac52795a165dd4 M 712533732d47b31b7e3c071502471b2007ff7bde
[2/3] git commit: Adding support for WS-Security kerberos credential delegation + a system test
Adding support for WS-Security kerberos credential delegation + a system test
Conflicts:
rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/009e15fd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/009e15fd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/009e15fd
Branch: refs/heads/2.7.x-fixes
Commit: 009e15fd03ebf52622a478821ee65c1f9b8975ad
Parents: 04667db
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Aug 6 12:21:20 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 15:04:01 2014 +0100
--
.../cxf/ws/security/SecurityConstants.java | 14 ++
.../ws/security/kerberos/KerberosClient.java| 52 ++-
.../ws/security/wss4j/WSS4JInInterceptor.java | 11 ++
.../sts/kerberos/DoubleItPortTypeImpl.java | 50 +++
.../cxf/systest/sts/kerberos/Intermediary.java | 46 ++
.../sts/kerberos/IntermediaryPortTypeImpl.java | 90
.../kerberos/KerberosDelegationTokenTest.java | 113 +++
.../systest/sts/kerberos/KerberosTokenTest.java | 6 +-
.../sts/kerberos/DoubleItIntermediary.wsdl | 142 +++
.../sts/kerberos/cxf-intermediary-client.xml| 48 +++
.../systest/sts/kerberos/cxf-intermediary.xml | 102 +
.../cxf/systest/sts/kerberos/cxf-service.xml| 27
12 files changed, 699 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/009e15fd/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index dcf4a62..4ab0e50 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -528,6 +528,13 @@ public final class SecurityConstants {
* The default value is true.
*/
public static final String SC_FROM_JAAS_SUBJECT =
ws-security.sc.jaas-subject;
+
+/**
+ * A delegated credential to use for WS-Security. Currently only a
Kerberos GSSCredential
+ * Object is supported. This is used to retrieve a service ticket instead
of using the
+ * client credentials.
+ */
+public static final String DELEGATED_CREDENTIAL =
ws-security.delegated.credential;
//
// Internal tags
@@ -556,8 +563,15 @@ public final class SecurityConstants {
DISABLE_STS_CLIENT_WSMEX_CALL_USING_EPR_ADDRESS, STS_TOKEN_CRYPTO,
STS_TOKEN_PROPERTIES, STS_TOKEN_USERNAME, STS_TOKEN_ACT_AS,
STS_TOKEN_ON_BEHALF_OF,
TOKEN, TOKEN_ID, SUBJECT_ROLE_CLASSIFIER,
SUBJECT_ROLE_CLASSIFIER_TYPE, MUST_UNDERSTAND,
+ HEAD
ASYMMETRIC_SIGNATURE_ALGORITHM, ENABLE_SAML_ONE_TIME_USE_CACHE,
SAML_ONE_TIME_USE_CACHE_INSTANCE,
CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG
+===
+ASYMMETRIC_SIGNATURE_ALGORITHM, PASSWORD_ENCRYPTOR_INSTANCE,
ENABLE_SAML_ONE_TIME_USE_CACHE,
+SAML_ONE_TIME_USE_CACHE_INSTANCE, ENABLE_STREAMING_SECURITY,
RETURN_SECURITY_ERROR,
+CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
+DELEGATED_CREDENTIAL
+ 6e6c139... Adding support for WS-Security kerberos credential
delegation + a system test
}));
ALL_PROPERTIES = Collections.unmodifiableSet(s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/009e15fd/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
index 23c06ba..cc54a10 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
@@ -29,11 +29,22 @@ import org.apache.cxf.Bus;
import
[3/3] git commit: Fixing build
Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/24c140d8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/24c140d8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/24c140d8
Branch: refs/heads/2.7.x-fixes
Commit: 24c140d81ce29bb2237636883619d677b9698e34
Parents: 60e2a98
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Aug 6 15:32:24 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 15:32:24 2014 +0100
--
parent/pom.xml | 2 +-
.../cxf/ws/security/SecurityConstants.java | 6 ---
.../ws/security/kerberos/KerberosClient.java| 8 +---
.../ws/security/wss4j/WSS4JInInterceptor.java | 7
.../kerberos/KerberosDelegationTokenTest.java | 2 -
.../systest/sts/kerberos/KerberosTokenTest.java | 4 --
.../systest/sts/kerberos/cxf-intermediary.xml | 2 +-
.../cxf/systest/sts/kerberos/cxf-service.xml| 40 +---
8 files changed, 4 insertions(+), 67 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/24c140d8/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5df66f8..a5f00fd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,7 +156,7 @@
cxf.woodstox.core.version4.4.0/cxf.woodstox.core.version
cxf.woodstox.stax2-api.version3.1.4/cxf.woodstox.stax2-api.version
cxf.wsdl4j.version1.6.3/cxf.wsdl4j.version
-cxf.wss4j.version1.6.16/cxf.wss4j.version
+cxf.wss4j.version1.6.17-SNAPSHOT/cxf.wss4j.version
cxf.xerces.version2.11.0/cxf.xerces.version
cxf.xmlbeans.version2.6.0/cxf.xmlbeans.version
cxf.xmlschema.version2.1.0/cxf.xmlschema.version
http://git-wip-us.apache.org/repos/asf/cxf/blob/24c140d8/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index 4ab0e50..adc932d 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -563,15 +563,9 @@ public final class SecurityConstants {
DISABLE_STS_CLIENT_WSMEX_CALL_USING_EPR_ADDRESS, STS_TOKEN_CRYPTO,
STS_TOKEN_PROPERTIES, STS_TOKEN_USERNAME, STS_TOKEN_ACT_AS,
STS_TOKEN_ON_BEHALF_OF,
TOKEN, TOKEN_ID, SUBJECT_ROLE_CLASSIFIER,
SUBJECT_ROLE_CLASSIFIER_TYPE, MUST_UNDERSTAND,
- HEAD
ASYMMETRIC_SIGNATURE_ALGORITHM, ENABLE_SAML_ONE_TIME_USE_CACHE,
SAML_ONE_TIME_USE_CACHE_INSTANCE,
-CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG
-===
-ASYMMETRIC_SIGNATURE_ALGORITHM, PASSWORD_ENCRYPTOR_INSTANCE,
ENABLE_SAML_ONE_TIME_USE_CACHE,
-SAML_ONE_TIME_USE_CACHE_INSTANCE, ENABLE_STREAMING_SECURITY,
RETURN_SECURITY_ERROR,
CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
DELEGATED_CREDENTIAL
- 6e6c139... Adding support for WS-Security kerberos credential
delegation + a system test
}));
ALL_PROPERTIES = Collections.unmodifiableSet(s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/24c140d8/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
index cc54a10..207c55b 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
@@ -33,18 +33,12 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
- HEAD
+
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.message.token.KerberosSecurity;
import org.apache.ws.security.util.Base64;
import org.apache.ws.security.util.WSSecurityUtil;
-===
-import org.apache.wss4j.dom.WSSConfig;
-import org.apache.wss4j.dom.message.token.KerberosSecurity;
-import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.apache.xml.security.utils.Base64;
import org.ietf.jgss.GSSCredential;
- 6e6c139... Adding support for WS-Security kerberos credential
git commit: Fixing build II
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 24c140d81 - a11825e8d Fixing build II Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a11825e8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a11825e8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a11825e8 Branch: refs/heads/2.7.x-fixes Commit: a11825e8d6042dc46166b3c7341303632b843bcd Parents: 24c140d Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Aug 6 15:42:27 2014 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Aug 6 15:42:27 2014 +0100 -- .../cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/a11825e8/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java -- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java index e4c2ff5..ac6428f 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java @@ -21,13 +21,11 @@ package org.apache.cxf.systest.sts.kerberos; import java.net.URL; import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.sts.common.SecurityTestUtil; -import org.apache.cxf.systest.sts.common.TokenTestUtils; import org.apache.cxf.systest.sts.deployment.STSServer; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.example.contract.doubleit.DoubleItPortType;
[4/5] git commit: Merge branch 'master' of https://github.com/janbernhardt/cxf
Merge branch 'master' of https://github.com/janbernhardt/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/213b5024 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/213b5024 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/213b5024 Branch: refs/heads/master Commit: 213b50240f49a141c507c07d127a4f5043eb77af Parents: b9c91a7 fdb7dd8 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Aug 6 16:03:46 2014 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Aug 6 16:03:46 2014 +0100 -- parent/pom.xml | 1 + services/sts/sts-core/pom.xml | 6 + .../cxf/sts/claims/mapper/ClaimUtils.java | 281 +++ .../cxf/sts/claims/mapper/JexlClaimsMapper.java | 85 ++ .../sts/claims/mapper/JexlClaimsMapperTest.java | 224 +++ .../jexlClaimMappingsWithFunctions.script | 60 .../jexlClaimMappingsWithoutFunctions.script| 127 + 7 files changed, 784 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/213b5024/parent/pom.xml --
[5/5] git commit: Removing some tabs
Removing some tabs
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bf879ad9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bf879ad9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bf879ad9
Branch: refs/heads/master
Commit: bf879ad99c873cb718b7ca2b1879270a44e03734
Parents: 213b502
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Aug 6 16:17:12 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 16:17:12 2014 +0100
--
parent/pom.xml| 2 +-
services/sts/sts-core/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/bf879ad9/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 04cfc8e..33b4b82 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -191,7 +191,7 @@
cxf.jdom.bundle.version1.1_4/cxf.jdom.bundle.version
cxf.olingo.version1.2.0/cxf.olingo.version
cxf.tika.version1.5/cxf.tika.version
- cxf.jexl.version2.1.1/cxf.jexl.version
+cxf.jexl.version2.1.1/cxf.jexl.version
cxf.checkstyle.extension /
cxf.jaxb.context.class /
cxf.spring.validation.modeVALIDATION_AUTO/cxf.spring.validation.mode
http://git-wip-us.apache.org/repos/asf/cxf/blob/bf879ad9/services/sts/sts-core/pom.xml
--
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index e396384..2319410 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -125,7 +125,7 @@
groupIdorg.apache.commons/groupId
artifactIdcommons-jexl/artifactId
version${cxf.jexl.version}/version
- optionaltrue/optional
+optionaltrue/optional
/dependency
/dependencies
build
[2/5] git commit: [CXF-5927] Providing claim mapping utils
[CXF-5927] Providing claim mapping utils
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/31c80946
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/31c80946
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/31c80946
Branch: refs/heads/master
Commit: 31c80946f223a03eb827d56d07de7229d4bbe1b6
Parents: 17d077f
Author: Jan Bernhardt jbernha...@talend.com
Authored: Mon Aug 4 16:40:01 2014 +0200
Committer: Jan Bernhardt jbernha...@talend.com
Committed: Mon Aug 4 16:44:04 2014 +0200
--
.../apache/cxf/sts/claims/JexlClaimsMapper.java | 76 -
.../cxf/sts/claims/mapper/ClaimUtils.java | 281 +++
.../cxf/sts/claims/mapper/JexlClaimsMapper.java | 85 ++
.../sts/claims/mapper/JexlClaimsMapperTest.java | 24 +-
.../src/test/resources/jexlClaimMappings.script | 127 -
.../jexlClaimMappingsWithFunctions.script | 60
.../jexlClaimMappingsWithoutFunctions.script| 127 +
7 files changed, 573 insertions(+), 207 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/31c80946/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
--
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
deleted file mode 100644
index e11e112..000
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 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.sts.claims;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.logging.Logger;
-
-import org.apache.commons.jexl2.JexlContext;
-import org.apache.commons.jexl2.JexlEngine;
-import org.apache.commons.jexl2.MapContext;
-import org.apache.commons.jexl2.Script;
-import org.apache.cxf.common.logging.LogUtils;
-
-public class JexlClaimsMapper implements ClaimsMapper {
-
-private static final Logger LOG =
LogUtils.getL7dLogger(JexlClaimsMapper.class);
-
-JexlEngine jexl = new JexlEngine();
-JexlContext context = new MapContext();
-private Script script;
-
-public JexlClaimsMapper() {
-// jexl.setCache(512);
-// jexl.setLenient(false);
-jexl.setSilent(false);
-}
-
-public ProcessedClaimCollection mapClaims(String sourceRealm,
ProcessedClaimCollection sourceClaims,
-String targetRealm, ClaimsParameters parameters) {
-context.set(sourceClaims, sourceClaims);
-context.set(targetClaims, new ProcessedClaimCollection());
-context.set(sourceRealm, sourceRealm);
-context.set(targetRealm, targetRealm);
-context.set(claimsParameters, parameters);
-
-Script s = getScript();
-if (s == null) {
-LOG.warning(No claim mapping script defined);
-return new ProcessedClaimCollection(); // TODO Check if null or an
exception would be more
- // appropriate
-} else {
-return (ProcessedClaimCollection)s.execute(context);
-}
-}
-
-public Script getScript() {
-return script;
-}
-
-public void setScript(Script script) {
-this.script = script;
-}
-
-public void setScript(String scriptPath) throws IOException {
-this.script = jexl.createScript(new File(scriptPath));
-}
-
-}
http://git-wip-us.apache.org/repos/asf/cxf/blob/31c80946/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
--
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
new file mode 100644
index 000..b30354f
--- /dev/null
+++
[3/5] git commit: [CXF-5925] Making JEXL dependency optional and moving version to parent pom.xml
[CXF-5925] Making JEXL dependency optional and moving version to parent pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fdb7dd81
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fdb7dd81
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fdb7dd81
Branch: refs/heads/master
Commit: fdb7dd81e047c20d7ef7aec156716c855615ea9c
Parents: 31c8094
Author: Jan Bernhardt jbernha...@talend.com
Authored: Tue Aug 5 11:48:16 2014 +0200
Committer: Jan Bernhardt jbernha...@talend.com
Committed: Tue Aug 5 11:48:16 2014 +0200
--
parent/pom.xml| 1 +
services/sts/sts-core/pom.xml | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/fdb7dd81/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e010fbf..174333f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -189,6 +189,7 @@
cxf.jdom.bundle.version1.1_4/cxf.jdom.bundle.version
cxf.olingo.version1.2.0/cxf.olingo.version
cxf.tika.version1.5/cxf.tika.version
+ cxf.jexl.version2.1.1/cxf.jexl.version
cxf.checkstyle.extension /
cxf.jaxb.context.class /
cxf.spring.validation.modeVALIDATION_AUTO/cxf.spring.validation.mode
http://git-wip-us.apache.org/repos/asf/cxf/blob/fdb7dd81/services/sts/sts-core/pom.xml
--
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index f63f98b..e396384 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -124,7 +124,8 @@
dependency
groupIdorg.apache.commons/groupId
artifactIdcommons-jexl/artifactId
-version2.1.1/version
+version${cxf.jexl.version}/version
+ optionaltrue/optional
/dependency
/dependencies
build
[1/5] git commit: [CXF-5925] First implementation of a JEXL Claims Mapper
Repository: cxf
Updated Branches:
refs/heads/master b9c91a78a - bf879ad99
[CXF-5925] First implementation of a JEXL Claims Mapper
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/17d077f6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/17d077f6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/17d077f6
Branch: refs/heads/master
Commit: 17d077f63edc024cbe1508c60148630a9b67b5d6
Parents: 13893ab
Author: Jan Bernhardt jbernha...@talend.com
Authored: Mon Aug 4 12:20:14 2014 +0200
Committer: Jan Bernhardt jbernha...@talend.com
Committed: Mon Aug 4 12:21:22 2014 +0200
--
services/sts/sts-core/pom.xml | 5 +
.../apache/cxf/sts/claims/JexlClaimsMapper.java | 76 +++
.../sts/claims/mapper/JexlClaimsMapperTest.java | 208 +++
.../src/test/resources/jexlClaimMappings.script | 127 +++
4 files changed, 416 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/17d077f6/services/sts/sts-core/pom.xml
--
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index a382944..f63f98b 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -121,6 +121,11 @@
scopeprovided/scope
optionaltrue/optional
/dependency
+dependency
+groupIdorg.apache.commons/groupId
+artifactIdcommons-jexl/artifactId
+version2.1.1/version
+/dependency
/dependencies
build
plugins
http://git-wip-us.apache.org/repos/asf/cxf/blob/17d077f6/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
--
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
new file mode 100644
index 000..e11e112
--- /dev/null
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
@@ -0,0 +1,76 @@
+/**
+ * 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.sts.claims;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Logger;
+
+import org.apache.commons.jexl2.JexlContext;
+import org.apache.commons.jexl2.JexlEngine;
+import org.apache.commons.jexl2.MapContext;
+import org.apache.commons.jexl2.Script;
+import org.apache.cxf.common.logging.LogUtils;
+
+public class JexlClaimsMapper implements ClaimsMapper {
+
+private static final Logger LOG =
LogUtils.getL7dLogger(JexlClaimsMapper.class);
+
+JexlEngine jexl = new JexlEngine();
+JexlContext context = new MapContext();
+private Script script;
+
+public JexlClaimsMapper() {
+// jexl.setCache(512);
+// jexl.setLenient(false);
+jexl.setSilent(false);
+}
+
+public ProcessedClaimCollection mapClaims(String sourceRealm,
ProcessedClaimCollection sourceClaims,
+String targetRealm, ClaimsParameters parameters) {
+context.set(sourceClaims, sourceClaims);
+context.set(targetClaims, new ProcessedClaimCollection());
+context.set(sourceRealm, sourceRealm);
+context.set(targetRealm, targetRealm);
+context.set(claimsParameters, parameters);
+
+Script s = getScript();
+if (s == null) {
+LOG.warning(No claim mapping script defined);
+return new ProcessedClaimCollection(); // TODO Check if null or an
exception would be more
+ // appropriate
+} else {
+return (ProcessedClaimCollection)s.execute(context);
+}
+}
+
+public Script getScript() {
+return script;
+}
+
+public void setScript(Script script) {
+this.script = script;
+}
+
+public void setScript(String scriptPath) throws IOException {
+this.script = jexl.createScript(new
[4/4] git commit: Removing some tabs
Removing some tabs
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1d20b412
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1d20b412
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1d20b412
Branch: refs/heads/3.0.x-fixes
Commit: 1d20b412acd6ab6940baa9045d7550004d6a5feb
Parents: a272bbb
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Aug 6 16:17:12 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 16:18:52 2014 +0100
--
parent/pom.xml| 2 +-
services/sts/sts-core/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1d20b412/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a7f9c7f..67eeff5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -198,7 +198,7 @@
cxf.jdom.bundle.version1.1_4/cxf.jdom.bundle.version
cxf.olingo.version1.2.0/cxf.olingo.version
cxf.tika.version1.5/cxf.tika.version
- cxf.jexl.version2.1.1/cxf.jexl.version
+cxf.jexl.version2.1.1/cxf.jexl.version
cxf.checkstyle.extension /
cxf.jaxb.context.class /
cxf.spring.validation.modeVALIDATION_AUTO/cxf.spring.validation.mode
http://git-wip-us.apache.org/repos/asf/cxf/blob/1d20b412/services/sts/sts-core/pom.xml
--
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index 458edb1..5abfed0 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -125,7 +125,7 @@
groupIdorg.apache.commons/groupId
artifactIdcommons-jexl/artifactId
version${cxf.jexl.version}/version
- optionaltrue/optional
+optionaltrue/optional
/dependency
/dependencies
build
[2/4] git commit: [CXF-5927] Providing claim mapping utils
[CXF-5927] Providing claim mapping utils
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/987e491d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/987e491d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/987e491d
Branch: refs/heads/3.0.x-fixes
Commit: 987e491d6ae7f11c0f12fb33d365caec4306a7ab
Parents: 41198c2
Author: Jan Bernhardt jbernha...@talend.com
Authored: Mon Aug 4 16:40:01 2014 +0200
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 16:18:50 2014 +0100
--
.../apache/cxf/sts/claims/JexlClaimsMapper.java | 76 -
.../cxf/sts/claims/mapper/ClaimUtils.java | 281 +++
.../cxf/sts/claims/mapper/JexlClaimsMapper.java | 85 ++
.../sts/claims/mapper/JexlClaimsMapperTest.java | 24 +-
.../src/test/resources/jexlClaimMappings.script | 127 -
.../jexlClaimMappingsWithFunctions.script | 60
.../jexlClaimMappingsWithoutFunctions.script| 127 +
7 files changed, 573 insertions(+), 207 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/987e491d/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
--
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
deleted file mode 100644
index e11e112..000
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 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.sts.claims;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.logging.Logger;
-
-import org.apache.commons.jexl2.JexlContext;
-import org.apache.commons.jexl2.JexlEngine;
-import org.apache.commons.jexl2.MapContext;
-import org.apache.commons.jexl2.Script;
-import org.apache.cxf.common.logging.LogUtils;
-
-public class JexlClaimsMapper implements ClaimsMapper {
-
-private static final Logger LOG =
LogUtils.getL7dLogger(JexlClaimsMapper.class);
-
-JexlEngine jexl = new JexlEngine();
-JexlContext context = new MapContext();
-private Script script;
-
-public JexlClaimsMapper() {
-// jexl.setCache(512);
-// jexl.setLenient(false);
-jexl.setSilent(false);
-}
-
-public ProcessedClaimCollection mapClaims(String sourceRealm,
ProcessedClaimCollection sourceClaims,
-String targetRealm, ClaimsParameters parameters) {
-context.set(sourceClaims, sourceClaims);
-context.set(targetClaims, new ProcessedClaimCollection());
-context.set(sourceRealm, sourceRealm);
-context.set(targetRealm, targetRealm);
-context.set(claimsParameters, parameters);
-
-Script s = getScript();
-if (s == null) {
-LOG.warning(No claim mapping script defined);
-return new ProcessedClaimCollection(); // TODO Check if null or an
exception would be more
- // appropriate
-} else {
-return (ProcessedClaimCollection)s.execute(context);
-}
-}
-
-public Script getScript() {
-return script;
-}
-
-public void setScript(Script script) {
-this.script = script;
-}
-
-public void setScript(String scriptPath) throws IOException {
-this.script = jexl.createScript(new File(scriptPath));
-}
-
-}
http://git-wip-us.apache.org/repos/asf/cxf/blob/987e491d/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
--
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
new file mode 100644
index 000..b30354f
--- /dev/null
+++
[1/4] git commit: [CXF-5925] Making JEXL dependency optional and moving version to parent pom.xml
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 6e6c13909 - 1d20b412a
[CXF-5925] Making JEXL dependency optional and moving version to parent pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a272bbb9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a272bbb9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a272bbb9
Branch: refs/heads/3.0.x-fixes
Commit: a272bbb9f089a04f641aa59aa63a6026c7530e79
Parents: 987e491
Author: Jan Bernhardt jbernha...@talend.com
Authored: Tue Aug 5 11:48:16 2014 +0200
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 16:18:50 2014 +0100
--
parent/pom.xml| 1 +
services/sts/sts-core/pom.xml | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/a272bbb9/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b32f4a1..a7f9c7f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -198,6 +198,7 @@
cxf.jdom.bundle.version1.1_4/cxf.jdom.bundle.version
cxf.olingo.version1.2.0/cxf.olingo.version
cxf.tika.version1.5/cxf.tika.version
+ cxf.jexl.version2.1.1/cxf.jexl.version
cxf.checkstyle.extension /
cxf.jaxb.context.class /
cxf.spring.validation.modeVALIDATION_AUTO/cxf.spring.validation.mode
http://git-wip-us.apache.org/repos/asf/cxf/blob/a272bbb9/services/sts/sts-core/pom.xml
--
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index 5ea15e2..458edb1 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -124,7 +124,8 @@
dependency
groupIdorg.apache.commons/groupId
artifactIdcommons-jexl/artifactId
-version2.1.1/version
+version${cxf.jexl.version}/version
+ optionaltrue/optional
/dependency
/dependencies
build
[3/4] git commit: [CXF-5925] First implementation of a JEXL Claims Mapper
[CXF-5925] First implementation of a JEXL Claims Mapper
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/41198c25
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/41198c25
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/41198c25
Branch: refs/heads/3.0.x-fixes
Commit: 41198c257603227cc8ac142aba7e3aa871d86a8a
Parents: 6e6c139
Author: Jan Bernhardt jbernha...@talend.com
Authored: Mon Aug 4 12:20:14 2014 +0200
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 16:18:50 2014 +0100
--
services/sts/sts-core/pom.xml | 5 +
.../apache/cxf/sts/claims/JexlClaimsMapper.java | 76 +++
.../sts/claims/mapper/JexlClaimsMapperTest.java | 208 +++
.../src/test/resources/jexlClaimMappings.script | 127 +++
4 files changed, 416 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/41198c25/services/sts/sts-core/pom.xml
--
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index cf2c88b..5ea15e2 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -121,6 +121,11 @@
scopeprovided/scope
optionaltrue/optional
/dependency
+dependency
+groupIdorg.apache.commons/groupId
+artifactIdcommons-jexl/artifactId
+version2.1.1/version
+/dependency
/dependencies
build
plugins
http://git-wip-us.apache.org/repos/asf/cxf/blob/41198c25/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
--
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
new file mode 100644
index 000..e11e112
--- /dev/null
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
@@ -0,0 +1,76 @@
+/**
+ * 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.sts.claims;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Logger;
+
+import org.apache.commons.jexl2.JexlContext;
+import org.apache.commons.jexl2.JexlEngine;
+import org.apache.commons.jexl2.MapContext;
+import org.apache.commons.jexl2.Script;
+import org.apache.cxf.common.logging.LogUtils;
+
+public class JexlClaimsMapper implements ClaimsMapper {
+
+private static final Logger LOG =
LogUtils.getL7dLogger(JexlClaimsMapper.class);
+
+JexlEngine jexl = new JexlEngine();
+JexlContext context = new MapContext();
+private Script script;
+
+public JexlClaimsMapper() {
+// jexl.setCache(512);
+// jexl.setLenient(false);
+jexl.setSilent(false);
+}
+
+public ProcessedClaimCollection mapClaims(String sourceRealm,
ProcessedClaimCollection sourceClaims,
+String targetRealm, ClaimsParameters parameters) {
+context.set(sourceClaims, sourceClaims);
+context.set(targetClaims, new ProcessedClaimCollection());
+context.set(sourceRealm, sourceRealm);
+context.set(targetRealm, targetRealm);
+context.set(claimsParameters, parameters);
+
+Script s = getScript();
+if (s == null) {
+LOG.warning(No claim mapping script defined);
+return new ProcessedClaimCollection(); // TODO Check if null or an
exception would be more
+ // appropriate
+} else {
+return (ProcessedClaimCollection)s.execute(context);
+}
+}
+
+public Script getScript() {
+return script;
+}
+
+public void setScript(Script script) {
+this.script = script;
+}
+
+public void setScript(String scriptPath) throws IOException {
+this.script = jexl.createScript(new File(scriptPath));
+}
+
+}
[2/3] git commit: Remove references to various SAAJ jars as we can use the version in the JDK
Remove references to various SAAJ jars as we can use the version in the JDK
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4f61ca80
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4f61ca80
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4f61ca80
Branch: refs/heads/master
Commit: 4f61ca801deed173c648b2d424ac231663acd704
Parents: 1824d9c
Author: Daniel Kulp dk...@apache.org
Authored: Wed Aug 6 10:00:30 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Aug 6 11:28:21 2014 -0400
--
distribution/src/main/release/lib/WHICH_JARS | 5 ---
parent/pom.xml | 50 ---
2 files changed, 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4f61ca80/distribution/src/main/release/lib/WHICH_JARS
--
diff --git a/distribution/src/main/release/lib/WHICH_JARS
b/distribution/src/main/release/lib/WHICH_JARS
index e079461..2eea065 100755
--- a/distribution/src/main/release/lib/WHICH_JARS
+++ b/distribution/src/main/release/lib/WHICH_JARS
@@ -9,9 +9,6 @@ that calls in all the other jar.
Jars marked with a [7] at the end are optional for Java 7 as the
functionality provided by those jars are provided in the JDK.
-Some users may prefer to use axis2-saaj.jar rather than saaj-impl.jar. Both are
-supported.
-
The following jars are required for all CXF usage:
- cxf-core.jar
- geronimo-javamail.jar (Or the Sun equivalent) [7]
@@ -46,8 +43,6 @@ For Java2WSDL and WSDL2Java:
For JAX-WS support:
- neethi.jar
- wsdl4j.jar
-- saaj-api.jar [7]
-- saaj-impl.jar [7]
- asm.jar (semi-optional, helps with performance of wrapper types and is
required when adding JAXB annotations onto the SEI methods and
parameters.)
http://git-wip-us.apache.org/repos/asf/cxf/blob/4f61ca80/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 33b4b82..0be0cfe 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -42,12 +42,6 @@
cxf.codegenplugin.forkmodeonce/cxf.codegenplugin.forkmode
cxf.codegen.jvmArgs /
cxf.eclipse.outputDirectory${basedir}/target/classes/cxf.eclipse.outputDirectory
-
cxf.saaj.impl.groupIdcom.sun.xml.messaging.saaj/cxf.saaj.impl.groupId
-cxf.saaj.impl.artifactIdsaaj-impl/cxf.saaj.impl.artifactId
-cxf.saaj.impl.version1.3.23/cxf.saaj.impl.version
-
extra.saaj.dep.groupId${cxf.saaj.impl.groupId}/extra.saaj.dep.groupId
-
extra.saaj.dep.artifactId${cxf.saaj.impl.artifactId}/extra.saaj.dep.artifactId
-
extra.saaj.dep.version${cxf.saaj.impl.version}/extra.saaj.dep.version
!-- stuff related to ASM --
!-- use asm 3.x for now to avoid breaking 3rd party components --
cxf.asm.groupIdasm/cxf.asm.groupId
@@ -133,7 +127,6 @@
cxf.opensaml.xmltooling.version1.4.0_1/cxf.opensaml.xmltooling.version
cxf.opensamlws.version1.5.0_1/cxf.opensamlws.version
cxf.rhino.version1.7R2/cxf.rhino.version
-cxf.saaj-api.version1.3.5/cxf.saaj-api.version
cxf.servlet-api.grouporg.apache.geronimo.specs/cxf.servlet-api.group
cxf.servlet-api.artifactgeronimo-servlet_3.0_spec/cxf.servlet-api.artifact
cxf.servlet-api.version1.0/cxf.servlet-api.version
@@ -920,36 +913,6 @@
/exclusions
/dependency
dependency
-groupIdjavax.xml.soap/groupId
-artifactIdsaaj-api/artifactId
-version${cxf.saaj-api.version}/version
-exclusions
-exclusion
-groupIdjavax.activation/groupId
-artifactIdactivation/artifactId
-/exclusion
-exclusion
-groupIdactivation/groupId
-artifactIdactivation/artifactId
-/exclusion
-/exclusions
-/dependency
-dependency
-groupId${cxf.saaj.impl.groupId}/groupId
-artifactId${cxf.saaj.impl.artifactId}/artifactId
-version${cxf.saaj.impl.version}/version
-exclusions
-exclusion
-groupIdjavax.activation/groupId
-artifactIdactivation/artifactId
-/exclusion
-exclusion
-groupIdactivation/groupId
-artifactIdactivation/artifactId
-/exclusion
-/exclusions
-/dependency
-dependency
groupIdcom.sun.xml.bind/groupId
[4/6] git commit: Removing some tabs
Removing some tabs
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e7dc7216
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e7dc7216
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e7dc7216
Branch: refs/heads/2.7.x-fixes
Commit: e7dc7216fe855918bc8fdecd24950fe3abe29735
Parents: 3f3bd20
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Aug 6 16:17:12 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 16:24:30 2014 +0100
--
parent/pom.xml| 6 ++
services/sts/sts-core/pom.xml | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e7dc7216/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 0487552..b612d8a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -188,8 +188,14 @@
cxf.oro.bundle.version2.0.8_6/cxf.oro.bundle.version
cxf.dom4j.bundle.version1.6.1_5/cxf.dom4j.bundle.version
cxf.jdom.bundle.version1.1_4/cxf.jdom.bundle.version
+ HEAD
cxf.jexl.version2.1.1/cxf.jexl.version
+===
+cxf.olingo.version1.2.0/cxf.olingo.version
+cxf.tika.version1.5/cxf.tika.version
+cxf.jexl.version2.1.1/cxf.jexl.version
+ 1d20b41... Removing some tabs
cxf.checkstyle.extension /
cxf.jaxb.context.class /
http://git-wip-us.apache.org/repos/asf/cxf/blob/e7dc7216/services/sts/sts-core/pom.xml
--
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index f48b033..41145c9 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -111,7 +111,7 @@
groupIdorg.apache.commons/groupId
artifactIdcommons-jexl/artifactId
version${cxf.jexl.version}/version
- optionaltrue/optional
+optionaltrue/optional
/dependency
/dependencies
[6/6] git commit: Fixing merge
Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/46687eca Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/46687eca Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/46687eca Branch: refs/heads/2.7.x-fixes Commit: 46687ecacf5999fd3b909c3a00e051dbda0b597a Parents: 41707f6 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Aug 6 16:25:58 2014 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Aug 6 16:25:58 2014 +0100 -- parent/pom.xml | 7 --- 1 file changed, 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/46687eca/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index b612d8a..0ef6fa3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -188,14 +188,7 @@ cxf.oro.bundle.version2.0.8_6/cxf.oro.bundle.version cxf.dom4j.bundle.version1.6.1_5/cxf.dom4j.bundle.version cxf.jdom.bundle.version1.1_4/cxf.jdom.bundle.version - HEAD cxf.jexl.version2.1.1/cxf.jexl.version - -=== -cxf.olingo.version1.2.0/cxf.olingo.version -cxf.tika.version1.5/cxf.tika.version -cxf.jexl.version2.1.1/cxf.jexl.version - 1d20b41... Removing some tabs cxf.checkstyle.extension / cxf.jaxb.context.class /
[3/6] git commit: [CXF-5927] Providing claim mapping utils
[CXF-5927] Providing claim mapping utils
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ed2a2ef4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ed2a2ef4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ed2a2ef4
Branch: refs/heads/2.7.x-fixes
Commit: ed2a2ef408dff9c4a9d64512ddefc039ccd8449c
Parents: 79285f4
Author: Jan Bernhardt jbernha...@talend.com
Authored: Mon Aug 4 16:40:01 2014 +0200
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 16:24:20 2014 +0100
--
.../apache/cxf/sts/claims/JexlClaimsMapper.java | 76 -
.../cxf/sts/claims/mapper/ClaimUtils.java | 281 +++
.../cxf/sts/claims/mapper/JexlClaimsMapper.java | 85 ++
.../sts/claims/mapper/JexlClaimsMapperTest.java | 22 +-
.../src/test/resources/jexlClaimMappings.script | 127 -
.../jexlClaimMappingsWithFunctions.script | 60
.../jexlClaimMappingsWithoutFunctions.script| 127 +
7 files changed, 572 insertions(+), 206 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed2a2ef4/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
--
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
deleted file mode 100644
index c1cd1e8..000
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 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.sts.claims;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.logging.Logger;
-
-import org.apache.commons.jexl2.JexlContext;
-import org.apache.commons.jexl2.JexlEngine;
-import org.apache.commons.jexl2.MapContext;
-import org.apache.commons.jexl2.Script;
-import org.apache.cxf.common.logging.LogUtils;
-
-public class JexlClaimsMapper implements ClaimsMapper {
-
-private static final Logger LOG =
LogUtils.getL7dLogger(JexlClaimsMapper.class);
-
-JexlEngine jexl = new JexlEngine();
-JexlContext context = new MapContext();
-private Script script;
-
-public JexlClaimsMapper() {
-// jexl.setCache(512);
-// jexl.setLenient(false);
-jexl.setSilent(false);
-}
-
-public ClaimCollection mapClaims(String sourceRealm, ClaimCollection
sourceClaims,
-String targetRealm, ClaimsParameters parameters) {
-context.set(sourceClaims, sourceClaims);
-context.set(targetClaims, new ClaimCollection());
-context.set(sourceRealm, sourceRealm);
-context.set(targetRealm, targetRealm);
-context.set(claimsParameters, parameters);
-
-Script s = getScript();
-if (s == null) {
-LOG.warning(No claim mapping script defined);
-return new ClaimCollection(); // TODO Check if null or an
exception would be more
- // appropriate
-} else {
-return (ClaimCollection)s.execute(context);
-}
-}
-
-public Script getScript() {
-return script;
-}
-
-public void setScript(Script script) {
-this.script = script;
-}
-
-public void setScript(String scriptPath) throws IOException {
-this.script = jexl.createScript(new File(scriptPath));
-}
-
-}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed2a2ef4/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
--
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
new file mode 100644
index 000..2967a9a
--- /dev/null
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
@@ -0,0
[3/3] git commit: Fix some unneeded warnings
Fix some unneeded warnings
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1824d9ca
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1824d9ca
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1824d9ca
Branch: refs/heads/master
Commit: 1824d9cae26c3b141d873d0d01036602ac339c37
Parents: bf879ad
Author: Daniel Kulp dk...@apache.org
Authored: Wed Aug 6 09:52:12 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Aug 6 11:28:21 2014 -0400
--
.../cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java| 1 -
.../jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java | 1 -
2 files changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1824d9ca/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index 7adfaa5..ee68a61 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -191,7 +191,6 @@ public class JAXRSServerFactoryBeanDefinitionParser extends
AbstractBeanDefiniti
try {
if (basePackages != null) {
-@SuppressWarnings(unchecked)
final Map Class ? extends Annotation , Collection
Class ?classes =
ClasspathScanner.findClasses(basePackages,
Provider.class, Path.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/1824d9ca/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
--
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
index c35f25b..14b7678 100644
---
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
+++
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
@@ -124,7 +124,6 @@ public class JAXRSClientFactoryBeanDefinitionParser extends
AbstractFactoryBeanD
public void setApplicationContext(ApplicationContext ctx) throws
BeansException {
try {
if (basePackages != null) {
-@SuppressWarnings(unchecked)
final Map Class ? extends Annotation , Collection
Class ?classes =
ClasspathScanner.findClasses(basePackages, Path.class,
Provider.class);
[2/6] git commit: [CXF-5925] First implementation of a JEXL Claims Mapper
[CXF-5925] First implementation of a JEXL Claims Mapper
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/79285f4d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/79285f4d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/79285f4d
Branch: refs/heads/2.7.x-fixes
Commit: 79285f4d772a7cd242e2148a71d75a8064c98c11
Parents: a11825e
Author: Jan Bernhardt jbernha...@talend.com
Authored: Mon Aug 4 12:20:14 2014 +0200
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 16:24:20 2014 +0100
--
services/sts/sts-core/pom.xml | 6 +-
.../apache/cxf/sts/claims/JexlClaimsMapper.java | 76 +++
.../sts/claims/mapper/JexlClaimsMapperTest.java | 207 +++
.../src/test/resources/jexlClaimMappings.script | 127
4 files changed, 415 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/79285f4d/services/sts/sts-core/pom.xml
--
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index 68d6159..35a240e 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -107,7 +107,11 @@
scopeprovided/scope
optionaltrue/optional
/dependency
-
+ dependency
+groupIdorg.apache.commons/groupId
+artifactIdcommons-jexl/artifactId
+version2.1.1/version
+/dependency
/dependencies
build
http://git-wip-us.apache.org/repos/asf/cxf/blob/79285f4d/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
--
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
new file mode 100644
index 000..c1cd1e8
--- /dev/null
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/JexlClaimsMapper.java
@@ -0,0 +1,76 @@
+/**
+ * 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.sts.claims;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Logger;
+
+import org.apache.commons.jexl2.JexlContext;
+import org.apache.commons.jexl2.JexlEngine;
+import org.apache.commons.jexl2.MapContext;
+import org.apache.commons.jexl2.Script;
+import org.apache.cxf.common.logging.LogUtils;
+
+public class JexlClaimsMapper implements ClaimsMapper {
+
+private static final Logger LOG =
LogUtils.getL7dLogger(JexlClaimsMapper.class);
+
+JexlEngine jexl = new JexlEngine();
+JexlContext context = new MapContext();
+private Script script;
+
+public JexlClaimsMapper() {
+// jexl.setCache(512);
+// jexl.setLenient(false);
+jexl.setSilent(false);
+}
+
+public ClaimCollection mapClaims(String sourceRealm, ClaimCollection
sourceClaims,
+String targetRealm, ClaimsParameters parameters) {
+context.set(sourceClaims, sourceClaims);
+context.set(targetClaims, new ClaimCollection());
+context.set(sourceRealm, sourceRealm);
+context.set(targetRealm, targetRealm);
+context.set(claimsParameters, parameters);
+
+Script s = getScript();
+if (s == null) {
+LOG.warning(No claim mapping script defined);
+return new ClaimCollection(); // TODO Check if null or an
exception would be more
+ // appropriate
+} else {
+return (ClaimCollection)s.execute(context);
+}
+}
+
+public Script getScript() {
+return script;
+}
+
+public void setScript(Script script) {
+this.script = script;
+}
+
+public void setScript(String scriptPath) throws IOException {
+this.script = jexl.createScript(new File(scriptPath));
+}
+
+}
[1/6] git commit: [CXF-5925] Making JEXL dependency optional and moving version to parent pom.xml
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes a11825e8d - 46687ecac
[CXF-5925] Making JEXL dependency optional and moving version to parent pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3f3bd202
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3f3bd202
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3f3bd202
Branch: refs/heads/2.7.x-fixes
Commit: 3f3bd2026a1325d41ee8580b79c767399d024a30
Parents: ed2a2ef
Author: Jan Bernhardt jbernha...@talend.com
Authored: Tue Aug 5 11:48:16 2014 +0200
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 16:24:20 2014 +0100
--
parent/pom.xml| 2 +-
services/sts/sts-core/pom.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/3f3bd202/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a5f00fd..0487552 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -188,7 +188,7 @@
cxf.oro.bundle.version2.0.8_6/cxf.oro.bundle.version
cxf.dom4j.bundle.version1.6.1_5/cxf.dom4j.bundle.version
cxf.jdom.bundle.version1.1_4/cxf.jdom.bundle.version
-
+cxf.jexl.version2.1.1/cxf.jexl.version
cxf.checkstyle.extension /
cxf.jaxb.context.class /
http://git-wip-us.apache.org/repos/asf/cxf/blob/3f3bd202/services/sts/sts-core/pom.xml
--
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index 35a240e..f48b033 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -110,7 +110,8 @@
dependency
groupIdorg.apache.commons/groupId
artifactIdcommons-jexl/artifactId
-version2.1.1/version
+version${cxf.jexl.version}/version
+ optionaltrue/optional
/dependency
/dependencies
[5/6] git commit: Recording .gitmergeinfo Changes
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/41707f65 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/41707f65 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/41707f65 Branch: refs/heads/2.7.x-fixes Commit: 41707f65f0ba7a5f0f36497214af9a6c4c3c9a9b Parents: e7dc721 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Aug 6 16:24:30 2014 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Aug 6 16:24:30 2014 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/41707f65/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index e8b5253..4f4b218 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1420,6 +1420,7 @@ M 1ab9f70d4112432482f7030ea43b3870d524bd0d M 1c218c8f21311db0c9e77ca401ddbe339f18dc06 M 1c96e19bdc570947b18b343f143c6a85a27c0acb M 1cb8ea77bd878b694dbb739d2e08bcbe3e8c62df +M 1d20b412acd6ab6940baa9045d7550004d6a5feb M 1e62c4cf7343783018df42dbbffa61f678428e49 M 1e7c47d8d989d0f0206c8d4c1b11ef8638d5c3d6 M 1e9e67d778ed81d9adbce3b0d3cf61ab1e8d4a38
[1/3] git commit: Simplify the SSL config since we don't need to support Jetty 7.x.
Repository: cxf
Updated Branches:
refs/heads/master bf879ad99 - 71488c6fa
Simplify the SSL config since we don't need to support Jetty 7.x.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/71488c6f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/71488c6f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/71488c6f
Branch: refs/heads/master
Commit: 71488c6fa7635c88285214a0479379aafef9ed3c
Parents: 4f61ca8
Author: Daniel Kulp dk...@apache.org
Authored: Wed Aug 6 11:17:19 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Aug 6 11:28:21 2014 -0400
--
.../http_jetty/JettyHTTPServerEngine.java | 60 +++---
.../https_jetty/CXFJettySslSocketConnector.java | 181 ---
.../https_jetty/JettySslConnectorFactory.java | 97 --
.../JettyHTTPServerEngineFactoryTest.java | 9 +-
4 files changed, 119 insertions(+), 228 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/71488c6f/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
--
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 03540a5..0494237 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -50,11 +50,9 @@ import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.session.HashSessionIdManager;
import org.eclipse.jetty.server.session.HashSessionManager;
import org.eclipse.jetty.server.session.SessionHandler;
-import org.eclipse.jetty.server.ssl.SslConnector;
import org.eclipse.jetty.util.component.Container;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ThreadPool;
@@ -327,8 +325,6 @@ public class JettyHTTPServerEngine
// create a new jetty server instance if there is no server there
server = new Server();
-server.setSendServerVersion(getSendServerVersion());
-
if (mBeanContainer != null) {
getContainer(server).addEventListener(mBeanContainer);
}
@@ -636,10 +632,18 @@ public class JettyHTTPServerEngine
}
return ret;
}
+
+private boolean isSsl() {
+if (connector == null) {
+return false;
+}
+//return
https.equalsIgnoreCase(connector.getDefaultConnectionFactory().getProtocol());
+return connector instanceof org.eclipse.jetty.server.ssl.SslConnector;
+}
protected void retrieveListenerFactory() {
if (tlsServerParameters != null) {
-if (null != connector !(connector instanceof SslConnector)) {
+if (connector != null !isSsl()) {
LOG.warning(Connector + connector + for JettyServerEngine
Port
+ port + does not support SSL connections.);
return;
@@ -649,7 +653,7 @@ public class JettyHTTPServerEngine
protocol = https;
} else {
-if (connector instanceof SslConnector) {
+if (isSsl()) {
throw new RuntimeException(Connector + connector + for
JettyServerEngine Port
+ port + does not support non-SSL connections.);
}
@@ -666,35 +670,30 @@ public class JettyHTTPServerEngine
protected JettyConnectorFactory getHTTPConnectorFactory() {
return new JettyConnectorFactory() {
public AbstractConnector createConnector(JettyHTTPServerEngine
engine, String hosto, int porto) {
+
+
+// now we just use the SelectChannelConnector as the default
connector
+org.eclipse.jetty.server.nio.SelectChannelConnector result =
+new org.eclipse.jetty.server.nio.SelectChannelConnector();
+
engine.getServer().setSendServerVersion(getSendServerVersion());
+if (engine.getMaxIdleTime() 0) {
+result.setMaxIdleTime(engine.getMaxIdleTime());
+}
+
/*
HttpConfiguration httpConfig = new HttpConfiguration();
git commit: NPE fix
Repository: cxf
Updated Branches:
refs/heads/master 71488c6fa - b9f47488b
NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b9f47488
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b9f47488
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b9f47488
Branch: refs/heads/master
Commit: b9f47488b223a386572719ce93534abbd57bbc55
Parents: 71488c6
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Aug 6 17:42:16 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Aug 6 17:42:16 2014 +0100
--
.../apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b9f47488/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
index abc2bf4..c23739b 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
@@ -73,7 +73,7 @@ public class KerberosAuthenticationFilter implements
ContainerRequestFilter {
ListString authHeaders = messageContext.getHttpHeaders()
.getRequestHeader(HttpHeaders.AUTHORIZATION);
-if (authHeaders.size() != 1) {
+if (authHeaders == null || authHeaders.size() != 1) {
LOG.fine(No Authorization header is available);
throw ExceptionUtils.toNotAuthorizedException(null,
getFaultResponse());
}
[CONF] Apache CXF Documentation JAXRS Kerberos
Colm O hEigeartaigh edited the page:
JAXRS Kerberos
Wiki Markup
{span:style=font-size:2em;font-weight:bold} JAX-RS Kerberos Support {span}
Table of Contents
Introduction
...
Code Block
xml
bean id=kerberosFilter class=org.apache.cxf.jaxrs.security.KerberosAuthenticationFilter
property name=loginContextName value=KerberosServiceKeyTab/
/bean
jaxrs:server
jaxrs:serviceBeans
bean class=org.mycompany.MyCompanyResource/
/jaxrs:serviceBeans
jaxrs:providers
ref bean=kerberosFilter/
/jaxrs:providers
/jaxrs:server
...
svn commit: r918563 - in /websites/production/cxf/content: cache/docs.pageCache docs/jaxrs-kerberos.html
Author: buildbot
Date: Wed Aug 6 16:46:50 2014
New Revision: 918563
Log:
Production update by buildbot for cxf
Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/jaxrs-kerberos.html
Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.
Modified: websites/production/cxf/content/docs/jaxrs-kerberos.html
==
--- websites/production/cxf/content/docs/jaxrs-kerberos.html (original)
+++ websites/production/cxf/content/docs/jaxrs-kerberos.html Wed Aug 6
16:46:50 2014
@@ -118,12 +118,12 @@ Apache CXF -- JAXRS Kerberos
td height=100%
!-- Content --
div class=wiki-content
-div id=ConfluenceContentp/ppspan
style=font-size:2em;font-weight:bold JAX-RS Kerberos Support
/span/pp/pp/pp#160;/ppstyle type=text/css/*![CDATA[*/
-div.rbtoc1400294782728 {padding: 0px;}
-div.rbtoc1400294782728 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1400294782728 li {margin-left: 0px;padding-left: 0px;}
+div id=ConfluenceContentp#160;/pp#160;/pspan
style=font-size:2em;font-weight:bold JAX-RS Kerberos Support
/spanp#160;/pp#160;/pp#160;/ppstyle
type=text/css/*![CDATA[*/
+div.rbtoc1407343583511 {padding: 0px;}
+div.rbtoc1407343583511 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1407343583511 li {margin-left: 0px;padding-left: 0px;}
-/*]]*//style/pdiv class=toc-macro rbtoc1400294782728
+/*]]*//style/pdiv class=toc-macro rbtoc1407343583511
ul class=toc-indentationlia shape=rect
href=#JAXRSKerberos-IntroductionIntroduction/a
ul class=toc-indentationlia shape=rect
href=#JAXRSKerberos-SetupSetup/a
ul class=toc-indentationlia shape=rect
href=#JAXRSKerberos-UnixUnix/a/lilia shape=rect
href=#JAXRSKerberos-WindowsWindows/a/li/ul
@@ -162,7 +162,7 @@ Book b = wc.get(Book.class);
lt;bean class=quot;org.mycompany.MyCompanyResourcequot;/gt;
lt;/jaxrs:serviceBeansgt;
lt;jaxrs:providersgt;
-lt;ref bean=quot;kerberosFilterquot;gt;
+lt;ref bean=quot;kerberosFilterquot;/gt;
lt;/jaxrs:providersgt;
lt;/jaxrs:servergt;
]]/script
git commit: [CXF-5932] Caching method properties early
Repository: cxf
Updated Branches:
refs/heads/master b9f47488b - 0d5ee5483
[CXF-5932] Caching method properties early
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0d5ee548
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0d5ee548
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0d5ee548
Branch: refs/heads/master
Commit: 0d5ee54837b71b2f3c99a6640cd0d80e101859d8
Parents: b9f4748
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Aug 6 21:12:51 2014 +0300
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Aug 6 21:12:51 2014 +0300
--
.../cxf/jaxrs/model/OperationResourceInfo.java | 58 +++-
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 9 +--
.../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 10 +++-
3 files changed, 53 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/0d5ee548/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
index c9c9ac1..9889084 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxrs.model;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import java.lang.reflect.Type;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -49,7 +50,11 @@ public class OperationResourceInfo {
private ListParameter parameters;
private boolean oneway;
private SetString nameBindings = new LinkedHashSetString();
-
+private Class?[] actualInParamTypes;
+private Type[] actualInGenericParamTypes;
+private Annotation[][] actualInParamAnnotations;
+private Annotation[] actualOutParamAnnotations;
+
public OperationResourceInfo(Method mInvoke, ClassResourceInfo cri) {
this(mInvoke, mInvoke, cri);
}
@@ -67,6 +72,7 @@ public class OperationResourceInfo {
this.oneway = ori.oneway;
this.classResourceInfo = cri;
this.nameBindings = ori.nameBindings;
+initActualMethodProperties();
}
public OperationResourceInfo(Method mInvoke, Method mAnnotated,
ClassResourceInfo cri) {
@@ -81,6 +87,7 @@ public class OperationResourceInfo {
checkEncoded();
checkDefaultParameterValue();
checkOneway();
+initActualMethodProperties();
}
//CHECKSTYLE:OFF
@@ -101,6 +108,30 @@ public class OperationResourceInfo {
checkMediaTypes(consumeMediaTypes, produceMediaTypes);
parameters = params;
this.oneway = oneway;
+initActualMethodProperties();
+}
+
+private void initActualMethodProperties() {
+Method actualMethod = annotatedMethod == null ? methodToInvoke :
annotatedMethod;
+actualInParamTypes = actualMethod.getParameterTypes();
+actualInGenericParamTypes = actualMethod.getGenericParameterTypes();
+actualInParamAnnotations = actualMethod.getParameterAnnotations();
+
+// out annotations
+Annotation[] invokedAnns = methodToInvoke.getAnnotations();
+if (methodToInvoke != annotatedMethod annotatedMethod != null) {
+Annotation[] superAnns = annotatedMethod.getAnnotations();
+if (invokedAnns.length 0) {
+Annotation[] merged = new Annotation[superAnns.length +
invokedAnns.length];
+System.arraycopy(superAnns, 0, merged, 0, superAnns.length);
+System.arraycopy(invokedAnns, 0, merged, superAnns.length,
invokedAnns.length);
+actualOutParamAnnotations = merged;
+} else {
+actualOutParamAnnotations = superAnns;
+}
+} else {
+actualOutParamAnnotations = invokedAnns;
+}
}
public void addNameBindings(ListString names) {
@@ -236,20 +267,17 @@ public class OperationResourceInfo {
defaultParamValue = dv.value();
}
}
+public Annotation[][] getInParameterAnnotations() {
+return actualInParamAnnotations;
+}
+public Type[] getInGenericParameterTypes() {
+return actualInGenericParamTypes;
+}
+public Class?[] getInParameterTypes() {
+return actualInParamTypes;
+}
public Annotation[] getOutAnnotations() {
-Annotation[] invokedAnns = methodToInvoke.getAnnotations();
-if (methodToInvoke != annotatedMethod
git commit: [CXF-5932] Caching method properties early
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 1d20b412a - ca40783c0
[CXF-5932] Caching method properties early
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ca40783c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ca40783c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ca40783c
Branch: refs/heads/3.0.x-fixes
Commit: ca40783c03222f52dcea0c5410ea67bea400224e
Parents: 1d20b41
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Aug 6 21:12:51 2014 +0300
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Aug 6 21:14:18 2014 +0300
--
.../cxf/jaxrs/model/OperationResourceInfo.java | 58 +++-
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 9 +--
.../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 10 +++-
3 files changed, 53 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ca40783c/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
index c9c9ac1..9889084 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxrs.model;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import java.lang.reflect.Type;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -49,7 +50,11 @@ public class OperationResourceInfo {
private ListParameter parameters;
private boolean oneway;
private SetString nameBindings = new LinkedHashSetString();
-
+private Class?[] actualInParamTypes;
+private Type[] actualInGenericParamTypes;
+private Annotation[][] actualInParamAnnotations;
+private Annotation[] actualOutParamAnnotations;
+
public OperationResourceInfo(Method mInvoke, ClassResourceInfo cri) {
this(mInvoke, mInvoke, cri);
}
@@ -67,6 +72,7 @@ public class OperationResourceInfo {
this.oneway = ori.oneway;
this.classResourceInfo = cri;
this.nameBindings = ori.nameBindings;
+initActualMethodProperties();
}
public OperationResourceInfo(Method mInvoke, Method mAnnotated,
ClassResourceInfo cri) {
@@ -81,6 +87,7 @@ public class OperationResourceInfo {
checkEncoded();
checkDefaultParameterValue();
checkOneway();
+initActualMethodProperties();
}
//CHECKSTYLE:OFF
@@ -101,6 +108,30 @@ public class OperationResourceInfo {
checkMediaTypes(consumeMediaTypes, produceMediaTypes);
parameters = params;
this.oneway = oneway;
+initActualMethodProperties();
+}
+
+private void initActualMethodProperties() {
+Method actualMethod = annotatedMethod == null ? methodToInvoke :
annotatedMethod;
+actualInParamTypes = actualMethod.getParameterTypes();
+actualInGenericParamTypes = actualMethod.getGenericParameterTypes();
+actualInParamAnnotations = actualMethod.getParameterAnnotations();
+
+// out annotations
+Annotation[] invokedAnns = methodToInvoke.getAnnotations();
+if (methodToInvoke != annotatedMethod annotatedMethod != null) {
+Annotation[] superAnns = annotatedMethod.getAnnotations();
+if (invokedAnns.length 0) {
+Annotation[] merged = new Annotation[superAnns.length +
invokedAnns.length];
+System.arraycopy(superAnns, 0, merged, 0, superAnns.length);
+System.arraycopy(invokedAnns, 0, merged, superAnns.length,
invokedAnns.length);
+actualOutParamAnnotations = merged;
+} else {
+actualOutParamAnnotations = superAnns;
+}
+} else {
+actualOutParamAnnotations = invokedAnns;
+}
}
public void addNameBindings(ListString names) {
@@ -236,20 +267,17 @@ public class OperationResourceInfo {
defaultParamValue = dv.value();
}
}
+public Annotation[][] getInParameterAnnotations() {
+return actualInParamAnnotations;
+}
+public Type[] getInGenericParameterTypes() {
+return actualInGenericParamTypes;
+}
+public Class?[] getInParameterTypes() {
+return actualInParamTypes;
+}
public Annotation[] getOutAnnotations() {
-Annotation[] invokedAnns = methodToInvoke.getAnnotations();
-if (methodToInvoke != annotatedMethod
git commit: NPE fix
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes ca40783c0 - 300105443
NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/30010544
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/30010544
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/30010544
Branch: refs/heads/3.0.x-fixes
Commit: 300105443ed39e3bcaf1b2f7ea0062d4e4b21ba6
Parents: ca40783
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Aug 6 17:42:16 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Aug 6 21:15:35 2014 +0300
--
.../apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/30010544/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
index abc2bf4..c23739b 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
@@ -73,7 +73,7 @@ public class KerberosAuthenticationFilter implements
ContainerRequestFilter {
ListString authHeaders = messageContext.getHttpHeaders()
.getRequestHeader(HttpHeaders.AUTHORIZATION);
-if (authHeaders.size() != 1) {
+if (authHeaders == null || authHeaders.size() != 1) {
LOG.fine(No Authorization header is available);
throw ExceptionUtils.toNotAuthorizedException(null,
getFaultResponse());
}
git commit: More work to issolate the differences between Jetty 8/9.
Repository: cxf
Updated Branches:
refs/heads/master 0d5ee5483 - c044f726f
More work to issolate the differences between Jetty 8/9.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c044f726
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c044f726
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c044f726
Branch: refs/heads/master
Commit: c044f726fae2a2f35ce5c6c3b9ebbfe54125ad11
Parents: 0d5ee54
Author: Daniel Kulp dk...@apache.org
Authored: Wed Aug 6 15:08:05 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Aug 6 15:08:30 2014 -0400
--
.../http_jetty/JettyConnectorFactory.java | 37
.../http_jetty/JettyHTTPServerEngine.java | 193 +--
.../transport/http_jetty/Messages.properties| 56 +-
.../https_jetty/JettySslConnectorFactory.java | 151 ---
.../transport/https_jetty/Messages.properties | 72 ---
.../src/test/resources/logging.properties | 4 +-
6 files changed, 196 insertions(+), 317 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c044f726/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java
--
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java
deleted file mode 100644
index c5273b3..000
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * 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.transport.http_jetty;
-
-import org.eclipse.jetty.server.AbstractConnector;
-
-
-/**
- * Encapsulates creation of Jetty listener.
- */
-public interface JettyConnectorFactory {
-
-/**
- * Create a Listener.
- * @param jettyHTTPServerEngine
- *
- * @param host the host to bind to. IP address or hostname is allowed.
null to bind to all hosts.
- * @param port the listen port
- */
-AbstractConnector createConnector(JettyHTTPServerEngine
jettyHTTPServerEngine, String host, int port);
-}
http://git-wip-us.apache.org/repos/asf/cxf/blob/c044f726/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
--
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 0494237..dacb5ba 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -29,17 +29,23 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.PostConstruct;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.X509KeyManager;
import javax.servlet.ServletContext;
import org.apache.cxf.Bus;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.PropertyUtils;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.common.util.SystemPropertyAction;
+import org.apache.cxf.configuration.jsse.SSLUtils;
import org.apache.cxf.configuration.jsse.TLSServerParameters;
+import org.apache.cxf.configuration.security.ClientAuthentication;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.transport.HttpUriMapper;
-import org.apache.cxf.transport.https_jetty.JettySslConnectorFactory;
+import org.apache.cxf.transport.https.AliasedX509ExtendedKeyManager;
import org.eclipse.jetty.security.SecurityHandler;
import org.eclipse.jetty.server.AbstractConnector;
[3/3] git commit: CXF-5923: Create sample to demonstrate usage of search extension with Lucene and Tika
CXF-5923: Create sample to demonstrate usage of search extension with Lucene
and Tika
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f18acbcd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f18acbcd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f18acbcd
Branch: refs/heads/master
Commit: f18acbcdfc48aca354610614c0ba3a46dcb8332a
Parents: c044f72
Author: reta drr...@gmail.com
Authored: Wed Aug 6 18:27:48 2014 -0400
Committer: reta drr...@gmail.com
Committed: Wed Aug 6 18:27:48 2014 -0400
--
.../release/samples/jax_rs/search/README.txt|35 +
.../main/release/samples/jax_rs/search/pom.xml | 151 +
.../java/demo/jaxrs/search/client/Client.java |89 +
.../java/demo/jaxrs/search/server/Catalog.java | 194 +
.../java/demo/jaxrs/search/server/Server.java |60 +
.../resources/JavaWebSocketAPI_1.0_Final.pdf| Bin 0 - 214897 bytes
.../resources/jsr339-jaxrs-2.0-final-spec.pdf | 12183 +
distribution/src/main/release/samples/pom.xml | 1 +
8 files changed, 12713 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/f18acbcd/distribution/src/main/release/samples/jax_rs/search/README.txt
--
diff --git a/distribution/src/main/release/samples/jax_rs/search/README.txt
b/distribution/src/main/release/samples/jax_rs/search/README.txt
new file mode 100644
index 000..322becc
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/search/README.txt
@@ -0,0 +1,35 @@
+JAX-RS Search Demo
+=
+
+The demo shows a basic usage of search extension with REST based Web Services
using
+JAX-RS 2.0 (JSR-339). The REST server provides the following services:
+
+A RESTful catalog service is provided on URL http://localhost:9000/catalog.
+
+A HTTP GET request to URL http://localhost:9000/catalog
+returns all the documents currently stored and managed (in JSON format):
+
+[
+jsr339-jaxrs-2.0-final-spec.pdf,
+JavaWebSocketAPI_1.0_Final.pdf
+]
+
+
+Building and running the demo using Maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the Maven pom.xml file can be used to build and run the demo.
+
+
+Using either UNIX or Windows:
+
+ mvn install
+ mvn -Pserver (from one command line window)
+ mvn -Pclient (from a second command line window)
+
+
+To remove the target dir, run mvn clean.
+
+
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/f18acbcd/distribution/src/main/release/samples/jax_rs/search/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/search/pom.xml
b/distribution/src/main/release/samples/jax_rs/search/pom.xml
new file mode 100644
index 000..4f9f9c9
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/search/pom.xml
@@ -0,0 +1,151 @@
+?xml version=1.0?
+!--
+ 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.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+modelVersion4.0.0/modelVersion
+artifactIdjax_rs_search/artifactId
+nameJAX-RS Basic Demo/name
+descriptionJAX-RS Basic Demo/description
+parent
+groupIdorg.apache.cxf.samples/groupId
+artifactIdcxf-samples/artifactId
+version3.1.0-SNAPSHOT/version
+relativePath../../relativePath
+/parent
+properties
+cxf.version${project.version}/cxf.version
+httpclient.version3.1/httpclient.version
+/properties
+profiles
+profile
+idserver/id
+build
+defaultGoaltest/defaultGoal
+plugins
+plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdexec-maven-plugin/artifactId
+executions
+
[1/3] CXF-5923: Create sample to demonstrate usage of search extension with Lucene and Tika
Repository: cxf Updated Branches: refs/heads/master c044f726f - f18acbcdf http://git-wip-us.apache.org/repos/asf/cxf/blob/f18acbcd/distribution/src/main/release/samples/pom.xml -- diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 36115ce..30b0edc 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -51,6 +51,7 @@ modulejax_rs/basic_https/module modulejax_rs/basic/module modulejax_rs/websocket/module +modulejax_rs/search/module modulecallback/module modulewsdl_first_pure_xml/module modulejaxws_dispatch_provider/module
[1/2] git commit: http-jetty now compiles and it's unit tests pass with both Jetty 8 and Jetty 9
Repository: cxf
Updated Branches:
refs/heads/master f18acbcdf - a5f8a4dd4
http-jetty now compiles and it's unit tests pass with both Jetty 8 and Jetty 9
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a5f8a4dd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a5f8a4dd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a5f8a4dd
Branch: refs/heads/master
Commit: a5f8a4dd4d9ecbfc1f8a1a8e5bcb4af17f561cc5
Parents: e242307
Author: Daniel Kulp dk...@apache.org
Authored: Wed Aug 6 21:24:07 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Aug 6 22:04:34 2014 -0400
--
.../http_jetty/JettyHTTPServerEngine.java | 177 +++
.../http_jetty/JettyHTTPDestinationTest.java| 4 +-
.../JettyHTTPServerEngineFactoryTest.java | 15 --
.../http_jetty/JettyHTTPServerEngineTest.java | 58 ++
.../transport/http_jetty/invalid-engines.xml| 5 -
.../spring/ApplicationContextTest.java | 2 -
.../transport/http_jetty/spring/beans-props.xml | 5 -
.../cxf/transport/http_jetty/spring/beans.xml | 5 -
8 files changed, 155 insertions(+), 116 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5f8a4dd/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
--
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index dacb5ba..fb60d39 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -23,6 +23,8 @@ import java.io.Closeable;
import java.io.IOException;
import java.net.URL;
import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
@@ -35,6 +37,7 @@ import javax.net.ssl.X509KeyManager;
import javax.servlet.ServletContext;
import org.apache.cxf.Bus;
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.PropertyUtils;
@@ -333,8 +336,11 @@ public class JettyHTTPServerEngine
if (mBeanContainer != null) {
getContainer(server).addEventListener(mBeanContainer);
+if (!Server.getVersion().startsWith(8)) {
+addServerMBean();
+}
}
-
+
if (connector == null) {
connector = createConnector(getHost(), getPort());
if (LOG.isLoggable(Level.FINER)) {
@@ -474,6 +480,27 @@ public class JettyHTTPServerEngine
++servantCount;
}
+private void addServerMBean() {
+try {
+mBeanContainer.getClass().getMethod(beanAdded, Container.class,
Object.class)
+.invoke(mBeanContainer, null, server);
+} catch (RuntimeException rex) {
+throw rex;
+} catch (Exception r) {
+throw new RuntimeException(r);
+}
+}
+private void removeServerMBean() {
+try {
+mBeanContainer.getClass().getMethod(beanRemoved,
Container.class, Object.class)
+.invoke(mBeanContainer, null, server);
+} catch (RuntimeException rex) {
+throw rex;
+} catch (Exception r) {
+throw new RuntimeException(r);
+}
+}
+
private Connector createConnector(String hosto, int porto) {
// now we just use the SelectChannelConnector as the default connector
SslContextFactory sslcf = null;
@@ -489,51 +516,102 @@ public class JettyHTTPServerEngine
};
decorateCXFJettySslSocketConnector(sslcf);
}
-
-
-//Jetty 8
-org.eclipse.jetty.server.nio.SelectChannelConnector result = null;
-if (tlsServerParameters == null) {
-result = new org.eclipse.jetty.server.nio.SelectChannelConnector();
+AbstractConnector result = null;
+if (!Server.getVersion().startsWith(8)) {
+result = createConnectorJetty9(sslcf, hosto, porto);
} else {
-result = new
org.eclipse.jetty.server.ssl.SslSelectChannelConnector(sslcf);
-}
-getServer().setSendServerVersion(getSendServerVersion());
-if (getMaxIdleTime() 0) {
-
[2/2] git commit: Revert accidental commmit
Revert accidental commmit Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e242307a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e242307a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e242307a Branch: refs/heads/master Commit: e242307ad8bbe53788f3e03e9e2f0ca977d01340 Parents: f18acbc Author: Daniel Kulp dk...@apache.org Authored: Wed Aug 6 21:19:11 2014 -0400 Committer: Daniel Kulp dk...@apache.org Committed: Wed Aug 6 22:04:34 2014 -0400 -- systests/ws-security/src/test/resources/logging.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/e242307a/systests/ws-security/src/test/resources/logging.properties -- diff --git a/systests/ws-security/src/test/resources/logging.properties b/systests/ws-security/src/test/resources/logging.properties index f177e00..b2e5a79 100644 --- a/systests/ws-security/src/test/resources/logging.properties +++ b/systests/ws-security/src/test/resources/logging.properties @@ -38,7 +38,7 @@ #handlers= java.util.logging.ConsoleHandler # To also add the FileHandler, use the following line instead. -handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler +#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler # Default global logging level. # This specifies which kinds of events are logged across @@ -46,7 +46,7 @@ handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler # can be overriden by a facility specific level # Note that the ConsoleHandler also has a separate level # setting to limit messages printed to the console. -.level= FINE +.level= INFO # Handler specific properties.
