cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1510980 - in /cxf/branches/2.7.x-fixes/api: pom.xml src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
Date Tue, 06 Aug 2013 14:45:11 GMT
Author: dkulp
Date: Tue Aug  6 14:45:11 2013
New Revision: 1510980

URL: http://svn.apache.org/r1510980
Log:
Merged revisions 1510960 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1510960 | dkulp | 2013-08-06 09:36:42 -0400 (Tue, 06 Aug 2013) | 2 lines

  Flip to using the ObjectFactory.class directly to avoid class.forName and classloader issues.

........

Modified:
    cxf/branches/2.7.x-fixes/api/pom.xml
    cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java

Modified: cxf/branches/2.7.x-fixes/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/pom.xml?rev=1510980&r1=1510979&r2=1510980&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/api/pom.xml Tue Aug  6 14:45:11 2013
@@ -218,20 +218,30 @@
                                     <xsd>${basedir}/src/main/resources/schemas/wsdl/http.xsd</xsd>
                                     <bindingFile>${basedir}/src/main/resources/schemas/wsdl/http.xjb</bindingFile>
                                     <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
+                                    <extensionArgs>
+                                        <extensionArg>-npa</extensionArg>
+                                    </extensionArgs>
                                 </xsdOption>
                                 <xsdOption>
                                     <xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr.xsd</xsd>
                                     <packagename>org.apache.cxf.ws.addressing</packagename>
+                                    <extensionArgs>
+                                        <extensionArg>-npa</extensionArg>
+                                    </extensionArgs>
                                 </xsdOption>
                                 <xsdOption>
                                     <xsd>${basedir}/src/main/resources/schemas/wsdl/addressing.xsd</xsd>
                                     <bindingFile>${basedir}/src/main/resources/schemas/wsdl/addressing.xjb</bindingFile>
+                                    <extensionArgs>
+                                        <extensionArg>-npa</extensionArg>
+                                    </extensionArgs>
                                 </xsdOption>
                                 <xsdOption>
                                     <xsd>${basedir}/src/main/resources/schemas/configuration/security.xsd</xsd>
                                     <bindingFile>${basedir}/src/main/resources/schemas/configuration/security.xjb</bindingFile>
                                     <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
                                     <extensionArgs>
+                                        <extensionArg>-npa</extensionArg>
                                         <extensionArg>-Xdv</extensionArg>
                                     </extensionArgs>
                                 </xsdOption>
@@ -239,10 +249,16 @@
                                     <xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd</xsd>
                                     <bindingFile>${basedir}/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb</bindingFile>
                                     <extension>true</extension>
+                                    <extensionArgs>
+                                        <extensionArg>-npa</extensionArg>
+                                    </extensionArgs>
                                 </xsdOption>
                                 <xsdOption>
                                     <xsd>${basedir}/src/main/resources/schemas/wsdl/addressing200403.xsd</xsd>
                                     <bindingFile>${basedir}/src/main/resources/schemas/wsdl/addressing200403.xjb</bindingFile>
+                                    <extensionArgs>
+                                        <extensionArg>-npa</extensionArg>
+                                    </extensionArgs>
                                 </xsdOption>
                             </xsdOptions>
                         </configuration>

Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java?rev=1510980&r1=1510979&r2=1510980&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
(original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
Tue Aug  6 14:45:11 2013
@@ -35,7 +35,6 @@ import org.w3c.dom.Element;
 // importation convention: if the same class name is used for 
 // 2005/08 and 2004/08, then the former version is imported
 // and the latter is fully qualified when used
-import org.apache.cxf.common.util.PackageUtils;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.ws.addressing.v200408.AttributedQName;
 import org.apache.cxf.ws.addressing.v200408.AttributedURI;
@@ -521,9 +520,8 @@ public class VersionTransformer {
             WSA_NAMESPACE_NAME + "/role/none";
         public static final ObjectFactory WSA_OBJECT_FACTORY = 
             new ObjectFactory();
-        public static final Class<org.apache.cxf.ws.addressing.v200408.EndpointReferenceType>
-        EPR_TYPE = 
-            org.apache.cxf.ws.addressing.v200408.EndpointReferenceType.class;
+        public static final Class<org.apache.cxf.ws.addressing.v200408.EndpointReferenceType>
EPR_TYPE 
+            = org.apache.cxf.ws.addressing.v200408.EndpointReferenceType.class;
         
         private static JAXBContext jaxbContext;
         
@@ -539,10 +537,7 @@ public class VersionTransformer {
         public static JAXBContext getJAXBContext() throws JAXBException {
             synchronized (Names200408.class) {
                 if (jaxbContext == null) {
-                    Class<?> clz = org.apache.cxf.ws.addressing.v200408.ObjectFactory.class;
-                    jaxbContext =
-                        JAXBContext.newInstance(PackageUtils.getPackageName(clz),
-                                                clz.getClassLoader());
+                    jaxbContext = JAXBContext.newInstance(org.apache.cxf.ws.addressing.v200408.ObjectFactory.class);
                 }
             }
             return jaxbContext;
@@ -585,8 +580,7 @@ public class VersionTransformer {
         public static JAXBContext getJAXBContext() throws JAXBException {
             synchronized (Names200403.class) {
                 if (jaxbContext == null) {
-                    Class<?> clz = org.apache.cxf.ws.addressing.v200403.ObjectFactory.class;
-                    jaxbContext = JAXBContext.newInstance(clz.getPackage().getName(), clz.getClassLoader());
+                    jaxbContext = JAXBContext.newInstance(org.apache.cxf.ws.addressing.v200403.ObjectFactory.class);
                 }
             }
             return jaxbContext;



Mime
View raw message