Merge pull request #21471 from neuwerk/xlxpCXfNamespacePrefixMapper

jaxws-2.2: Update CXF to account for changes in XLXP and clean up projects

dev/com.ibm.ws.org.apache.cxf.cxf.core.3.2/src/org/apache/cxf/common/jaxb/JAXBUtils.java

@@ -33,6 +33,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.lang.reflect.Type;
+import java.lang.NoClassDefFoundError;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -626,10 +627,20 @@ private static synchronized ClassLoader getXJCClassLoader() {
 
     public static Object setNamespaceMapper(Bus bus, final Map<String, String> nspref,
                                             Marshaller marshaller) throws PropertyException {
+        LOG.info("****@TTJJ className of mapper is: " + marshaller.getClass() + " nspref stands for " + nspref);
         ClassLoaderService classLoaderService = bus.getExtension(ClassLoaderService.class);
+//        if(marshaller.getClass().getName().startsWith("com.ibm")) {
+//            try {
+//                Object mapper = classLoaderService.createNamespaceWrapperInstance(marshaller.getClass(), nspref);  
+//            } catch (NoClassDefFound) {
+//                if(NoClassDefFoundError e) {
+//                    // do nothing since XLXP has messed with the way this property gets read. 
+//                }
+//            }
+//        }
         Object mapper = classLoaderService.createNamespaceWrapperInstance(marshaller.getClass(), nspref);
         if (mapper != null) {
-            if (marshaller.getClass().getName().contains(".internal.")) {
+            if ((marshaller.getClass().getName().contains("com.sun") && marshaller.getClass().getName().contains(".internal."))) {
                 marshaller.setProperty("com.sun.xml.internal.bind.namespacePrefixMapper",
                                        mapper);
             } else if (marshaller.getClass().getName().contains("com.sun")) {
@@ -641,6 +652,8 @@ public static Object setNamespaceMapper(Bus bus, final Map<String, String> nspre
             //Liberty change begin
             } else if (marshaller.getClass().getName().startsWith("org.glassfish.")) {
                 marshaller.setProperty("org.glassfish.jaxb.namespacePrefixMapper", mapper);
+            } else if (marshaller.getClass().getName().startsWith("com.ibm")) {
+                marshaller.setProperty("com.ibm.jtc.jax.xml.bind.namespacePrefixMapper", mapper);
             }
            //Liberty change end
         }

dev/com.ibm.ws.org.apache.cxf.cxf.core.3.2/src/org/apache/cxf/common/spi/NamespaceClassGenerator.java

@@ -48,13 +48,15 @@ public synchronized Class<?> createNamespaceWrapperClass(Class<?> mcls, Map<Stri
 
         if (mcls.getName().contains("eclipse")) {
             return createEclipseNamespaceMapper(mcls, map);
-        } else if (mcls.getName().contains(".internal")) {
+        } else if (mcls.getName().contains("com.sun") && mcls.getName().contains(".internal")) {
             postFix = "Internal";
         } else if (mcls.getName().contains("com.sun")) {
             postFix = "RI";
         //Liberty change begin
         } else if (mcls.getName().startsWith("org.glassfish")) {
             postFix = "Glassfish";
+        } else if (mcls.getName().startsWith("com.ibm")) {
+            postFix = "IBM";
         }
         //Liberty change end
 
@@ -65,7 +67,23 @@ public synchronized Class<?> createNamespaceWrapperClass(Class<?> mcls, Map<Stri
         if (cls == null) {
             try {
                 byte[] bts = createNamespaceWrapperInternal(postFix);
-                className = "org.apache.cxf.jaxb.NamespaceMapper" + postFix;
+                className = "org.apache.cxf.jaxb.NamespaceMapper" + postFix; 
+
+                if(postFix.equals("IBM")) {
+                    try {
+                        return loadClass(className, NamespaceClassCreator.class, bts);
+                    } catch(NoClassDefFoundError e) {
+                        postFix = "RI";
+                        className = "org.apache.cxf.jaxb.NamespaceMapper";
+                        className += postFix;
+                        cls = findClass(className, NamespaceClassCreator.class);
+
+                        bts = createNamespaceWrapperInternal(postFix);
+                        return loadClass(className, NamespaceClassCreator.class, bts);
+
+                    }
+                }
+
                 return loadClass(className, NamespaceClassCreator.class, bts);
             } catch (RuntimeException ex) {
                 // continue
@@ -300,11 +318,17 @@ private byte[] createEclipseNamespaceMapper() {
     private byte[] createNamespaceWrapperInternal(String postFix) {
 
         //Liberty change begin
-        String superName = "Glassfish".equals(postFix) ? 
+        String superName;
+
+        if(postFix.equals("IBM")) {
+            superName = "com/ibm/jtc/jax/xml/bind/namespacePrefixMapper";
+        } else {
+            superName = "Glassfish".equals(postFix) ? 
                         "org/glassfish/jaxb/runtime/marshaller/NamespacePrefixMapper" : 
                         ("com/sun/xml/"
                         + ("RI".equals(postFix) ? "" : "internal/")
                         + "bind/marshaller/NamespacePrefixMapper");
+        }
         //Liberty change end
         String postFixedName = "org/apache/cxf/jaxb/NamespaceMapper" + postFix;
         ASMHelper.ClassWriter cw = helper.createClassWriter();

dev/com.ibm.ws.org.apache.cxf.rt.security.3.4.1/bnd.bnd

@@ -10,6 +10,8 @@
 #*******************************************************************************
 -include= jar:${fileuri;${repo;org.apache.cxf:cxf-rt-security;3.4.1;EXACT}}!/META-INF/MANIFEST.MF,bnd.overrides
 
+-sub: *.bnd
+
 -includeresource: \
     @${repo;org.apache.cxf:cxf-rt-security;3.4.1;EXACT}!/!META-INF/maven/*|META-INF/MANIFEST.MF, \
     @${repo;org.apache.cxf:cxf-rt-security;3.4.1;EXACT}!/META-INF/DEPENDENCIES, \