Ori Liel has uploaded a new change for review. Change subject: restapi: Accept Old Payload Syntax (#1072819) - WIP ......................................................................
restapi: Accept Old Payload Syntax (#1072819) - WIP Change-Id: Ife0a9845ec6135fbae2e76c693054b259bce1e4e Signed-off-by: Ori Liel <[email protected]> --- M backend/manager/modules/restapi/interface/definition/pom.xml M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd A backend/manager/modules/restapi/interface/jaxbplugin/pom.xml A backend/manager/modules/restapi/interface/jaxbplugin/src/main/java/org/ovirt/engine/api/JaxbCustomPlugin.java A backend/manager/modules/restapi/interface/jaxbplugin/src/main/resources/META-INF/com.sun.tools.xjc.Plugin M backend/manager/modules/restapi/interface/pom.xml 6 files changed, 83 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/26035/1 diff --git a/backend/manager/modules/restapi/interface/definition/pom.xml b/backend/manager/modules/restapi/interface/definition/pom.xml index e9d3641..2f4b307 100644 --- a/backend/manager/modules/restapi/interface/definition/pom.xml +++ b/backend/manager/modules/restapi/interface/definition/pom.xml @@ -58,6 +58,12 @@ <artifactId>snakeyaml</artifactId> </dependency> + <dependency> + <groupId>org.ovirt.engine.api</groupId> + <artifactId>jaxbplugin</artifactId> + <version>3.5.0-SNAPSHOT</version> + </dependency> + </dependencies> <build> @@ -77,6 +83,13 @@ </executions> <configuration> + <plugins> + <plugin> + <groupId>org.ovirt.engine.api</groupId> + <artifactId>jaxbplugin</artifactId> + <version>3.5.0-SNAPSHOT</version> + </plugin> + </plugins> <generatePackage>org.ovirt.engine.api.model</generatePackage> <extension>true</extension> </configuration> diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd index 746b8b0..3366433 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd @@ -2508,6 +2508,7 @@ <xs:complexType name="Payload"> <xs:sequence> + <xs:element ref="file"/> <xs:element ref="files"/> <xs:element name="volume_id" type="xs:string" minOccurs="0" maxOccurs="1"/> </xs:sequence> @@ -2693,7 +2694,13 @@ <xs:element name="disks" type="Disks" minOccurs="0" maxOccurs="1"/> <xs:element ref="initialization" minOccurs="0" maxOccurs="1"/> <xs:element name="nics" type="Nics" minOccurs="0" maxOccurs="1"/> - <xs:element name="tags" type="Tags" minOccurs="0" maxOccurs="1"/> + <xs:element name="tags2" type="Tags" minOccurs="0" maxOccurs="1"> + <xs:annotation> + <xs:appinfo> + <jaxb:property name="tags"/> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element name="snapshots" type="Snapshots" minOccurs="0" maxOccurs="1"/> <xs:element name="placement_policy" type="VmPlacementPolicy" minOccurs="0" maxOccurs="1"/> <xs:element name="memory_policy" type="MemoryPolicy" minOccurs="0" maxOccurs="1"/> @@ -3513,7 +3520,7 @@ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element ref="parameter" maxOccurs="unbounded" minOccurs="0"> <xs:annotation> - <xs:appinfo> + <xs:appinfo> <jaxb:property name="Parameters"/> </xs:appinfo> </xs:annotation> diff --git a/backend/manager/modules/restapi/interface/jaxbplugin/pom.xml b/backend/manager/modules/restapi/interface/jaxbplugin/pom.xml new file mode 100644 index 0000000..2515ae0 --- /dev/null +++ b/backend/manager/modules/restapi/interface/jaxbplugin/pom.xml @@ -0,0 +1,26 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.ovirt.engine.api</groupId> + <artifactId>interface</artifactId> + <version>3.5.0-SNAPSHOT</version> + </parent> + + <artifactId>jaxbplugin</artifactId> + <packaging>jar</packaging> + + <name>oVirt Engine API JAXB Plugin</name> + + <dependencies> + + <dependency> + <groupId>com.sun.tools.xjc.maven2</groupId> + <artifactId>maven-jaxb-plugin</artifactId> + <scope>compile</scope> + <version>1.1.1</version> + </dependency> + + </dependencies> + +</project> diff --git a/backend/manager/modules/restapi/interface/jaxbplugin/src/main/java/org/ovirt/engine/api/JaxbCustomPlugin.java b/backend/manager/modules/restapi/interface/jaxbplugin/src/main/java/org/ovirt/engine/api/JaxbCustomPlugin.java new file mode 100644 index 0000000..f51ea78 --- /dev/null +++ b/backend/manager/modules/restapi/interface/jaxbplugin/src/main/java/org/ovirt/engine/api/JaxbCustomPlugin.java @@ -0,0 +1,33 @@ +package org.ovirt.engine.api; + +import org.xml.sax.ErrorHandler; +import org.xml.sax.SAXException; + +import com.sun.tools.xjc.Options; +import com.sun.tools.xjc.Plugin; +import com.sun.tools.xjc.outline.ClassOutline; +import com.sun.tools.xjc.outline.Outline; + +public class JaxbCustomPlugin extends Plugin { + + @Override + public String getOptionName() { + return "Solve duplicate name issue"; + } + + @Override + public String getUsage() { + return "Regular usage, no parameters"; + } + + @Override + public boolean run(Outline model, Options arg1, ErrorHandler arg2) throws SAXException { + System.out.println("HERE!!!!!!!!!!!!!!!!!!!!!!!!!"); + for (ClassOutline classOutline : model.getClasses()) { + System.out.println(classOutline.getClass().getName()); + } + + return true; + } + +} diff --git a/backend/manager/modules/restapi/interface/jaxbplugin/src/main/resources/META-INF/com.sun.tools.xjc.Plugin b/backend/manager/modules/restapi/interface/jaxbplugin/src/main/resources/META-INF/com.sun.tools.xjc.Plugin new file mode 100644 index 0000000..dd547a0 --- /dev/null +++ b/backend/manager/modules/restapi/interface/jaxbplugin/src/main/resources/META-INF/com.sun.tools.xjc.Plugin @@ -0,0 +1 @@ +org.ovirt.engine.api.JaxbCustomPlugin \ No newline at end of file diff --git a/backend/manager/modules/restapi/interface/pom.xml b/backend/manager/modules/restapi/interface/pom.xml index 031e562..8d9cff9 100644 --- a/backend/manager/modules/restapi/interface/pom.xml +++ b/backend/manager/modules/restapi/interface/pom.xml @@ -15,6 +15,7 @@ <modules> <module>common</module> <module>definition</module> + <module>jaxbplugin</module> </modules> <profiles> -- To view, visit http://gerrit.ovirt.org/26035 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife0a9845ec6135fbae2e76c693054b259bce1e4e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ori Liel <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
