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:24:00 UTC
[1/5] cxf git commit: CXF-6346 Fixed the test errors of FailoverTest
in systest/jaxrs in JDK1.8
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes e21501b29 -> c26f841ae
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/1368e8f3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1368e8f3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1368e8f3
Branch: refs/heads/3.0.x-fixes
Commit: 1368e8f332ecc6ef984d4ab6eafbae46bab7f3be
Parents: e21501b
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 11:11:06 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/1368e8f3/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/5] 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/5263a8d1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5263a8d1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5263a8d1
Branch: refs/heads/3.0.x-fixes
Commit: 5263a8d1e11be0610aa5ddfee1e0b39bbbebcec1
Parents: 1368e8f3
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:11:19 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/5263a8d1/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 ad659a5..63233d7 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;
@@ -79,13 +76,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 {
[4/5] cxf git commit: Simplify test
Posted by ni...@apache.org.
Simplify test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/66502264
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/66502264
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/66502264
Branch: refs/heads/3.0.x-fixes
Commit: 66502264aa200f761182f7e2465794b10a8cad3f
Parents: c2a4dd4
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Nov 27 15:55:12 2014 +0100
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Apr 13 11:14:55 2015 +0800
----------------------------------------------------------------------
.../cxf/osgi/itests/NoAriesBlueprintTest.java | 35 +++++++++++---------
.../apache/cxf/osgi/itests/OSGiTestSupport.java | 5 +++
2 files changed, 25 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/66502264/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
index 58f5e22..1bf2ae5 100644
--- a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
+++ b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
@@ -18,9 +18,9 @@
*/
package org.apache.cxf.osgi.itests;
+
import org.junit.Test;
import org.junit.runner.RunWith;
-
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@@ -28,8 +28,9 @@ import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.when;
+
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
@@ -48,21 +49,25 @@ public class NoAriesBlueprintTest extends OSGiTestSupport {
@Configuration
public Option[] config() {
+ String localRepo = System.getProperty("localRepository");
+ if (localRepo == null) {
+ localRepo = "";
+ }
+
return new Option[]{
systemProperty("java.awt.headless").value("true"),
- systemProperty("org.ops4j.pax.url.mvn.localRepository")
- .value(System.getProperty("localRepository")),
- mavenBundle().groupId("org.apache.ws.xmlschema").artifactId("xmlschema-core").versionAsInProject(),
- mavenBundle().groupId("org.apache.cxf").artifactId("cxf-core").versionAsInProject(),
- mavenBundle().groupId("org.apache.servicemix.bundles")
- .artifactId("org.apache.servicemix.bundles.wsdl4j").versionAsInProject(),
- mavenBundle().groupId("org.apache.cxf").artifactId("cxf-rt-wsdl").versionAsInProject(),
- mavenBundle().groupId("org.apache.cxf").artifactId("cxf-rt-databinding-jaxb").versionAsInProject(),
- mavenBundle().groupId("org.apache.cxf").artifactId("cxf-rt-bindings-xml").versionAsInProject(),
- mavenBundle().groupId("org.apache.cxf").artifactId("cxf-rt-bindings-soap").versionAsInProject(),
- mavenBundle().groupId("org.apache.cxf").artifactId("cxf-rt-frontend-simple").versionAsInProject(),
- mavenBundle().groupId("org.apache.cxf").artifactId("cxf-rt-transports-http").versionAsInProject(),
- mavenBundle().groupId("org.apache.cxf").artifactId("cxf-rt-frontend-jaxws").versionAsInProject(),
+ when(!"".equals(localRepo))
+ .useOptions(systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)),
+ mvnBundle("org.apache.ws.xmlschema", "xmlschema-core"),
+ mvnBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j"),
+ mvnBundle("org.apache.cxf", "cxf-core"),
+ mvnBundle("org.apache.cxf", "cxf-rt-wsdl"),
+ mvnBundle("org.apache.cxf", "cxf-rt-databinding-jaxb"),
+ mvnBundle("org.apache.cxf", "cxf-rt-bindings-xml"),
+ mvnBundle("org.apache.cxf", "cxf-rt-bindings-soap"),
+ mvnBundle("org.apache.cxf", "cxf-rt-frontend-simple"),
+ mvnBundle("org.apache.cxf", "cxf-rt-transports-http"),
+ mvnBundle("org.apache.cxf", "cxf-rt-frontend-jaxws"),
junitBundles()
};
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/66502264/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
index 933348a..5d842ff 100644
--- a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
+++ b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
@@ -23,6 +23,8 @@ package org.apache.cxf.osgi.itests;
import javax.inject.Inject;
import org.junit.Assert;
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -49,4 +51,7 @@ public class OSGiTestSupport {
return null;
}
+ public MavenArtifactProvisionOption mvnBundle(String groupId, String artifactId) {
+ return CoreOptions.mavenBundle().groupId(groupId).artifactId(artifactId).versionAsInProject();
+ }
}
[3/5] 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/c2a4dd4b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c2a4dd4b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c2a4dd4b
Branch: refs/heads/3.0.x-fixes
Commit: c2a4dd4b06a29499c8b5430547f52ce22f94bf55
Parents: 5263a8d
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:11:33 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/c2a4dd4b/osgi/itests-felix/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index 20176b0..809a54a 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -111,17 +111,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>
[5/5] cxf git commit: Fix test failure in osgi itests
Posted by ni...@apache.org.
Fix test failure in osgi itests
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c26f841a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c26f841a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c26f841a
Branch: refs/heads/3.0.x-fixes
Commit: c26f841ae70b2bbb40a248cfd93dbd1e4a381e04
Parents: 6650226
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Dec 17 15:48:27 2014 +0100
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Apr 13 11:15:08 2015 +0800
----------------------------------------------------------------------
osgi/itests-felix/pom.xml | 4 ++++
.../java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c26f841a/osgi/itests-felix/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index 809a54a..759bb48 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -72,6 +72,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c26f841a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
index 1bf2ae5..de3ed84 100644
--- a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
+++ b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
@@ -66,6 +66,7 @@ public class NoAriesBlueprintTest extends OSGiTestSupport {
mvnBundle("org.apache.cxf", "cxf-rt-bindings-xml"),
mvnBundle("org.apache.cxf", "cxf-rt-bindings-soap"),
mvnBundle("org.apache.cxf", "cxf-rt-frontend-simple"),
+ mvnBundle("org.apache.geronimo.specs", "geronimo-servlet_3.0_spec"),
mvnBundle("org.apache.cxf", "cxf-rt-transports-http"),
mvnBundle("org.apache.cxf", "cxf-rt-frontend-jaxws"),
junitBundles()