Use -Xdv plugin in more places
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/958bb235 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/958bb235 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/958bb235 Branch: refs/heads/master Commit: 958bb235fd67e2dd3989d56e55b1ff61e68fc926 Parents: 55504e7 Author: Daniel Kulp <[email protected]> Authored: Tue Aug 8 16:26:32 2017 -0400 Committer: Daniel Kulp <[email protected]> Committed: Tue Aug 8 16:26:32 2017 -0400 ---------------------------------------------------------------------- rt/ws/eventing/pom.xml | 6 ++++++ rt/ws/policy/pom.xml | 9 +++++++++ rt/ws/rm/pom.xml | 6 +++++- rt/wsdl/pom.xml | 3 +++ services/wsn/wsn-api/pom.xml | 10 ++++++++++ 5 files changed, 33 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/958bb235/rt/ws/eventing/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/eventing/pom.xml b/rt/ws/eventing/pom.xml index 034d348..c029c9f 100644 --- a/rt/ws/eventing/pom.xml +++ b/rt/ws/eventing/pom.xml @@ -114,12 +114,18 @@ <bindingFile>${basedir}/src/main/resources/schemas/eventing.xjb</bindingFile> <catalog>${basedir}/src/main/resources/schemas/catalog.cat</catalog> <extension>true</extension> + <extensionArgs> + <extensionArg>-Xdv:attributes</extensionArg> + </extensionArgs> </xsdOption> <xsdOption> <xsd>${basedir}/src/main/resources/schemas/eventdescriptions.xsd</xsd> <packagename>org.apache.cxf.ws.eventing.descriptions</packagename> <catalog>${basedir}/src/main/resources/schemas/catalog.cat</catalog> <extension>true</extension> + <extensionArgs> + <extensionArg>-Xdv:attributes</extensionArg> + </extensionArgs> </xsdOption> </xsdOptions> </configuration> http://git-wip-us.apache.org/repos/asf/cxf/blob/958bb235/rt/ws/policy/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml index 74573b7..ca35b48 100644 --- a/rt/ws/policy/pom.xml +++ b/rt/ws/policy/pom.xml @@ -139,6 +139,9 @@ <deleteDir>${basedir}/target/generated/src/main/java/org/oasis_open</deleteDir> <deleteDir>${basedir}/target/generated/src/main/java/org/w3</deleteDir> </deleteDirs> + <extensionArgs> + <extensionArg>-Xdv:attributes</extensionArg> + </extensionArgs> </xsdOption> <xsdOption> <xsd>${basedir}/src/main/resources/schemas/ws-policy-200607.xsd</xsd> @@ -148,8 +151,14 @@ <deleteDir>${basedir}/target/generated/src/main/java/org/oasis_open</deleteDir> <deleteDir>${basedir}/target/generated/src/main/java/org/w3</deleteDir> </deleteDirs> + <extensionArgs> + <extensionArg>-Xdv:attributes</extensionArg> + </extensionArgs> </xsdOption> </xsdOptions> + <extensions> + <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension> + </extensions> </configuration> <goals> <goal>xsdtojava</goal> http://git-wip-us.apache.org/repos/asf/cxf/blob/958bb235/rt/ws/rm/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml index c0749fb..7831043 100644 --- a/rt/ws/rm/pom.xml +++ b/rt/ws/rm/pom.xml @@ -167,6 +167,7 @@ </deleteDirs> <extensionArgs> <extensionArg>-npa</extensionArg> + <extensionArg>-Xdv:attributes</extensionArg> </extensionArgs> </xsdOption> <xsdOption> @@ -178,6 +179,7 @@ </deleteDirs> <extensionArgs> <extensionArg>-npa</extensionArg> + <extensionArg>-Xdv:attributes</extensionArg> </extensionArgs> </xsdOption> <xsdOption> @@ -189,6 +191,7 @@ </deleteDirs> <extensionArgs> <extensionArg>-npa</extensionArg> + <extensionArg>-Xdv:attributes</extensionArg> </extensionArgs> </xsdOption> <xsdOption> @@ -200,6 +203,7 @@ </deleteDirs> <extensionArgs> <extensionArg>-npa</extensionArg> + <extensionArg>-Xdv:attributes</extensionArg> </extensionArgs> </xsdOption> <xsdOption> @@ -208,7 +212,7 @@ <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog> <extension>true</extension> <extensionArgs> - <extensionArg>-Xdv</extensionArg> + <extensionArg>-Xdv:attributes</extensionArg> </extensionArgs> </xsdOption> </xsdOptions> http://git-wip-us.apache.org/repos/asf/cxf/blob/958bb235/rt/wsdl/pom.xml ---------------------------------------------------------------------- diff --git a/rt/wsdl/pom.xml b/rt/wsdl/pom.xml index 8ba7a73..15c2aac 100644 --- a/rt/wsdl/pom.xml +++ b/rt/wsdl/pom.xml @@ -96,6 +96,9 @@ <deleteDirs> <deleteDir>${basedir}/target/generated/src/test/java/org/apache/cxf/wsdl</deleteDir> </deleteDirs> + <extensionArgs> + <extensionArg>-Xdv:attributes</extensionArg> + </extensionArgs> </xsdOption> </xsdOptions> </configuration> http://git-wip-us.apache.org/repos/asf/cxf/blob/958bb235/services/wsn/wsn-api/pom.xml ---------------------------------------------------------------------- diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml index 4d2b180..8f08757 100644 --- a/services/wsn/wsn-api/pom.xml +++ b/services/wsn/wsn-api/pom.xml @@ -50,12 +50,22 @@ <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> <configuration> <fork>${cxf.codegenplugin.forkmode}</fork> <defaultOptions> + <xjcargs> + <xjcarg>-Xdv:attributes</xjcarg> + </xjcargs> <markGenerated>true</markGenerated> <faultSerialVersionUID>1</faultSerialVersionUID> </defaultOptions>
