Working on #24.

highsource · highsource · commit 6c8f4fa1206b · 2016-03-20T22:55:19.000+01:00
diff --git a/plugin/.classpath b/plugin/.classpath
@@ -6,14 +6,22 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/plugin/.gitignore b/plugin/.gitignore
@@ -1 +1,4 @@
 /target
+.classpath
+.project
+.settings
diff --git a/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatePlugin.java b/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatePlugin.java
@@ -196,7 +196,6 @@ protected void processClassOutline(ClassOutline classOutline,
 	protected void processFieldOutline(ClassOutline classOutline,
 			FieldOutline fieldOutline, Options options,
 			ErrorHandler errorHandler) {
-
 		final CCustomizations customizations = CustomizationUtils
 				.getCustomizations(fieldOutline);
 		annotate(fieldOutline.parent().ref.owner(), fieldOutline,
diff --git a/pom.xml b/pom.xml
@@ -130,7 +130,7 @@
 		<jaxb-api.version>2.2.11</jaxb-api.version>
 		<maven-jaxb2-plugin.version>0.13.1</maven-jaxb2-plugin.version>
 		<annox.version>1.0.1</annox.version>
-		<jaxb2-basics.version>0.11.0</jaxb2-basics.version>
+		<jaxb2-basics.version>0.11.1-SNAPSHOT</jaxb2-basics.version>
 	</properties>
 	<dependencies>
 		<!-- JUnit -->
diff --git a/samples/.gitignore b/samples/.gitignore
@@ -1 +1,4 @@
 /target
+.classpath
+.project
+.settings
diff --git a/tests/.gitignore b/tests/.gitignore
@@ -1 +1,3 @@
 /target
+.project
+.settings
diff --git a/tests/annotate/.classpath b/tests/annotate/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry including="**/*.java" kind="src" output="target/classes" path="target/generated-sources/xjc">
 		<attributes>
 			<attribute name="optional" value="true"/>
diff --git a/tests/annox/annotations/.classpath b/tests/annox/annotations/.classpath
@@ -6,14 +6,22 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/tests/issues/.classpath b/tests/issues/.classpath
@@ -6,7 +6,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry including="**/*.java" kind="src" output="target/classes" path="target/generated-sources/xjc">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -19,7 +23,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/tests/issues/pom.xml b/tests/issues/pom.xml
@@ -61,9 +61,16 @@
 				<configuration>
 					<extension>true</extension>
 					<args>
+						<arg>-Xcustomizations</arg>
+						<arg>-Xcustomizations-directory=${basedir}/src/main/resources</arg>
+						<arg>-Xcustomizations-verbose=true</arg>
 						<arg>-Xannotate</arg>
 					</args>
 					<plugins>
+						<plugin>
+							<groupId>org.jvnet.jaxb2_commons</groupId>
+							<artifactId>jaxb2-basics</artifactId>
+						</plugin>
 						<plugin>
 							<groupId>org.jvnet.jaxb2_commons</groupId>
 							<artifactId>jaxb2-basics-annotate</artifactId>
diff --git a/tests/issues/src/main/resources/binding.xjb b/tests/issues/src/main/resources/binding.xjb
@@ -54,6 +54,5 @@
 				<annox:annotate annox:class="java.lang.Deprecated" />
 			</annox:annotate>
 		</jaxb:bindings>
-		&gh24type;
 	</jaxb:bindings>
 </jaxb:bindings>
diff --git a/tests/issues/src/main/resources/org/jvnet/jaxb2_commons/tests/issues/Gh24Type.value.xml b/tests/issues/src/main/resources/org/jvnet/jaxb2_commons/tests/issues/Gh24Type.value.xml
@@ -0,0 +1,31 @@
+<!--
+
+    Copyright © 2005-2015, Alexey Valikov
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    The views and conclusions contained in the software and documentation are those
+    of the authors and should not be interpreted as representing official policies,
+    either expressed or implied, of the FreeBSD Project.
+
+-->
+<annox:annotate xmlns:annox="http://annox.dev.java.net">@javax.annotation.Generated({"jaxb2-annotate-plugin"})</annox:annotate>
diff --git a/tests/one/.classpath b/tests/one/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry including="**/*.java" kind="src" output="target/classes" path="target/generated-sources/xjc">
 		<attributes>
 			<attribute name="optional" value="true"/>
