Repository: cxf Updated Branches: refs/heads/master 03cacaa47 -> b003f35e6
Some cleanup of the generated code Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b003f35e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b003f35e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b003f35e Branch: refs/heads/master Commit: b003f35e61ab9e9a686d84b38295abfcf807f194 Parents: 03cacaa Author: Daniel Kulp <[email protected]> Authored: Wed Aug 9 16:19:49 2017 -0400 Committer: Daniel Kulp <[email protected]> Committed: Wed Aug 9 16:20:02 2017 -0400 ---------------------------------------------------------------------- core/pom.xml | 8 ++++---- rt/bindings/corba/pom.xml | 2 +- rt/databinding/jaxb/pom.xml | 2 +- rt/management/pom.xml | 2 +- rt/transports/http-jetty/pom.xml | 2 ++ rt/transports/http-netty/netty-server/pom.xml | 2 ++ rt/transports/http-undertow/pom.xml | 2 ++ rt/ws/eventing/pom.xml | 4 ++-- rt/ws/policy/pom.xml | 4 ++-- rt/ws/rm/pom.xml | 10 +++++----- rt/ws/security/pom.xml | 6 ++++++ rt/wsdl/pom.xml | 2 +- services/ws-discovery/ws-discovery-api/pom.xml | 6 ++++++ services/wsn/wsn-api/pom.xml | 2 +- services/xkms/xkms-common/pom.xml | 10 ++++++++++ systests/uncategorized/pom.xml | 10 ++++++++++ systests/ws-security/pom.xml | 10 ++++++++++ 17 files changed, 66 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index e1e2570..0921b11 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -289,7 +289,7 @@ <extensionArgs> <extensionArg>-Xjavadoc</extensionArg> <extensionArg>-npa</extensionArg> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> <xsdOption> @@ -298,7 +298,7 @@ <extensionArgs> <extensionArg>-npa</extensionArg> <extensionArg>-Xjavadoc</extensionArg> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> <xsdOption> @@ -318,7 +318,7 @@ <extensionArgs> <extensionArg>-npa</extensionArg> <extensionArg>-Xjavadoc</extensionArg> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> <xsdOption> @@ -327,7 +327,7 @@ <extensionArgs> <extensionArg>-Xjavadoc</extensionArg> <extensionArg>-npa</extensionArg> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> </xsdOptions> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/rt/bindings/corba/pom.xml ---------------------------------------------------------------------- diff --git a/rt/bindings/corba/pom.xml b/rt/bindings/corba/pom.xml index 2e4c8c1..7c0811e 100644 --- a/rt/bindings/corba/pom.xml +++ b/rt/bindings/corba/pom.xml @@ -100,7 +100,7 @@ <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir> </deleteDirs> <extensionArgs> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> </xsdOptions> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/rt/databinding/jaxb/pom.xml ---------------------------------------------------------------------- diff --git a/rt/databinding/jaxb/pom.xml b/rt/databinding/jaxb/pom.xml index f8f552d..0bfd6b7 100644 --- a/rt/databinding/jaxb/pom.xml +++ b/rt/databinding/jaxb/pom.xml @@ -55,7 +55,7 @@ <xsdOption> <xsd>${basedir}/src/test/resources/wsdl/jaxb/misc_test.xsd</xsd> <extensionArgs> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> <xsdOption> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/rt/management/pom.xml ---------------------------------------------------------------------- diff --git a/rt/management/pom.xml b/rt/management/pom.xml index b0c19bf..108ac3a 100644 --- a/rt/management/pom.xml +++ b/rt/management/pom.xml @@ -94,7 +94,7 @@ <extension>true</extension> <bindingFile>${basedir}/src/main/build-resources/instrumentation.xjb</bindingFile> <extensionArgs> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> </xsdOptions> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/rt/transports/http-jetty/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/pom.xml b/rt/transports/http-jetty/pom.xml index 3b23208..c7f364f 100644 --- a/rt/transports/http-jetty/pom.xml +++ b/rt/transports/http-jetty/pom.xml @@ -177,12 +177,14 @@ <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs> <extensions> <extension>org.apache.cxf.xjcplugins:cxf-xjc-bug986:${cxf.xjc-utils.version}</extension> + <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension> </extensions> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot> <xsdOptions> <xsdOption> <extensionArgs> <arg>-Xbug986</arg> + <arg>-Xdv</arg> </extensionArgs> <xsd>${basedir}/src/main/resources/schemas/configuration/http-jetty.xsd</xsd> <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/rt/transports/http-netty/netty-server/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/http-netty/netty-server/pom.xml b/rt/transports/http-netty/netty-server/pom.xml index 2591da6..931a3fe 100644 --- a/rt/transports/http-netty/netty-server/pom.xml +++ b/rt/transports/http-netty/netty-server/pom.xml @@ -151,12 +151,14 @@ <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs> <extensions> <extension>org.apache.cxf.xjcplugins:cxf-xjc-bug986:${cxf.xjc-utils.version}</extension> + <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension> </extensions> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot> <xsdOptions> <xsdOption> <extensionArgs> <arg>-Xbug986</arg> + <arg>-Xdv</arg> </extensionArgs> <xsd>${basedir}/src/main/resources/schemas/configuration/http-netty-server.xsd</xsd> <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/rt/transports/http-undertow/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/http-undertow/pom.xml b/rt/transports/http-undertow/pom.xml index 87f5947..cc45d27 100644 --- a/rt/transports/http-undertow/pom.xml +++ b/rt/transports/http-undertow/pom.xml @@ -157,12 +157,14 @@ <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs> <extensions> <extension>org.apache.cxf.xjcplugins:cxf-xjc-bug986:${cxf.xjc-utils.version}</extension> + <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension> </extensions> <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot> <xsdOptions> <xsdOption> <extensionArgs> <arg>-Xbug986</arg> + <arg>-Xdv</arg> </extensionArgs> <xsd>${basedir}/src/main/resources/schemas/configuration/http-undertow.xsd</xsd> <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/rt/ws/eventing/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/eventing/pom.xml b/rt/ws/eventing/pom.xml index c029c9f..b4c8e9a 100644 --- a/rt/ws/eventing/pom.xml +++ b/rt/ws/eventing/pom.xml @@ -115,7 +115,7 @@ <catalog>${basedir}/src/main/resources/schemas/catalog.cat</catalog> <extension>true</extension> <extensionArgs> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> <xsdOption> @@ -124,7 +124,7 @@ <catalog>${basedir}/src/main/resources/schemas/catalog.cat</catalog> <extension>true</extension> <extensionArgs> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> </xsdOptions> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/rt/ws/policy/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml index ca35b48..3dbaa4c 100644 --- a/rt/ws/policy/pom.xml +++ b/rt/ws/policy/pom.xml @@ -140,7 +140,7 @@ <deleteDir>${basedir}/target/generated/src/main/java/org/w3</deleteDir> </deleteDirs> <extensionArgs> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> <xsdOption> @@ -152,7 +152,7 @@ <deleteDir>${basedir}/target/generated/src/main/java/org/w3</deleteDir> </deleteDirs> <extensionArgs> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> </xsdOptions> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/rt/ws/rm/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml index 7831043..f0e7c4d 100644 --- a/rt/ws/rm/pom.xml +++ b/rt/ws/rm/pom.xml @@ -167,7 +167,7 @@ </deleteDirs> <extensionArgs> <extensionArg>-npa</extensionArg> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> <xsdOption> @@ -179,7 +179,7 @@ </deleteDirs> <extensionArgs> <extensionArg>-npa</extensionArg> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> <xsdOption> @@ -191,7 +191,7 @@ </deleteDirs> <extensionArgs> <extensionArg>-npa</extensionArg> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> <xsdOption> @@ -203,7 +203,7 @@ </deleteDirs> <extensionArgs> <extensionArg>-npa</extensionArg> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> <xsdOption> @@ -212,7 +212,7 @@ <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog> <extension>true</extension> <extensionArgs> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> </xsdOptions> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/rt/ws/security/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml index f6385b3..f9a466d 100644 --- a/rt/ws/security/pom.xml +++ b/rt/ws/security/pom.xml @@ -175,11 +175,17 @@ <extension>true</extension> <xsd>${basedir}/src/main/model/ws-trust-1.3.xsd</xsd> <bindingFile>${basedir}/src/main/model/binding.xjb</bindingFile> + <extensionArgs> + <extensionArg>-Xdv</extensionArg> + </extensionArgs> </xsdOption> <xsdOption> <extension>true</extension> <xsd>${basedir}/src/main/model/ws-trust-1.4.xsd</xsd> <bindingFile>${basedir}/src/main/model/binding14.xjb</bindingFile> + <extensionArgs> + <extensionArg>-Xdv</extensionArg> + </extensionArgs> </xsdOption> </xsdOptions> </configuration> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/rt/wsdl/pom.xml ---------------------------------------------------------------------- diff --git a/rt/wsdl/pom.xml b/rt/wsdl/pom.xml index 15c2aac..18ea761 100644 --- a/rt/wsdl/pom.xml +++ b/rt/wsdl/pom.xml @@ -97,7 +97,7 @@ <deleteDir>${basedir}/target/generated/src/test/java/org/apache/cxf/wsdl</deleteDir> </deleteDirs> <extensionArgs> - <extensionArg>-Xdv:attributes</extensionArg> + <extensionArg>-Xdv</extensionArg> </extensionArgs> </xsdOption> </xsdOptions> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/services/ws-discovery/ws-discovery-api/pom.xml ---------------------------------------------------------------------- diff --git a/services/ws-discovery/ws-discovery-api/pom.xml b/services/ws-discovery/ws-discovery-api/pom.xml index a79ea84..5e7b900 100644 --- a/services/ws-discovery/ws-discovery-api/pom.xml +++ b/services/ws-discovery/ws-discovery-api/pom.xml @@ -88,6 +88,11 @@ <artifactId>cxf-xjc-bug986</artifactId> <version>${cxf.xjc-utils.version}</version> </dependency> + <dependency> + <groupId>org.apache.cxf.xjcplugins</groupId> + <artifactId>cxf-xjc-dv</artifactId> + <version>${cxf.xjc-utils.version}</version> + </dependency> </dependencies> <executions> <execution> @@ -102,6 +107,7 @@ <wsdlOption> <xjcargs> <xjcarg>-Xbug986</xjcarg> + <xjcarg>-Xdv</xjcarg> </xjcargs> <wsdl>${basedir}/src/main/resources/org/apache/cxf/ws/discovery/wsdl/wsdd-discovery-1.1-wsdl-os.wsdl</wsdl> <extraargs> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/services/wsn/wsn-api/pom.xml ---------------------------------------------------------------------- diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml index 8f08757..ec89864 100644 --- a/services/wsn/wsn-api/pom.xml +++ b/services/wsn/wsn-api/pom.xml @@ -64,7 +64,7 @@ <fork>${cxf.codegenplugin.forkmode}</fork> <defaultOptions> <xjcargs> - <xjcarg>-Xdv:attributes</xjcarg> + <xjcarg>-Xdv</xjcarg> </xjcargs> <markGenerated>true</markGenerated> <faultSerialVersionUID>1</faultSerialVersionUID> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/services/xkms/xkms-common/pom.xml ---------------------------------------------------------------------- diff --git a/services/xkms/xkms-common/pom.xml b/services/xkms/xkms-common/pom.xml index 75d121b..37d34a9 100644 --- a/services/xkms/xkms-common/pom.xml +++ b/services/xkms/xkms-common/pom.xml @@ -53,6 +53,13 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-codegen-plugin</artifactId> <version>${project.version}</version> + <dependencies> + <dependency> + <groupId>org.apache.cxf.xjcplugins</groupId> + <artifactId>cxf-xjc-dv</artifactId> + <version>${cxf.xjc-utils.version}</version> + </dependency> + </dependencies> <executions> <execution> <id>generate-sources</id> @@ -64,6 +71,9 @@ <fork>${cxf.codegenplugin.forkmode}</fork> <wsdlOptions> <wsdlOption> + <xjcargs> + <xjcarg>-Xdv</xjcarg> + </xjcargs> <wsdl>${basedir}/src/main/model/xkms.wsdl</wsdl> <bindingFile>${basedir}/src/main/model/binding.xjb</bindingFile> </wsdlOption> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/systests/uncategorized/pom.xml ---------------------------------------------------------------------- diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml index 7008e91..50d52a2 100644 --- a/systests/uncategorized/pom.xml +++ b/systests/uncategorized/pom.xml @@ -36,6 +36,13 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-codegen-plugin</artifactId> <version>${project.version}</version> + <dependencies> + <dependency> + <groupId>org.apache.cxf.xjcplugins</groupId> + <artifactId>cxf-xjc-dv</artifactId> + <version>${cxf.xjc-utils.version}</version> + </dependency> + </dependencies> <executions> <execution> <id>generate-test-sources</id> @@ -45,6 +52,9 @@ <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot> <testWsdlRoot>${basedir}/src/test/resources/wsdl_systest</testWsdlRoot> <defaultOptions> + <xjcargs> + <xjcarg>-Xdv</xjcarg> + </xjcargs> <markGenerated>true</markGenerated> <faultSerialVersionUID>1</faultSerialVersionUID> <frontEnd>cxf</frontEnd> http://git-wip-us.apache.org/repos/asf/cxf/blob/b003f35e/systests/ws-security/pom.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/pom.xml b/systests/ws-security/pom.xml index 212830b..e00706e 100644 --- a/systests/ws-security/pom.xml +++ b/systests/ws-security/pom.xml @@ -51,6 +51,13 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-codegen-plugin</artifactId> <version>${project.version}</version> + <dependencies> + <dependency> + <groupId>org.apache.cxf.xjcplugins</groupId> + <artifactId>cxf-xjc-dv</artifactId> + <version>${cxf.xjc-utils.version}</version> + </dependency> + </dependencies> <executions> <execution> <phase>generate-sources</phase> @@ -58,6 +65,9 @@ <fork>${cxf.codegenplugin.forkmode}</fork> <sourceRoot>${basedir}/target/generated-sources</sourceRoot> <defaultOptions> + <xjcargs> + <xjcarg>-Xdv</xjcarg> + </xjcargs> <markGenerated>true</markGenerated> <faultSerialVersionUID>1</faultSerialVersionUID> </defaultOptions>
