You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/12 21:07:20 UTC
svn commit: r1230746 [1/2] - in /cxf/trunk: ./
api/src/main/java/org/apache/cxf/ws/addressing/
api/src/main/java/org/apache/cxf/wsdl/ common/common/
common/common/src/main/java/org/apache/cxf/common/jaxb/
common/common/src/main/java/org/apache/cxf/conf...
Author: dkulp
Date: Thu Jan 12 20:07:17 2012
New Revision: 1230746
URL: http://svn.apache.org/viewvc?rev=1230746&view=rev
Log:
Resolve the org.apache.cxf.jaxb split package issue
Added:
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBBeanInfo.java (contents, props changed)
- copied, changed from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBBeanInfo.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java (contents, props changed)
- copied, changed from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextProxy.java (contents, props changed)
- copied, changed from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextProxy.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java (contents, props changed)
- copied, changed from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/Messages.properties (contents, props changed)
- copied, changed from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/CommonUtilityMessages.properties
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java (contents, props changed)
- copied, changed from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/NamespaceMapper.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java (contents, props changed)
- copied, changed from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java (contents, props changed)
- copied, changed from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java (contents, props changed)
- copied, changed from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java (contents, props changed)
- copied, changed from r1230685, cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java (contents, props changed)
- copied, changed from r1230685, cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java (contents, props changed)
- copied, changed from r1230685, cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java (contents, props changed)
- copied, changed from r1230685, cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
Removed:
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/CommonUtilityMessages.properties
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBBeanInfo.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextProxy.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/NamespaceMapper.java
cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java
cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java
cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java
cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/VersionTransformerTest.java
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
cxf/trunk/common/common/pom.xml
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
cxf/trunk/pom.xml
cxf/trunk/rt/databinding/jaxb/pom.xml
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Messages.properties
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataBinding.java
cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/ParameterMapper.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Thu Jan 12 20:07:17 2012
@@ -32,10 +32,10 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import org.apache.cxf.Bus;
+import org.apache.cxf.common.jaxb.JAXBContextCache;
+import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.jaxb.JAXBContextCache;
-import org.apache.cxf.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
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=1230746&r1=1230745&r2=1230746&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 Thu Jan 12 20:07:17 2012
@@ -27,12 +27,9 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.ws.EndpointReference;
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
+//import javax.xml.ws.EndpointReference;
+//import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import org.w3c.dom.Document;
import org.w3c.dom.Element;
// importation convention: if the same class name is used for
@@ -40,8 +37,6 @@ import org.w3c.dom.Element;
// 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.helpers.XMLUtils;
-import org.apache.cxf.staxutils.W3CDOMStreamReader;
import org.apache.cxf.ws.addressing.v200408.AttributedQName;
import org.apache.cxf.ws.addressing.v200408.AttributedURI;
import org.apache.cxf.ws.addressing.v200408.ObjectFactory;
@@ -290,44 +285,6 @@ public class VersionTransformer {
putAll(internal.getOtherAttributes(), exposed.getOtherAttributes());
return internal;
}
-/**
- * Convert from EndpointReference to CXF internal 2005/08 EndpointReferenceType
- *
- * @param external the javax.xml.ws.EndpointReference
- * @return CXF internal 2005/08 EndpointReferenceType
- */
- public static EndpointReferenceType convertToInternal(EndpointReference external) {
- if (external instanceof W3CEndpointReference) {
-
-
- try {
- Document doc = XMLUtils.newDocument();
- DOMResult result = new DOMResult(doc);
- external.writeTo(result);
- W3CDOMStreamReader reader = new W3CDOMStreamReader(doc.getDocumentElement());
-
- // CXF internal 2005/08 EndpointReferenceType should be
- // compatible with W3CEndpointReference
- //jaxContext = ContextUtils.getJAXBContext();
- JAXBContext jaxbContext = JAXBContext
- .newInstance(new Class[] {org.apache.cxf.ws.addressing.ObjectFactory.class});
- EndpointReferenceType internal = jaxbContext.createUnmarshaller()
- .unmarshal(reader, EndpointReferenceType.class)
- .getValue();
- return internal;
- } catch (JAXBException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ParserConfigurationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return null;
- } else {
- //TODO: 200408
- }
- return null;
- }
/**
* Convert from 2005/08 ReferenceParametersType to 2004/08
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java Thu Jan 12 20:07:17 2012
@@ -70,6 +70,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.jaxb.JAXBContextCache;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.endpoint.EndpointResolverRegistry;
@@ -78,7 +79,6 @@ import org.apache.cxf.endpoint.ServerReg
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.helpers.LoadingByteArrayOutputStream;
import org.apache.cxf.helpers.XMLUtils;
-import org.apache.cxf.jaxb.JAXBContextCache;
import org.apache.cxf.resource.ExtendedURIResolver;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.service.model.SchemaInfo;
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java Thu Jan 12 20:07:17 2012
@@ -50,12 +50,12 @@ import javax.xml.stream.util.StreamReade
import org.w3c.dom.Element;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.jaxb.JAXBContextCache;
+import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.PackageUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.jaxb.JAXBContextCache;
-import org.apache.cxf.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.staxutils.StaxUtils;
Modified: cxf/trunk/common/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/pom.xml?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/common/common/pom.xml (original)
+++ cxf/trunk/common/common/pom.xml Thu Jan 12 20:07:17 2012
@@ -78,12 +78,6 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
Copied: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBBeanInfo.java (from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBBeanInfo.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBBeanInfo.java?p2=cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBBeanInfo.java&p1=cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBBeanInfo.java&r1=1230685&r2=1230746&rev=1230746&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBBeanInfo.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBBeanInfo.java Thu Jan 12 20:07:17 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.jaxb;
+package org.apache.cxf.common.jaxb;
import java.util.Collection;
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBBeanInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBBeanInfo.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java (from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java?p2=cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java&p1=cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java&r1=1230685&r2=1230746&rev=1230746&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java Thu Jan 12 20:07:17 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.jaxb;
+package org.apache.cxf.common.jaxb;
import java.io.BufferedReader;
import java.io.InputStream;
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextProxy.java (from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextProxy.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextProxy.java?p2=cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextProxy.java&p1=cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextProxy.java&r1=1230685&r2=1230746&rev=1230746&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextProxy.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextProxy.java Thu Jan 12 20:07:17 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.jaxb;
+package org.apache.cxf.common.jaxb;
/**
*
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextProxy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBContextProxy.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java (from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java?p2=cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java&p1=cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java&r1=1230685&r2=1230746&rev=1230746&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java Thu Jan 12 20:07:17 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.jaxb;
+package org.apache.cxf.common.jaxb;
import java.io.BufferedReader;
@@ -113,7 +113,7 @@ public final class JAXBUtils {
private static final Map<String, String> BUILTIN_DATATYPES_MAP;
private static final Map<String, Class<?>> HOLDER_TYPES_MAP;
- private static final Logger LOG = LogUtils.getL7dLogger(JAXBUtils.class, "CommonUtilityMessages");
+ private static final Logger LOG = LogUtils.getL7dLogger(JAXBUtils.class);
private static ClassLoader jaxbXjcLoader;
static {
@@ -590,7 +590,7 @@ public final class JAXBUtils {
}
} else {
try {
- Class<?> cls = Class.forName("org.apache.cxf.jaxb.NamespaceMapper");
+ Class<?> cls = Class.forName("org.apache.cxf.common.jaxb.NamespaceMapper");
mapper = cls.getConstructor(Map.class).newInstance(nspref);
} catch (Exception ex) {
LOG.log(Level.INFO, "Could not create NamespaceMapper", ex);
@@ -756,13 +756,6 @@ public final class JAXBUtils {
return null;
}
- public static JAXBBeanInfo getBeanInfo(JAXBContextProxy context, Class<?> cls) {
- Object o = context.getBeanInfo(cls);
- if (o == null) {
- return null;
- }
- return ReflectionInvokationHandler.createProxyWrapper(o, JAXBBeanInfo.class);
- }
public static List<DOMResult> generateJaxbSchemas(
JAXBContext context, final Map<String, DOMResult> builtIns) throws IOException {
@@ -1154,4 +1147,13 @@ public final class JAXBUtils {
return helper.loadClass(className,
cls, bts);
}
+
+ public static JAXBBeanInfo getBeanInfo(JAXBContextProxy context, Class<?> cls) {
+ Object o = context.getBeanInfo(cls);
+ if (o == null) {
+ return null;
+ }
+ return ReflectionInvokationHandler.createProxyWrapper(o, JAXBBeanInfo.class);
+ }
+
}
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/Messages.properties (from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/CommonUtilityMessages.properties)
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/Messages.properties?p2=cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/Messages.properties&p1=cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/CommonUtilityMessages.properties&r1=1230685&r2=1230746&rev=1230746&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/CommonUtilityMessages.properties (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/Messages.properties Thu Jan 12 20:07:17 2012
@@ -18,4 +18,3 @@
# under the License.
#
#
-DATATYPE_FACTORY_INSTANTIATION_EXC = Failed to create DatatypeFactory.
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/Messages.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/Messages.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/Messages.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java (from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/NamespaceMapper.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java?p2=cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java&p1=cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/NamespaceMapper.java&r1=1230685&r2=1230746&rev=1230746&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/NamespaceMapper.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java Thu Jan 12 20:07:17 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.jaxb;
+package org.apache.cxf.common.jaxb;
import java.util.Map;
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java Thu Jan 12 20:07:17 2012
@@ -39,11 +39,11 @@ import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import org.apache.cxf.common.jaxb.JAXBContextCache;
+import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxb.JAXBContextCache;
-import org.apache.cxf.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.staxutils.StaxUtils;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.BeanDefinition;
Modified: cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/pom.xml (original)
+++ cxf/trunk/pom.xml Thu Jan 12 20:07:17 2012
@@ -685,8 +685,8 @@
<chmod>true</chmod>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- <stagingRepositoryId>apache.cxf.site</stagingRepositoryId>
- <stagingSiteURL>scp://people.apache.org/www/cxf.apache.org/maven-site-${project.version}</stagingSiteURL>
+ <stagingRepositoryId>apache.cxf.site</stagingRepositoryId>
+ <stagingSiteURL>scp://people.apache.org/www/cxf.apache.org/maven-site-${project.version}</stagingSiteURL>
</configuration>
<dependencies>
<dependency>
Modified: cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ cxf/trunk/rt/databinding/jaxb/pom.xml Thu Jan 12 20:07:17 2012
@@ -86,6 +86,12 @@
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-api</artifactId>
<version>${project.version}</version>
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Thu Jan 12 20:07:17 2012
@@ -58,6 +58,12 @@ import org.apache.cxf.Bus;
import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.jaxb.JAXBUtils;
+import org.apache.cxf.common.jaxb.JAXBUtils.JCodeModel;
+import org.apache.cxf.common.jaxb.JAXBUtils.JDefinedClass;
+import org.apache.cxf.common.jaxb.JAXBUtils.JPackage;
+import org.apache.cxf.common.jaxb.JAXBUtils.S2JJAXBModel;
+import org.apache.cxf.common.jaxb.JAXBUtils.SchemaCompiler;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ReflectionInvokationHandler;
import org.apache.cxf.common.util.StringUtils;
@@ -68,12 +74,6 @@ import org.apache.cxf.endpoint.EndpointI
import org.apache.cxf.endpoint.SimpleEndpointImplFactory;
import org.apache.cxf.helpers.FileUtils;
import org.apache.cxf.jaxb.JAXBDataBinding;
-import org.apache.cxf.jaxb.JAXBUtils;
-import org.apache.cxf.jaxb.JAXBUtils.JCodeModel;
-import org.apache.cxf.jaxb.JAXBUtils.JDefinedClass;
-import org.apache.cxf.jaxb.JAXBUtils.JPackage;
-import org.apache.cxf.jaxb.JAXBUtils.S2JJAXBModel;
-import org.apache.cxf.jaxb.JAXBUtils.SchemaCompiler;
import org.apache.cxf.resource.URIResolver;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.factory.ServiceConstructionException;
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java Thu Jan 12 20:07:17 2012
@@ -26,13 +26,13 @@ import javax.xml.namespace.QName;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.jaxb.JAXBUtils.JType;
+import org.apache.cxf.common.jaxb.JAXBUtils.Mapping;
+import org.apache.cxf.common.jaxb.JAXBUtils.S2JJAXBModel;
+import org.apache.cxf.common.jaxb.JAXBUtils.TypeAndAnnotation;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ASMHelper;
import org.apache.cxf.common.util.PrimitiveUtils;
-import org.apache.cxf.jaxb.JAXBUtils.JType;
-import org.apache.cxf.jaxb.JAXBUtils.Mapping;
-import org.apache.cxf.jaxb.JAXBUtils.S2JJAXBModel;
-import org.apache.cxf.jaxb.JAXBUtils.TypeAndAnnotation;
import org.apache.cxf.service.ServiceModelVisitor;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.model.FaultInfo;
Copied: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java (from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java?p2=cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java&p1=cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java&r1=1230685&r2=1230746&rev=1230746&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java Thu Jan 12 20:07:17 2012
@@ -34,7 +34,7 @@ import org.apache.cxf.common.logging.Log
public final class DatatypeFactory {
public static final Duration PT0S;
- private static final Logger LOG = LogUtils.getL7dLogger(DatatypeFactory.class, "CommonUtilityMessages");
+ private static final Logger LOG = LogUtils.getL7dLogger(DatatypeFactory.class);
static {
Propchange: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java Thu Jan 12 20:07:17 2012
@@ -44,6 +44,7 @@ import javax.xml.bind.annotation.adapter
import javax.xml.namespace.QName;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.service.ServiceModelVisitor;
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Thu Jan 12 20:07:17 2012
@@ -57,6 +57,9 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.common.jaxb.JAXBContextCache;
+import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
import org.apache.cxf.common.util.PackageUtils;
@@ -71,7 +74,6 @@ import org.apache.cxf.databinding.Wrappe
import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.interceptor.InterceptorProvider;
-import org.apache.cxf.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.jaxb.attachment.JAXBAttachmentSchemaValidationHack;
import org.apache.cxf.jaxb.io.DataReaderImpl;
import org.apache.cxf.jaxb.io.DataWriterImpl;
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Thu Jan 12 20:07:17 2012
@@ -74,6 +74,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.common.util.SOAPConstants;
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java Thu Jan 12 20:07:17 2012
@@ -41,6 +41,9 @@ import javax.xml.namespace.QName;
import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.jaxb.JAXBBeanInfo;
+import org.apache.cxf.common.jaxb.JAXBContextProxy;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ReflectionInvokationHandler;
import org.apache.cxf.common.util.StringUtils;
Copied: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java (from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java?p2=cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java&p1=cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java&r1=1230685&r2=1230746&rev=1230746&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java (from r1230685, cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java?p2=cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java&p1=cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java&r1=1230685&r2=1230746&rev=1230746&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Messages.properties?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Messages.properties (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Messages.properties Thu Jan 12 20:07:17 2012
@@ -29,4 +29,4 @@ SCHEMA_GEN_EXC = Could not generate sche
CREATED_JAXB_CONTEXT = Created JAXBContext "{0}" with classes {1}.
NO_BEAN_INFO = Could not find JAXB information for bean class {0} in context. Make sure it follows JAXB conventions.
CANNOT_CREATE_ELEMENT = Cannot create element {0} with type of {1} due to element already exists with type {2}.
-
\ No newline at end of file
+DATATYPE_FACTORY_INSTANTIATION_EXC = Failed to create DatatypeFactory.
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java Thu Jan 12 20:07:17 2012
@@ -36,13 +36,13 @@ import javax.xml.bind.attachment.Attachm
import javax.xml.namespace.QName;
import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.databinding.DataWriter;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.jaxb.JAXBDataBase;
import org.apache.cxf.jaxb.JAXBDataBinding;
import org.apache.cxf.jaxb.JAXBEncoderDecoder;
-import org.apache.cxf.jaxb.JAXBUtils;
import org.apache.cxf.jaxb.attachment.JAXBAttachmentMarshaller;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.ws.commons.schema.XmlSchemaElement;
Copied: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java (from r1230685, cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java?p2=cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java&p1=cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java&r1=1230685&r2=1230746&rev=1230746&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java Thu Jan 12 20:07:17 2012
@@ -45,6 +45,7 @@ import org.w3c.dom.Node;
import org.apache.cxf.Bus;
import org.apache.cxf.binding.BindingFactoryManager;
+import org.apache.cxf.common.jaxb.JAXBContextProxy;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ReflectionInvokationHandler;
import org.apache.cxf.databinding.DataReader;
Copied: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java (from r1230685, cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java?p2=cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java&p1=cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java&r1=1230685&r2=1230746&rev=1230746&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java Thu Jan 12 20:07:17 2012
@@ -50,6 +50,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.jaxb_form.ObjectWithQualifiedElementElement;
Copied: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java (from r1230685, cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java?p2=cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java&p1=cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java&r1=1230685&r2=1230746&rev=1230746&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java (from r1230685, cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java?p2=cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java&p1=cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java&r1=1230685&r2=1230746&rev=1230746&view=diff
==============================================================================
--- cxf/trunk/common/common/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java Thu Jan 12 20:07:17 2012
@@ -20,6 +20,8 @@
package org.apache.cxf.jaxb;
+import org.apache.cxf.common.jaxb.JAXBUtils;
+
import org.junit.Assert;
import org.junit.Test;
Propchange: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataBinding.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataBinding.java (original)
+++ cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataBinding.java Thu Jan 12 20:07:17 2012
@@ -34,6 +34,7 @@ import javax.xml.transform.dom.DOMSource
import org.w3c.dom.Document;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.xmlschema.SchemaCollection;
import org.apache.cxf.databinding.AbstractDataBinding;
@@ -42,7 +43,6 @@ import org.apache.cxf.databinding.DataRe
import org.apache.cxf.databinding.DataWriter;
import org.apache.cxf.databinding.WrapperCapableDatabinding;
import org.apache.cxf.databinding.WrapperHelper;
-import org.apache.cxf.jaxb.JAXBUtils;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.ServiceInfo;
Modified: cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java Thu Jan 12 20:07:17 2012
@@ -33,6 +33,7 @@ import javax.xml.stream.XMLStreamWriter;
import org.w3c.dom.Node;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.xmlschema.SchemaCollection;
import org.apache.cxf.databinding.AbstractDataBinding;
@@ -41,7 +42,6 @@ import org.apache.cxf.databinding.DataRe
import org.apache.cxf.databinding.DataWriter;
import org.apache.cxf.databinding.WrapperCapableDatabinding;
import org.apache.cxf.databinding.WrapperHelper;
-import org.apache.cxf.jaxb.JAXBUtils;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.ServiceInfo;
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java Thu Jan 12 20:07:17 2012
@@ -72,6 +72,10 @@ import org.xml.sax.SAXParseException;
import org.apache.cxf.Bus;
import org.apache.cxf.catalog.OASISCatalogManager;
import org.apache.cxf.catalog.OASISCatalogManagerHelper;
+import org.apache.cxf.common.jaxb.JAXBUtils;
+import org.apache.cxf.common.jaxb.JAXBUtils.JCodeModel;
+import org.apache.cxf.common.jaxb.JAXBUtils.S2JJAXBModel;
+import org.apache.cxf.common.jaxb.JAXBUtils.SchemaCompiler;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.PackageUtils;
import org.apache.cxf.common.util.ReflectionInvokationHandler;
@@ -79,10 +83,6 @@ import org.apache.cxf.common.util.System
import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxb.JAXBUtils;
-import org.apache.cxf.jaxb.JAXBUtils.JCodeModel;
-import org.apache.cxf.jaxb.JAXBUtils.S2JJAXBModel;
-import org.apache.cxf.jaxb.JAXBUtils.SchemaCompiler;
import org.apache.cxf.jaxrs.model.wadl.WadlGenerator;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java Thu Jan 12 20:07:17 2012
@@ -67,6 +67,9 @@ import org.w3c.dom.Node;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.common.WSDLConstants;
+import org.apache.cxf.common.jaxb.JAXBBeanInfo;
+import org.apache.cxf.common.jaxb.JAXBContextProxy;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.PackageUtils;
import org.apache.cxf.common.util.ReflectionInvokationHandler;
@@ -79,9 +82,6 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.helpers.XMLUtils;
-import org.apache.cxf.jaxb.JAXBBeanInfo;
-import org.apache.cxf.jaxb.JAXBContextProxy;
-import org.apache.cxf.jaxb.JAXBUtils;
import org.apache.cxf.jaxrs.JAXRSServiceImpl;
import org.apache.cxf.jaxrs.ext.Oneway;
import org.apache.cxf.jaxrs.ext.RequestHandler;
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java Thu Jan 12 20:07:17 2012
@@ -63,9 +63,9 @@ import javax.xml.validation.Schema;
import org.xml.sax.helpers.DefaultHandler;
import org.apache.cxf.common.i18n.BundleUtils;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.PackageUtils;
-import org.apache.cxf.jaxb.JAXBUtils;
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.jaxrs.utils.InjectionUtils;
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java Thu Jan 12 20:07:17 2012
@@ -55,8 +55,8 @@ import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Source;
+import org.apache.cxf.common.jaxb.NamespaceMapper;
import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.jaxb.NamespaceMapper;
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.ext.xml.XMLInstruction;
import org.apache.cxf.jaxrs.ext.xml.XMLSource;
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java Thu Jan 12 20:07:17 2012
@@ -68,10 +68,10 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.i18n.BundleUtils;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.jaxb.JAXBUtils;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.lifecycle.PerRequestResourceProvider;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java Thu Jan 12 20:07:17 2012
@@ -75,6 +75,7 @@ import org.apache.cxf.jaxb.JAXBDataBindi
import org.apache.cxf.jaxws.binding.soap.JaxWsSoapBindingConfiguration;
import org.apache.cxf.jaxws.handler.HandlerResolverImpl;
import org.apache.cxf.jaxws.handler.PortInfoImpl;
+import org.apache.cxf.jaxws.spi.ProviderImpl;
import org.apache.cxf.jaxws.support.BindingID;
import org.apache.cxf.jaxws.support.DummyImpl;
import org.apache.cxf.jaxws.support.JaxWsClientEndpointImpl;
@@ -95,7 +96,6 @@ import org.apache.cxf.transport.Destinat
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.workqueue.OneShotAsyncExecutor;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.ws.addressing.VersionTransformer;
import org.apache.cxf.wsdl.EndpointReferenceUtils;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl.http.AddressType;
@@ -683,7 +683,7 @@ public class ServiceImpl extends Service
Class<T> type,
Mode mode,
WebServiceFeature... features) {
- EndpointReferenceType ref = VersionTransformer.convertToInternal(endpointReference);
+ EndpointReferenceType ref = ProviderImpl.convertToInternal(endpointReference);
QName portName = EndpointReferenceUtils.getPortQName(ref, bus);
updatePortInfoAddress(portName, EndpointReferenceUtils.getAddress(ref));
return createDispatch(portName,
@@ -708,7 +708,7 @@ public class ServiceImpl extends Service
JAXBContext context,
Mode mode,
WebServiceFeature... features) {
- EndpointReferenceType ref = VersionTransformer.convertToInternal(endpointReference);
+ EndpointReferenceType ref = ProviderImpl.convertToInternal(endpointReference);
QName portName = EndpointReferenceUtils.getPortQName(ref, bus);
updatePortInfoAddress(portName, EndpointReferenceUtils.getAddress(ref));
return createDispatch(portName, context, mode, features);
@@ -717,7 +717,7 @@ public class ServiceImpl extends Service
@Override
public <T> T getPort(EndpointReference endpointReference, Class<T> serviceEndpointInterface,
WebServiceFeature... features) {
- return getPort(VersionTransformer.convertToInternal(endpointReference), serviceEndpointInterface,
+ return getPort(ProviderImpl.convertToInternal(endpointReference), serviceEndpointInterface,
features);
}
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java Thu Jan 12 20:07:17 2012
@@ -42,12 +42,12 @@ import javax.xml.bind.annotation.adapter
import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ASMHelper;
import org.apache.cxf.common.util.PackageUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.JavaUtils;
-import org.apache.cxf.jaxb.JAXBUtils;
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.InterfaceInfo;
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java Thu Jan 12 20:07:17 2012
@@ -30,7 +30,9 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMResult;
import javax.xml.ws.Endpoint;
import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceException;
@@ -38,6 +40,7 @@ import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.spi.ServiceDelegate;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.Bus;
@@ -46,13 +49,16 @@ import org.apache.cxf.common.WSDLConstan
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.jaxws.EndpointUtils;
import org.apache.cxf.jaxws.ServiceImpl;
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.staxutils.W3CDOMStreamReader;
import org.apache.cxf.staxutils.W3CDOMStreamWriter;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
import org.apache.cxf.wsdl.WSDLManager;
@@ -163,6 +169,50 @@ public class ProviderImpl extends javax.
metadata, wsdlDocumentLocation, referenceParameters,
null, null);
}
+
+ /**
+ * Convert from EndpointReference to CXF internal 2005/08 EndpointReferenceType
+ *
+ * @param external the javax.xml.ws.EndpointReference
+ * @return CXF internal 2005/08 EndpointReferenceType
+ */
+ public static EndpointReferenceType convertToInternal(EndpointReference external) {
+ if (external instanceof W3CEndpointReference) {
+
+
+ try {
+ Document doc = XMLUtils.newDocument();
+ DOMResult result = new DOMResult(doc);
+ external.writeTo(result);
+ W3CDOMStreamReader reader = new W3CDOMStreamReader(doc.getDocumentElement());
+
+ // CXF internal 2005/08 EndpointReferenceType should be
+ // compatible with W3CEndpointReference
+ //jaxContext = ContextUtils.getJAXBContext();
+ JAXBContext context = JAXBContext
+ .newInstance(new Class[] {org.apache.cxf.ws.addressing.ObjectFactory.class});
+ EndpointReferenceType internal = context.createUnmarshaller()
+ .unmarshal(reader, EndpointReferenceType.class)
+ .getValue();
+ return internal;
+ } catch (JAXBException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (ParserConfigurationException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return null;
+ } else {
+ //TODO: 200408
+ }
+ return null;
+ }
+
+
+
+
+
//CHECKSTYLE:OFF - spec requires a bunch of params
public W3CEndpointReference createW3CEndpointReference(String address,
QName interfaceName,
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java Thu Jan 12 20:07:17 2012
@@ -84,7 +84,6 @@ import org.apache.cxf.staxutils.W3CDOMSt
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
import org.apache.cxf.ws.addressing.Names;
-import org.apache.cxf.ws.addressing.VersionTransformer;
import org.apache.cxf.ws.addressing.WSAddressingFeature;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.neethi.Constants;
@@ -249,7 +248,7 @@ public class JaxWsEndpointImpl extends E
if (ext instanceof UnknownExtensibilityElement && wsaEpr.equals(ext.getElementType())) {
DOMSource domSource = new DOMSource(((UnknownExtensibilityElement)ext).getElement());
W3CEndpointReference w3cEPR = new W3CEndpointReference(domSource);
- EndpointReferenceType ref = VersionTransformer.convertToInternal(w3cEPR);
+ EndpointReferenceType ref = ProviderImpl.convertToInternal(w3cEPR);
endpoint.getTarget().setMetadata(ref.getMetadata());
endpoint.getTarget().setReferenceParameters(ref.getReferenceParameters());
endpoint.getTarget().getOtherAttributes().putAll(ref.getOtherAttributes());
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java Thu Jan 12 20:07:17 2012
@@ -32,11 +32,11 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.common.jaxb.JAXBContextCache;
+import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.common.util.PackageUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.configuration.security.TLSClientParametersType;
-import org.apache.cxf.jaxb.JAXBContextCache;
-import org.apache.cxf.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.staxutils.StaxUtils;
/**
Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java Thu Jan 12 20:07:17 2012
@@ -28,8 +28,8 @@ import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.cxf.jaxb.JAXBContextCache;
-import org.apache.cxf.jaxb.JAXBContextCache.CachedContextAndSchemas;
+import org.apache.cxf.common.jaxb.JAXBContextCache;
+import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
import org.apache.neethi.Assertion;
import org.apache.neethi.PolicyComponent;
Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java Thu Jan 12 20:07:17 2012
@@ -34,10 +34,10 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.jaxb.JAXBContextCache;
+import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.jaxb.JAXBContextCache;
-import org.apache.cxf.jaxb.JAXBContextCache.CachedContextAndSchemas;
-import org.apache.cxf.jaxb.JAXBUtils;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Constants;
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java Thu Jan 12 20:07:17 2012
@@ -42,8 +42,8 @@ import javax.xml.ws.handler.MessageConte
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapVersion;
-import org.apache.cxf.jaxb.JAXBContextCache;
-import org.apache.cxf.jaxb.JAXBContextCache.CachedContextAndSchemas;
+import org.apache.cxf.common.jaxb.JAXBContextCache;
+import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.ws.security.sts.provider.model.ObjectFactory;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenCollectionType;
import org.apache.cxf.ws.security.sts.provider.model.RequestSecurityTokenResponseCollectionType;
Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java Thu Jan 12 20:07:17 2012
@@ -29,9 +29,9 @@ import javax.xml.ws.wsaddressing.W3CEndp
import org.apache.callback.CallbackPortType;
import org.apache.callback.ServerPortType;
import org.apache.cxf.Bus;
-import org.apache.cxf.jaxb.JAXBUtils;
+import org.apache.cxf.common.jaxb.JAXBUtils;
+import org.apache.cxf.jaxws.spi.ProviderImpl;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.ws.addressing.VersionTransformer;
import org.apache.cxf.wsdl.EndpointReferenceUtils;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
@@ -58,7 +58,7 @@ public class ServerImpl implements Serve
WSDLManager manager = new WSDLManagerImpl();
- EndpointReferenceType callback = VersionTransformer.convertToInternal(w3cRef);
+ EndpointReferenceType callback = ProviderImpl.convertToInternal(w3cRef);
QName interfaceName = EndpointReferenceUtils.getInterfaceName(callback, bus);
QName serviceName = EndpointReferenceUtils.getServiceName(callback, bus);
Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java Thu Jan 12 20:07:17 2012
@@ -36,11 +36,11 @@ import org.apache.cxf.factory_pattern.Nu
import org.apache.cxf.factory_pattern.NumberFactoryService;
import org.apache.cxf.factory_pattern.NumberService;
import org.apache.cxf.jaxws.ServiceImpl;
+import org.apache.cxf.jaxws.spi.ProviderImpl;
import org.apache.cxf.jaxws.support.ServiceDelegateAccessor;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.ws.addressing.VersionTransformer;
import org.apache.cxf.wsdl.EndpointReferenceUtils;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -89,7 +89,7 @@ public class ManualHttpMulitplexClientSe
// use the epr info only
// no wsdl so default generated soap/http binding will be used
// address url must come from the calling context
- EndpointReferenceType epr = VersionTransformer.convertToInternal(w3cEpr);
+ EndpointReferenceType epr = ProviderImpl.convertToInternal(w3cEpr);
QName serviceName = EndpointReferenceUtils.getServiceName(epr, bus);
Service numService = Service.create(serviceName);
@@ -105,14 +105,14 @@ public class ManualHttpMulitplexClientSe
// try again with the address from another epr
w3cEpr = nfact.create("3");
- epr = VersionTransformer.convertToInternal(w3cEpr);
+ epr = ProviderImpl.convertToInternal(w3cEpr);
setupContextWithEprAddress(epr, num);
numResp = num.isEven();
assertTrue("3 is not even", Boolean.FALSE.equals(numResp.isEven()));
// try again with the address from another epr
w3cEpr = nfact.create("6");
- epr = VersionTransformer.convertToInternal(w3cEpr);
+ epr = ProviderImpl.convertToInternal(w3cEpr);
setupContextWithEprAddress(epr, num);
numResp = num.isEven();
assertTrue("6 is even", Boolean.TRUE.equals(numResp.isEven()));
@@ -127,7 +127,7 @@ public class ManualHttpMulitplexClientSe
W3CEndpointReference w3cEpr = factory.create("20");
- EndpointReferenceType numberTwoRef = VersionTransformer.convertToInternal(w3cEpr);
+ EndpointReferenceType numberTwoRef = ProviderImpl.convertToInternal(w3cEpr);
assertNotNull("reference", numberTwoRef);
// use getPort with epr api on service
@@ -137,7 +137,7 @@ public class ManualHttpMulitplexClientSe
Number num = serviceImpl.getPort(numberTwoRef, Number.class);
assertTrue("20 is even", num.isEven().isEven());
w3cEpr = factory.create("23");
- EndpointReferenceType numberTwentyThreeRef = VersionTransformer.convertToInternal(w3cEpr);
+ EndpointReferenceType numberTwentyThreeRef = ProviderImpl.convertToInternal(w3cEpr);
num = serviceImpl.getPort(numberTwentyThreeRef, Number.class);
assertTrue("23 is not even", !num.isEven().isEven());
}
Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java Thu Jan 12 20:07:17 2012
@@ -29,9 +29,9 @@ import javax.xml.ws.Service;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import org.apache.cxf.Bus;
-import org.apache.cxf.jaxb.JAXBUtils;
+import org.apache.cxf.common.jaxb.JAXBUtils;
+import org.apache.cxf.jaxws.spi.ProviderImpl;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.ws.addressing.VersionTransformer;
import org.apache.cxf.wsdl.EndpointReferenceUtils;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
@@ -58,7 +58,7 @@ public class ServerImpl implements Serve
try {
W3CEndpointReference w3cEpr = callbackObject.getCallback();
- EndpointReferenceType callback = VersionTransformer.convertToInternal(w3cEpr);
+ EndpointReferenceType callback = ProviderImpl.convertToInternal(w3cEpr);
WSDLManager manager = new WSDLManagerImpl();
Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java (original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java Thu Jan 12 20:07:17 2012
@@ -23,7 +23,7 @@ import java.io.File;
import java.net.URI;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.jaxb.JAXBContextCache;
+import org.apache.cxf.common.jaxb.JAXBContextCache;
import org.apache.cxf.jaxws.JaxwsServiceBuilder;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.tools.common.ProcessorTestBase;
Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java (original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java Thu Jan 12 20:07:17 2012
@@ -22,7 +22,7 @@ package org.apache.cxf.tools.java2wsdl.p
import java.io.File;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.jaxb.JAXBContextCache;
+import org.apache.cxf.common.jaxb.JAXBContextCache;
import org.apache.cxf.jaxws.JaxwsServiceBuilder;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.tools.common.ProcessorTestBase;
Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java (original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java Thu Jan 12 20:07:17 2012
@@ -28,8 +28,8 @@ import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.common.jaxb.JAXBContextCache;
import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.jaxb.JAXBContextCache;
import org.apache.cxf.jaxws.JaxwsServiceBuilder;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.ServiceInfo;
Modified: cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java (original)
+++ cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java Thu Jan 12 20:07:17 2012
@@ -81,7 +81,7 @@ public final class CustomizationParser {
//hard code to enable jaxb extensions
compilerArgs.add("-extension");
String name = "/org/apache/cxf/tools/common/jaxb/W3CEPRJaxbBinding.xml";
- if (org.apache.cxf.jaxb.JAXBUtils.isJAXB22()) {
+ if (org.apache.cxf.common.jaxb.JAXBUtils.isJAXB22()) {
name = "/org/apache/cxf/tools/common/jaxb/W3CEPRJaxbBinding_jaxb22.xml";
}
URL bindingFileUrl = getClass().getResource(name);
Modified: cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original)
+++ cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Thu Jan 12 20:07:17 2012
@@ -416,7 +416,7 @@ public class JAXBDataBinding implements
}
private boolean isJAXB22() {
- return org.apache.cxf.jaxb.JAXBUtils.isJAXB22();
+ return org.apache.cxf.common.jaxb.JAXBUtils.isJAXB22();
}
private static final class ReferenceFinder extends AbstractReferenceFinderImpl {
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java Thu Jan 12 20:07:17 2012
@@ -25,7 +25,7 @@ import java.util.logging.Level;
import javax.jws.WebParam;
-import org.apache.cxf.jaxb.JAXBUtils;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.service.model.FaultInfo;
import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.MessagePartInfo;
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java?rev=1230746&r1=1230745&r2=1230746&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java Thu Jan 12 20:07:17 2012
@@ -31,8 +31,8 @@ import javax.xml.bind.annotation.adapter
import javax.xml.namespace.QName;
import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.jaxb.JAXBUtils;
import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;