Fixed #26.

Author: highsource

README.md

@@ -1,7 +1,7 @@
 jaxb2-annotate-plugin
 =====================
 
-JAXB2 Annotate Plugin is capable of adding arbitrary annotations to the generated sources.
+JAXB2 Annotate Plugin is capable of adding or removing arbitrary annotations to/from the generated sources.
 
 Usage overview
 --------------
@@ -131,11 +131,106 @@ jaxb:extensionBindingPrefixes="xjc annox"
 Note: yes, I know that `http://annox.dev.java.net` no longer exists. Changing this namespace would break old builds.
 This is just a namespace, there must not necessarily be content there. Treat it as a logical identifier, nothing else.
 
+Removing annotations
+--------------
+
+* Customize your schema using binding files or directly in schema
+* Add the plugin to the XJC classpath.
+* Activate the plugin using `-XremoveAnnotation`-switch.
+
+You can remove annotations using customizations directly in schema:
+
+````xml
+<xsd:schema
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+	jaxb:version="2.1" 
+	xmlns:annox="http://annox.dev.java.net" 
+	jaxb:extensionBindingPrefixes="annox">
+
+
+
+	<xsd:complexType name="FooType">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<annox:removeAnnotation class="javax.xml.bind.annotation.XmlType" />
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="bar" type="xsd:string"/>
+			<xsd:element name="foobar" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<annox:removeAnnotation class="javax.xml.bind.annotation.XmlElement" target="field" />
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+
+</xsd:schema>
+````
+
+Or in binding files:
+
+````xml
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<jaxb:bindings
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:annox="http://annox.dev.java.net"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"
+	jaxb:extensionBindingPrefixes="xjc annox"
+	version="2.1">
+
+	<jaxb:bindings schemaLocation="schema.xsd" node="/xs:schema">
+		<jaxb:bindings node="xs:complexType[@name='FooType']">
+			<annox:removeAnnotation class="javax.xml.bind.annotation.XmlType" />
+		</jaxb:bindings>
+		<jaxb:bindings node="xs:complexType[@name='FooType']//xs:element[@name='foobar']">
+			<annox:removeAnnotation class="javax.xml.bind.annotation.XmlElement" target="field" />
+		</jaxb:bindings>
+	</jaxb:bindings>
+
+</jaxb:bindings>
+````
+
+You can use the following customization elements in the `http://annox.dev.java.net` namespace:
+* `removeAnnotation` with the optional `target` attribute:
+ * `package`
+ * `class`
+ * `getter`
+ * `setter`
+ * `setter-parameter`
+ * `field`
+ * `enum-value-method`
+ * `enum-fromValue-method`
+* `removeAnnotationFromProperty`
+* `removeAnnotationFromPackage`
+* `removeAnnotationFromClass`
+* `removeAnnotationFromElement`
+* `removeAnnotationFromeEnum`
+* `removeAnnotationFromEnumConstant`
+* `removeAnnotationFromEnumValueMethod` - removes annotation from the `value()` method of the enum
+* `removeAnnotationFromEnumFromValueMethod` - removes annotation from the `fromValue(String)` method of the enum
+
+The `http://annox.dev.java.net` namespace must be declared in the `jaxb:extensionBindingPrefixes` attribute via prefix, ex.:
+
+````
+xmlns:annox="http://annox.dev.java.net"
+jaxb:extensionBindingPrefixes="xjc annox"
+````
+
+Note: yes, I know that `http://annox.dev.java.net` no longer exists. Changing this namespace would break old builds.
+This is just a namespace, there must not necessarily be content there. Treat it as a logical identifier, nothing else.
+
+
 Using JAXB2 Annotate Plugin with Maven
 --------------------------------------
 
 * Add `org.jvnet.jaxb2_commons:jaxb2-basics-annotate` as XJC plugin
-* Turn on the plugin using `-Xannotate` switch
+* Turn on the plugin using `-Xannotate` or `-XremoveAnnotation`switch
 * Add artifact with your annotations as another XJC plugin
 
 Example:
@@ -148,6 +243,7 @@ Example:
 		<extension>true</extension>
 		<args>
 			<arg>-Xannotate</arg>
+			<arg>-XremoveAnnotation</arg>
 		</args>
 		<plugins>
 			<plugin>

plugin/pom.xml

@@ -72,11 +72,11 @@
 			<artifactId>jaxb-xjc</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
+		<!--dependency>
 			<groupId>org.jvnet.jaxb2.maven2</groupId>
 			<artifactId>maven-jaxb2-plugin-testing</artifactId>
 			<scope>test</scope>
-		</dependency>
+		</dependency-->
 		<!-- Annox -->
 		<dependency>
 			<groupId>org.jvnet.annox</groupId>

plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotationTarget.java renamed to plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/AnnotationTarget.java

@@ -26,13 +26,19 @@
  * of the authors and should not be interpreted as representing official policies,
  * either expressed or implied, of the FreeBSD Project.
  */
-package org.jvnet.jaxb2_commons.plugin.annotate;
+package org.jvnet.jaxb2_commons.plugin;
 
 import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.xml.namespace.QName;
 
 import org.apache.commons.lang3.Validate;
+import org.jvnet.jaxb2_commons.plugin.annotate.AnnotatePlugin;
+import org.jvnet.jaxb2_commons.plugin.removeannotation.RemoveAnnotationPlugin;
 import org.jvnet.jaxb2_commons.util.FieldAccessorUtils;
 import org.jvnet.jaxb2_commons.util.OutlineUtils;
 import org.w3c.dom.Element;
@@ -258,15 +264,15 @@ public JAnnotatable getAnnotatable(Outline outline,
 	};
 
 	private final String target;
-	private final QName name;
+	private final Set<QName> names;
 
-	AnnotationTarget(String target, QName name) {
+	AnnotationTarget(String target, QName... names) {
 		this.target = target;
-		this.name = name;
+		this.names = Collections.unmodifiableSet(new HashSet<QName>(Arrays.asList(names)));
 	}
 
-	public QName getName() {
-		return name;
+	public Set<QName> getNames() {
+		return names;
 	}
 
 	public String getTarget() {
@@ -322,7 +328,9 @@ public static AnnotationTarget getAnnotationTarget(final Element element,
 				element.getLocalName());
 
 		if (AnnotatePlugin.ANNOTATE_QNAME.equals(name)
-				|| AnnotatePlugin.ANNOTATE_PROPERTY_QNAME.equals(name)) {
+				|| AnnotatePlugin.ANNOTATE_PROPERTY_QNAME.equals(name)
+				|| RemoveAnnotationPlugin.REMOVE_ANNOTATION_QNAME.equals(name)
+				|| RemoveAnnotationPlugin.REMOVE_ANNOTATION_FROM_PROPERTY_QNAME.equals(name)) {
 			final String target = element.getAttribute("target");
 			if (target == null || "".equals(target)) {
 				return defaultAnnotationTarget;
@@ -332,7 +340,7 @@ public static AnnotationTarget getAnnotationTarget(final Element element,
 		} else {
 			for (AnnotationTarget possibleAnnotationTarget : AnnotationTarget
 					.values()) {
-				if (possibleAnnotationTarget.getName().equals(name)) {
+				if (possibleAnnotationTarget.names.contains(name)) {
 					return possibleAnnotationTarget;
 				}
 			}

plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatePlugin.java

@@ -30,6 +30,9 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.xml.namespace.QName;
 
@@ -38,6 +41,8 @@
 import org.jvnet.annox.model.XAnnotation;
 import org.jvnet.annox.parser.XAnnotationParser;
 import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin;
+import org.jvnet.jaxb2_commons.plugin.AnnotationTarget;
+import org.jvnet.jaxb2_commons.plugin.removeannotation.RemoveAnnotationPlugin;
 import org.jvnet.jaxb2_commons.util.CustomizationUtils;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -87,6 +92,23 @@ public class AnnotatePlugin extends AbstractParameterizablePlugin {
 			Constants.NAMESPACE_URI, "annotateEnumFromValueMethod");
 	public static final QName ANNOTATE_QNAME = new QName(
 			Constants.NAMESPACE_URI, "annotate");
+	
+	public static final Set<QName> CUSTOMIZATION_ELEMENT_QNAMES = Collections.unmodifiableSet(
+			new HashSet<QName>(Arrays.asList(
+					ANNOTATE_QNAME,
+					ANNOTATE_PACKAGE_QNAME,
+					ANNOTATE_CLASS_QNAME,
+					ANNOTATE_ELEMENT_QNAME,
+					ANNOTATE_PROPERTY_QNAME,
+					ANNOTATE_PROPERTY_FIELD_QNAME,
+					ANNOTATE_PROPERTY_GETTER_QNAME,
+					ANNOTATE_PROPERTY_SETTER_QNAME,
+					ANNOTATE_PROPERTY_SETTER_PARAMETER_QNAME,
+					ANNOTATE_ENUM_QNAME,
+					ANNOTATE_ENUM_CONSTANT_QNAME,
+					ANNOTATE_ENUM_VALUE_METHOD_QNAME,
+					ANNOTATE_ENUM_FROM_VALUE_METHOD_QNAME)));
+	
 
 	@Override
 	public String getOptionName() {
@@ -202,7 +224,7 @@ protected void processFieldOutline(ClassOutline classOutline,
 			ErrorHandler errorHandler) {
 		final CCustomizations customizations = CustomizationUtils
 				.getCustomizations(fieldOutline);
-		annotate(fieldOutline.parent().ref.owner(), fieldOutline,
+		annotateFieldOutline(fieldOutline.parent().ref.owner(), fieldOutline,
 				customizations, errorHandler);
 	}
 
@@ -226,7 +248,7 @@ protected void annotateElementOutline(final JCodeModel codeModel,
 			final Element element = customization.element;
 			final QName name = new QName(element.getNamespaceURI(),
 					element.getLocalName());
-			if (Constants.NAMESPACE_URI.equals(name.getNamespaceURI())) {
+			if (isCustomizationElementName(name)) {
 				customization.markAsAcknowledged();
 				final AnnotationTarget annotationTarget = AnnotationTarget
 						.getAnnotationTarget(element, AnnotationTarget.ELEMENT);
@@ -251,7 +273,7 @@ protected void annotateEnumOutline(final JCodeModel codeModel,
 			final Element element = customization.element;
 			final QName name = new QName(element.getNamespaceURI(),
 					element.getLocalName());
-			if (Constants.NAMESPACE_URI.equals(name.getNamespaceURI())) {
+			if (isCustomizationElementName(name)) {
 				customization.markAsAcknowledged();
 				final AnnotationTarget annotationTarget = AnnotationTarget
 						.getAnnotationTarget(element, AnnotationTarget.ENUM);
@@ -276,7 +298,7 @@ protected void annotateEnumConstantOutline(final JCodeModel codeModel,
 			final Element element = customization.element;
 			final QName name = new QName(element.getNamespaceURI(),
 					element.getLocalName());
-			if (Constants.NAMESPACE_URI.equals(name.getNamespaceURI())) {
+			if (isCustomizationElementName(name)) {
 				customization.markAsAcknowledged();
 				final AnnotationTarget annotationTarget = AnnotationTarget
 						.getAnnotationTarget(element,
@@ -301,7 +323,7 @@ protected void annotateClassOutline(final JCodeModel codeModel,
 			final Element element = customization.element;
 			final QName name = new QName(element.getNamespaceURI(),
 					element.getLocalName());
-			if (Constants.NAMESPACE_URI.equals(name.getNamespaceURI())) {
+			if (isCustomizationElementName(name)) {
 				customization.markAsAcknowledged();
 				final AnnotationTarget annotationTarget = AnnotationTarget
 						.getAnnotationTarget(element, AnnotationTarget.CLASS);
@@ -317,14 +339,14 @@ protected void annotateClassOutline(final JCodeModel codeModel,
 		}
 	}
 
-	protected void annotate(final JCodeModel codeModel,
+	protected void annotateFieldOutline(final JCodeModel codeModel,
 			final FieldOutline fieldOutline,
 			final CCustomizations customizations, ErrorHandler errorHandler) {
 		for (final CPluginCustomization customization : customizations) {
 			final Element element = customization.element;
 			final QName name = new QName(element.getNamespaceURI(),
 					element.getLocalName());
-			if (Constants.NAMESPACE_URI.equals(name.getNamespaceURI())) {
+			if (isCustomizationElementName(name)) {
 				customization.markAsAcknowledged();
 
 				final AnnotationTarget annotationTarget = AnnotationTarget
@@ -390,23 +412,16 @@ private void annotate(final JCodeModel codeModel,
 			}
 		}
 	}
+	
+	private boolean isCustomizationElementName(final QName name) {
+		return name != null &&
+				Constants.NAMESPACE_URI.equals(name.getNamespaceURI()) &&
+				!RemoveAnnotationPlugin.CUSTOMIZATION_ELEMENT_QNAMES.contains(name);
+	}
 
 	@Override
 	public Collection<QName> getCustomizationElementNames() {
-		return Arrays.asList(
-				ANNOTATE_QNAME,
-				ANNOTATE_PACKAGE_QNAME,
-				ANNOTATE_CLASS_QNAME,
-				ANNOTATE_ELEMENT_QNAME,
-				ANNOTATE_PROPERTY_QNAME,
-				ANNOTATE_PROPERTY_FIELD_QNAME,
-				ANNOTATE_PROPERTY_GETTER_QNAME,
-				ANNOTATE_PROPERTY_SETTER_QNAME,
-				ANNOTATE_PROPERTY_SETTER_PARAMETER_QNAME,
-				ANNOTATE_ENUM_QNAME,
-				ANNOTATE_ENUM_CONSTANT_QNAME,
-				ANNOTATE_ENUM_VALUE_METHOD_QNAME,
-				ANNOTATE_ENUM_FROM_VALUE_METHOD_QNAME);
+		return CUSTOMIZATION_ELEMENT_QNAMES;
 	}
 
 }