From 855eeb641dab99ea497622eb56fcd7d50b87d17b Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sat, 4 Feb 2012 22:02:10 +0000 Subject: [PATCH] [#1095] Move generator.generate.unsigned-types to generator.database namespace --- .../java/org/jooq/util/maven/Database.java | 5 + .../java/org/jooq/util/maven/Generate.java | 5 - .../main/java/org/jooq/util/maven/Plugin.java | 1 + .../java/org/jooq/util/GenerationTool.java | 4 +- .../org/jooq/util/jaxb/Configuration.java | 2 +- .../java/org/jooq/util/jaxb/Database.java | 34 ++++- .../java/org/jooq/util/jaxb/EnumType.java | 6 +- .../java/org/jooq/util/jaxb/ForcedType.java | 6 +- .../java/org/jooq/util/jaxb/Generate.java | 34 +---- .../java/org/jooq/util/jaxb/Generator.java | 6 +- .../main/java/org/jooq/util/jaxb/Jdbc.java | 4 +- .../org/jooq/util/jaxb/MasterDataTable.java | 6 +- .../org/jooq/util/jaxb/ObjectFactory.java | 126 +++++++++--------- .../java/org/jooq/util/jaxb/Schemata.java | 7 +- .../java/org/jooq/util/jaxb/Strategy.java | 7 +- .../main/java/org/jooq/util/jaxb/Target.java | 6 +- .../java/org/jooq/util/jaxb/package-info.java | 2 +- .../src/main/resources/jooq-codegen-2.0.4.xsd | 97 +++++--------- 18 files changed, 146 insertions(+), 212 deletions(-) diff --git a/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Database.java b/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Database.java index ea72e13fbe..2bd9a3c781 100644 --- a/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Database.java +++ b/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Database.java @@ -49,6 +49,7 @@ public class Database { private String inputSchema; private String outputSchema; private String dateAsTimestamp = "false"; + private String unsignedTypes = "true"; private List enumTypes; private List forcedTypes; @@ -76,6 +77,10 @@ public class Database { return dateAsTimestamp; } + String getUnsignedTypes() { + return unsignedTypes; + } + List getEnumTypes() { return enumTypes; } diff --git a/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Generate.java b/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Generate.java index 930c0461a6..0b80cd1207 100644 --- a/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Generate.java +++ b/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Generate.java @@ -43,7 +43,6 @@ public class Generate { private String relations = "false"; private String deprecated = "true"; private String instanceFields = "true"; - private String unsignedTypes = "true"; private String generatedAnnotation = "true"; String getRelations() { @@ -58,10 +57,6 @@ public class Generate { return instanceFields; } - String getUnsignedTypes() { - return unsignedTypes; - } - String getGeneratedAnnotation() { return generatedAnnotation; } diff --git a/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Plugin.java b/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Plugin.java index 18e9e054fe..b9ba79bff4 100644 --- a/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Plugin.java +++ b/jOOQ-codegen-maven/src/main/java/org/jooq/util/maven/Plugin.java @@ -96,6 +96,7 @@ public class Plugin extends AbstractMojo { props.put("generator.database.input-schema", defaultString(generator.getDatabase().getInputSchema())); props.put("generator.database.output-schema", defaultString(generator.getDatabase().getOutputSchema())); props.put("generator.database.date-as-timestamp", defaultString(generator.getDatabase().getDateAsTimestamp())); + props.put("generator.generate.unsigned-types", defaultString(generator.getDatabase().getUnsignedTypes())); if (generator.getDatabase().getEnumTypes() != null) { for (EnumType type : generator.getDatabase().getEnumTypes()) { diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java index ec771c59cb..8744bf0b81 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java @@ -184,6 +184,7 @@ public class GenerationTool { database.setIncludes(properties.containsKey("generator.database.includes") ? properties.getProperty("generator.database.includes") : null); database.setExcludes(properties.containsKey("generator.database.excludes") ? properties.getProperty("generator.database.excludes") : null); database.setDateAsTimestamp("true".equalsIgnoreCase(properties.getProperty("generator.database.date-as-timestamp"))); + database.setUnsignedTypes(!"false".equalsIgnoreCase(properties.getProperty("generator.generate.unsigned-types"))); database.setSchemata(schemata); // Avoid creating these empty elements when migrating @@ -204,7 +205,6 @@ public class GenerationTool { generate.setRelations("true".equalsIgnoreCase(properties.getProperty("generator.generate.relations"))); generate.setDeprecated(!"false".equalsIgnoreCase(properties.getProperty("generator.generate.deprecated"))); generate.setInstanceFields(!"false".equalsIgnoreCase(properties.getProperty("generator.generate.instance-fields"))); - generate.setUnsignedTypes(!"false".equalsIgnoreCase(properties.getProperty("generator.generate.unsigned-types"))); generate.setGeneratedAnnotation(!"false".equalsIgnoreCase(properties.getProperty("generator.generate.generated-annotation"))); org.jooq.util.jaxb.Generator generator = new org.jooq.util.jaxb.Generator(); @@ -308,7 +308,7 @@ public class GenerationTool { database.setConfiguredMasterDataTables(g.getDatabase().getMasterDataTables().getMasterDataTable()); database.setConfiguredEnumTypes(g.getDatabase().getEnumTypes().getEnumType()); database.setConfiguredForcedTypes(g.getDatabase().getForcedTypes().getForcedType()); - database.setSupportsUnsignedTypes(g.getGenerate().isUnsignedTypes()); + database.setSupportsUnsignedTypes(g.getDatabase().isUnsignedTypes()); generator.setTargetPackage(g.getTarget().getPackageName()); generator.setTargetDirectory(g.getTarget().getDirectory()); diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Configuration.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Configuration.java index 7bea1a6bc0..8d111e9b91 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Configuration.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Configuration.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.02.01 at 09:32:08 PM MEZ +// Generated on: 2012.02.04 at 10:53:56 PM MEZ // diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Database.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Database.java index 6513b15ab2..0c1ed1bed3 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Database.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Database.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.02.01 at 09:32:08 PM MEZ +// Generated on: 2012.02.04 at 10:53:56 PM MEZ // @@ -17,11 +17,6 @@ import javax.xml.bind.annotation.XmlType; /** - * - * Some configuration for the database abstraction - * (jooq-meta) - * - * *

Java class for Database complex type. * *

The following schema fragment specifies the expected content contained within this class. @@ -35,6 +30,7 @@ import javax.xml.bind.annotation.XmlType; * <element name="includes" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="excludes" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="dateAsTimestamp" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> + * <element name="unsignedTypes" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element name="schemata" type="{http://www.jooq.org/xsd/jooq-codegen-2.0.4.xsd}Schemata" minOccurs="0"/> * <element name="masterDataTables" minOccurs="0"> * <complexType> @@ -91,6 +87,8 @@ public class Database { protected String excludes; @XmlElement(defaultValue = "false") protected Boolean dateAsTimestamp; + @XmlElement(defaultValue = "true") + protected Boolean unsignedTypes; protected Schemata schemata; protected Database.MasterDataTables masterDataTables; protected Database.EnumTypes enumTypes; @@ -192,6 +190,30 @@ public class Database { this.dateAsTimestamp = value; } + /** + * Gets the value of the unsignedTypes property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isUnsignedTypes() { + return unsignedTypes; + } + + /** + * Sets the value of the unsignedTypes property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setUnsignedTypes(Boolean value) { + this.unsignedTypes = value; + } + /** * Gets the value of the schemata property. * diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/EnumType.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/EnumType.java index 23d2fac96f..e0feb014bc 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/EnumType.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/EnumType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.02.01 at 09:32:08 PM MEZ +// Generated on: 2012.02.04 at 10:53:56 PM MEZ // @@ -15,10 +15,6 @@ import javax.xml.bind.annotation.XmlType; /** - * - * Configuration for custom enum types - * - * *

Java class for EnumType complex type. * *

The following schema fragment specifies the expected content contained within this class. diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/ForcedType.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/ForcedType.java index f323eb8ad8..3607e60602 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/ForcedType.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/ForcedType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.02.01 at 09:32:08 PM MEZ +// Generated on: 2012.02.04 at 10:53:56 PM MEZ // @@ -15,10 +15,6 @@ import javax.xml.bind.annotation.XmlType; /** - * - * Configuration for forced types - * - * *

Java class for ForcedType complex type. * *

The following schema fragment specifies the expected content contained within this class. diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Generate.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Generate.java index 49e0423327..db7e6d6def 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Generate.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Generate.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.02.01 at 09:32:08 PM MEZ +// Generated on: 2012.02.04 at 10:53:56 PM MEZ // @@ -15,11 +15,6 @@ import javax.xml.bind.annotation.XmlType; /** - * - * Some configuration for the source code generator - * (jooq-codegen) - * - * *

Java class for Generate complex type. * *

The following schema fragment specifies the expected content contained within this class. @@ -32,7 +27,6 @@ import javax.xml.bind.annotation.XmlType; * <element name="relations" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element name="deprecated" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element name="instanceFields" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> - * <element name="unsignedTypes" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element name="generatedAnnotation" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * </all> * </restriction> @@ -55,8 +49,6 @@ public class Generate { @XmlElement(defaultValue = "true") protected Boolean instanceFields; @XmlElement(defaultValue = "true") - protected Boolean unsignedTypes; - @XmlElement(defaultValue = "true") protected Boolean generatedAnnotation; /** @@ -131,30 +123,6 @@ public class Generate { this.instanceFields = value; } - /** - * Gets the value of the unsignedTypes property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isUnsignedTypes() { - return unsignedTypes; - } - - /** - * Sets the value of the unsignedTypes property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setUnsignedTypes(Boolean value) { - this.unsignedTypes = value; - } - /** * Gets the value of the generatedAnnotation property. * diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Generator.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Generator.java index 5d9a5ee20f..22e07cab0b 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Generator.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Generator.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.02.01 at 09:32:08 PM MEZ +// Generated on: 2012.02.04 at 10:53:56 PM MEZ // @@ -15,10 +15,6 @@ import javax.xml.bind.annotation.XmlType; /** - * - * The source code generator's global configuration - * - * *

Java class for Generator complex type. * *

The following schema fragment specifies the expected content contained within this class. diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Jdbc.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Jdbc.java index 601832380a..e890ee450a 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Jdbc.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Jdbc.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.02.01 at 09:32:08 PM MEZ +// Generated on: 2012.02.04 at 10:53:56 PM MEZ // @@ -15,8 +15,6 @@ import javax.xml.bind.annotation.XmlType; /** - * The database connection configuration - * *

Java class for Jdbc complex type. * *

The following schema fragment specifies the expected content contained within this class. diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/MasterDataTable.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/MasterDataTable.java index 5f1dc1d7fa..724e373627 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/MasterDataTable.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/MasterDataTable.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.02.01 at 09:32:08 PM MEZ +// Generated on: 2012.02.04 at 10:53:56 PM MEZ // @@ -15,10 +15,6 @@ import javax.xml.bind.annotation.XmlType; /** - * - * Configuration for a master data table - * - * *

Java class for MasterDataTable complex type. * *

The following schema fragment specifies the expected content contained within this class. diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/ObjectFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/ObjectFactory.java index 1cfa8e6260..35ae3a6949 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/ObjectFactory.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/ObjectFactory.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.02.01 at 09:32:08 PM MEZ +// Generated on: 2012.02.04 at 10:53:56 PM MEZ // @@ -36,30 +36,6 @@ public class ObjectFactory { public ObjectFactory() { } - /** - * Create an instance of {@link Generator } - * - */ - public Generator createGenerator() { - return new Generator(); - } - - /** - * Create an instance of {@link Strategy } - * - */ - public Strategy createStrategy() { - return new Strategy(); - } - - /** - * Create an instance of {@link ForcedType } - * - */ - public ForcedType createForcedType() { - return new ForcedType(); - } - /** * Create an instance of {@link Jdbc } * @@ -69,35 +45,11 @@ public class ObjectFactory { } /** - * Create an instance of {@link MasterDataTable } + * Create an instance of {@link Database.ForcedTypes } * */ - public MasterDataTable createMasterDataTable() { - return new MasterDataTable(); - } - - /** - * Create an instance of {@link Generate } - * - */ - public Generate createGenerate() { - return new Generate(); - } - - /** - * Create an instance of {@link Schemata } - * - */ - public Schemata createSchemata() { - return new Schemata(); - } - - /** - * Create an instance of {@link Database.EnumTypes } - * - */ - public Database.EnumTypes createDatabaseEnumTypes() { - return new Database.EnumTypes(); + public Database.ForcedTypes createDatabaseForcedTypes() { + return new Database.ForcedTypes(); } /** @@ -108,6 +60,22 @@ public class ObjectFactory { return new Schemata.Schema(); } + /** + * Create an instance of {@link Schemata } + * + */ + public Schemata createSchemata() { + return new Schemata(); + } + + /** + * Create an instance of {@link Generator } + * + */ + public Generator createGenerator() { + return new Generator(); + } + /** * Create an instance of {@link Configuration } * @@ -116,6 +84,38 @@ public class ObjectFactory { return new Configuration(); } + /** + * Create an instance of {@link Target } + * + */ + public Target createTarget() { + return new Target(); + } + + /** + * Create an instance of {@link MasterDataTable } + * + */ + public MasterDataTable createMasterDataTable() { + return new MasterDataTable(); + } + + /** + * Create an instance of {@link Database.EnumTypes } + * + */ + public Database.EnumTypes createDatabaseEnumTypes() { + return new Database.EnumTypes(); + } + + /** + * Create an instance of {@link ForcedType } + * + */ + public ForcedType createForcedType() { + return new ForcedType(); + } + /** * Create an instance of {@link EnumType } * @@ -124,14 +124,6 @@ public class ObjectFactory { return new EnumType(); } - /** - * Create an instance of {@link Database.ForcedTypes } - * - */ - public Database.ForcedTypes createDatabaseForcedTypes() { - return new Database.ForcedTypes(); - } - /** * Create an instance of {@link Database.MasterDataTables } * @@ -149,11 +141,19 @@ public class ObjectFactory { } /** - * Create an instance of {@link Target } + * Create an instance of {@link Generate } * */ - public Target createTarget() { - return new Target(); + public Generate createGenerate() { + return new Generate(); + } + + /** + * Create an instance of {@link Strategy } + * + */ + public Strategy createStrategy() { + return new Strategy(); } } diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Schemata.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Schemata.java index 60d7df15a9..0ce19487da 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Schemata.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Schemata.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.02.01 at 09:32:08 PM MEZ +// Generated on: 2012.02.04 at 10:53:56 PM MEZ // @@ -17,11 +17,6 @@ import javax.xml.bind.annotation.XmlType; /** - * - * Some configuration for the schema abstraction - * (jooq-meta) - * - * *

Java class for Schemata complex type. * *

The following schema fragment specifies the expected content contained within this class. diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Strategy.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Strategy.java index 9732d7b367..052ff01647 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Strategy.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Strategy.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.02.01 at 09:32:08 PM MEZ +// Generated on: 2012.02.04 at 10:53:56 PM MEZ // @@ -15,11 +15,6 @@ import javax.xml.bind.annotation.XmlType; /** - * - * Some configuration for the generator strategy, - * providing naming schemes for generated artefacts - * - * *

Java class for Strategy complex type. * *

The following schema fragment specifies the expected content contained within this class. diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Target.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Target.java index d23f070e18..5d360a7617 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Target.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Target.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.02.01 at 09:32:08 PM MEZ +// Generated on: 2012.02.04 at 10:53:56 PM MEZ // @@ -15,10 +15,6 @@ import javax.xml.bind.annotation.XmlType; /** - * - * Configuration for the target artefacts - * - * *

Java class for Target complex type. * *

The following schema fragment specifies the expected content contained within this class. diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/package-info.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/package-info.java index e46ce8d7a4..34d4bf7b27 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/package-info.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/package-info.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.02.01 at 09:32:08 PM MEZ +// Generated on: 2012.02.04 at 10:53:56 PM MEZ // @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-codegen-2.0.4.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) diff --git a/jOOQ-meta/src/main/resources/jooq-codegen-2.0.4.xsd b/jOOQ-meta/src/main/resources/jooq-codegen-2.0.4.xsd index ac92ca3e34..9d570c5848 100644 --- a/jOOQ-meta/src/main/resources/jooq-codegen-2.0.4.xsd +++ b/jOOQ-meta/src/main/resources/jooq-codegen-2.0.4.xsd @@ -5,16 +5,19 @@ elementFormDefault="qualified"> - - - The XML version of the jOOQ configuration. More info - can be found here: http://www.jooq.org/manual/META/Configuration/ - - + + + @@ -22,46 +25,53 @@ - - The database connection configuration - + + + + + + + + + - - - The source code generator's global configuration - - + + + + maxOccurs="1" /> + + + + + + - - - Some configuration for the generator strategy, - providing naming schemes for generated artefacts - - @@ -69,20 +79,19 @@ - - - Some configuration for the database abstraction - (jooq-meta) - - + + + + @@ -112,12 +121,6 @@ - - - Some configuration for the schema abstraction - (jooq-meta) - - @@ -133,11 +136,6 @@ - - - Configuration for a master data table - - - - - Configuration for custom enum types - - - - - Configuration for forced types - - - - - Some configuration for the source code generator - (jooq-codegen) - - @@ -187,19 +169,12 @@ minOccurs="0" maxOccurs="1" /> - - - - Configuration for the target artefacts - -