Author: dkulp
Date: Tue Mar 27 20:13:29 2012
New Revision: 1306003
URL: http://svn.apache.org/viewvc?rev=1306003&view=rev
Log:
Move over to using the new cxf-xjc-runtime packaged classes for the data
adapter things.
Modified:
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/wsdl/binding.xml
cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml
cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
cxf/trunk/pom.xml
cxf/trunk/systests/wsdl_maven/codegen/pom.xml
cxf/trunk/systests/wsdl_maven/codegen/src/it/cxf-4004/src/main/resources/wsdl/binding.xml
cxf/trunk/systests/wsdl_maven/codegen/src/main/resources/defaultBinding.xml
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date.xjb
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date_embed.xml
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/echo_date.xjb
cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/resources/external_jaxws_embed_jaxb_date.xml
cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/echo_date.xjb
Modified:
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml
Tue Mar 27 20:13:29 2012
@@ -32,6 +32,7 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
+ <cxf.xjc-utils.version>2.4.1-SNAPSHOT</cxf.xjc-utils.version>
<cxf.release.base>${basedir}/../..</cxf.release.base>
</properties>
<build>
@@ -184,15 +185,15 @@
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>2.6.0-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
<version>2.6.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>cxf-xjc-runtime</artifactId>
+ <version>${cxf.xjc-utils.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
Modified:
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/wsdl/binding.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_spring_config/wsdl/binding.xml?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/wsdl/binding.xml
(original)
+++
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/wsdl/binding.xml
Tue Mar 27 20:13:29 2012
@@ -7,11 +7,11 @@
<jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
<jxb:globalBindings>
<jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
-
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
-
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDateTime"
+
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDateTime"/>
<jxb:javaType name="java.util.Date" xmlType="xs:date"
-
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDate"
-
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDate"/>
+
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDate"
+
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDate"/>
</jxb:globalBindings>
</jaxws:bindings>
</jaxws:bindings>
\ No newline at end of file
Modified: cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml Tue Mar
27 20:13:29 2012
@@ -32,6 +32,7 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
+ <cxf.xjc-utils.version>2.4.1-SNAPSHOT</cxf.xjc-utils.version>
<cxf.release.base>${basedir}/../..</cxf.release.base>
</properties>
<build>
@@ -126,13 +127,13 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<id>client</id>
@@ -174,15 +175,15 @@
<version>2.6.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>cxf-xjc-runtime</artifactId>
+ <version>${cxf.xjc-utils.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>3.0.6.RELEASE</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified:
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml
(original)
+++
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml
Tue Mar 27 20:13:29 2012
@@ -7,11 +7,11 @@
<jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
<jxb:globalBindings>
<jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
-
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
-
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDateTime"
+
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDateTime"/>
<jxb:javaType name="java.util.Date" xmlType="xs:date"
-
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDate"
-
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDate"/>
+
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDate"
+
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDate"/>
</jxb:globalBindings>
</jaxws:bindings>
</jaxws:bindings>
\ No newline at end of file
Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Tue Mar 27
20:13:29 2012
@@ -259,7 +259,10 @@
<bundle start-level='40'
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${cxf.rhino.bundle.version}</bundle>
<bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-frontend-js/${project.version}</bundle>
</feature>
-
+ <feature name="cxf-xjc-runtime" version="${project.version}"
resolver='(obr)'>
+ <bundle start-level='40'
dependency="true">mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf.xjc-utils/cxf-xjc-runtime/${cxf.xjc-utils.version}</bundle>
+ </feature>
<feature name="cxf-tools" version="${project.version}" resolver='(obr)'>
<feature version="${project.version}">cxf-core</feature>
@@ -284,6 +287,9 @@
<bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-databinding-jaxb/${project.version}</bundle>
<bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-frontend-javascript/${project.version}</bundle>
<bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-frontend-jaxws/${project.version}</bundle>
+
+ <!-- need antlr
+
<bundle>mvn:org.apache.cxf/cxf-tools-corba/${project.version}</bundle-->
</feature>
<feature name="cxf" version="${project.version}" resolver='(obr)'>
@@ -304,28 +310,24 @@
<feature version="${project.version}">cxf-transports-local</feature>
<feature version="${project.version}">cxf-transports-jms</feature>
- <!-- tools really aren't needed in OSGi by default
- <feature version="${project.version}">cxf-tools</feature>
- -->
+ <feature version="${project.version}">cxf-xjc-runtime</feature>
<feature version="${project.version}">cxf-ws-security</feature>
<feature version="${project.version}">cxf-ws-rm</feature>
<feature version="${project.version}">cxf-ws-mex</feature>
<feature version="${project.version}">cxf-javascript</feature>
<feature version="${project.version}">cxf-frontend-javascript</feature>
<feature version="${project.version}">cxf-features-clustering</feature>
-
<!-- Compatibility bundle for the Require-Bundle use cases -->
<bundle
start-level='50'>mvn:org.apache.cxf/cxf-bundle-compatible/${project.version}</bundle>
+ <!-- tools really aren't needed in OSGi by default
+ <feature version="${project.version}">cxf-tools</feature>
+ -->
<!-- need msv
<bundle>mvn:org.apache.cxf/cxf-wstx-msv-validation/${project.version}</bundle-->
<!-- need sdo deps
<bundle>mvn:org.apache.cxf/cxf-rt-databinding-sdo/${project.version}</bundle-->
- <!-- need jibx deps
-
<bundle>mvn:org.apache.cxf/cxf-rt-databinding-jibx/${project.version}</bundle-->
- <!-- need antlr
-
<bundle>mvn:org.apache.cxf/cxf-tools-corba/${project.version}</bundle-->
</feature>
<feature name="cxf-sts" version="${project.version}" resolver='(obr)'>
Modified: cxf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
--- cxf/trunk/pom.xml (original)
+++ cxf/trunk/pom.xml Tue Mar 27 20:13:29 2012
@@ -46,7 +46,7 @@
<properties>
<cxf.compiler.fork>false</cxf.compiler.fork>
<cxf.build-utils.version>2.4.0</cxf.build-utils.version>
- <cxf.xjc-utils.version>2.4.0</cxf.xjc-utils.version>
+ <cxf.xjc-utils.version>2.4.1-SNAPSHOT</cxf.xjc-utils.version>
<cxf.jdk.version>1.6</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
Modified: cxf/trunk/systests/wsdl_maven/codegen/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/wsdl_maven/codegen/pom.xml?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
--- cxf/trunk/systests/wsdl_maven/codegen/pom.xml (original)
+++ cxf/trunk/systests/wsdl_maven/codegen/pom.xml Tue Mar 27 20:13:29 2012
@@ -36,14 +36,14 @@
<artifactId>cxf-codegen-plugin</artifactId>
<version>${project.version}</version>
<executions>
- <!-- Codegen with default settings.
- This test shows some of the defaults that work
without configuration.
- In this case the wsdl dependency to the service
"cxf-systests-java2ws"
- will be processed.
- As we have a file named defaultBinding.xml in the
classpath
- this binding will be applied.
- The binding file contains an empty wsdlLocation.
This means that
- the binding will be applied to the wsdl currently
processed. -->
+ <!-- Codegen with default settings.
+ This test shows some of the defaults that work
without configuration.
+ In this case the wsdl dependency to the service
"cxf-systests-java2ws"
+ will be processed.
+ As we have a file named defaultBinding.xml in the
classpath
+ this binding will be applied.
+ The binding file contains an empty wsdlLocation. This
means that
+ the binding will be applied to the wsdl currently
processed. -->
<execution>
<id>generate-java-sources</id>
<phase>generate-sources</phase>
@@ -78,43 +78,44 @@
</execution>
</executions>
</plugin>
-<!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>1.5</version>
- <configuration>
- <projectsDirectory>src/it</projectsDirectory>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <preBuildHookScript>setup</preBuildHookScript>
- <postBuildHookScript>verify</postBuildHookScript>
-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
--->
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.5</version>
+ <configuration>
+ <projectsDirectory>src/it</projectsDirectory>
+
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <preBuildHookScript>setup</preBuildHookScript>
+ <postBuildHookScript>verify</postBuildHookScript>
+
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>org.apache.cxf.systests.wsdl_maven</groupId>
<artifactId>cxf-systests-java2ws</artifactId>
<version>${project.version}</version>
- <type>wsdl</type>
+ <type>wsdl</type>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -122,11 +123,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>cxf-xjc-runtime</artifactId>
+ <version>${cxf.xjc-utils.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.cxf.systests.wsdl_maven</groupId>
<artifactId>cxf-systests-java2ws</artifactId>
Modified:
cxf/trunk/systests/wsdl_maven/codegen/src/it/cxf-4004/src/main/resources/wsdl/binding.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/wsdl_maven/codegen/src/it/cxf-4004/src/main/resources/wsdl/binding.xml?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
---
cxf/trunk/systests/wsdl_maven/codegen/src/it/cxf-4004/src/main/resources/wsdl/binding.xml
(original)
+++
cxf/trunk/systests/wsdl_maven/codegen/src/it/cxf-4004/src/main/resources/wsdl/binding.xml
Tue Mar 27 20:13:29 2012
@@ -7,11 +7,11 @@
<jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
<jxb:globalBindings>
<jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
-
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
-
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDateTime"
+
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDateTime"/>
<jxb:javaType name="java.util.Date" xmlType="xs:date"
-
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDate"
-
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDate"/>
+
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDate"
+
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDate"/>
</jxb:globalBindings>
</jaxws:bindings>
</jaxws:bindings>
\ No newline at end of file
Modified:
cxf/trunk/systests/wsdl_maven/codegen/src/main/resources/defaultBinding.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/wsdl_maven/codegen/src/main/resources/defaultBinding.xml?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
--- cxf/trunk/systests/wsdl_maven/codegen/src/main/resources/defaultBinding.xml
(original)
+++ cxf/trunk/systests/wsdl_maven/codegen/src/main/resources/defaultBinding.xml
Tue Mar 27 20:13:29 2012
@@ -24,11 +24,11 @@
<jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
<jxb:globalBindings>
<jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
-
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
-
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDateTime"
+
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDateTime"/>
<jxb:javaType name="java.util.Date" xmlType="xs:date"
-
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDate"
-
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDate"/>
+
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDate"
+
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDate"/>
</jxb:globalBindings>
</jaxws:bindings>
</jaxws:bindings>
\ No newline at end of file
Modified:
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
---
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
(original)
+++
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
Tue Mar 27 20:13:29 2012
@@ -38,7 +38,7 @@ public final class DateTypeCustomGenerat
private static final String TEMPLATE_EXT = TEMPLATE_BASE +
"date_type_cust.vm";
private static final String TEMPLATE_EMB = TEMPLATE_BASE +
"date_type_cust_embed.vm";
- private static final String DATE_ADAPTER =
"org.apache.cxf.tools.common.DataTypeAdapter";
+ private static final String DATE_ADAPTER =
"org.apache.cxf.xjc.runtime.DataTypeAdapter";
private static final String CALENDAR_ADAPTER =
"javax.xml.bind.DatatypeConverter";
private String wsdlName;
Modified:
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date.xjb
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date.xjb?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
---
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date.xjb
(original)
+++
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date.xjb
Tue Mar 27 20:13:29 2012
@@ -21,12 +21,12 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<jxb:bindings schemaLocation="hello_schema1.xsd" node="/xs:schema">
<jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
- <jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+ <jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDateTime"
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDateTime"/>
</jxb:globalBindings>
</jxb:bindings>
<jxb:bindings schemaLocation="hello_schema2.xsd" node="/xs:schema">
<jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
- <jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+ <jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDateTime"
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDateTime"/>
</jxb:globalBindings>
</jxb:bindings>
</jxb:bindings>
\ No newline at end of file
Modified:
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date_embed.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date_embed.xml?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
---
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date_embed.xml
(original)
+++
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date_embed.xml
Tue Mar 27 20:13:29 2012
@@ -24,8 +24,8 @@
<jaxws:bindings
node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://date.fortest.tools.cxf.apache.org/']">
<jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
-
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
-
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDateTime"
+
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDateTime"/>
</jxb:globalBindings>
</jaxws:bindings>
</jaxws:bindings>
\ No newline at end of file
Modified:
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/echo_date.xjb
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/echo_date.xjb?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
---
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/echo_date.xjb
(original)
+++
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/echo_date.xjb
Tue Mar 27 20:13:29 2012
@@ -24,8 +24,8 @@
<jaxws:bindings
node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://date.fortest.tools.cxf.apache.org/']">
<jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
-
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
-
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDateTime"
+
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDateTime"/>
</jxb:globalBindings>
</jaxws:bindings>
</jaxws:bindings>
\ No newline at end of file
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/resources/external_jaxws_embed_jaxb_date.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/resources/external_jaxws_embed_jaxb_date.xml?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/resources/external_jaxws_embed_jaxb_date.xml
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/resources/external_jaxws_embed_jaxb_date.xml
Tue Mar 27 20:13:29 2012
@@ -24,8 +24,8 @@ under the License.
<jaxws:bindings
node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://apache.org/hello_world_soap_http/types']">
<jaxb:globalBindings>
<jaxb:javaType name="java.util.Date" xmlType="xs:dateTime"
-
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
-
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDateTime"
+
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDateTime"/>
</jaxb:globalBindings>
</jaxws:bindings>
</jaxws:bindings>
\ No newline at end of file
Modified:
cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/echo_date.xjb
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/echo_date.xjb?rev=1306003&r1=1306002&r2=1306003&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/echo_date.xjb
(original)
+++ cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/echo_date.xjb
Tue Mar 27 20:13:29 2012
@@ -34,8 +34,8 @@
<jaxws:bindings
node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://date.fortest.tools.cxf.apache.org/']">
<jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
-
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
-
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+
parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDateTime"
+
printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDateTime"/>
</jxb:globalBindings>
</jaxws:bindings>
</jaxws:bindings>
\ No newline at end of file
