Author: dkulp
Date: Tue Aug 6 13:36:42 2013
New Revision: 1510960
URL: http://svn.apache.org/r1510960
Log:
Flip to using the ObjectFactory.class directly to avoid class.forName and
classloader issues.
Modified:
cxf/trunk/api/pom.xml
cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
Modified: cxf/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=1510960&r1=1510959&r2=1510960&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Tue Aug 6 13:36:42 2013
@@ -214,20 +214,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>
@@ -235,10 +245,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/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java?rev=1510960&r1=1510959&r2=1510960&view=diff
==============================================================================
---
cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
(original)
+++
cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
Tue Aug 6 13:36:42 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;
@@ -520,9 +519,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;
@@ -538,10 +536,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;
@@ -584,8 +579,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;
