Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Sep 24, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
336d980
[#378] Java package refactor jaxb2_commons to jaxb
mattrpav Sep 21, 2023
e8d69b8
fixup
laurentschoelens Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions ...axb2_commons/plugin/AnnotationTarget.java → ...g/jvnet/jaxb/plugin/AnnotationTarget.java
View file
Open in desktop
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
10 changes: 5 additions & 5 deletions ...mmons/plugin/annotate/AnnotatePlugin.java → .../jaxb/plugin/annotate/AnnotatePlugin.java
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...annotate/AnnotatingArrayValueVisitor.java → ...annotate/AnnotatingArrayValueVisitor.java
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...nnotate/AnnotatingSingleValueVisitor.java → ...nnotate/AnnotatingSingleValueVisitor.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...ns/plugin/annotate/AnnotatingVisitor.java → ...xb/plugin/annotate/AnnotatingVisitor.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...b2_commons/plugin/annotate/Annotator.java → ...jvnet/jaxb/plugin/annotate/Annotator.java
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions ...oveannotation/RemoveAnnotationPlugin.java → ...oveannotation/RemoveAnnotationPlugin.java
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions jaxb-annotate-parent/plugin/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...axb2_commons/plugin/annotate/tests/A.java → ...g/jvnet/jaxb/plugin/annotate/tests/A.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...axb2_commons/plugin/annotate/tests/B.java → ...g/jvnet/jaxb/plugin/annotate/tests/B.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...axb2_commons/plugin/annotate/tests/D.java → ...g/jvnet/jaxb/plugin/annotate/tests/D.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...axb2_commons/plugin/annotate/tests/E.java → ...g/jvnet/jaxb/plugin/annotate/tests/E.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...axb2_commons/plugin/annotate/tests/F.java → ...g/jvnet/jaxb/plugin/annotate/tests/F.java
View file
Open in desktop
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
View file
Open in desktop
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