Fixes #11.

Author: highsource

README.md

@@ -118,8 +118,8 @@ You can use the following customization elements in the `http://annox.dev.java.n
 * `annotateElement`
 * `annotateEnum`
 * `annotateEnumConstant`
-* `annotateEnumValueMethod` - place annotation above `value()` method
-* `annotateEnumFromValueMethod` - place annotation above `fromValue(String)` method
+* `annotateEnumValueMethod` - annotate the `value()` method of the enum
+* `annotateEnumFromValueMethod` - annotate 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.:
 

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

@@ -393,12 +393,19 @@ private void annotate(final JCodeModel codeModel,
 
 	@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,
+		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);
 	}
 

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

@@ -220,9 +220,10 @@ public JAnnotatable getAnnotatable(Outline outline,
 				throws IllegalArgumentException, UnsupportedOperationException {
 			final JMethod valueMethod = enumOutline.clazz.getMethod("value", new JType[0]);
 			if (null == valueMethod) {
-				throw new UnsupportedOperationException(MessageFormat.format(
-						"Method value() not found in enum [{0}]",
-						enumOutline.clazz.name()));
+				throw new IllegalArgumentException(
+						MessageFormat
+								.format("Could not annotate the value() method of the enum [{0}] since it could not be found.",
+										enumOutline.clazz.name()));
 			}
 			return valueMethod;
 		}
@@ -237,9 +238,11 @@ public JAnnotatable getAnnotatable(Outline outline,
 			final JType jTypeString = codeModel._ref(String.class);
 			final JMethod fromValueMethod = enumOutline.clazz.getMethod("fromValue", new JType[]{jTypeString});
 			if (null == fromValueMethod) {
-				throw new UnsupportedOperationException(MessageFormat.format(
-						"Method fromValue(String) not found in enum [{0}]",
-						enumOutline.clazz.name()));
+				throw new IllegalArgumentException(
+						MessageFormat
+								.format("Could not annotate the fromValue(String) method of the enum [{0}] since it could not be found.",
+										enumOutline.clazz.name()));
+				
 			}
 			return fromValueMethod;
 		}

pom.xml

@@ -217,7 +217,7 @@
 			</dependency>
 			<dependency>
 				<groupId>com.sun.xml.bind</groupId>
-				<artifactId>jaxb-core</artifactId>
+				<artifactId>jaxb-impl</artifactId>
 				<version>${jaxb.version}</version>
 			</dependency>
 			<dependency>
@@ -329,8 +329,8 @@
 					<inherited>true</inherited>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
+						<source>1.6</source>
+						<target>1.6</target>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -369,6 +369,11 @@
 						</dependency>
 					</dependencies>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-invoker-plugin</artifactId>
+					<version>3.0.0</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>

tests/annotations/.gitignore

@@ -0,0 +1,4 @@
+target
+.project
+.classpath
+.settings

tests/annox/annotations/.settings/org.eclipse.core.resources.prefs renamed to tests/annotations/.settings/org.eclipse.core.resources.prefs

@@ -34,11 +34,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.jvnet.jaxb2_commons</groupId>
-		<artifactId>jaxb2-annotate-plugin-test-annox</artifactId>
+		<artifactId>jaxb2-annotate-plugin-tests</artifactId>
 		<version>1.0.3-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
-	<artifactId>jaxb2-annotate-plugin-test-annox-annotations</artifactId>
+	<artifactId>jaxb2-annotate-plugin-test-annotations</artifactId>
 	<packaging>jar</packaging>
-	<name>JAXB2 Annotate Plugin - Test [annox-annotations]</name>
+	<name>JAXB2 Annotate Plugin - Test [annotations]</name>
 </project>

tests/annox/annotations/.settings/org.eclipse.jdt.core.prefs renamed to tests/annotations/.settings/org.eclipse.jdt.core.prefs

@@ -26,10 +26,7 @@
  * 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.test.annox.annotations;
+package org.jvnet.jaxb2_commons.plugin.annotate.tests.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;