cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [3/4] cxf git commit: Update to not pull in jaxb-impl and use the in-jre version by default
Date Wed, 23 Nov 2016 14:51:50 GMT
Update to not pull in jaxb-impl and use the in-jre version by default


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

Branch: refs/heads/master
Commit: 54b71171e89bb1be7d169ac91bb626c9c1ca293b
Parents: 211302f
Author: Daniel Kulp <dkulp@apache.org>
Authored: Wed Nov 23 09:11:03 2016 -0500
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Wed Nov 23 09:51:40 2016 -0500

----------------------------------------------------------------------
 rt/databinding/jaxb/pom.xml                                  | 8 --------
 .../test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java   | 4 ----
 rt/frontend/simple/pom.xml                                   | 1 +
 .../java/org/apache/cxf/systest/jaxws/ClientServerTest.java  | 7 ++++++-
 4 files changed, 7 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/54b71171/rt/databinding/jaxb/pom.xml
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/pom.xml b/rt/databinding/jaxb/pom.xml
index 7556d26..a27348b 100644
--- a/rt/databinding/jaxb/pom.xml
+++ b/rt/databinding/jaxb/pom.xml
@@ -97,14 +97,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-        </dependency>
-        <dependency>
             <groupId>${cxf.asm.groupId}</groupId>
             <artifactId>${cxf.asm.artifactId}</artifactId>
             <optional>true</optional>

http://git-wip-us.apache.org/repos/asf/cxf/blob/54b71171/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
index 980f2de..0251d22 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
@@ -277,10 +277,6 @@ public class JAXBDataBindingTest extends Assert {
     public void testDeclaredNamespaceMappingInternal() throws Exception {
         doNamespaceMappingTest(true, true);
     }
-    @Test
-    public void testDeclaredNamespaceMappingRINoAsm() throws Exception {
-        doNamespaceMappingTest(false, false);
-    }
     
     @Test
     public void testDeclaredNamespaceMappingInternalNoAsm() throws Exception {

http://git-wip-us.apache.org/repos/asf/cxf/blob/54b71171/rt/frontend/simple/pom.xml
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/pom.xml b/rt/frontend/simple/pom.xml
index 1f8af0e..89b5214 100644
--- a/rt/frontend/simple/pom.xml
+++ b/rt/frontend/simple/pom.xml
@@ -136,6 +136,7 @@
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
             <optional>true</optional>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/cxf/blob/54b71171/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
index 7bece33..be0b0bb 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
@@ -40,6 +40,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
 import java.util.zip.GZIPInputStream;
 
+import javax.xml.bind.JAXBContext;
 import javax.xml.namespace.QName;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.AsyncHandler;
@@ -916,7 +917,11 @@ public class ClientServerTest extends AbstractBusClientServerTestBase
{
         // that would actually notice the difference. At least it ensures that 
         // specifying the property does not explode.
         Map<String, Object> jaxbContextProperties = new HashMap<String, Object>();
-        jaxbContextProperties.put("com.sun.xml.bind.defaultNamespaceRemap", "uri:ultima:thule");
+        if (JAXBContext.newInstance(String.class).getClass().getName().contains("internal"))
{
+            jaxbContextProperties.put("com.sun.xml.internal.bind.defaultNamespaceRemap",
"uri:ultima:thule");
+        } else {
+            jaxbContextProperties.put("com.sun.xml.bind.defaultNamespaceRemap", "uri:ultima:thule");
+        }
         dcf.setJaxbContextProperties(jaxbContextProperties);
         client = dcf.createClient(wsdlUrl, serviceName, portName);
         updateAddressPort(client, PORT);


Mime
View raw message