[#378] Java package refactor jaxb2_commons to jaxb (#393)

* [#378] Java package refactor jaxb2_commons to jaxb --------- Co-authored-by: Laurent Schoelens <61973605+laurentschoelens@users.noreply.github.com>
highsource · Sep 24, 2023 · 478c659 · 478c659
1 parent 757a1fa
commit 478c659
Show file tree

Hide file tree

Showing 549 changed files with 1,916 additions and 1,936 deletions.
diff --git a/...axb2_commons/plugin/AnnotationTarget.java → ...g/jvnet/jaxb/plugin/AnnotationTarget.java b/...axb2_commons/plugin/AnnotationTarget.java → ...g/jvnet/jaxb/plugin/AnnotationTarget.java
@@ -26,7 +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;
+package org.jvnet.jaxb.plugin;
 
 import java.text.MessageFormat;
 import java.util.Arrays;
@@ -37,10 +37,10 @@
 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.jvnet.jaxb.plugin.annotate.AnnotatePlugin;
+import org.jvnet.jaxb.plugin.removeannotation.RemoveAnnotationPlugin;
+import org.jvnet.jaxb.util.FieldAccessorUtils;
+import org.jvnet.jaxb.util.OutlineUtils;
 import org.w3c.dom.Element;
 
 import com.sun.codemodel.JAnnotatable;

diff --git a/...mmons/plugin/annotate/AnnotatePlugin.java → .../jaxb/plugin/annotate/AnnotatePlugin.java b/...mmons/plugin/annotate/AnnotatePlugin.java → .../jaxb/plugin/annotate/AnnotatePlugin.java
@@ -26,7 +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;
+package org.jvnet.jaxb.plugin.annotate;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -40,10 +40,10 @@
 import org.jvnet.jaxb.annox.Constants;
 import org.jvnet.jaxb.annox.model.XAnnotation;
 import org.jvnet.jaxb.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.jvnet.jaxb.plugin.AbstractParameterizablePlugin;
+import org.jvnet.jaxb.plugin.AnnotationTarget;
+import org.jvnet.jaxb.plugin.removeannotation.RemoveAnnotationPlugin;
+import org.jvnet.jaxb.util.CustomizationUtils;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;

diff --git a/...annotate/AnnotatingArrayValueVisitor.java → ...annotate/AnnotatingArrayValueVisitor.java b/...annotate/AnnotatingArrayValueVisitor.java → ...annotate/AnnotatingArrayValueVisitor.java
@@ -26,7 +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;
+package org.jvnet.jaxb.plugin.annotate;
 
 import org.jvnet.jaxb.annox.model.XAnnotation;
 import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField;
@@ -46,7 +46,7 @@
 import org.jvnet.jaxb.annox.model.annotation.value.XShortAnnotationValue;
 import org.jvnet.jaxb.annox.model.annotation.value.XStringAnnotationValue;
 import org.jvnet.jaxb.annox.model.annotation.value.XXAnnotationAnnotationValue;
-import org.jvnet.jaxb2_commons.util.CodeModelUtils;
+import org.jvnet.jaxb.util.CodeModelUtils;
 
 import com.sun.codemodel.JAnnotationArrayMember;
 import com.sun.codemodel.JAnnotationUse;

diff --git a/...nnotate/AnnotatingSingleValueVisitor.java → ...nnotate/AnnotatingSingleValueVisitor.java b/...nnotate/AnnotatingSingleValueVisitor.java → ...nnotate/AnnotatingSingleValueVisitor.java
@@ -26,7 +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;
+package org.jvnet.jaxb.plugin.annotate;
 
 import org.jvnet.jaxb.annox.model.XAnnotation;
 import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField;
@@ -46,7 +46,7 @@
 import org.jvnet.jaxb.annox.model.annotation.value.XShortAnnotationValue;
 import org.jvnet.jaxb.annox.model.annotation.value.XStringAnnotationValue;
 import org.jvnet.jaxb.annox.model.annotation.value.XXAnnotationAnnotationValue;
-import org.jvnet.jaxb2_commons.util.CodeModelUtils;
+import org.jvnet.jaxb.util.CodeModelUtils;
 
 import com.sun.codemodel.JAnnotationUse;
 import com.sun.codemodel.JClass;

diff --git a/...ns/plugin/annotate/AnnotatingVisitor.java → ...xb/plugin/annotate/AnnotatingVisitor.java b/...ns/plugin/annotate/AnnotatingVisitor.java → ...xb/plugin/annotate/AnnotatingVisitor.java
@@ -26,7 +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;
+package org.jvnet.jaxb.plugin.annotate;
 
 import org.jvnet.jaxb.annox.model.XAnnotationFieldVisitor;
 import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField;

diff --git a/...b2_commons/plugin/annotate/Annotator.java → ...jvnet/jaxb/plugin/annotate/Annotator.java b/...b2_commons/plugin/annotate/Annotator.java → ...jvnet/jaxb/plugin/annotate/Annotator.java
@@ -26,7 +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;
+package org.jvnet.jaxb.plugin.annotate;
 
 import java.util.Collection;
 

diff --git a/...oveannotation/RemoveAnnotationPlugin.java → ...oveannotation/RemoveAnnotationPlugin.java b/...oveannotation/RemoveAnnotationPlugin.java → ...oveannotation/RemoveAnnotationPlugin.java
@@ -26,7 +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.removeannotation;
+package org.jvnet.jaxb.plugin.removeannotation;
 
 import java.text.MessageFormat;
 import java.util.Arrays;
@@ -39,9 +39,9 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.jvnet.jaxb.annox.Constants;
-import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin;
-import org.jvnet.jaxb2_commons.plugin.AnnotationTarget;
-import org.jvnet.jaxb2_commons.util.CustomizationUtils;
+import org.jvnet.jaxb.plugin.AbstractParameterizablePlugin;
+import org.jvnet.jaxb.plugin.AnnotationTarget;
+import org.jvnet.jaxb.util.CustomizationUtils;
 import org.w3c.dom.Element;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;

diff --git a/jaxb-annotate-parent/plugin/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin b/jaxb-annotate-parent/plugin/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
@@ -1,2 +1,2 @@
-org.jvnet.jaxb2_commons.plugin.annotate.AnnotatePlugin
-org.jvnet.jaxb2_commons.plugin.removeannotation.RemoveAnnotationPlugin
+org.jvnet.jaxb.plugin.annotate.AnnotatePlugin
+org.jvnet.jaxb.plugin.removeannotation.RemoveAnnotationPlugin
diff --git a/...axb2_commons/plugin/annotate/tests/A.java → ...g/jvnet/jaxb/plugin/annotate/tests/A.java b/...axb2_commons/plugin/annotate/tests/A.java → ...g/jvnet/jaxb/plugin/annotate/tests/A.java
@@ -29,7 +29,7 @@
 /**
  *
  */
-package org.jvnet.jaxb2_commons.plugin.annotate.tests;
+package org.jvnet.jaxb.plugin.annotate.tests;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...axb2_commons/plugin/annotate/tests/B.java → ...g/jvnet/jaxb/plugin/annotate/tests/B.java b/...axb2_commons/plugin/annotate/tests/B.java → ...g/jvnet/jaxb/plugin/annotate/tests/B.java
@@ -29,7 +29,7 @@
 /**
  *
  */
-package org.jvnet.jaxb2_commons.plugin.annotate.tests;
+package org.jvnet.jaxb.plugin.annotate.tests;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...axb2_commons/plugin/annotate/tests/D.java → ...g/jvnet/jaxb/plugin/annotate/tests/D.java b/...axb2_commons/plugin/annotate/tests/D.java → ...g/jvnet/jaxb/plugin/annotate/tests/D.java
@@ -26,7 +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.tests;
+package org.jvnet.jaxb.plugin.annotate.tests;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...axb2_commons/plugin/annotate/tests/E.java → ...g/jvnet/jaxb/plugin/annotate/tests/E.java b/...axb2_commons/plugin/annotate/tests/E.java → ...g/jvnet/jaxb/plugin/annotate/tests/E.java
@@ -29,7 +29,7 @@
 /**
  *
  */
-package org.jvnet.jaxb2_commons.plugin.annotate.tests;
+package org.jvnet.jaxb.plugin.annotate.tests;
 
 public enum E {
 

diff --git a/...axb2_commons/plugin/annotate/tests/F.java → ...g/jvnet/jaxb/plugin/annotate/tests/F.java b/...axb2_commons/plugin/annotate/tests/F.java → ...g/jvnet/jaxb/plugin/annotate/tests/F.java
@@ -26,7 +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.tests;
+package org.jvnet.jaxb.plugin.annotate.tests;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/jaxb-annotate-parent/plugin/src/test/resources/schema.xsd b/jaxb-annotate-parent/plugin/src/test/resources/schema.xsd
@@ -42,7 +42,7 @@
 				<xjc:noValidatingUnmarshaller /-->
 			</jaxb:globalBindings>
 			<jaxb:schemaBindings>
-				<jaxb:package name="org.jvnet.jaxb2_commons.plugin.annotate.tests"/>
+				<jaxb:package name="org.jvnet.jaxb.plugin.annotate.tests"/>
 			</jaxb:schemaBindings>
 		</xs:appinfo>
 	</xs:annotation>
@@ -53,16 +53,16 @@
 			<xs:appinfo>
 				<annox:annotate>
 				<A
-					xmlns="http://annox.dev.java.net/org.jvnet.jaxb2_commons.plugin.annotate.tests"
+					xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests"
 					booleanField="false" byteField="0" charField="a"
-					classField="java.lang.String" anotherClassField="org.jvnet.jaxb2_commons.plugin.annotate.tests.One" doubleField="1" enumField="ONE"
+					classField="java.lang.String" anotherClassField="org.jvnet.jaxb.plugin.annotate.tests.One" doubleField="1" enumField="ONE"
 					floatField="2.3" intField="4" longField="5" shortField="6"
 					stringField="7">
 					<annotationField>
 						<B booleanArrayField="false true" byteArrayField="0 1"
 							charArrayField="a b"
 							classArrayField="java.lang.String java.lang.Boolean"
-							anotherClassArrayField="org.jvnet.jaxb2_commons.plugin.annotate.tests.One org.jvnet.jaxb2_commons.plugin.annotate.tests.Two"
+							anotherClassArrayField="org.jvnet.jaxb.plugin.annotate.tests.One org.jvnet.jaxb.plugin.annotate.tests.Two"
 							doubleArrayField="2 3" enumArrayField="ONE TWO"
 							floatArrayField="4.5 6.7" intArrayField="8 9"
 							longArrayField="10 11" shortArrayField="12 13"
@@ -71,9 +71,9 @@
 							<stringArrayField>17</stringArrayField>
 							<annotationArrayField>
 								<C
-									annox:class="org.jvnet.jaxb2_commons.plugin.annotate.tests.B$C"/>
+									annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/>
 								<C
-									annox:class="org.jvnet.jaxb2_commons.plugin.annotate.tests.B$C"/>
+									annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/>
 							</annotationArrayField>
 						</B>
 					</annotationField>
@@ -88,7 +88,7 @@
 						<annox:annotate>
 
 							<A
-								xmlns="http://annox.dev.java.net/org.jvnet.jaxb2_commons.plugin.annotate.tests"
+								xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests"
 								booleanField="false" byteField="0" charField="a"
 								classField="double" doubleField="1"
 								enumField="ONE" floatField="2.3" intField="4"
@@ -97,7 +97,7 @@
 									<B booleanArrayField="false true"
 										byteArrayField="0 1" charArrayField="a b"
 										classArrayField="java.lang.String java.lang.Boolean"
-										anotherClassArrayField="org.jvnet.jaxb2_commons.plugin.annotate.tests.Two org.jvnet.jaxb2_commons.plugin.annotate.tests.One"
+										anotherClassArrayField="org.jvnet.jaxb.plugin.annotate.tests.Two org.jvnet.jaxb.plugin.annotate.tests.One"
 										doubleArrayField="2 3"
 										enumArrayField="ONE TWO"
 										floatArrayField="4.5 6.7"
@@ -109,17 +109,17 @@
 										<stringArrayField>17</stringArrayField>
 										<annotationArrayField>
 											<C
-												annox:class="org.jvnet.jaxb2_commons.plugin.annotate.tests.B$C"/>
+												annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/>
 											<C
-												annox:class="org.jvnet.jaxb2_commons.plugin.annotate.tests.B$C"/>
+												annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/>
 										</annotationArrayField>
 									</B>
 								</annotationField>
 							</A>
 						</annox:annotate>
 						<annox:annotate target="field">
 						    <A
-								xmlns="http://annox.dev.java.net/org.jvnet.jaxb2_commons.plugin.annotate.tests"
+								xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests"
 								booleanField="false" byteField="0" charField="a"
 								classField="double[]" doubleField="1"
 								enumField="ONE" floatField="2.3" intField="4"
@@ -128,7 +128,7 @@
 									<B booleanArrayField="false true"
 										byteArrayField="0 1" charArrayField="a b"
 										classArrayField="java.lang.String java.lang.Boolean"
-										anotherClassArrayField="org.jvnet.jaxb2_commons.plugin.annotate.tests.Two org.jvnet.jaxb2_commons.plugin.annotate.tests.One"
+										anotherClassArrayField="org.jvnet.jaxb.plugin.annotate.tests.Two org.jvnet.jaxb.plugin.annotate.tests.One"
 										doubleArrayField="2 3"
 										enumArrayField="ONE TWO"
 										floatArrayField="4.5 6.7"
@@ -140,17 +140,17 @@
 										<stringArrayField>17</stringArrayField>
 										<annotationArrayField>
 											<C
-												annox:class="org.jvnet.jaxb2_commons.plugin.annotate.tests.B$C"/>
+												annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/>
 											<C
-												annox:class="org.jvnet.jaxb2_commons.plugin.annotate.tests.B$C"/>
+												annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/>
 										</annotationArrayField>
 									</B>
 								</annotationField>
 							</A>
 						</annox:annotate>
 						<annox:annotate target="setter">
 							<A
-								xmlns="http://annox.dev.java.net/org.jvnet.jaxb2_commons.plugin.annotate.tests"
+								xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests"
 								booleanField="false" byteField="0" charField="a"
 								classField="java.lang.String" doubleField="1"
 								enumField="ONE" floatField="2.3" intField="4"
@@ -159,7 +159,7 @@
 									<B booleanArrayField="false true"
 										byteArrayField="0 1" charArrayField="a b"
 										classArrayField="java.lang.String java.lang.Boolean"
-										anotherClassArrayField="org.jvnet.jaxb2_commons.plugin.annotate.tests.Two org.jvnet.jaxb2_commons.plugin.annotate.tests.One"
+										anotherClassArrayField="org.jvnet.jaxb.plugin.annotate.tests.Two org.jvnet.jaxb.plugin.annotate.tests.One"
 										doubleArrayField="2 3"
 										enumArrayField="ONE TWO"
 										floatArrayField="4.5 6.7"
@@ -171,17 +171,17 @@
 										<stringArrayField>17</stringArrayField>
 										<annotationArrayField>
 											<C
-												annox:class="org.jvnet.jaxb2_commons.plugin.annotate.tests.B$C"/>
+												annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/>
 											<C
-												annox:class="org.jvnet.jaxb2_commons.plugin.annotate.tests.B$C"/>
+												annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/>
 										</annotationArrayField>
 									</B>
 								</annotationField>
 							</A>
 						</annox:annotate>
 						<annox:annotate target="class">
 							<A
-								xmlns="http://annox.dev.java.net/org.jvnet.jaxb2_commons.plugin.annotate.tests"
+								xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests"
 								booleanField="false" byteField="0" charField="a"
 								classField="java.lang.String" doubleField="1"
 								enumField="ONE" floatField="2.3" intField="4"
@@ -190,7 +190,7 @@
 									<B booleanArrayField="false true"
 										byteArrayField="0 1" charArrayField="a b"
 										classArrayField="java.lang.String java.lang.Boolean"
-										anotherClassArrayField="org.jvnet.jaxb2_commons.plugin.annotate.tests.Two org.jvnet.jaxb2_commons.plugin.annotate.tests.One"
+										anotherClassArrayField="org.jvnet.jaxb.plugin.annotate.tests.Two org.jvnet.jaxb.plugin.annotate.tests.One"
 										doubleArrayField="2 3"
 										enumArrayField="ONE TWO"
 										floatArrayField="4.5 6.7"
@@ -202,9 +202,9 @@
 										<stringArrayField>17</stringArrayField>
 										<annotationArrayField>
 											<C
-												annox:class="org.jvnet.jaxb2_commons.plugin.annotate.tests.B$C"/>
+												annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/>
 											<C
-												annox:class="org.jvnet.jaxb2_commons.plugin.annotate.tests.B$C"/>
+												annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/>
 										</annotationArrayField>
 									</B>
 								</annotationField>
@@ -222,7 +222,7 @@
 		<xs:annotation>
 			<xs:appinfo>
 				<annox:annotate>
-					<F xmlns="http://annox.dev.java.net/org.jvnet.jaxb2_commons.plugin.annotate.tests" value="enum type" />
+					<F xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests" value="enum type" />
 				</annox:annotate>
 			</xs:appinfo>
 		</xs:annotation>
@@ -231,7 +231,7 @@
 				<xs:annotation>
 					<xs:appinfo>
 						<annox:annotate>
-							<F xmlns="http://annox.dev.java.net/org.jvnet.jaxb2_commons.plugin.annotate.tests" value="enum constant" />
+							<F xmlns="http://annox.dev.java.net/org.jvnet.jaxb.plugin.annotate.tests" value="enum constant" />
 						</annox:annotate>
 					</xs:appinfo>
 				</xs:annotation>
@@ -244,33 +244,33 @@
 		<xs:annotation>
 			<xs:appinfo>
 				<annox:annotate>
-				@org.jvnet.jaxb2_commons.plugin.annotate.tests.A(
+				@org.jvnet.jaxb.plugin.annotate.tests.A(
 					booleanField = false,
 					byteField = 0,
 					charField = 'a',
 					classField = java.lang.String[][][].class,
-					anotherClassField=org.jvnet.jaxb2_commons.plugin.annotate.tests.One.class,
+					anotherClassField=org.jvnet.jaxb.plugin.annotate.tests.One.class,
 					doubleField = 1,
-					enumField = org.jvnet.jaxb2_commons.plugin.annotate.tests.E.ONE,
+					enumField = org.jvnet.jaxb.plugin.annotate.tests.E.ONE,
 					floatField = 2.3f,
 					intField = 4,
 					longField = 5,
 					shortField = 6,
 					stringField = "7",
-					annotationField = @org.jvnet.jaxb2_commons.plugin.annotate.tests.B(
+					annotationField = @org.jvnet.jaxb.plugin.annotate.tests.B(
 						booleanArrayField = { false, true },
 						byteArrayField = { 0, 1 },
 						charArrayField = { 'a', 'b' },
 						classArrayField = {	java.lang.String.class, java.lang.Boolean.class },
-						anotherClassArrayField= {org.jvnet.jaxb2_commons.plugin.annotate.tests.One.class, org.jvnet.jaxb2_commons.plugin.annotate.tests.Two.class },
+						anotherClassArrayField= {org.jvnet.jaxb.plugin.annotate.tests.One.class, org.jvnet.jaxb.plugin.annotate.tests.Two.class },
 						doubleArrayField = { 2, 3 },
-						enumArrayField = { org.jvnet.jaxb2_commons.plugin.annotate.tests.E.ONE, org.jvnet.jaxb2_commons.plugin.annotate.tests.E.TWO },
+						enumArrayField = { org.jvnet.jaxb.plugin.annotate.tests.E.ONE, org.jvnet.jaxb.plugin.annotate.tests.E.TWO },
 						floatArrayField = { 4.5f, 6.7f },
 						intArrayField = { 8, 9 },
 						longArrayField = { 10, -9223372036854775808L },
 						shortArrayField = { 12, 13 },
 						stringArrayField = { "14", "15", "16", "17" },
-						annotationArrayField = { @org.jvnet.jaxb2_commons.plugin.annotate.tests.B.C, @org.jvnet.jaxb2_commons.plugin.annotate.tests.B.C }))
+						annotationArrayField = { @org.jvnet.jaxb.plugin.annotate.tests.B.C, @org.jvnet.jaxb.plugin.annotate.tests.B.C }))
 					</annox:annotate>
 			</xs:appinfo>
 		</xs:annotation>
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ @@
     /**
      *
      */
-    package org.jvnet.jaxb2_commons.plugin.annotate.tests;
+    package org.jvnet.jaxb.plugin.annotate.tests;
     public enum E {
@@ Expand Down @@