[TAVERNA-1041] cxf-xjc-plugin for taverna-scufl2-schemas Note that binding.xjb for xml.xsd is no longer needed
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/cee07dbe Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/cee07dbe Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/cee07dbe Branch: refs/heads/master Commit: cee07dbeaba1bc92e84e036f940a453576d87f92 Parents: 25864b0 Author: Stian Soiland-Reyes <[email protected]> Authored: Wed Apr 18 11:46:15 2018 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Wed Apr 18 11:46:15 2018 +0100 ---------------------------------------------------------------------- taverna-scufl2-schemas/pom.xml | 29 ++++++++++++-------- .../taverna/scufl2/rdfxml/xsd/binding.xjb | 27 ------------------ 2 files changed, 17 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/cee07dbe/taverna-scufl2-schemas/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-scufl2-schemas/pom.xml b/taverna-scufl2-schemas/pom.xml index 61aa1bc..65b408f 100644 --- a/taverna-scufl2-schemas/pom.xml +++ b/taverna-scufl2-schemas/pom.xml @@ -29,18 +29,23 @@ <build> <plugins> <plugin> - <groupId>org.jvnet.jaxb2.maven2</groupId> - <artifactId>maven-jaxb2-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <schemaDirectory>src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/</schemaDirectory> - </configuration> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-xjc-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>xsdtojava</goal> + </goals> + </execution> + </executions> + <configuration> + <xsdOptions combine.self="override"> + <!-- We don't use src/main/xsd as in ../pom.xml, as our XSDs go into the final JAR --> + <xsdOption> + <xsdDir>${project.basedir}/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/</xsdDir> + </xsdOption> + </xsdOptions> + </configuration> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/cee07dbe/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/binding.xjb ---------------------------------------------------------------------- diff --git a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/binding.xjb b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/binding.xjb deleted file mode 100644 index 5604309..0000000 --- a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/binding.xjb +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<jaxb:bindings version="2.1" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; - xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd";> - <jaxb:bindings scd="x-schema::xml" xmlns:xml="http://www.w3.org/XML/1998/namespace";> - <jaxb:schemaBindings> - <jaxb:package name="org.apache.taverna.robundle.xml.xml" /> - </jaxb:schemaBindings> - </jaxb:bindings> - -</jaxb:bindings> \ No newline at end of file
