You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2015/04/13 05:08:34 UTC
[1/3] cxf git commit: CXF-6346 Fixed the test errors of FailoverTest
in systest/jaxrs in JDK1.8
Repository: cxf
Updated Branches:
refs/heads/master 577ccc51c -> 7a17ee621
CXF-6346 Fixed the test errors of FailoverTest in systest/jaxrs in JDK1.8
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6a58f387
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6a58f387
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6a58f387
Branch: refs/heads/master
Commit: 6a58f38730a362e743973b868c20dbe5a3fb8f24
Parents: 577ccc5
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Apr 13 10:58:41 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Apr 13 10:58:41 2015 +0800
----------------------------------------------------------------------
.../main/java/org/apache/cxf/message/ExchangeImpl.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6a58f387/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java b/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
index 2e53fae..99c4dbf 100644
--- a/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
+++ b/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
@@ -19,6 +19,7 @@
package org.apache.cxf.message;
+import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.cxf.Bus;
@@ -90,6 +91,15 @@ public class ExchangeImpl extends ConcurrentHashMap<String, Object> implements
return key.cast(get(key.getName()));
}
+ public void putAll(Map<? extends String, ?> m) {
+ for (Map.Entry<? extends String, ?> e : m.entrySet()) {
+ // just skip the null value to void the NPE in JDK1.8
+ if (e.getValue() != null) {
+ super.put(e.getKey(), e.getValue());
+ }
+ }
+ }
+
public <T> void put(Class<T> key, T value) {
if (value == null) {
super.remove(key);
[2/3] cxf git commit: CXF-6346 Fixed the unit test failures of
JAXRSJweJwsTest in systest/rs-security
Posted by ni...@apache.org.
CXF-6346 Fixed the unit test failures of JAXRSJweJwsTest in systest/rs-security
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/82019e93
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/82019e93
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/82019e93
Branch: refs/heads/master
Commit: 82019e93cabd855f0232d914bcf0e5c4e853b8f8
Parents: 6a58f38
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Apr 13 11:03:05 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Apr 13 11:03:05 2015 +0800
----------------------------------------------------------------------
.../cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/82019e93/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
index 39726e5..642abc6 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
@@ -26,8 +26,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
-import javax.crypto.Cipher;
-
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import org.apache.cxf.Bus;
@@ -39,7 +37,6 @@ import org.apache.cxf.rs.security.jose.jaxrs.JweWriterInterceptor;
import org.apache.cxf.rs.security.jose.jaxrs.JwsClientResponseFilter;
import org.apache.cxf.rs.security.jose.jaxrs.JwsWriterInterceptor;
import org.apache.cxf.rs.security.jose.jaxrs.PrivateKeyPasswordProvider;
-import org.apache.cxf.rs.security.jose.jwa.AlgorithmUtils;
import org.apache.cxf.rs.security.jose.jwa.ContentAlgorithm;
import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
import org.apache.cxf.rs.security.jose.jwa.SignatureAlgorithm;
@@ -73,13 +70,8 @@ public class JAXRSJweJwsTest extends AbstractBusClientServerTestBase {
}
private static void registerBouncyCastleIfNeeded() throws Exception {
- try {
- // Java 8 apparently has it
- Cipher.getInstance(AlgorithmUtils.AES_GCM_ALGO_JAVA);
- } catch (Throwable t) {
- // Oracle Java 7
- Security.addProvider(new BouncyCastleProvider());
- }
+ // Still need it for Oracle Java 7 and Java 8
+ Security.addProvider(new BouncyCastleProvider());
}
@AfterClass
public static void unregisterBouncyCastleIfNeeded() throws Exception {
[3/3] cxf git commit: CXF-6346 Fixed the NoAriesBlueprintTest test
failure with JDK1.8
Posted by ni...@apache.org.
CXF-6346 Fixed the NoAriesBlueprintTest test failure with JDK1.8
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7a17ee62
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7a17ee62
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7a17ee62
Branch: refs/heads/master
Commit: 7a17ee62100bf421ce7a026b63ebdd7d8d2f28b4
Parents: 82019e9
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Apr 13 11:08:24 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Apr 13 11:08:24 2015 +0800
----------------------------------------------------------------------
osgi/itests-felix/pom.xml | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7a17ee62/osgi/itests-felix/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index f180322..7829fd8 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -115,17 +115,25 @@
<version>1.6.0</version>
<scope>test</scope>
</dependency>
-
+
+ <!--Updated the felix and osgi version to support JDK8 -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>3.2.2</version>
+ <version>4.4.0</version>
<scope>test</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.0</version>
+ </dependency>
+
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.3.0</version>
</dependency>
<dependency>