I think the convention for xml is 2 space per indent. -D
On Mon, Jun 11, 2012 at 1:55 PM, <[email protected]> wrote: > Revision 16852 Author rfscholte Date 2012-06-11 15:55:55 -0500 (Mon, 11 Jun > 2012) > > Log Message > > Fix MJAXB-37: Getters not being generated for Boolean fields > > Modified Paths > > trunk/mojo/jaxb2-maven-plugin/pom.xml > trunk/mojo/jaxb2-maven-plugin/src/main/java/org/codehaus/mojo/jaxb2/AbstractXjcMojo.java > > Added Paths > > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/ > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/invoker.properties > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/pom.xml > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/ > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/main/ > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/main/java/ > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/main/java/foo/ > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/main/java/foo/bar/ > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/main/java/foo/bar/Main.java > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/main/xsd/ > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/main/xsd/address.xsd > > Diff > > Modified: trunk/mojo/jaxb2-maven-plugin/pom.xml (16851 => 16852) > > --- trunk/mojo/jaxb2-maven-plugin/pom.xml 2012-06-11 19:52:05 UTC (rev > 16851) > +++ trunk/mojo/jaxb2-maven-plugin/pom.xml 2012-06-11 20:55:55 UTC (rev > 16852) > @@ -120,7 +120,7 @@ > <dependency> > <groupId>com.sun.xml.bind</groupId> > <artifactId>jaxb-xjc</artifactId> > - <version>2.1.12</version> > + <version>2.1.13</version> > </dependency> > <dependency> > <groupId>org.apache.maven.plugin-testing</groupId> > > Added: trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/invoker.properties (0 > => 16852) > > --- trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/invoker.properties > (rev 0) > +++ > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/invoker.properties > 2012-06-11 > 20:55:55 UTC (rev 16852) > @@ -0,0 +1 @@ > +invoker.goals = clean compile > \ No newline at end of file > > Added: trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/pom.xml (0 => 16852) > > --- trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/pom.xml > (rev 0) > +++ trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/pom.xml 2012-06-11 > 20:55:55 UTC (rev 16852) > @@ -0,0 +1,71 @@ > +<?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. > + --> > + > +<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> > + > + <groupId>org.codehaus.mojo.jaxb2.itd</groupId> > + <artifactId>mjaxb-37</artifactId> > + <version>1.0-SNAPSHOT</version> > + > + <name>Test for boolean</name> > + <description>Check if primitive Boolean is generated instead of the > default Boolean-object.</description> > + > + <properties> > + > <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> > + </properties> > + > + <build> > + <plugins> > + <plugin> > + <groupId>org.codehaus.mojo</groupId> > + <artifactId>jaxb2-maven-plugin</artifactId> > + <version>@pom.version@</version> > + <executions> > + <execution> > + <goals> > + <goal>xjc</goal> > + </goals> > + </execution> > + </executions> > + <configuration> > + > <packageName>com.example.myschema</packageName> <!-- The name of your > generated source package --> > + > <includeSchemasOutputPath>xsd</includeSchemasOutputPath> > + <enableIntrospection>true</enableIntrospection> > + </configuration> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-compiler-plugin</artifactId> > + <version>2.3.2</version> > + <configuration> > + <source>1.5</source> > + <target>1.5</target> > + </configuration> > + </plugin> > + </plugins> > + </build> > + <dependencies> > + <dependency> > + <groupId>javax.xml.bind</groupId> > + <artifactId>jaxb-api</artifactId> > + <version>2.1</version> > + </dependency> > + </dependencies> > +</project> > > Added: > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/main/java/foo/bar/Main.java > (0 => 16852) > > --- > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/main/java/foo/bar/Main.java > (rev 0) > +++ > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/main/java/foo/bar/Main.java > 2012-06-11 > 20:55:55 UTC (rev 16852) > @@ -0,0 +1,16 @@ > +package foo.bar; > + > +import com.example.myschema.*; > + > +public class Main > +{ > + > + public static void main( String args ) > + { > + ObjectFactory objectFactory = new ObjectFactory(); > + AddressType address = objectFactory.createAddressType(); > + boolean primary = address.isPrimary(); > + Boolean expensive = address.getExpensive(); > + } > + > +} > > Added: > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/main/xsd/address.xsd (0 => > 16852) > > --- trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/main/xsd/address.xsd > (rev 0) > +++ > trunk/mojo/jaxb2-maven-plugin/src/it/mjaxb-37/src/main/xsd/address.xsd > 2012-06-11 > 20:55:55 UTC (rev 16852) > @@ -0,0 +1,18 @@ > +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema";> > + > + <xsd:complexType name="AddressType"> > + <xsd:sequence> > + <xsd:element name="Name" type="xsd:string"/> > + <xsd:element name="Line1" type="xsd:string"/> > + <xsd:element name="Line2" type="xsd:string"/> > + <xsd:element name="City" type="xsd:string"/> > + <xsd:element name="State" type="xsd:string"/> > + <xsd:element name="ZipCode" type="xsd:decimal"/> > + <xsd:element name="primary" type="xsd:boolean"/> > + <xsd:element name="expensive" type="xsd:boolean" nillable="true"/> > + </xsd:sequence> > + </xsd:complexType> > + > + <xsd:element name="address" type="AddressType"/> > + > +</xsd:schema> > \ No newline at end of file > > Modified: > trunk/mojo/jaxb2-maven-plugin/src/main/java/org/codehaus/mojo/jaxb2/AbstractXjcMojo.java > (16851 => 16852) > > --- > trunk/mojo/jaxb2-maven-plugin/src/main/java/org/codehaus/mojo/jaxb2/AbstractXjcMojo.java > 2012-06-11 > 19:52:05 UTC (rev 16851) > +++ > trunk/mojo/jaxb2-maven-plugin/src/main/java/org/codehaus/mojo/jaxb2/AbstractXjcMojo.java > 2012-06-11 > 20:55:55 UTC (rev 16852) > @@ -245,6 +245,14 @@ > */ > protected boolean failOnNoSchemas; > > + /** > + * Enable correct generation of Boolean getters/setters to enable Bean > Introspection apis. > + * > + * @parameter default-value="false" > + * @since 1.4 > + */ > + private boolean enableIntrospection; > + > public AbstractXjcMojo() > { > super(); > @@ -503,6 +511,11 @@ > args.add( "-target" ); > args.add( target ); > } > + > + if ( enableIntrospection ) > + { > + args.add( "-enableIntrospection" ); > + } > if ( arguments != null && arguments.trim().length() > 0 ) > { > try > > ________________________________ > > To unsubscribe from this list please visit: > > http://xircles.codehaus.org/manage_email --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email
