Skip to content

Commit

Permalink
[#378] Java package refactor jaxb2_commons to jaxb
Browse files Browse the repository at this point in the history
  • Loading branch information
mattrpav committed Sep 21, 2023
1 parent 757a1fa commit 336d980
Show file tree
Hide file tree
Showing 549 changed files with 1,916 additions and 1,936 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff 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;

import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Expand Down
Original file line number Diff 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;

import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff 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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
62 changes: 31 additions & 31 deletions jaxb-annotate-parent/plugin/src/test/resources/schema.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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"
Expand All @@ -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>
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
Loading

0 comments on commit 336d980

Please sign in to comment.