diff --git a/.gitignore b/.gitignore index 0876da643..7872f1f61 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ **/.project **/.settings target +.DS_Store diff --git a/README.md b/README.md index a2ec3c79a..e4967c273 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,53 @@ -<<<<<<< HEAD -# JAXB Maven Plugin # +# JAXB Tools + +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.jvnet.jaxb/jaxb-tools-project/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/org.jvnet.jaxb/jaxb-tools-project/?gav=true) +[![GitHub Actions Status](https://github.com/highsource/jaxb-tools/workflows/Maven%20CI/badge.svg)](https://github.com/highsource/jaxb-tools/actions) +[![CodeQL](https://github.com/highsource/jaxb-tools/workflows/CodeQL/badge.svg)](https://github.com/highsource/jaxb-tools/actions/workflows/codeql-analysis.yml?query=workflow%3ACodeQL) + +Welcome to the most advanced and feature-full sets of JAXB related tools. + +The project is currently containing the following tools : +* [JAXB Maven Plugin](#jaxb-maven-plugin) +* [JAXB Basics Plugins](#jaxb2-basics) +* [Annox](#annox) +* [JAXB Annotate Plugin](#jaxb-annotate-plugin) + +## Java versions + +Supported Java versions are `8`, and higher for all projects. +Build is tested against JDK8, JDK11 and JDK17. + +## [Documentation](https://github.com/highsource/jaxb-tools/wiki) + +Please refer to the [wiki](https://github.com/highsource/jaxb-tools/wiki) for the full documentation. + +* [Jakarta Slack](https://jakarta.ee/connect/) Join the #jaxb channel on Jakarta EE Slack +* [User Guide](https://github.com/highsource/jaxb-tools/wiki/User-Guide) +* Maven Documentation (Work in progress) +* [Configuration Cheat Sheet](https://github.com/highsource/jaxb-tools/wiki/Configuration-Cheat-Sheet) +* [Common Pitfalls and Problems](https://github.com/highsource/jaxb-tools/wiki/Common-Pitfalls-and-Problems) (Work in progress) +* [Best Practices](https://github.com/highsource/jaxb-tools/wiki/Best-Practices) (Work in progress) +* [FAQ](https://github.com/highsource/jaxb-tools/wiki/FAQ) +* [Sample Projects](https://github.com/highsource/jaxb-tools/wiki/Sample-Projects) +* [Support](https://github.com/highsource/jaxb-tools/wiki/Support) +* [License](https://github.com/highsource/jaxb-tools/blob/master/LICENSE) +* [JAXB Eclipse Project](https://github.com/eclipse-ee4j/jaxb-ri) + +## Disclaimer + +This project is not developed, supported or in any other way affiliated with Apache. The `org.jvnet.jaxb:jaxb-tools` is not an Apache product (and does not pretend to be one), it is a completely independent development. + +This project is also *not* developed by or affiliated with Oracle or Sun. Even if it is featured on [https://jaxb.java.net/](https://jaxb.java.net) pages, + +**This plugin is in no way _official_ JAXB Maven plugin by Sun or Oracle.** + +This is a completely independent development. [I](https://github.com/highsource) am *not* an Oracle employee. + +# JAXB Maven Plugin Welcome to the `org.jvnet.jaxb:jaxb-maven-plugin`, the most advanced and feature-full Maven plugin for XML Schema compilation. -## Quick start ## +## Quick start * Put your schemas (`*.xsd`) and bindings (`*.xjb`) into the `src/main/resources` folder. * Add the plugin to your `pom.xml`: @@ -41,37 +85,7 @@ If you need an older JAXB version, you can use one of the following variants, wh * `org.jvnet.jaxb2.maven2:maven-jaxb21-plugin:0.15.2` - JAXB 2.1. * `org.jvnet.jaxb2.maven2:maven-jaxb22-plugin:0.15.1` - JAXB 2.2. -### Java versions - -Supported Java versions are `8`, and higher. - -## [Documentation](https://github.com/highsource/jaxb-tools/wiki) ## - -Please refer to the [wiki](https://github.com/highsource/jaxb-tools/wiki) for the full documentation. - -* [Jakarta Slack](https://jakarta.ee/connect/) Join the #jaxb channel on Jakarta EE Slack -* [User Guide](https://github.com/highsource/jaxb-tools/wiki/User-Guide) -* Maven Documentation (Work in progress) -* [Configuration Cheat Sheet](https://github.com/highsource/jaxb-tools/wiki/Configuration-Cheat-Sheet) -* [Common Pitfalls and Problems](https://github.com/highsource/jaxb-tools/wiki/Common-Pitfalls-and-Problems) (Work in progress) -* [Best Practices](https://github.com/highsource/jaxb-tools/wiki/Best-Practices) (Work in progress) -* [FAQ](https://github.com/highsource/jaxb-tools/wiki/FAQ) -* [Sample Projects](https://github.com/highsource/jaxb-tools/wiki/Sample-Projects) -* [Support](https://github.com/highsource/jaxb-tools/wiki/Support) -* [License](https://github.com/highsource/jaxb-tools/blob/master/LICENSE) -* [JAXB Eclipse Project](https://github.com/eclipse-ee4j/jaxb-ri) - -## Disclaimer ## - -This project is not developed, supported or in any other way affiliated with Apache. The `org.jvnet.jaxb:jaxb-maven-plugin` is not an Apache product (and does not pretend to be one), it is a completely independent development. - -This project is also *not* developed by or affiliated with Oracle or Sun. Even if it is featured on [https://jaxb.java.net/](https://jaxb.java.net) pages, - -**This plugin is in no way _official_ JAXB Maven plugin by Sun or Oracle.** - -This is a completely indepentent development. [I](https://github.com/highsource) am *not* an Oracle employee. - -## Related ## +## Related This Maven plugin wraps and enhances the [JAXB](https://jaxb.java.net/) [Schema Compiler (XJC)](http://docs.oracle.com/javase/6/docs/technotes/tools/share/xjc.html) and allows compiling XML Schemas (as well as WSDL, DTDs, RELAX NG) into Java classes in Maven builds. @@ -84,14 +98,12 @@ compiling XML Schemas (as well as WSDL, DTDs, RELAX NG) into Java classes in Mav JAXB2 Basics is an [open source](https://github.com/highsource/jaxb2-basics/blob/master/LICENSE) project which provides useful plugins and tools for [JAXB 2.x reference implementation](https://jaxb.java.net/). -# Documentation +## Documentation Please refer to the [wiki](https://github.com/highsource/jaxb2-basics/wiki) for documentation. JAXB2 Basics can only be used with JAXB/XJC 2.3.0 and higher. JAXB/XJC versions 2.2.x and earlier are no longer supported. -JAXB2 Basics can only be used with Java 1.8 and above. - ## Using JAXB2 Basics * [Using JAXB2 Basics Plugins](https://github.com/highsource/jaxb2-basics/wiki/Using-JAXB2-Basics-Plugins) @@ -112,50 +124,48 @@ JAXB2 Basics can only be used with Java 1.8 and above. * [EnumValue Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-EnumValue-Plugin) - makes all the generated enums implement the `EnumValue` interface. * JAXBIndex Plugin - generated `jaxb.index` files listing schema-derived classes. * [FixJAXB1058 Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-FixJAXB1058-Plugin) - fixes [JAXB-1058](https://java.net/jira/browse/JAXB-1058). +* Commons Lang Plugin - generates the toString(), hashCode() and equals() methods using Apache commons-lang3. +* Default Value Plugin - modifies the JAXB code model to set default values to the schema `default` attribute. +* Fluent API Plugin - support a fluent api in addition to the default (JavaBean) setter methods. +* Namespace Prefix Plugin - adds `javax.xml.bind.annotation.XmlNs` annotations to `package-info.java` files +* Value Constructor Plugin - generates another constructor, taking an argument for each field in the class and initialises the field with the argument value. -## Credits ## +## Credits * Many thanks to **James Annesley** for his ideas and help with the [SimpleEquals Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-SimpleEquals-Plugin) and the [SimpleHashCode Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-SimpleHashCode-Plugin). - -Annox -===== +# Annox Parse Java annotations from text or XML resources. ```java - // Parse annotation from the string - XAnnotation xannotation = - (XAnnotation) XAnnotationParser.INSTANCE.parse - ("@javax.xml.bind.annotation.XmlRootElement(name=\"foo\")"); - - // Create an instance of the annotation - XmlRootElement xmlRootElement = xannotation.getResult(); - assertEquals("foo", xmlRootElement.name()); - assertEquals("##default", xmlRootElement.namespace()); - - // Analyze the structure of the annotation - assertEquals(String.class, xannotation.getFieldsMap().get("name").getType()); - assertEquals("##default", xannotation.getFieldsMap().get("namespace").getResult()); +// Parse annotation from the string +XAnnotation xannotation = + (XAnnotation) XAnnotationParser.INSTANCE.parse + ("@javax.xml.bind.annotation.XmlRootElement(name=\"foo\")"); + +// Create an instance of the annotation +XmlRootElement xmlRootElement = xannotation.getResult(); +assertEquals("foo", xmlRootElement.name()); +assertEquals("##default", xmlRootElement.namespace()); + +// Analyze the structure of the annotation +assertEquals(String.class, xannotation.getFieldsMap().get("name").getType()); +assertEquals("##default", xannotation.getFieldsMap().get("namespace").getResult()); ``` -======= -[![Maven Central](https://img.shields.io/maven-central/v/org.jvnet.jaxb2_commons/jaxb2-basics-annotate.svg)](https://github.com/highsource/jaxb2-annotate-plugin) -jaxb2-annotate-plugin -===================== +# JAXB Annotate Plugin -JAXB2 Annotate Plugin is capable of adding or removing arbitrary annotations to/from the generated sources. +JAXB Annotate Plugin is capable of adding or removing arbitrary annotations to/from the generated sources. -Usage overview --------------- +## Usage overview * Annotate your schema using binding files or directly in schema * Add the plugin to the XJC classpath. * Add your annotation classes to the XJC classpath. * Activate the plugin using `-Xannotate`-switch. -Providing annotations ---------------------- +## Providing annotations You can annotate your schema-derived elements using normal Java annotation syntax. ([Old XML syntax](http://confluence.highsource.org/display/J2B/Annotate+Plugin) is still supported but no longer recommended.) @@ -171,38 +181,37 @@ Inner classes should use the dot (`.`) as delimiter (not `$`). You can put your annotations directly in schema: ````xml - - - - - - - - @java.lang.SuppressWarnings({"unchecked","rawtypes"}) - @javax.annotation.Generated({"XJC","JAXB2 Annotate Plugin"}) - - - - - - - - @java.lang.SuppressWarnings({"unchecked","rawtypes"}) - @java.lang.Deprecated - @java.lang.Deprecated - @java.lang.Deprecated - @java.lang.Deprecated - @java.lang.Deprecated - - - - - + + + + + + + @java.lang.SuppressWarnings({"unchecked","rawtypes"}) + @javax.annotation.Generated({"XJC","JAXB2 Annotate Plugin"}) + + + + + + + + @java.lang.SuppressWarnings({"unchecked","rawtypes"}) + @java.lang.Deprecated + @java.lang.Deprecated + @java.lang.Deprecated + @java.lang.Deprecated + @java.lang.Deprecated + + + + + @@ -224,23 +233,23 @@ Or in binding files: ````xml - - - - - @javax.xml.bind.annotation.XmlRootElement(name="IssueJIIB39CType") - - - @javax.xml.bind.annotation.XmlAttribute(required=false, name="test") - - + + + + + @javax.xml.bind.annotation.XmlRootElement(name="IssueJIIB39CType") + + + @javax.xml.bind.annotation.XmlAttribute(required=false, name="test") + + ```` @@ -274,8 +283,7 @@ jaxb:extensionBindingPrefixes="xjc annox" Note: yes, I know that `http://annox.dev.java.net` no longer exists. Changing this namespace would break old builds. This is just a namespace, there must not necessarily be content there. Treat it as a logical identifier, nothing else. -Removing annotations --------------- +## Removing annotations * Customize your schema using binding files or directly in schema * Add the plugin to the XJC classpath. @@ -284,32 +292,30 @@ Removing annotations You can remove annotations using customizations directly in schema: ````xml - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + ```` @@ -318,23 +324,23 @@ Or in binding files: ````xml - - - - - - - - - - + + + + + + + + + + ```` @@ -369,10 +375,9 @@ Note: yes, I know that `http://annox.dev.java.net` no longer exists. Changing th This is just a namespace, there must not necessarily be content there. Treat it as a logical identifier, nothing else. -Using JAXB2 Annotate Plugin with Maven --------------------------------------- +## Using JAXB2 Annotate Plugin with Maven -* Add `org.jvnet.jaxb2_commons:jaxb2-basics-annotate` as XJC plugin +* Add `org.jvnet.jaxb:jaxb-basics-annotate` as XJC plugin * Turn on the plugin using `-Xannotate` or `-XremoveAnnotation`switch * Add artifact with your annotations as another XJC plugin @@ -380,33 +385,32 @@ Example: ````xml - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - - true - - -Xannotate - -XremoveAnnotation - - - - org.jvnet.jaxb2_commons - jaxb2-basics-annotate - - - - com.acme.foo - my-custom-annotations - - - + org.jvnet.jaxb + jaxb-maven-plugin + + true + + -Xannotate + -XremoveAnnotation + + + + org.jvnet.jaxb + jaxb-basics-annotate + + + + com.acme.foo + my-custom-annotations + + + ```` See [this example](https://github.com/highsource/jaxb2-annotate-plugin/tree/master/tests/annox). -Note that annotations are first compiled in the `annotations` module and the added to the classpath of the `maven-jaxb2-plugin` in the `schema` module: +Note that annotations are first compiled in the `annotations` module and the added to the classpath of the `jaxb-maven-plugin` in the `schema` module: + +## Using JAXB2 Annotate Plugin with Ant -Using JAXB2 Annotate Plugin with Ant ------------------------------------- See [this example](https://github.com/highsource/jaxb2-annotate-plugin/blob/master/samples/annotate/project-build.xml). ->>>>>>> jaxb2-annotate-plugin/master diff --git a/basics/ant/.gitignore b/basics/ant/.gitignore deleted file mode 100644 index 85fca1c32..000000000 --- a/basics/ant/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/target/ -.settings -.project -.classpath - diff --git a/basics/basic/.gitignore b/basics/basic/.gitignore deleted file mode 100644 index b98130674..000000000 --- a/basics/basic/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -.settings -.project -.classpath diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java b/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java index 54a986dc5..cbdedf88b 100644 --- a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java +++ b/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java @@ -5,6 +5,7 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; @@ -204,12 +205,11 @@ private static void addNamespacePrefix(JClass xmlNsClass, JAnnotationArrayMember ns.param("prefix", prefix); } - @SuppressWarnings("unchecked") private static JAnnotationUse getOrAddXmlSchemaAnnotation(JPackage p, JClass xmlSchemaClass) { JAnnotationUse xmlAnn = null; - final List annotations = getAnnotations(p); + final Collection annotations = getAnnotations(p); if (annotations != null) { for (JAnnotationUse annotation : annotations) { final JClass clazz = getAnnotationJClass(annotation); @@ -257,51 +257,19 @@ private static Model getPackageModel(PackageOutlineImpl packageOutline) { } } - @SuppressWarnings("unchecked") - private static List getAnnotations(JPackage p) { - // TODO bump jaxb-xjc dependency to version >= 2.2.2 and use the annotations() method instead. - try { - final Field annotationsField = JPackage.class.getDeclaredField("annotations"); - annotationsField.setAccessible(true); - return (List) annotationsField.get(p); - } - catch (IllegalAccessException e) { - throw new RuntimeException("Unable to access 'annotation' field for package [" + p.name() + "] : " + e.getMessage(), e); - } - catch (NoSuchFieldException e) { - throw new RuntimeException("Unable to find 'annotation' field for package [" + p.name() + "] : " + e.getMessage(), e); - } + private static Collection getAnnotations(JPackage p) { + return p.annotations(); } private static JClass getAnnotationJClass(JAnnotationUse annotation) { - try { - final Field clazzField = JAnnotationUse.class.getDeclaredField("clazz"); - clazzField.setAccessible(true); - return (JClass) clazzField.get(annotation); - } - catch (IllegalAccessException e) { - throw new RuntimeException("Unable to access 'clazz' field for class [JAnnotationUse] : " + e.getMessage(), e); - } - catch (NoSuchFieldException e) { - throw new RuntimeException("Unable to find 'annotation' field for class [JAnnotationUse] : " + e.getMessage(), e); - } + return annotation.getAnnotationClass(); } - @SuppressWarnings("unchecked") private static Map getAnnotationMemberValues(JAnnotationUse annotation) { - try { - final Field clazzField = JAnnotationUse.class.getDeclaredField("memberValues"); - clazzField.setAccessible(true); - return (Map) clazzField.get(annotation); - } - catch (IllegalAccessException e) { - throw new RuntimeException("Unable to access 'memberValues' field for class [JAnnotationUse] : " + e.getMessage(), e); - } - catch (NoSuchFieldException e) { - throw new RuntimeException("Unable to find 'memberValues' field for class [JAnnotationUse] : " + e.getMessage(), e); - } + return annotation.getAnnotationMembers(); } + private static String getStringAnnotationValue(JAnnotationValue val) { try { final Field clazzField = val.getClass().getDeclaredField("value"); diff --git a/basics/dist/pom.xml b/basics/dist/pom.xml index 5c25214e7..066a1d760 100644 --- a/basics/dist/pom.xml +++ b/basics/dist/pom.xml @@ -2,7 +2,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb jaxb2-basics-dist pom JAXB Tools :: JAXB Basics :: Distribution diff --git a/basics/plugins/.gitignore b/basics/plugins/.gitignore deleted file mode 100644 index f66a28914..000000000 --- a/basics/plugins/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.project -.classpath \ No newline at end of file diff --git a/basics/pom.xml b/basics/pom.xml index 64bead830..6425c9608 100644 --- a/basics/pom.xml +++ b/basics/pom.xml @@ -46,131 +46,13 @@ - - UTF-8 - 2.3.0.1 - 1.9.4 - 3.3.13 - - - 3.1 - - - - - junit - junit - test - - - - - - org.jvnet.jaxb - jaxb2-basics-plugins - ${project.version} - - - org.jvnet.jaxb - jaxb2-basics-ant - ${project.version} - - - org.jvnet.jaxb - jaxb2-basics-runtime - ${project.version} - - - org.jvnet.jaxb - jaxb2-basics-tools - ${project.version} - - - org.jvnet.jaxb - jaxb2-basics-testing - ${project.version} - - - org.jvnet.jaxb - jaxb2-basics - ${project.version} - - - - org.jvnet.jaxb - jaxb-maven-plugin - ${project.version} - - - org.jvnet.jaxb - jaxb-maven-plugin-testing - ${project.version} - - - - - org.glassfish.jaxb - jaxb-core - ${jaxb-core.version} - - - - joda-time - joda-time - 2.5 - - - - org.apache.commons - commons-lang3 - 3.2.1 - - - commons-io - commons-io - 2.11.0 - - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - - - commons-logging - commons-logging - - - - - - org.springframework - spring - 2.0.7 - - - - xmlunit - xmlunit - 1.5 - - - - org.apache.ant - ant - ${ant.version} - - - org.apache.ant - ant-launcher - ${ant.version} - - - - com.google.code.javaparser - javaparser - 1.0.11 - - - + + + + junit + junit + test + + diff --git a/basics/runtime/.gitignore b/basics/runtime/.gitignore deleted file mode 100644 index 7266935b6..000000000 --- a/basics/runtime/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -.settings -.project -.classpath \ No newline at end of file diff --git a/basics/samples/.gitignore b/basics/samples/.gitignore deleted file mode 100644 index 1de565933..000000000 --- a/basics/samples/.gitignore +++ /dev/null @@ -1 +0,0 @@ -target \ No newline at end of file diff --git a/basics/samples/basic/.gitignore b/basics/samples/basic/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/basics/samples/basic/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/basics/samples/cxf/.gitignore b/basics/samples/cxf/.gitignore deleted file mode 100644 index eb5a316cb..000000000 --- a/basics/samples/cxf/.gitignore +++ /dev/null @@ -1 +0,0 @@ -target diff --git a/basics/samples/po-simple/.gitignore b/basics/samples/po-simple/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/basics/samples/po-simple/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/basics/samples/po-simple/project-pom.xml b/basics/samples/po-simple/project-pom.xml index e2de0f5ab..d1ef6e4af 100644 --- a/basics/samples/po-simple/project-pom.xml +++ b/basics/samples/po-simple/project-pom.xml @@ -32,6 +32,12 @@ ${slf4j.version} test + + junit + junit + ${junit4.version} + test + test diff --git a/basics/samples/po/.gitignore b/basics/samples/po/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/basics/samples/po/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/basics/samples/po/project-build.xml b/basics/samples/po/project-build.xml index 6982ad556..86cc4de35 100644 --- a/basics/samples/po/project-build.xml +++ b/basics/samples/po/project-build.xml @@ -8,7 +8,6 @@ - diff --git a/basics/samples/pom.xml b/basics/samples/pom.xml index 05118f656..201199639 100644 --- a/basics/samples/pom.xml +++ b/basics/samples/pom.xml @@ -1,5 +1,5 @@ - 4.0.0 jaxb2-basics-samples @@ -10,12 +10,24 @@ jaxb-basics-project 2.0.5-SNAPSHOT + + true + po basic po-simple cxf + + + org.jvnet.jaxb + jaxb-maven-plugin + ${project.version} + maven-plugin + provided + + install @@ -115,13 +127,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - true - - diff --git a/basics/testing/.gitignore b/basics/testing/.gitignore deleted file mode 100644 index 7266935b6..000000000 --- a/basics/testing/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -.settings -.project -.classpath \ No newline at end of file diff --git a/basics/tests/JAXB-1058/.gitignore b/basics/tests/JAXB-1058/.gitignore deleted file mode 100644 index cd578f0c0..000000000 --- a/basics/tests/JAXB-1058/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -.classpath -.project -.settings diff --git a/basics/tests/commons_lang/pom.xml b/basics/tests/commons_lang/pom.xml index 28cc8ee3f..4050bb4aa 100644 --- a/basics/tests/commons_lang/pom.xml +++ b/basics/tests/commons_lang/pom.xml @@ -19,7 +19,6 @@ org.apache.commons commons-lang3 - 3.12.0 diff --git a/basics/tests/episodes/.gitignore b/basics/tests/episodes/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/basics/tests/episodes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/basics/tests/episodes/a/.gitignore b/basics/tests/episodes/a/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/basics/tests/episodes/a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/basics/tests/episodes/b/.gitignore b/basics/tests/episodes/b/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/basics/tests/episodes/b/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/basics/tests/ignoring/.gitignore b/basics/tests/ignoring/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/basics/tests/ignoring/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/basics/tests/issues/.gitignore b/basics/tests/issues/.gitignore deleted file mode 100644 index 7266935b6..000000000 --- a/basics/tests/issues/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -.settings -.project -.classpath \ No newline at end of file diff --git a/basics/tests/one/.gitignore b/basics/tests/one/.gitignore deleted file mode 100644 index 7266935b6..000000000 --- a/basics/tests/one/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -.settings -.project -.classpath \ No newline at end of file diff --git a/basics/tests/po/.gitignore b/basics/tests/po/.gitignore deleted file mode 100644 index 7266935b6..000000000 --- a/basics/tests/po/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -.settings -.project -.classpath \ No newline at end of file diff --git a/basics/tests/pom.xml b/basics/tests/pom.xml index 2591f500a..219928266 100644 --- a/basics/tests/pom.xml +++ b/basics/tests/pom.xml @@ -1,5 +1,5 @@ - 4.0.0 jaxb2-basics-tests @@ -10,6 +10,9 @@ jaxb-basics-project 2.0.5-SNAPSHOT + + true + commons_lang defaultvalue @@ -48,13 +51,6 @@ test - - org.apache.maven.plugins - maven-deploy-plugin - - true - - org.apache.maven.plugins maven-javadoc-plugin diff --git a/basics/tests/simple-hashCode-equals-01/.gitignore b/basics/tests/simple-hashCode-equals-01/.gitignore deleted file mode 100644 index b98130674..000000000 --- a/basics/tests/simple-hashCode-equals-01/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -.settings -.project -.classpath diff --git a/basics/tests/simplify-01/.gitignore b/basics/tests/simplify-01/.gitignore deleted file mode 100644 index abdf2e1b9..000000000 --- a/basics/tests/simplify-01/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.settings -.classpath -.project -/target diff --git a/basics/tests/simplify-02/.gitignore b/basics/tests/simplify-02/.gitignore deleted file mode 100644 index abdf2e1b9..000000000 --- a/basics/tests/simplify-02/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.settings -.classpath -.project -/target diff --git a/basics/tests/superclass/.gitignore b/basics/tests/superclass/.gitignore deleted file mode 100644 index a5a68e4f1..000000000 --- a/basics/tests/superclass/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.settings -.project \ No newline at end of file diff --git a/basics/tests/superclass/a/.gitignore b/basics/tests/superclass/a/.gitignore deleted file mode 100644 index 6ebe318f9..000000000 --- a/basics/tests/superclass/a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.settings -.project -.classpath -target diff --git a/basics/tests/superclass/b/.gitignore b/basics/tests/superclass/b/.gitignore deleted file mode 100644 index 6ebe318f9..000000000 --- a/basics/tests/superclass/b/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.settings -.project -.classpath -target diff --git a/basics/tests/wildcard/.gitignore b/basics/tests/wildcard/.gitignore deleted file mode 100644 index 7266935b6..000000000 --- a/basics/tests/wildcard/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -.settings -.project -.classpath \ No newline at end of file diff --git a/basics/tests/zj/.gitignore b/basics/tests/zj/.gitignore deleted file mode 100644 index 7266935b6..000000000 --- a/basics/tests/zj/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -.settings -.project -.classpath \ No newline at end of file diff --git a/basics/tools/.gitignore b/basics/tools/.gitignore deleted file mode 100644 index 7266935b6..000000000 --- a/basics/tools/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -.settings -.project -.classpath \ No newline at end of file diff --git a/jaxb-annotate-parent/plugin/.gitignore b/jaxb-annotate-parent/plugin/.gitignore deleted file mode 100644 index 4874fbf33..000000000 --- a/jaxb-annotate-parent/plugin/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.classpath -.project -.settings diff --git a/jaxb-annotate-parent/plugin/pom.xml b/jaxb-annotate-parent/plugin/pom.xml index 74f869429..2925a0142 100644 --- a/jaxb-annotate-parent/plugin/pom.xml +++ b/jaxb-annotate-parent/plugin/pom.xml @@ -45,7 +45,6 @@ org.jvnet.jaxb jaxb2-basics-tools - ${project.version} org.apache.commons @@ -66,7 +65,6 @@ org.jvnet.jaxb jaxb-annox - ${project.version} diff --git a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatePlugin.java b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatePlugin.java index 7509be4fc..70fed949f 100644 --- a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatePlugin.java +++ b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatePlugin.java @@ -37,9 +37,9 @@ import javax.xml.namespace.QName; import org.apache.commons.lang3.StringUtils; -import org.jvnet.annox.Constants; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.parser.XAnnotationParser; +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; diff --git a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingArrayValueVisitor.java b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingArrayValueVisitor.java index 859e65109..a815d0348 100644 --- a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingArrayValueVisitor.java +++ b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingArrayValueVisitor.java @@ -28,24 +28,24 @@ */ package org.jvnet.jaxb2_commons.plugin.annotate; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.model.annotation.field.XAnnotationField; -import org.jvnet.annox.model.annotation.value.XAnnotationValueVisitor; -import org.jvnet.annox.model.annotation.value.XArrayClassAnnotationValue; -import org.jvnet.annox.model.annotation.value.XBooleanAnnotationValue; -import org.jvnet.annox.model.annotation.value.XByteAnnotationValue; -import org.jvnet.annox.model.annotation.value.XCharAnnotationValue; -import org.jvnet.annox.model.annotation.value.XClassAnnotationValue; -import org.jvnet.annox.model.annotation.value.XClassByNameAnnotationValue; -import org.jvnet.annox.model.annotation.value.XDoubleAnnotationValue; -import org.jvnet.annox.model.annotation.value.XEnumAnnotationValue; -import org.jvnet.annox.model.annotation.value.XEnumByNameAnnotationValue; -import org.jvnet.annox.model.annotation.value.XFloatAnnotationValue; -import org.jvnet.annox.model.annotation.value.XIntAnnotationValue; -import org.jvnet.annox.model.annotation.value.XLongAnnotationValue; -import org.jvnet.annox.model.annotation.value.XShortAnnotationValue; -import org.jvnet.annox.model.annotation.value.XStringAnnotationValue; -import org.jvnet.annox.model.annotation.value.XXAnnotationAnnotationValue; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValueVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XArrayClassAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XBooleanAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XByteAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XCharAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XClassAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XClassByNameAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XDoubleAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XEnumAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XEnumByNameAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XFloatAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XIntAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XLongAnnotationValue; +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 com.sun.codemodel.JAnnotationArrayMember; diff --git a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingSingleValueVisitor.java b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingSingleValueVisitor.java index bd5a255f3..bd17eb655 100644 --- a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingSingleValueVisitor.java +++ b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingSingleValueVisitor.java @@ -28,24 +28,24 @@ */ package org.jvnet.jaxb2_commons.plugin.annotate; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.model.annotation.field.XAnnotationField; -import org.jvnet.annox.model.annotation.value.XAnnotationValueVisitor; -import org.jvnet.annox.model.annotation.value.XArrayClassAnnotationValue; -import org.jvnet.annox.model.annotation.value.XBooleanAnnotationValue; -import org.jvnet.annox.model.annotation.value.XByteAnnotationValue; -import org.jvnet.annox.model.annotation.value.XCharAnnotationValue; -import org.jvnet.annox.model.annotation.value.XClassAnnotationValue; -import org.jvnet.annox.model.annotation.value.XClassByNameAnnotationValue; -import org.jvnet.annox.model.annotation.value.XDoubleAnnotationValue; -import org.jvnet.annox.model.annotation.value.XEnumAnnotationValue; -import org.jvnet.annox.model.annotation.value.XEnumByNameAnnotationValue; -import org.jvnet.annox.model.annotation.value.XFloatAnnotationValue; -import org.jvnet.annox.model.annotation.value.XIntAnnotationValue; -import org.jvnet.annox.model.annotation.value.XLongAnnotationValue; -import org.jvnet.annox.model.annotation.value.XShortAnnotationValue; -import org.jvnet.annox.model.annotation.value.XStringAnnotationValue; -import org.jvnet.annox.model.annotation.value.XXAnnotationAnnotationValue; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValueVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XArrayClassAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XBooleanAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XByteAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XCharAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XClassAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XClassByNameAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XDoubleAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XEnumAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XEnumByNameAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XFloatAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XIntAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XLongAnnotationValue; +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 com.sun.codemodel.JAnnotationUse; diff --git a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingVisitor.java b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingVisitor.java index 5b44155a9..ad3df2527 100644 --- a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingVisitor.java +++ b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingVisitor.java @@ -28,10 +28,10 @@ */ package org.jvnet.jaxb2_commons.plugin.annotate; -import org.jvnet.annox.model.XAnnotationFieldVisitor; -import org.jvnet.annox.model.annotation.field.XArrayAnnotationField; -import org.jvnet.annox.model.annotation.field.XSingleAnnotationField; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.XAnnotationFieldVisitor; +import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; import com.sun.codemodel.JAnnotationArrayMember; import com.sun.codemodel.JAnnotationUse; diff --git a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/Annotator.java b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/Annotator.java index 7ae95437b..6da2b0249 100644 --- a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/Annotator.java +++ b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/Annotator.java @@ -30,9 +30,9 @@ import java.util.Collection; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.model.XAnnotationFieldVisitor; -import org.jvnet.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.XAnnotationFieldVisitor; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; import com.sun.codemodel.JAnnotatable; import com.sun.codemodel.JAnnotationUse; diff --git a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/removeannotation/RemoveAnnotationPlugin.java b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/removeannotation/RemoveAnnotationPlugin.java index 600cee60a..1648648dd 100644 --- a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/removeannotation/RemoveAnnotationPlugin.java +++ b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/removeannotation/RemoveAnnotationPlugin.java @@ -38,7 +38,7 @@ import javax.xml.namespace.QName; import org.apache.commons.lang3.StringUtils; -import org.jvnet.annox.Constants; +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; diff --git a/jaxb-annotate-parent/pom.xml b/jaxb-annotate-parent/pom.xml index 2512fc3a6..babd85b51 100644 --- a/jaxb-annotate-parent/pom.xml +++ b/jaxb-annotate-parent/pom.xml @@ -90,18 +90,4 @@ - - - junit - junit - test - - - diff --git a/jaxb-annotate-parent/samples/.gitignore b/jaxb-annotate-parent/samples/.gitignore deleted file mode 100644 index 4874fbf33..000000000 --- a/jaxb-annotate-parent/samples/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.classpath -.project -.settings diff --git a/jaxb-annotate-parent/samples/annotate/.gitignore b/jaxb-annotate-parent/samples/annotate/.gitignore deleted file mode 100644 index 804dd1d1b..000000000 --- a/jaxb-annotate-parent/samples/annotate/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.project -.classpath diff --git a/jaxb-annotate-parent/samples/annotate/pom.xml b/jaxb-annotate-parent/samples/annotate/pom.xml index ddefb5bea..cadb406a4 100644 --- a/jaxb-annotate-parent/samples/annotate/pom.xml +++ b/jaxb-annotate-parent/samples/annotate/pom.xml @@ -49,20 +49,10 @@ org.jvnet.jaxb jaxb-basics-annotate - ${project.version} - - - commons-logging - commons-logging org.jvnet.jaxb jaxb2-basics-ant - ${project.version} - - - org.apache.logging.log4j - log4j-jcl @@ -77,7 +67,6 @@ org.hibernate hibernate-search - 4.1.1.Final junit diff --git a/jaxb-annotate-parent/samples/annotate/project-build.xml b/jaxb-annotate-parent/samples/annotate/project-build.xml index 9d380a876..7853a2e19 100644 --- a/jaxb-annotate-parent/samples/annotate/project-build.xml +++ b/jaxb-annotate-parent/samples/annotate/project-build.xml @@ -78,24 +78,28 @@ + + - - - + + - + + + + + - + @@ -107,15 +111,14 @@ - + + - - + - @@ -127,8 +130,8 @@ srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc" classpathref="compile.path" includeantruntime="false" - source="1.7" - target="1.7"> + source="1.8" + target="1.8"> @@ -144,8 +147,8 @@ srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc" classpathref="test-compile.path" includeantruntime="false" - source="1.7" - target="1.7"> + source="1.8" + target="1.8"> diff --git a/jaxb-annotate-parent/samples/annotate/project-pom.xml b/jaxb-annotate-parent/samples/annotate/project-pom.xml index 7133a52fe..765191567 100644 --- a/jaxb-annotate-parent/samples/annotate/project-pom.xml +++ b/jaxb-annotate-parent/samples/annotate/project-pom.xml @@ -55,9 +55,9 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${maven-jaxb2-plugin.version} + org.jvnet.jaxb + jaxb-maven-plugin + ${project.version} @@ -72,8 +72,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics-annotate + org.jvnet.jaxb + jaxb-basics-annotate ${project.version} @@ -90,8 +90,8 @@ true maven-compiler-plugin - 1.6 - 1.6 + 1.8 + 1.8 diff --git a/jaxb-annotate-parent/samples/pom.xml b/jaxb-annotate-parent/samples/pom.xml index 2da52993e..d08e21f74 100644 --- a/jaxb-annotate-parent/samples/pom.xml +++ b/jaxb-annotate-parent/samples/pom.xml @@ -28,8 +28,8 @@ either expressed or implied, of the FreeBSD Project. --> - 4.0.0 @@ -44,6 +44,18 @@ annotate + + true + + + + org.jvnet.jaxb + jaxb-maven-plugin + ${project.version} + maven-plugin + provided + + install @@ -143,13 +155,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - true - - diff --git a/jaxb-annotate-parent/tests/.gitignore b/jaxb-annotate-parent/tests/.gitignore deleted file mode 100644 index f66a28914..000000000 --- a/jaxb-annotate-parent/tests/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.project -.classpath \ No newline at end of file diff --git a/jaxb-annotate-parent/tests/annotate/.gitignore b/jaxb-annotate-parent/tests/annotate/.gitignore deleted file mode 100644 index f66a28914..000000000 --- a/jaxb-annotate-parent/tests/annotate/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.project -.classpath \ No newline at end of file diff --git a/jaxb-annotate-parent/tests/annotate/pom.xml b/jaxb-annotate-parent/tests/annotate/pom.xml index 0ae1cbd63..964d36130 100644 --- a/jaxb-annotate-parent/tests/annotate/pom.xml +++ b/jaxb-annotate-parent/tests/annotate/pom.xml @@ -33,31 +33,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-annotate-plugin-tests - 1.1.1-SNAPSHOT + org.jvnet.jaxb + jaxb-annotate-plugin-tests + 2.0.5-SNAPSHOT ../pom.xml - jaxb2-annotate-plugin-test-annotate + jaxb-annotate-plugin-test-annotate jar - JAXB2 Annotate Plugin - Test [annotate] + JAXB Tools :: Annotate :: Test [annotate] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2_commons - jaxb2-basics-annotate + org.jvnet.jaxb + jaxb-basics-annotate test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -66,8 +66,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics-annotate + org.jvnet.jaxb + jaxb-basics-annotate diff --git a/jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb2_commons/tests/annotate/RunAnnotatePlugin.java b/jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb2_commons/tests/annotate/RunAnnotatePlugin.java index f958324d2..642afab7d 100644 --- a/jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb2_commons/tests/annotate/RunAnnotatePlugin.java +++ b/jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb2_commons/tests/annotate/RunAnnotatePlugin.java @@ -31,8 +31,8 @@ import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunAnnotatePlugin extends RunXJC2Mojo { diff --git a/jaxb-annotate-parent/tests/annotations/.gitignore b/jaxb-annotate-parent/tests/annotations/.gitignore deleted file mode 100644 index f66a28914..000000000 --- a/jaxb-annotate-parent/tests/annotations/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.project -.classpath \ No newline at end of file diff --git a/jaxb-annotate-parent/tests/annotations/pom.xml b/jaxb-annotate-parent/tests/annotations/pom.xml index 1affd2e9a..14d5c6898 100644 --- a/jaxb-annotate-parent/tests/annotations/pom.xml +++ b/jaxb-annotate-parent/tests/annotations/pom.xml @@ -33,12 +33,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-annotate-plugin-tests - 1.1.1-SNAPSHOT + org.jvnet.jaxb + jaxb-annotate-plugin-tests + 2.0.5-SNAPSHOT ../pom.xml - jaxb2-annotate-plugin-test-annotations + jaxb-annotate-plugin-test-annotations jar - JAXB2 Annotate Plugin - Test [annotations] + JAXB Tools :: Annotate :: Test [annotations] diff --git a/jaxb-annotate-parent/tests/annox/.gitignore b/jaxb-annotate-parent/tests/annox/.gitignore deleted file mode 100644 index f66a28914..000000000 --- a/jaxb-annotate-parent/tests/annox/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.project -.classpath \ No newline at end of file diff --git a/jaxb-annotate-parent/tests/annox/pom.xml b/jaxb-annotate-parent/tests/annox/pom.xml index 32fc5af1d..3cf9ef59e 100644 --- a/jaxb-annotate-parent/tests/annox/pom.xml +++ b/jaxb-annotate-parent/tests/annox/pom.xml @@ -33,18 +33,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-annotate-plugin-tests - 1.1.1-SNAPSHOT + org.jvnet.jaxb + jaxb-annotate-plugin-tests + 2.0.5-SNAPSHOT ../pom.xml - jaxb2-annotate-plugin-test-annox + jaxb-annotate-plugin-test-annox jar - JAXB2 Annotate Plugin - Test [annox] + JAXB Tools :: Annotate :: Test [annox] - org.jvnet.jaxb2_commons - jaxb2-annotate-plugin-test-annotations + org.jvnet.jaxb + jaxb-annotate-plugin-test-annotations ${project.version} @@ -52,8 +52,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -61,12 +61,12 @@ - org.jvnet.jaxb2_commons - jaxb2-basics-annotate + org.jvnet.jaxb + jaxb-basics-annotate - org.jvnet.jaxb2_commons - jaxb2-annotate-plugin-test-annotations + org.jvnet.jaxb + jaxb-annotate-plugin-test-annotations diff --git a/jaxb-annotate-parent/tests/issues/.gitignore b/jaxb-annotate-parent/tests/issues/.gitignore deleted file mode 100644 index f66a28914..000000000 --- a/jaxb-annotate-parent/tests/issues/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.project -.classpath \ No newline at end of file diff --git a/jaxb-annotate-parent/tests/issues/pom.xml b/jaxb-annotate-parent/tests/issues/pom.xml index 8a91ad605..bae2aae1f 100644 --- a/jaxb-annotate-parent/tests/issues/pom.xml +++ b/jaxb-annotate-parent/tests/issues/pom.xml @@ -33,30 +33,27 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-annotate-plugin-tests - 1.1.1-SNAPSHOT + org.jvnet.jaxb + jaxb-annotate-plugin-tests + 2.0.5-SNAPSHOT ../pom.xml - jaxb2-annotate-plugin-test-issues + jaxb-annotate-plugin-test-issues jar - JAXB2 Annotate Plugin - Test [issues] - - 1.0.0 - + JAXB Tools :: Annotate :: Test [issues] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2_commons - jaxb2-basics-annotate + org.jvnet.jaxb + jaxb-basics-annotate - org.jvnet.jaxb2_commons - jaxb2-annotate-plugin-test-annotations + org.jvnet.jaxb + jaxb-annotate-plugin-test-annotations ${project.version} @@ -69,8 +66,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -82,20 +79,20 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics - org.jvnet.jaxb2_commons - jaxb2-basics-annotate + org.jvnet.jaxb + jaxb-basics-annotate com.fasterxml.jackson.core jackson-annotations - org.jvnet.jaxb2_commons - jaxb2-annotate-plugin-test-annotations + org.jvnet.jaxb + jaxb-annotate-plugin-test-annotations diff --git a/jaxb-annotate-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/tests/RunIssuesPlugin.java b/jaxb-annotate-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/tests/RunIssuesPlugin.java index fd1d68a44..18d333b3b 100644 --- a/jaxb-annotate-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/tests/RunIssuesPlugin.java +++ b/jaxb-annotate-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/tests/RunIssuesPlugin.java @@ -31,8 +31,8 @@ import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunIssuesPlugin extends RunXJC2Mojo { diff --git a/jaxb-annotate-parent/tests/one/.gitignore b/jaxb-annotate-parent/tests/one/.gitignore deleted file mode 100644 index f66a28914..000000000 --- a/jaxb-annotate-parent/tests/one/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.project -.classpath \ No newline at end of file diff --git a/jaxb-annotate-parent/tests/one/pom.xml b/jaxb-annotate-parent/tests/one/pom.xml index 4bac8677a..91f7098a4 100644 --- a/jaxb-annotate-parent/tests/one/pom.xml +++ b/jaxb-annotate-parent/tests/one/pom.xml @@ -33,30 +33,30 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-annotate-plugin-tests - 1.1.1-SNAPSHOT + org.jvnet.jaxb + jaxb-annotate-plugin-tests + 2.0.5-SNAPSHOT - jaxb2-annotate-plugin-test-one + jaxb-annotate-plugin-test-one jar - JAXB2 Annotate Plugin - Test [one] + JAXB Tools :: Annotate :: Test [one] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2_commons - jaxb2-basics-annotate + org.jvnet.jaxb + jaxb-basics-annotate test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -64,8 +64,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics-annotate + org.jvnet.jaxb + jaxb-basics-annotate diff --git a/jaxb-annotate-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/RunOnePlugin.java b/jaxb-annotate-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/RunOnePlugin.java index 6f2e9cdab..e16c2ad93 100644 --- a/jaxb-annotate-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/RunOnePlugin.java +++ b/jaxb-annotate-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/RunOnePlugin.java @@ -31,8 +31,8 @@ import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunOnePlugin extends RunXJC2Mojo { diff --git a/jaxb-annotate-parent/tests/pom.xml b/jaxb-annotate-parent/tests/pom.xml index 91dbd1729..11a02b0d0 100644 --- a/jaxb-annotate-parent/tests/pom.xml +++ b/jaxb-annotate-parent/tests/pom.xml @@ -28,18 +28,17 @@ either expressed or implied, of the FreeBSD Project. --> - 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-annotate-plugin-tests + jaxb-annotate-plugin-tests pom - JAXB2 Annotate Plugin - Tests + JAXB Tools :: Annotate :: Tests - org.jvnet.jaxb2_commons - jaxb2-annotate-plugin-project - 1.1.1-SNAPSHOT + org.jvnet.jaxb + jaxb-annotate-plugin-parent + 2.0.5-SNAPSHOT ../pom.xml @@ -49,47 +48,39 @@ issues one + + true + + + org.jvnet.jaxb + jaxb-maven-plugin + ${project.version} + maven-plugin + provided + + + org.jvnet.jaxb + jaxb2-basics + provided + org.glassfish.jaxb jaxb-core - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-testing test test - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - - - generate - - generate - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - org.apache.maven.plugins maven-javadoc-plugin @@ -99,4 +90,4 @@ - \ No newline at end of file + diff --git a/jaxb-annox-parent/jaxb-annox/.gitignore b/jaxb-annox-parent/jaxb-annox/.gitignore deleted file mode 100644 index 252d3b1ef..000000000 --- a/jaxb-annox-parent/jaxb-annox/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -target -.settings -.project -.classpath diff --git a/jaxb-annox-parent/jaxb-annox/META-INF/.gitignore b/jaxb-annox-parent/jaxb-annox/META-INF/.gitignore deleted file mode 100644 index 44d7f550c..000000000 --- a/jaxb-annox-parent/jaxb-annox/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/META-INF/MANIFEST.MF b/jaxb-annox-parent/jaxb-annox/META-INF/MANIFEST.MF index 808e3905a..31de5d4e7 100644 --- a/jaxb-annox-parent/jaxb-annox/META-INF/MANIFEST.MF +++ b/jaxb-annox-parent/jaxb-annox/META-INF/MANIFEST.MF @@ -1,29 +1,31 @@ Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Created-By: 17.0.3.1 (Oracle Corporation) -Tool: Bnd-1.15.0 -Bnd-LastModified: 1692302035692 -Export-Package: org.jvnet.annox,org.jvnet.annox.annotation;uses:="org.ap - ache.commons.lang3",org.jvnet.annox.io,org.jvnet.annox.model;uses:="org - .apache.commons.lang3,org.jvnet.annox.parser,org.jvnet.annox.reflect,or - g.apache.commons.lang3.builder",org.jvnet.annox.parser;uses:="org.jvnet - .annox.model,org.jvnet.annox.util,org.jvnet.annox.annotation,org.jvnet. - annox,org.apache.commons.lang3",org.jvnet.annox.reader;uses:="org.jvnet - .annox.model,org.jvnet.annox.reflect",org.jvnet.annox.reader.resourced; - uses:="org.apache.commons.lang3,org.jvnet.annox.io,org.jvnet.annox.mode - l,org.jvnet.annox.util,org.jvnet.annox.parser,org.jvnet.annox.reflect,o - rg.jvnet.annox.reader",org.jvnet.annox.reflect;uses:="org.jvnet.annox.r - eader.resourced,org.jvnet.annox.model,org.apache.commons.lang3,org.jvne - t.annox.reader",org.jvnet.annox.util;uses:="org.jvnet.annox,org.apache. - commons.lang3",org.jvnet.annox.xml.bind;uses:="org.jvnet.annox.reflect" -Import-Package: org.apache.commons.lang3;version="3.2.1",org.apache.comm - ons.lang3.builder;version="3.2.1" -Bundle-Version: 2.0.5.SNAPSHOT -Bundle-SymbolicName: org.jvnet.jaxb.annox -Bundle-License: https://github.com/highsource/jaxb-tools/blob/master/LIC - ENSE +Bnd-LastModified: 1692905945319 +Build-Jdk: 1.8.0_311 +Built-By: lschoelens Bundle-Description: JAXB Annox is a part of JAXB Tools project which imp lements support for reading and writing XML annotations. -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-License: https://github.com/highsource/jaxb-tools/blob/master/LIC + ENSE +Bundle-ManifestVersion: 2 Bundle-Name: JAXB Tools :: JAXB Annox - +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-SymbolicName: org.jvnet.jaxb.annox +Bundle-Version: 2.0.5.SNAPSHOT +Created-By: Apache Maven Bundle Plugin +Export-Package: org.jvnet.jaxb.annox;version="2.0.5.SNAPSHOT",org.jvnet. + jaxb.annox.annotation;version="2.0.5.SNAPSHOT",org.jvnet.jaxb.annox.io; + version="2.0.5.SNAPSHOT",org.jvnet.jaxb.annox.model;uses:="org.jvnet.ja + xb.annox.reflect";version="2.0.5.SNAPSHOT",org.jvnet.jaxb.annox.parser; + uses:="org.jvnet.jaxb.annox.annotation,org.jvnet.jaxb.annox.model";vers + ion="2.0.5.SNAPSHOT",org.jvnet.jaxb.annox.reader;uses:="org.jvnet.jaxb. + annox.model,org.jvnet.jaxb.annox.reflect";version="2.0.5.SNAPSHOT",org. + jvnet.jaxb.annox.reader.resourced;uses:="org.jvnet.jaxb.annox.model,org + .jvnet.jaxb.annox.parser,org.jvnet.jaxb.annox.reader,org.jvnet.jaxb.ann + ox.reflect";version="2.0.5.SNAPSHOT",org.jvnet.jaxb.annox.reflect;uses: + ="org.jvnet.jaxb.annox.reader";version="2.0.5.SNAPSHOT",org.jvnet.jaxb. + annox.util;version="2.0.5.SNAPSHOT",org.jvnet.jaxb.annox.xml.bind;uses: + ="org.jvnet.jaxb.annox.reflect";version="2.0.5.SNAPSHOT" +Import-Package: org.apache.commons.lang3;version="3.12.0",org.apache.com + mons.lang3.builder;version="3.12.0" +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))" +Tool: Bnd-3.5.0.201709291849 diff --git a/jaxb-annox-parent/jaxb-annox/pom.xml b/jaxb-annox-parent/jaxb-annox/pom.xml index e1c7bced3..b4f63cd34 100644 --- a/jaxb-annox-parent/jaxb-annox/pom.xml +++ b/jaxb-annox-parent/jaxb-annox/pom.xml @@ -6,7 +6,6 @@ 2.0.5-SNAPSHOT ../pom.xml - org.jvnet.jaxb jaxb-annox jar JAXB Tools :: JAXB Annox @@ -18,7 +17,6 @@ org.glassfish.jaxb jaxb-runtime - ${jaxb.version} provided @@ -28,23 +26,19 @@ commons-io commons-io - 2.4 com.google.code.javaparser javaparser - 1.0.11 - + org.hibernate hibernate-search - 3.0.0.GA test javax.transaction jta - 1.1 test @@ -54,7 +48,6 @@ org.apache.felix maven-bundle-plugin true - 2.2.0 bundle-manifest @@ -70,20 +63,20 @@ ${annox.osgi.version} - org.apache.commons.lang3;version="3.2.1", - org.apache.commons.lang3.builder;version="3.2.1" + org.apache.commons.lang3;version="3.12.0", + org.apache.commons.lang3.builder;version="3.12.0" - org.jvnet.annox, - org.jvnet.annox.annotation, - org.jvnet.annox.io, - org.jvnet.annox.model, - org.jvnet.annox.parser, - org.jvnet.annox.reader, - org.jvnet.annox.reader.resourced, - org.jvnet.annox.reflect, - org.jvnet.annox.util, - org.jvnet.annox.xml.bind + org.jvnet.jaxb.annox, + org.jvnet.jaxb.annox.annotation, + org.jvnet.jaxb.annox.io, + org.jvnet.jaxb.annox.model, + org.jvnet.jaxb.annox.parser, + org.jvnet.jaxb.annox.reader, + org.jvnet.jaxb.annox.reader.resourced, + org.jvnet.jaxb.annox.reflect, + org.jvnet.jaxb.annox.util, + org.jvnet.jaxb.annox.xml.bind J2SE-1.5 @@ -94,7 +87,6 @@ org.apache.maven.plugins maven-jar-plugin - 2.5 META-INF/MANIFEST.MF diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/Constants.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/Constants.java similarity index 85% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/Constants.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/Constants.java index 7ed9e758d..a8ee0600b 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/Constants.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/Constants.java @@ -1,4 +1,4 @@ -package org.jvnet.annox; +package org.jvnet.jaxb.annox; public class Constants { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/annotation/AnnotationClassNotFoundException.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/annotation/AnnotationClassNotFoundException.java similarity index 91% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/annotation/AnnotationClassNotFoundException.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/annotation/AnnotationClassNotFoundException.java index 28d8e3a3a..75a984b76 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/annotation/AnnotationClassNotFoundException.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/annotation/AnnotationClassNotFoundException.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.annotation; +package org.jvnet.jaxb.annox.annotation; import org.apache.commons.lang3.Validate; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/annotation/NoSuchAnnotationFieldException.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/annotation/NoSuchAnnotationFieldException.java similarity index 94% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/annotation/NoSuchAnnotationFieldException.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/annotation/NoSuchAnnotationFieldException.java index a8831e8de..7767029f4 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/annotation/NoSuchAnnotationFieldException.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/annotation/NoSuchAnnotationFieldException.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.annotation; +package org.jvnet.jaxb.annox.annotation; import java.lang.annotation.Annotation; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/io/NestedIOException.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/io/NestedIOException.java similarity index 95% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/io/NestedIOException.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/io/NestedIOException.java index d1780820b..593deeafa 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/io/NestedIOException.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/io/NestedIOException.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.io; +package org.jvnet.jaxb.annox.io; import java.io.IOException; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/japa/parser/AnnotationExprParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/japa/parser/AnnotationExprParser.java similarity index 97% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/japa/parser/AnnotationExprParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/japa/parser/AnnotationExprParser.java index 9bef5b9fb..73e0c1595 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/japa/parser/AnnotationExprParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/japa/parser/AnnotationExprParser.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.japa.parser; +package org.jvnet.jaxb.annox.japa.parser; import japa.parser.JavaParser; import japa.parser.ParseException; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/japa/parser/ast/visitor/AbstractGenericExpressionVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/japa/parser/ast/visitor/AbstractGenericExpressionVisitor.java similarity index 99% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/japa/parser/ast/visitor/AbstractGenericExpressionVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/japa/parser/ast/visitor/AbstractGenericExpressionVisitor.java index aea426190..a3f67a2bc 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/japa/parser/ast/visitor/AbstractGenericExpressionVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/japa/parser/ast/visitor/AbstractGenericExpressionVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.japa.parser.ast.visitor; +package org.jvnet.jaxb.annox.japa.parser.ast.visitor; import japa.parser.ast.CompilationUnit; import japa.parser.ast.ImportDeclaration; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotated.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotated.java similarity index 98% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotated.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotated.java index af042f2cc..c4f236703 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotated.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotated.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model; +package org.jvnet.jaxb.annox.model; import java.lang.annotation.Annotation; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotatedElement.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotatedElement.java similarity index 97% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotatedElement.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotatedElement.java index 14f6d3e0a..3a974641a 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotatedElement.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotatedElement.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model; +package org.jvnet.jaxb.annox.model; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotation.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotation.java similarity index 97% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotation.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotation.java index eb23bd7e7..39e12e09b 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotation.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotation.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model; +package org.jvnet.jaxb.annox.model; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationHandler; @@ -13,8 +13,8 @@ import java.util.Set; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.model.annotation.field.XAnnotationField; -import org.jvnet.annox.parser.XGenericFieldParser; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.parser.XGenericFieldParser; /** * Defines an xannotation. diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotationFieldValueVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationFieldValueVisitor.java similarity index 68% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotationFieldValueVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationFieldValueVisitor.java index c700740da..c02c540aa 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotationFieldValueVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationFieldValueVisitor.java @@ -1,23 +1,23 @@ -//package org.jvnet.annox.model; -// -//import org.jvnet.annox.model.annotation.field.XArrayAnnotationField; -//import org.jvnet.annox.model.annotation.field.XSingleAnnotationField; -//import org.jvnet.annox.model.annotation.value.XAnnotationAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XArrayClassAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XBooleanAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XByteAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XCharAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XClassAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XClassByNameAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XDoubleAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XEnumAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XEnumByNameAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XFloatAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XIntAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XLongAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XShortAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XStringAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XXAnnotationAnnotationValue; +//package org.jvnet.jaxb.annox.model; +// +//import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField; +//import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField; +//import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XArrayClassAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XBooleanAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XByteAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XCharAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XClassAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XClassByNameAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XDoubleAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XEnumAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XEnumByNameAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XFloatAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XIntAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XLongAnnotationValue; +//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; // //public interface XAnnotationFieldValueVisitor extends XAnnotationFieldVisitor { // @@ -100,3 +100,5 @@ // XArrayClassAnnotationValue value); // //} + + diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotationFieldValueVisitorAdapter.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationFieldValueVisitorAdapter.java similarity index 82% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotationFieldValueVisitorAdapter.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationFieldValueVisitorAdapter.java index 57a125fc1..3a94e5a03 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotationFieldValueVisitorAdapter.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationFieldValueVisitorAdapter.java @@ -1,27 +1,27 @@ -//package org.jvnet.annox.model; +//package org.jvnet.jaxb.annox.model; // //import org.apache.commons.lang3.Validate; -//import org.jvnet.annox.model.annotation.field.XAnnotationField; -//import org.jvnet.annox.model.annotation.field.XArrayAnnotationField; -//import org.jvnet.annox.model.annotation.field.XSingleAnnotationField; -//import org.jvnet.annox.model.annotation.value.XAnnotationAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XAnnotationValueVisitor; -//import org.jvnet.annox.model.annotation.value.XArrayClassAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XBooleanAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XByteAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XCharAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XClassAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XClassByNameAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XDoubleAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XEnumAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XEnumByNameAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XFloatAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XIntAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XLongAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XShortAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XStringAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XXAnnotationAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +//import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField; +//import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField; +//import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValueVisitor; +//import org.jvnet.jaxb.annox.model.annotation.value.XArrayClassAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XBooleanAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XByteAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XCharAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XClassAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XClassByNameAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XDoubleAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XEnumAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XEnumByNameAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XFloatAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XIntAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XLongAnnotationValue; +//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; // //public class XAnnotationFieldValueVisitorAdapter implements // XAnnotationFieldVisitor { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotationFieldVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationFieldVisitor.java similarity index 64% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotationFieldVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationFieldVisitor.java index c9d256122..710539d00 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotationFieldVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationFieldVisitor.java @@ -1,7 +1,7 @@ -package org.jvnet.annox.model; +package org.jvnet.jaxb.annox.model; -import org.jvnet.annox.model.annotation.field.XArrayAnnotationField; -import org.jvnet.annox.model.annotation.field.XSingleAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField; /** * Annotation visitor. diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotationInvocationHandler.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationInvocationHandler.java similarity index 98% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotationInvocationHandler.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationInvocationHandler.java index 89e6cc933..e1a4064e1 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XAnnotationInvocationHandler.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationInvocationHandler.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model; +package org.jvnet.jaxb.annox.model; import java.lang.annotation.Annotation; import java.lang.annotation.IncompleteAnnotationException; @@ -17,7 +17,7 @@ import java.util.Map.Entry; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; public final class XAnnotationInvocationHandler implements InvocationHandler { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XClass.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XClass.java similarity index 98% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XClass.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XClass.java index e15eb7cef..7c630d90f 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XClass.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XClass.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model; +package org.jvnet.jaxb.annox.model; import org.apache.commons.lang3.Validate; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XConstructor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XConstructor.java similarity index 96% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XConstructor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XConstructor.java index 498f159b9..1932b91d3 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XConstructor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XConstructor.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.model; +package org.jvnet.jaxb.annox.model; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.reflect.ParameterizedAnnotatedElement; +import org.jvnet.jaxb.annox.reflect.ParameterizedAnnotatedElement; /** * Defines an annotated constructor. diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XField.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XField.java similarity index 94% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XField.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XField.java index 0735af15a..76d18618c 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XField.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XField.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model; +package org.jvnet.jaxb.annox.model; import java.lang.reflect.Field; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XMember.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XMember.java similarity index 97% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XMember.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XMember.java index 5e66cca19..2b863f7a0 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XMember.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XMember.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model; +package org.jvnet.jaxb.annox.model; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Member; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XMethod.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XMethod.java similarity index 95% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XMethod.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XMethod.java index 33d0df397..5eeda2844 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XMethod.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XMethod.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.model; +package org.jvnet.jaxb.annox.model; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.reflect.ParameterizedAnnotatedElement; +import org.jvnet.jaxb.annox.reflect.ParameterizedAnnotatedElement; /** * Defines an annotated method. diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XPackage.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XPackage.java similarity index 96% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XPackage.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XPackage.java index 6089435d5..d11001acf 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XPackage.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XPackage.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model; +package org.jvnet.jaxb.annox.model; import org.apache.commons.lang3.Validate; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XParameter.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XParameter.java similarity index 95% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XParameter.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XParameter.java index eb8921aff..980ba6f9e 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/XParameter.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XParameter.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model; +package org.jvnet.jaxb.annox.model; import org.apache.commons.lang3.Validate; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/field/XAnnotationField.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/field/XAnnotationField.java similarity index 93% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/field/XAnnotationField.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/field/XAnnotationField.java index 3ab6a9862..18ffb7688 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/field/XAnnotationField.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/field/XAnnotationField.java @@ -1,7 +1,7 @@ -package org.jvnet.annox.model.annotation.field; +package org.jvnet.jaxb.annox.model.annotation.field; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.model.XAnnotationFieldVisitor; +import org.jvnet.jaxb.annox.model.XAnnotationFieldVisitor; /** * Defines an annotation field. diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/field/XArrayAnnotationField.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/field/XArrayAnnotationField.java similarity index 93% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/field/XArrayAnnotationField.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/field/XArrayAnnotationField.java index 96c22eb4d..4e75304dd 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/field/XArrayAnnotationField.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/field/XArrayAnnotationField.java @@ -1,12 +1,12 @@ -package org.jvnet.annox.model.annotation.field; +package org.jvnet.jaxb.annox.model.annotation.field; import java.lang.reflect.Array; import java.text.MessageFormat; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.model.XAnnotationFieldVisitor; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.util.ClassUtils; +import org.jvnet.jaxb.annox.model.XAnnotationFieldVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.util.ClassUtils; public class XArrayAnnotationField extends XAnnotationField { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/field/XSingleAnnotationField.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/field/XSingleAnnotationField.java similarity index 85% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/field/XSingleAnnotationField.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/field/XSingleAnnotationField.java index f82cf68fa..ec86ff523 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/field/XSingleAnnotationField.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/field/XSingleAnnotationField.java @@ -1,8 +1,8 @@ -package org.jvnet.annox.model.annotation.field; +package org.jvnet.jaxb.annox.model.annotation.field; -import org.jvnet.annox.model.XAnnotationFieldVisitor; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.util.ClassUtils; +import org.jvnet.jaxb.annox.model.XAnnotationFieldVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.util.ClassUtils; public class XSingleAnnotationField extends XAnnotationField { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/AbstractBasicXAnnotationValueVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/AbstractBasicXAnnotationValueVisitor.java similarity index 96% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/AbstractBasicXAnnotationValueVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/AbstractBasicXAnnotationValueVisitor.java index 5b4e53883..422b9274e 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/AbstractBasicXAnnotationValueVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/AbstractBasicXAnnotationValueVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public abstract class AbstractBasicXAnnotationValueVisitor implements XAnnotationValueVisitor { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XAnnotationValue.java similarity index 93% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XAnnotationValue.java index f5ddcd587..d6f6ab4da 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public abstract class XAnnotationValue { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XAnnotationValueVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XAnnotationValueVisitor.java similarity index 93% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XAnnotationValueVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XAnnotationValueVisitor.java index 60591944e..21a6c0b70 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XAnnotationValueVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XAnnotationValueVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public interface XAnnotationValueVisitor { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XArrayClassAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XArrayClassAnnotationValue.java similarity index 96% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XArrayClassAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XArrayClassAnnotationValue.java index cd0f9106b..41b3807ee 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XArrayClassAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XArrayClassAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XBooleanAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XBooleanAnnotationValue.java similarity index 82% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XBooleanAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XBooleanAnnotationValue.java index 571c4e1b7..4bf5d6a6d 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XBooleanAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XBooleanAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public class XBooleanAnnotationValue extends XStaticAnnotationValue { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XByteAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XByteAnnotationValue.java similarity index 82% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XByteAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XByteAnnotationValue.java index c62712368..6de19b120 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XByteAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XByteAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public class XByteAnnotationValue extends XStaticAnnotationValue { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XCharAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XCharAnnotationValue.java similarity index 82% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XCharAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XCharAnnotationValue.java index b0bace547..d18ffc16f 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XCharAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XCharAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public class XCharAnnotationValue extends XStaticAnnotationValue { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XClassAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XClassAnnotationValue.java similarity index 82% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XClassAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XClassAnnotationValue.java index abe6b8a95..49a8392a9 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XClassAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XClassAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public class XClassAnnotationValue extends XStaticAnnotationValue> { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XClassByNameAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XClassByNameAnnotationValue.java similarity index 94% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XClassByNameAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XClassByNameAnnotationValue.java index 34149a950..ac29f209f 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XClassByNameAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XClassByNameAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; import java.text.MessageFormat; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XDoubleAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XDoubleAnnotationValue.java similarity index 82% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XDoubleAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XDoubleAnnotationValue.java index 513633bd5..6f874dc6c 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XDoubleAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XDoubleAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public class XDoubleAnnotationValue extends XStaticAnnotationValue { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XDynamicAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XDynamicAnnotationValue.java similarity index 61% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XDynamicAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XDynamicAnnotationValue.java index 4a6991c18..6c67b050f 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XDynamicAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XDynamicAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public abstract class XDynamicAnnotationValue extends XAnnotationValue { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XEnumAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XEnumAnnotationValue.java similarity index 82% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XEnumAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XEnumAnnotationValue.java index ac3426be3..26e636381 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XEnumAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XEnumAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public class XEnumAnnotationValue> extends XStaticAnnotationValue { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XEnumByNameAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XEnumByNameAnnotationValue.java similarity index 94% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XEnumByNameAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XEnumByNameAnnotationValue.java index c316ee7b8..9c4f704e8 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XEnumByNameAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XEnumByNameAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; import org.apache.commons.lang3.Validate; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XFloatAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XFloatAnnotationValue.java similarity index 82% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XFloatAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XFloatAnnotationValue.java index a904757b8..2300cd7a6 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XFloatAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XFloatAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public class XFloatAnnotationValue extends XStaticAnnotationValue { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XIntAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XIntAnnotationValue.java similarity index 82% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XIntAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XIntAnnotationValue.java index 295b17ba2..bb4a9325a 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XIntAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XIntAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public class XIntAnnotationValue extends XStaticAnnotationValue { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XLongAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XLongAnnotationValue.java similarity index 82% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XLongAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XLongAnnotationValue.java index 20f29b659..836e0fa8c 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XLongAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XLongAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public class XLongAnnotationValue extends XStaticAnnotationValue { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XShortAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XShortAnnotationValue.java similarity index 82% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XShortAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XShortAnnotationValue.java index f016ca26f..97129681f 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XShortAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XShortAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public class XShortAnnotationValue extends XStaticAnnotationValue { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XStaticAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XStaticAnnotationValue.java similarity index 87% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XStaticAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XStaticAnnotationValue.java index 4b2b4b84a..4ff9ae372 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XStaticAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XStaticAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; import org.apache.commons.lang3.Validate; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XStringAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XStringAnnotationValue.java similarity index 82% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XStringAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XStringAnnotationValue.java index 48ff2c27d..c08921ef4 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XStringAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XStringAnnotationValue.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; public class XStringAnnotationValue extends XStaticAnnotationValue { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XXAnnotationAnnotationValue.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XXAnnotationAnnotationValue.java similarity index 90% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XXAnnotationAnnotationValue.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XXAnnotationAnnotationValue.java index 2617d23ea..803471bbd 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/model/annotation/value/XXAnnotationAnnotationValue.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XXAnnotationAnnotationValue.java @@ -1,9 +1,9 @@ -package org.jvnet.annox.model.annotation.value; +package org.jvnet.jaxb.annox.model.annotation.value; import java.lang.annotation.Annotation; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.XAnnotation; public class XXAnnotationAnnotationValue extends XDynamicAnnotationValue { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XAnnotationArrayAnnotationFieldParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XAnnotationArrayAnnotationFieldParser.java similarity index 86% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XAnnotationArrayAnnotationFieldParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XAnnotationArrayAnnotationFieldParser.java index 2b49ec5bc..2dc9c969b 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XAnnotationArrayAnnotationFieldParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XAnnotationArrayAnnotationFieldParser.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser; +package org.jvnet.jaxb.annox.parser; import japa.parser.ast.Node; import japa.parser.ast.expr.AnnotationExpr; @@ -9,16 +9,16 @@ import java.text.MessageFormat; import java.util.List; -import org.jvnet.annox.annotation.NoSuchAnnotationFieldException; -import org.jvnet.annox.japa.parser.ast.visitor.AbstractGenericExpressionVisitor; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.model.annotation.field.XAnnotationField; -import org.jvnet.annox.model.annotation.field.XArrayAnnotationField; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XXAnnotationAnnotationValue; -import org.jvnet.annox.parser.exception.AnnotationElementParseException; -import org.jvnet.annox.parser.exception.AnnotationExpressionParseException; -import org.jvnet.annox.util.AnnotationElementUtils; +import org.jvnet.jaxb.annox.annotation.NoSuchAnnotationFieldException; +import org.jvnet.jaxb.annox.japa.parser.ast.visitor.AbstractGenericExpressionVisitor; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XXAnnotationAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.AnnotationElementParseException; +import org.jvnet.jaxb.annox.parser.exception.AnnotationExpressionParseException; +import org.jvnet.jaxb.annox.util.AnnotationElementUtils; import org.w3c.dom.Element; public class XAnnotationArrayAnnotationFieldParser diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XAnnotationFieldParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XAnnotationFieldParser.java similarity index 80% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XAnnotationFieldParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XAnnotationFieldParser.java index 4528a910a..e6c0b6f91 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XAnnotationFieldParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XAnnotationFieldParser.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser; +package org.jvnet.jaxb.annox.parser; import japa.parser.ast.expr.Expression; @@ -6,10 +6,10 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.jvnet.annox.annotation.NoSuchAnnotationFieldException; -import org.jvnet.annox.model.annotation.field.XAnnotationField; -import org.jvnet.annox.parser.exception.AnnotationElementParseException; -import org.jvnet.annox.parser.exception.AnnotationExpressionParseException; +import org.jvnet.jaxb.annox.annotation.NoSuchAnnotationFieldException; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.parser.exception.AnnotationElementParseException; +import org.jvnet.jaxb.annox.parser.exception.AnnotationExpressionParseException; import org.w3c.dom.Element; public abstract class XAnnotationFieldParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XAnnotationParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XAnnotationParser.java similarity index 94% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XAnnotationParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XAnnotationParser.java index 8c02363ac..d6c574db5 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XAnnotationParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XAnnotationParser.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser; +package org.jvnet.jaxb.annox.parser; import japa.parser.ParseException; import japa.parser.ast.Node; @@ -22,16 +22,16 @@ import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.Constants; -import org.jvnet.annox.annotation.AnnotationClassNotFoundException; -import org.jvnet.annox.annotation.NoSuchAnnotationFieldException; -import org.jvnet.annox.japa.parser.AnnotationExprParser; -import org.jvnet.annox.japa.parser.ast.visitor.AbstractGenericExpressionVisitor; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.model.annotation.field.XAnnotationField; -import org.jvnet.annox.parser.exception.AnnotationElementParseException; -import org.jvnet.annox.parser.exception.AnnotationExpressionParseException; -import org.jvnet.annox.parser.exception.AnnotationStringParseException; +import org.jvnet.jaxb.annox.Constants; +import org.jvnet.jaxb.annox.annotation.AnnotationClassNotFoundException; +import org.jvnet.jaxb.annox.annotation.NoSuchAnnotationFieldException; +import org.jvnet.jaxb.annox.japa.parser.AnnotationExprParser; +import org.jvnet.jaxb.annox.japa.parser.ast.visitor.AbstractGenericExpressionVisitor; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.parser.exception.AnnotationElementParseException; +import org.jvnet.jaxb.annox.parser.exception.AnnotationExpressionParseException; +import org.jvnet.jaxb.annox.parser.exception.AnnotationStringParseException; import org.w3c.dom.Element; public class XAnnotationParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XAnnotationSingleAnnotationFieldParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XAnnotationSingleAnnotationFieldParser.java similarity index 79% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XAnnotationSingleAnnotationFieldParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XAnnotationSingleAnnotationFieldParser.java index 72650d80b..c6e5972af 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XAnnotationSingleAnnotationFieldParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XAnnotationSingleAnnotationFieldParser.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser; +package org.jvnet.jaxb.annox.parser; import japa.parser.ast.Node; import japa.parser.ast.expr.AnnotationExpr; @@ -6,15 +6,15 @@ import java.lang.annotation.Annotation; -import org.jvnet.annox.annotation.NoSuchAnnotationFieldException; -import org.jvnet.annox.japa.parser.ast.visitor.AbstractGenericExpressionVisitor; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.model.annotation.field.XAnnotationField; -import org.jvnet.annox.model.annotation.field.XSingleAnnotationField; -import org.jvnet.annox.model.annotation.value.XXAnnotationAnnotationValue; -import org.jvnet.annox.parser.exception.AnnotationElementParseException; -import org.jvnet.annox.parser.exception.AnnotationExpressionParseException; -import org.jvnet.annox.util.AnnotationElementUtils; +import org.jvnet.jaxb.annox.annotation.NoSuchAnnotationFieldException; +import org.jvnet.jaxb.annox.japa.parser.ast.visitor.AbstractGenericExpressionVisitor; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.value.XXAnnotationAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.AnnotationElementParseException; +import org.jvnet.jaxb.annox.parser.exception.AnnotationExpressionParseException; +import org.jvnet.jaxb.annox.util.AnnotationElementUtils; import org.w3c.dom.Element; public class XAnnotationSingleAnnotationFieldParser diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XArrayAnnotationFieldParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XArrayAnnotationFieldParser.java similarity index 86% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XArrayAnnotationFieldParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XArrayAnnotationFieldParser.java index bb878cf95..5c70b20a3 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XArrayAnnotationFieldParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XArrayAnnotationFieldParser.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser; +package org.jvnet.jaxb.annox.parser; import japa.parser.ast.Node; import japa.parser.ast.expr.AnnotationExpr; @@ -12,16 +12,16 @@ import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.annotation.NoSuchAnnotationFieldException; -import org.jvnet.annox.model.annotation.field.XAnnotationField; -import org.jvnet.annox.model.annotation.field.XArrayAnnotationField; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.parser.exception.AnnotationElementParseException; -import org.jvnet.annox.parser.exception.AnnotationExpressionParseException; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; -import org.jvnet.annox.parser.value.XAnnotationValueParser; -import org.jvnet.annox.util.AnnotationElementUtils; +import org.jvnet.jaxb.annox.annotation.NoSuchAnnotationFieldException; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.AnnotationElementParseException; +import org.jvnet.jaxb.annox.parser.exception.AnnotationExpressionParseException; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.parser.value.XAnnotationValueParser; +import org.jvnet.jaxb.annox.util.AnnotationElementUtils; import org.w3c.dom.Element; public class XArrayAnnotationFieldParser extends diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XGenericFieldParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XGenericFieldParser.java similarity index 90% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XGenericFieldParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XGenericFieldParser.java index a2b38d21c..753d8a0cc 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XGenericFieldParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XGenericFieldParser.java @@ -1,24 +1,24 @@ -package org.jvnet.annox.parser; +package org.jvnet.jaxb.annox.parser; import japa.parser.ast.expr.Expression; import java.lang.annotation.Annotation; -import org.jvnet.annox.annotation.NoSuchAnnotationFieldException; -import org.jvnet.annox.model.annotation.field.XAnnotationField; -import org.jvnet.annox.parser.exception.AnnotationElementParseException; -import org.jvnet.annox.parser.exception.AnnotationExpressionParseException; -import org.jvnet.annox.parser.value.XBooleanAnnotationValueParser; -import org.jvnet.annox.parser.value.XByteAnnotationValueParser; -import org.jvnet.annox.parser.value.XCharAnnotationValueParser; -import org.jvnet.annox.parser.value.XClassAnnotationValueParser; -import org.jvnet.annox.parser.value.XDoubleAnnotationValueParser; -import org.jvnet.annox.parser.value.XEnumAnnotationValueParser; -import org.jvnet.annox.parser.value.XFloatAnnotationValueParser; -import org.jvnet.annox.parser.value.XIntAnnotationValueParser; -import org.jvnet.annox.parser.value.XLongAnnotationValueParser; -import org.jvnet.annox.parser.value.XShortAnnotationValueParser; -import org.jvnet.annox.parser.value.XStringAnnotationValueParser; +import org.jvnet.jaxb.annox.annotation.NoSuchAnnotationFieldException; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.parser.exception.AnnotationElementParseException; +import org.jvnet.jaxb.annox.parser.exception.AnnotationExpressionParseException; +import org.jvnet.jaxb.annox.parser.value.XBooleanAnnotationValueParser; +import org.jvnet.jaxb.annox.parser.value.XByteAnnotationValueParser; +import org.jvnet.jaxb.annox.parser.value.XCharAnnotationValueParser; +import org.jvnet.jaxb.annox.parser.value.XClassAnnotationValueParser; +import org.jvnet.jaxb.annox.parser.value.XDoubleAnnotationValueParser; +import org.jvnet.jaxb.annox.parser.value.XEnumAnnotationValueParser; +import org.jvnet.jaxb.annox.parser.value.XFloatAnnotationValueParser; +import org.jvnet.jaxb.annox.parser.value.XIntAnnotationValueParser; +import org.jvnet.jaxb.annox.parser.value.XLongAnnotationValueParser; +import org.jvnet.jaxb.annox.parser.value.XShortAnnotationValueParser; +import org.jvnet.jaxb.annox.parser.value.XStringAnnotationValueParser; import org.w3c.dom.Element; public class XGenericFieldParser extends XAnnotationFieldParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XSingleAnnotationFieldParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XSingleAnnotationFieldParser.java similarity index 76% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XSingleAnnotationFieldParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XSingleAnnotationFieldParser.java index 5b01540f0..04383abc7 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XSingleAnnotationFieldParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XSingleAnnotationFieldParser.java @@ -1,20 +1,20 @@ -package org.jvnet.annox.parser; +package org.jvnet.jaxb.annox.parser; import japa.parser.ast.expr.Expression; import java.lang.annotation.Annotation; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.annotation.NoSuchAnnotationFieldException; -import org.jvnet.annox.model.annotation.field.XAnnotationField; -import org.jvnet.annox.model.annotation.field.XSingleAnnotationField; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.parser.exception.AnnotationElementParseException; -import org.jvnet.annox.parser.exception.AnnotationExpressionParseException; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; -import org.jvnet.annox.parser.value.XAnnotationValueParser; -import org.jvnet.annox.util.AnnotationElementUtils; +import org.jvnet.jaxb.annox.annotation.NoSuchAnnotationFieldException; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.AnnotationElementParseException; +import org.jvnet.jaxb.annox.parser.exception.AnnotationExpressionParseException; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.parser.value.XAnnotationValueParser; +import org.jvnet.jaxb.annox.util.AnnotationElementUtils; import org.w3c.dom.Element; public class XSingleAnnotationFieldParser extends diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XXAnnotationArrayAnnotationFieldParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XXAnnotationArrayAnnotationFieldParser.java similarity index 84% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XXAnnotationArrayAnnotationFieldParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XXAnnotationArrayAnnotationFieldParser.java index 2b65a8fc4..c27bbffca 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XXAnnotationArrayAnnotationFieldParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XXAnnotationArrayAnnotationFieldParser.java @@ -1,4 +1,4 @@ -//package org.jvnet.annox.parser; +//package org.jvnet.jaxb.annox.parser; // //import japa.parser.ast.Node; //import japa.parser.ast.expr.AnnotationExpr; @@ -9,16 +9,16 @@ //import java.text.MessageFormat; //import java.util.List; // -//import org.jvnet.annox.annotation.NoSuchAnnotationFieldException; -//import org.jvnet.annox.japa.parser.ast.visitor.AbstractGenericExpressionVisitor; -//import org.jvnet.annox.model.XAnnotation; -//import org.jvnet.annox.model.annotation.field.XAnnotationField; -//import org.jvnet.annox.model.annotation.field.XArrayAnnotationField; -//import org.jvnet.annox.model.annotation.value.XAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XXAnnotationAnnotationValue; -//import org.jvnet.annox.parser.exception.AnnotationElementParseException; -//import org.jvnet.annox.parser.exception.AnnotationExpressionParseException; -//import org.jvnet.annox.util.AnnotationElementUtils; +//import org.jvnet.jaxb.annox.annotation.NoSuchAnnotationFieldException; +//import org.jvnet.jaxb.annox.japa.parser.ast.visitor.AbstractGenericExpressionVisitor; +//import org.jvnet.jaxb.annox.model.XAnnotation; +//import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +//import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField; +//import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XXAnnotationAnnotationValue; +//import org.jvnet.jaxb.annox.parser.exception.AnnotationElementParseException; +//import org.jvnet.jaxb.annox.parser.exception.AnnotationExpressionParseException; +//import org.jvnet.jaxb.annox.util.AnnotationElementUtils; //import org.w3c.dom.Element; // //public class XXAnnotationArrayAnnotationFieldParser @@ -124,4 +124,4 @@ // } // return new XArrayAnnotationField(name, type, xannotationValues); // } -//} \ No newline at end of file +//} diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XXAnnotationSingleAnnotationFieldParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XXAnnotationSingleAnnotationFieldParser.java similarity index 80% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XXAnnotationSingleAnnotationFieldParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XXAnnotationSingleAnnotationFieldParser.java index 7ccd3f7f7..373277fb1 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/XXAnnotationSingleAnnotationFieldParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XXAnnotationSingleAnnotationFieldParser.java @@ -1,4 +1,4 @@ -//package org.jvnet.annox.parser; +//package org.jvnet.jaxb.annox.parser; // //import japa.parser.ast.Node; //import japa.parser.ast.expr.AnnotationExpr; @@ -7,16 +7,16 @@ //import java.lang.annotation.Annotation; //import java.text.MessageFormat; // -//import org.jvnet.annox.annotation.NoSuchAnnotationFieldException; -//import org.jvnet.annox.japa.parser.ast.visitor.AbstractGenericExpressionVisitor; -//import org.jvnet.annox.model.XAnnotation; -//import org.jvnet.annox.model.annotation.field.XAnnotationField; -//import org.jvnet.annox.model.annotation.field.XSingleAnnotationField; -//import org.jvnet.annox.model.annotation.value.XAnnotationValue; -//import org.jvnet.annox.model.annotation.value.XXAnnotationAnnotationValue; -//import org.jvnet.annox.parser.exception.AnnotationElementParseException; -//import org.jvnet.annox.parser.exception.AnnotationExpressionParseException; -//import org.jvnet.annox.util.AnnotationElementUtils; +//import org.jvnet.jaxb.annox.annotation.NoSuchAnnotationFieldException; +//import org.jvnet.jaxb.annox.japa.parser.ast.visitor.AbstractGenericExpressionVisitor; +//import org.jvnet.jaxb.annox.model.XAnnotation; +//import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +//import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField; +//import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +//import org.jvnet.jaxb.annox.model.annotation.value.XXAnnotationAnnotationValue; +//import org.jvnet.jaxb.annox.parser.exception.AnnotationElementParseException; +//import org.jvnet.jaxb.annox.parser.exception.AnnotationExpressionParseException; +//import org.jvnet.jaxb.annox.util.AnnotationElementUtils; //import org.w3c.dom.Element; // //public class XXAnnotationSingleAnnotationFieldParser @@ -103,4 +103,4 @@ // new XXAnnotationAnnotationValue(annotation)); // } // -//} \ No newline at end of file +//} diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/exception/AnnotationElementParseException.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/exception/AnnotationElementParseException.java similarity index 89% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/exception/AnnotationElementParseException.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/exception/AnnotationElementParseException.java index a420aa026..8df307ff3 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/exception/AnnotationElementParseException.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/exception/AnnotationElementParseException.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.exception; +package org.jvnet.jaxb.annox.parser.exception; import org.w3c.dom.Element; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/exception/AnnotationExpressionParseException.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/exception/AnnotationExpressionParseException.java similarity index 91% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/exception/AnnotationExpressionParseException.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/exception/AnnotationExpressionParseException.java index 7a8075b23..4c91ed472 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/exception/AnnotationExpressionParseException.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/exception/AnnotationExpressionParseException.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.exception; +package org.jvnet.jaxb.annox.parser.exception; import java.text.MessageFormat; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/exception/AnnotationStringParseException.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/exception/AnnotationStringParseException.java similarity index 90% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/exception/AnnotationStringParseException.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/exception/AnnotationStringParseException.java index b4710e65e..fa992dffc 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/exception/AnnotationStringParseException.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/exception/AnnotationStringParseException.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.exception; +package org.jvnet.jaxb.annox.parser.exception; public class AnnotationStringParseException extends Exception { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/exception/ValueParseException.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/exception/ValueParseException.java similarity index 94% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/exception/ValueParseException.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/exception/ValueParseException.java index 5f185c59a..2500588c1 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/exception/ValueParseException.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/exception/ValueParseException.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.exception; +package org.jvnet.jaxb.annox.parser.exception; import java.text.MessageFormat; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/BooleanExpressionVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/BooleanExpressionVisitor.java similarity index 65% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/BooleanExpressionVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/BooleanExpressionVisitor.java index 0099cfd4e..9dec21ee5 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/BooleanExpressionVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/BooleanExpressionVisitor.java @@ -1,7 +1,7 @@ -package org.jvnet.annox.parser.java.visitor; +package org.jvnet.jaxb.annox.parser.java.visitor; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XBooleanAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XBooleanAnnotationValue; import japa.parser.ast.expr.BooleanLiteralExpr; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/ByteExpressionVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/ByteExpressionVisitor.java similarity index 66% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/ByteExpressionVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/ByteExpressionVisitor.java index a43fe6c78..f2b09c136 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/ByteExpressionVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/ByteExpressionVisitor.java @@ -1,9 +1,9 @@ -package org.jvnet.annox.parser.java.visitor; +package org.jvnet.jaxb.annox.parser.java.visitor; -import japa.parser.ast.expr.StringLiteralExpr; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XByteAnnotationValue; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XByteAnnotationValue; +import japa.parser.ast.expr.StringLiteralExpr; public final class ByteExpressionVisitor extends ExpressionVisitor> { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/CharacterExpressionVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/CharacterExpressionVisitor.java similarity index 72% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/CharacterExpressionVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/CharacterExpressionVisitor.java index eb0138b92..491be5284 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/CharacterExpressionVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/CharacterExpressionVisitor.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.parser.java.visitor; +package org.jvnet.jaxb.annox.parser.java.visitor; -import japa.parser.ast.expr.StringLiteralExpr; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XCharAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XCharAnnotationValue; -import org.jvnet.annox.parser.exception.ValueParseException; +import japa.parser.ast.expr.StringLiteralExpr; public final class CharacterExpressionVisitor extends ExpressionVisitor> { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/ClassExpressionVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/ClassExpressionVisitor.java similarity index 91% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/ClassExpressionVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/ClassExpressionVisitor.java index 39fdc9baa..a6f8e6d25 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/ClassExpressionVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/ClassExpressionVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.java.visitor; +package org.jvnet.jaxb.annox.parser.java.visitor; import japa.parser.ast.expr.ClassExpr; import japa.parser.ast.type.ClassOrInterfaceType; @@ -10,11 +10,11 @@ import java.lang.reflect.Array; -import org.jvnet.annox.model.annotation.value.AbstractBasicXAnnotationValueVisitor; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XArrayClassAnnotationValue; -import org.jvnet.annox.model.annotation.value.XClassAnnotationValue; -import org.jvnet.annox.model.annotation.value.XClassByNameAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.AbstractBasicXAnnotationValueVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XArrayClassAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XClassAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XClassByNameAnnotationValue; public final class ClassExpressionVisitor extends ExpressionVisitor>> { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/DoubleExpressionVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/DoubleExpressionVisitor.java similarity index 66% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/DoubleExpressionVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/DoubleExpressionVisitor.java index 1b42e78b8..c8b431852 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/DoubleExpressionVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/DoubleExpressionVisitor.java @@ -1,9 +1,9 @@ -package org.jvnet.annox.parser.java.visitor; +package org.jvnet.jaxb.annox.parser.java.visitor; -import japa.parser.ast.expr.StringLiteralExpr; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XDoubleAnnotationValue; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XDoubleAnnotationValue; +import japa.parser.ast.expr.StringLiteralExpr; public final class DoubleExpressionVisitor extends ExpressionVisitor> { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/EnumExpressionVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/EnumExpressionVisitor.java similarity index 77% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/EnumExpressionVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/EnumExpressionVisitor.java index f55488bea..414437356 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/EnumExpressionVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/EnumExpressionVisitor.java @@ -1,9 +1,9 @@ -package org.jvnet.annox.parser.java.visitor; +package org.jvnet.jaxb.annox.parser.java.visitor; -import japa.parser.ast.expr.FieldAccessExpr; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XEnumAnnotationValue; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XEnumAnnotationValue; +import japa.parser.ast.expr.FieldAccessExpr; public final class EnumExpressionVisitor extends ExpressionVisitor>> { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/ExpressionVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/ExpressionVisitor.java similarity index 69% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/ExpressionVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/ExpressionVisitor.java index f679b1da8..fee1ca361 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/ExpressionVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/ExpressionVisitor.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.parser.java.visitor; +package org.jvnet.jaxb.annox.parser.java.visitor; import japa.parser.ast.Node; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.japa.parser.ast.visitor.AbstractGenericExpressionVisitor; -import org.jvnet.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.japa.parser.ast.visitor.AbstractGenericExpressionVisitor; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; public class ExpressionVisitor extends AbstractGenericExpressionVisitor { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/FloatExpressionVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/FloatExpressionVisitor.java similarity index 67% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/FloatExpressionVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/FloatExpressionVisitor.java index dfd3282e7..59c2476e9 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/FloatExpressionVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/FloatExpressionVisitor.java @@ -1,9 +1,9 @@ -package org.jvnet.annox.parser.java.visitor; +package org.jvnet.jaxb.annox.parser.java.visitor; -import japa.parser.ast.expr.StringLiteralExpr; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XFloatAnnotationValue; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XFloatAnnotationValue; +import japa.parser.ast.expr.StringLiteralExpr; public final class FloatExpressionVisitor extends ExpressionVisitor> { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/IntegerExpressionVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/IntegerExpressionVisitor.java similarity index 67% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/IntegerExpressionVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/IntegerExpressionVisitor.java index 1eb7c573c..bcd9c16d0 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/IntegerExpressionVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/IntegerExpressionVisitor.java @@ -1,9 +1,9 @@ -package org.jvnet.annox.parser.java.visitor; +package org.jvnet.jaxb.annox.parser.java.visitor; -import japa.parser.ast.expr.StringLiteralExpr; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XIntAnnotationValue; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XIntAnnotationValue; +import japa.parser.ast.expr.StringLiteralExpr; public final class IntegerExpressionVisitor extends ExpressionVisitor> { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/LongExpressionVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/LongExpressionVisitor.java similarity index 82% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/LongExpressionVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/LongExpressionVisitor.java index 7146cf279..4bb4be148 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/LongExpressionVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/LongExpressionVisitor.java @@ -1,12 +1,12 @@ -package org.jvnet.annox.parser.java.visitor; +package org.jvnet.jaxb.annox.parser.java.visitor; + +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XLongAnnotationValue; import japa.parser.ast.expr.LongLiteralExpr; import japa.parser.ast.expr.LongLiteralMinValueExpr; import japa.parser.ast.expr.StringLiteralExpr; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XLongAnnotationValue; - public final class LongExpressionVisitor extends ExpressionVisitor> { public LongExpressionVisitor(Class targetClass) { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/ShortExpressionVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/ShortExpressionVisitor.java similarity index 67% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/ShortExpressionVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/ShortExpressionVisitor.java index a3980549b..65913eda8 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/ShortExpressionVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/ShortExpressionVisitor.java @@ -1,9 +1,9 @@ -package org.jvnet.annox.parser.java.visitor; +package org.jvnet.jaxb.annox.parser.java.visitor; -import japa.parser.ast.expr.StringLiteralExpr; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XShortAnnotationValue; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XShortAnnotationValue; +import japa.parser.ast.expr.StringLiteralExpr; public final class ShortExpressionVisitor extends ExpressionVisitor> { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/StringExpressionVisitor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/StringExpressionVisitor.java similarity index 66% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/StringExpressionVisitor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/StringExpressionVisitor.java index b4697844c..390fa48ac 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/java/visitor/StringExpressionVisitor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/StringExpressionVisitor.java @@ -1,9 +1,9 @@ -package org.jvnet.annox.parser.java.visitor; +package org.jvnet.jaxb.annox.parser.java.visitor; -import japa.parser.ast.expr.StringLiteralExpr; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XStringAnnotationValue; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XStringAnnotationValue; +import japa.parser.ast.expr.StringLiteralExpr; public final class StringExpressionVisitor extends ExpressionVisitor> { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XAnnotationValueParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XAnnotationValueParser.java similarity index 57% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XAnnotationValueParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XAnnotationValueParser.java index 1030bd8e5..d0955d85b 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XAnnotationValueParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XAnnotationValueParser.java @@ -1,8 +1,8 @@ -package org.jvnet.annox.parser.value; +package org.jvnet.jaxb.annox.parser.value; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; public abstract class XAnnotationValueParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XBooleanAnnotationValueParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XBooleanAnnotationValueParser.java similarity index 58% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XBooleanAnnotationValueParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XBooleanAnnotationValueParser.java index 5bad22fdc..c62fcecf9 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XBooleanAnnotationValueParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XBooleanAnnotationValueParser.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.parser.value; +package org.jvnet.jaxb.annox.parser.value; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XBooleanAnnotationValue; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.BooleanExpressionVisitor; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XBooleanAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.BooleanExpressionVisitor; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; public class XBooleanAnnotationValueParser extends XAnnotationValueParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XByteAnnotationValueParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XByteAnnotationValueParser.java similarity index 57% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XByteAnnotationValueParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XByteAnnotationValueParser.java index 4a8b6fa56..742305b32 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XByteAnnotationValueParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XByteAnnotationValueParser.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.parser.value; +package org.jvnet.jaxb.annox.parser.value; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XByteAnnotationValue; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.ByteExpressionVisitor; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XByteAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.ByteExpressionVisitor; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; public class XByteAnnotationValueParser extends XAnnotationValueParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XCharAnnotationValueParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XCharAnnotationValueParser.java similarity index 62% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XCharAnnotationValueParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XCharAnnotationValueParser.java index 29b5997dc..7012d1a23 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XCharAnnotationValueParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XCharAnnotationValueParser.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.parser.value; +package org.jvnet.jaxb.annox.parser.value; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XCharAnnotationValue; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.CharacterExpressionVisitor; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XCharAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.CharacterExpressionVisitor; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; public class XCharAnnotationValueParser extends XAnnotationValueParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XClassAnnotationValueParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XClassAnnotationValueParser.java similarity index 85% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XClassAnnotationValueParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XClassAnnotationValueParser.java index d87d1bb7d..5be507df7 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XClassAnnotationValueParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XClassAnnotationValueParser.java @@ -1,17 +1,17 @@ -package org.jvnet.annox.parser.value; +package org.jvnet.jaxb.annox.parser.value; import java.lang.reflect.Array; import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.StringUtils; -import org.jvnet.annox.model.annotation.value.AbstractBasicXAnnotationValueVisitor; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XArrayClassAnnotationValue; -import org.jvnet.annox.model.annotation.value.XClassAnnotationValue; -import org.jvnet.annox.model.annotation.value.XClassByNameAnnotationValue; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.ClassExpressionVisitor; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.AbstractBasicXAnnotationValueVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XArrayClassAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XClassAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XClassByNameAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.ClassExpressionVisitor; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; public class XClassAnnotationValueParser extends XAnnotationValueParser, Class> { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XDoubleAnnotationValueParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XDoubleAnnotationValueParser.java similarity index 58% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XDoubleAnnotationValueParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XDoubleAnnotationValueParser.java index 49b33d0ac..d4cdeab76 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XDoubleAnnotationValueParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XDoubleAnnotationValueParser.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.parser.value; +package org.jvnet.jaxb.annox.parser.value; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XDoubleAnnotationValue; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.DoubleExpressionVisitor; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XDoubleAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.DoubleExpressionVisitor; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; public class XDoubleAnnotationValueParser extends XAnnotationValueParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XEnumAnnotationValueParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XEnumAnnotationValueParser.java similarity index 70% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XEnumAnnotationValueParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XEnumAnnotationValueParser.java index f652fb1c7..d3d6a43e9 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XEnumAnnotationValueParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XEnumAnnotationValueParser.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.parser.value; +package org.jvnet.jaxb.annox.parser.value; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XEnumAnnotationValue; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.EnumExpressionVisitor; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XEnumAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.EnumExpressionVisitor; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; public class XEnumAnnotationValueParser extends XAnnotationValueParser, Enum> { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XFloatAnnotationValueParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XFloatAnnotationValueParser.java similarity index 58% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XFloatAnnotationValueParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XFloatAnnotationValueParser.java index a3dd1bf1f..a78f305f0 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XFloatAnnotationValueParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XFloatAnnotationValueParser.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.parser.value; +package org.jvnet.jaxb.annox.parser.value; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XFloatAnnotationValue; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; -import org.jvnet.annox.parser.java.visitor.FloatExpressionVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XFloatAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.parser.java.visitor.FloatExpressionVisitor; public class XFloatAnnotationValueParser extends XAnnotationValueParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XIntAnnotationValueParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XIntAnnotationValueParser.java similarity index 58% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XIntAnnotationValueParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XIntAnnotationValueParser.java index d11909cc1..95c8cb7c0 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XIntAnnotationValueParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XIntAnnotationValueParser.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.parser.value; +package org.jvnet.jaxb.annox.parser.value; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XIntAnnotationValue; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; -import org.jvnet.annox.parser.java.visitor.IntegerExpressionVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XIntAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.parser.java.visitor.IntegerExpressionVisitor; public class XIntAnnotationValueParser extends XAnnotationValueParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XLongAnnotationValueParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XLongAnnotationValueParser.java similarity index 57% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XLongAnnotationValueParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XLongAnnotationValueParser.java index d3b6361e8..d0b9301f1 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XLongAnnotationValueParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XLongAnnotationValueParser.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.parser.value; +package org.jvnet.jaxb.annox.parser.value; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XLongAnnotationValue; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; -import org.jvnet.annox.parser.java.visitor.LongExpressionVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XLongAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.parser.java.visitor.LongExpressionVisitor; public class XLongAnnotationValueParser extends XAnnotationValueParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XShortAnnotationValueParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XShortAnnotationValueParser.java similarity index 58% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XShortAnnotationValueParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XShortAnnotationValueParser.java index 414d940dd..187054f1b 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XShortAnnotationValueParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XShortAnnotationValueParser.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.parser.value; +package org.jvnet.jaxb.annox.parser.value; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XShortAnnotationValue; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; -import org.jvnet.annox.parser.java.visitor.ShortExpressionVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XShortAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.parser.java.visitor.ShortExpressionVisitor; public class XShortAnnotationValueParser extends XAnnotationValueParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XStringAnnotationValueParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XStringAnnotationValueParser.java similarity index 58% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XStringAnnotationValueParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XStringAnnotationValueParser.java index 691c680e6..7f356424b 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/parser/value/XStringAnnotationValueParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/value/XStringAnnotationValueParser.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.parser.value; +package org.jvnet.jaxb.annox.parser.value; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; -import org.jvnet.annox.model.annotation.value.XStringAnnotationValue; -import org.jvnet.annox.parser.exception.ValueParseException; -import org.jvnet.annox.parser.java.visitor.ExpressionVisitor; -import org.jvnet.annox.parser.java.visitor.StringExpressionVisitor; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XStringAnnotationValue; +import org.jvnet.jaxb.annox.parser.exception.ValueParseException; +import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor; +import org.jvnet.jaxb.annox.parser.java.visitor.StringExpressionVisitor; public class XStringAnnotationValueParser extends XAnnotationValueParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/XReader.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/XReader.java similarity index 73% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/XReader.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/XReader.java index c58c53454..f99c5b677 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/XReader.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/XReader.java @@ -1,15 +1,15 @@ -package org.jvnet.annox.reader; +package org.jvnet.jaxb.annox.reader; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; -import org.jvnet.annox.model.XClass; -import org.jvnet.annox.model.XConstructor; -import org.jvnet.annox.model.XField; -import org.jvnet.annox.model.XMethod; -import org.jvnet.annox.model.XPackage; -import org.jvnet.annox.reflect.AnnotatedElementException; +import org.jvnet.jaxb.annox.model.XClass; +import org.jvnet.jaxb.annox.model.XConstructor; +import org.jvnet.jaxb.annox.model.XField; +import org.jvnet.jaxb.annox.model.XMethod; +import org.jvnet.jaxb.annox.model.XPackage; +import org.jvnet.jaxb.annox.reflect.AnnotatedElementException; public interface XReader { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NClass.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NClass.java similarity index 91% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NClass.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NClass.java index 98e50caa8..0ce0a0f80 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NClass.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NClass.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reader.resourced; +package org.jvnet.jaxb.annox.reader.resourced; import java.util.List; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NConstructor.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NConstructor.java similarity index 91% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NConstructor.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NConstructor.java index d0250079f..154522d8b 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NConstructor.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NConstructor.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reader.resourced; +package org.jvnet.jaxb.annox.reader.resourced; import java.util.List; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NField.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NField.java similarity index 89% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NField.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NField.java index e103f1380..07f9113ef 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NField.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NField.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reader.resourced; +package org.jvnet.jaxb.annox.reader.resourced; import java.util.List; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NMethod.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NMethod.java similarity index 91% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NMethod.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NMethod.java index 1de41ddee..2654f85c8 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NMethod.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NMethod.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reader.resourced; +package org.jvnet.jaxb.annox.reader.resourced; import java.util.List; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NPackage.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NPackage.java similarity index 90% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NPackage.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NPackage.java index 9bfedc872..a6f78d599 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NPackage.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NPackage.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reader.resourced; +package org.jvnet.jaxb.annox.reader.resourced; import java.util.List; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NParameter.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NParameter.java similarity index 89% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NParameter.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NParameter.java index 8d4748314..534f0d6ab 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NParameter.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NParameter.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reader.resourced; +package org.jvnet.jaxb.annox.reader.resourced; import java.util.List; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NParser.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NParser.java similarity index 92% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NParser.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NParser.java index 71f75913a..6499d22da 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NParser.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NParser.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reader.resourced; +package org.jvnet.jaxb.annox.reader.resourced; import java.io.IOException; import java.io.InputStream; @@ -7,7 +7,7 @@ import javax.xml.bind.JAXBException; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.io.NestedIOException; +import org.jvnet.jaxb.annox.io.NestedIOException; public class NParser { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NXConverter.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NXConverter.java similarity index 93% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NXConverter.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NXConverter.java index 1b62302b1..2a12a28af 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/NXConverter.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/NXConverter.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reader.resourced; +package org.jvnet.jaxb.annox.reader.resourced; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -7,17 +7,17 @@ import java.util.List; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.model.XClass; -import org.jvnet.annox.model.XConstructor; -import org.jvnet.annox.model.XField; -import org.jvnet.annox.model.XMethod; -import org.jvnet.annox.model.XPackage; -import org.jvnet.annox.model.XParameter; -import org.jvnet.annox.parser.XAnnotationParser; -import org.jvnet.annox.parser.exception.AnnotationElementParseException; -import org.jvnet.annox.util.ClassUtils; -import org.jvnet.annox.util.ReflectionUtils; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.XClass; +import org.jvnet.jaxb.annox.model.XConstructor; +import org.jvnet.jaxb.annox.model.XField; +import org.jvnet.jaxb.annox.model.XMethod; +import org.jvnet.jaxb.annox.model.XPackage; +import org.jvnet.jaxb.annox.model.XParameter; +import org.jvnet.jaxb.annox.parser.XAnnotationParser; +import org.jvnet.jaxb.annox.parser.exception.AnnotationElementParseException; +import org.jvnet.jaxb.annox.util.ClassUtils; +import org.jvnet.jaxb.annox.util.ReflectionUtils; import org.w3c.dom.Element; public class NXConverter { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/ResourcedXReader.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/ResourcedXReader.java similarity index 95% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/ResourcedXReader.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/ResourcedXReader.java index 85851c8a8..bab512a78 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/ResourcedXReader.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/ResourcedXReader.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reader.resourced; +package org.jvnet.jaxb.annox.reader.resourced; import java.io.IOException; import java.io.InputStream; @@ -11,15 +11,15 @@ import javax.xml.bind.JAXBContext; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.model.XClass; -import org.jvnet.annox.model.XConstructor; -import org.jvnet.annox.model.XField; -import org.jvnet.annox.model.XMethod; -import org.jvnet.annox.model.XPackage; -import org.jvnet.annox.parser.XAnnotationParser; -import org.jvnet.annox.parser.exception.AnnotationElementParseException; -import org.jvnet.annox.reader.XReader; -import org.jvnet.annox.reflect.AnnotatedElementException; +import org.jvnet.jaxb.annox.model.XClass; +import org.jvnet.jaxb.annox.model.XConstructor; +import org.jvnet.jaxb.annox.model.XField; +import org.jvnet.jaxb.annox.model.XMethod; +import org.jvnet.jaxb.annox.model.XPackage; +import org.jvnet.jaxb.annox.parser.XAnnotationParser; +import org.jvnet.jaxb.annox.parser.exception.AnnotationElementParseException; +import org.jvnet.jaxb.annox.reader.XReader; +import org.jvnet.jaxb.annox.reflect.AnnotatedElementException; public class ResourcedXReader implements XReader { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/package-info.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/package-info.java similarity index 87% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/package-info.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/package-info.java index e140a686f..527b1a9a1 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reader/resourced/package-info.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reader/resourced/package-info.java @@ -1,3 +1,3 @@ @javax.xml.bind.annotation.XmlSchema(namespace = "http://annox.dev.java.net", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, attributeFormDefault = javax.xml.bind.annotation.XmlNsForm.UNQUALIFIED) @javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD) -package org.jvnet.annox.reader.resourced; \ No newline at end of file +package org.jvnet.jaxb.annox.reader.resourced; \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/AnnotatedElementException.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/AnnotatedElementException.java similarity index 92% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/AnnotatedElementException.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/AnnotatedElementException.java index 3be4a5f5e..f75ce6c34 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/AnnotatedElementException.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/AnnotatedElementException.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reflect; +package org.jvnet.jaxb.annox.reflect; import java.lang.reflect.AnnotatedElement; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/AnnotatedElementFactory.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/AnnotatedElementFactory.java similarity index 93% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/AnnotatedElementFactory.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/AnnotatedElementFactory.java index 32562bcf8..1456968b7 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/AnnotatedElementFactory.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/AnnotatedElementFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reflect; +package org.jvnet.jaxb.annox.reflect; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Constructor; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/ConstructorAnnotatedElement.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/ConstructorAnnotatedElement.java similarity index 96% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/ConstructorAnnotatedElement.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/ConstructorAnnotatedElement.java index b8546bd4e..f81b30b1c 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/ConstructorAnnotatedElement.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/ConstructorAnnotatedElement.java @@ -1,7 +1,7 @@ /** * */ -package org.jvnet.annox.reflect; +package org.jvnet.jaxb.annox.reflect; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/DirectAnnotatedElementFactory.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/DirectAnnotatedElementFactory.java similarity index 95% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/DirectAnnotatedElementFactory.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/DirectAnnotatedElementFactory.java index da1e40bb7..1232937ea 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/DirectAnnotatedElementFactory.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/DirectAnnotatedElementFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reflect; +package org.jvnet.jaxb.annox.reflect; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Constructor; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/DualAnnotatedElementFactory.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/DualAnnotatedElementFactory.java similarity index 97% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/DualAnnotatedElementFactory.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/DualAnnotatedElementFactory.java index d75e822bc..57190c943 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/DualAnnotatedElementFactory.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/DualAnnotatedElementFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reflect; +package org.jvnet.jaxb.annox.reflect; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Constructor; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/MethodAnnotatedElement.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/MethodAnnotatedElement.java similarity index 95% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/MethodAnnotatedElement.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/MethodAnnotatedElement.java index 2440fef0a..f7ff30cca 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/MethodAnnotatedElement.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/MethodAnnotatedElement.java @@ -1,7 +1,7 @@ /** * */ -package org.jvnet.annox.reflect; +package org.jvnet.jaxb.annox.reflect; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/ParameterizedAnnotatedElement.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/ParameterizedAnnotatedElement.java similarity index 95% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/ParameterizedAnnotatedElement.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/ParameterizedAnnotatedElement.java index 9544187e0..bb6236fb7 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/ParameterizedAnnotatedElement.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/ParameterizedAnnotatedElement.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reflect; +package org.jvnet.jaxb.annox.reflect; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/ResourcedAnnotatedElementFactory.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/ResourcedAnnotatedElementFactory.java similarity index 92% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/ResourcedAnnotatedElementFactory.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/ResourcedAnnotatedElementFactory.java index ccb5c5835..491f3330c 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/reflect/ResourcedAnnotatedElementFactory.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/reflect/ResourcedAnnotatedElementFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reflect; +package org.jvnet.jaxb.annox.reflect; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Constructor; @@ -6,8 +6,8 @@ import java.lang.reflect.Method; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.reader.XReader; -import org.jvnet.annox.reader.resourced.ResourcedXReader; +import org.jvnet.jaxb.annox.reader.XReader; +import org.jvnet.jaxb.annox.reader.resourced.ResourcedXReader; public class ResourcedAnnotatedElementFactory implements AnnotatedElementFactory { diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/AnnotationElementUtils.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/AnnotationElementUtils.java similarity index 98% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/AnnotationElementUtils.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/AnnotationElementUtils.java index 10afc7616..24e4fd9b0 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/AnnotationElementUtils.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/AnnotationElementUtils.java @@ -1,11 +1,11 @@ -package org.jvnet.annox.util; +package org.jvnet.jaxb.annox.util; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.jvnet.annox.Constants; +import org.jvnet.jaxb.annox.Constants; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/ArrayUtils.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/ArrayUtils.java similarity index 98% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/ArrayUtils.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/ArrayUtils.java index 53af80708..7c3ca76cb 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/ArrayUtils.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/ArrayUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.util; +package org.jvnet.jaxb.annox.util; import org.apache.commons.lang3.Validate; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/ClassUtils.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/ClassUtils.java similarity index 99% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/ClassUtils.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/ClassUtils.java index a1f622cd9..58d77e640 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/ClassUtils.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/ClassUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.util; +package org.jvnet.jaxb.annox.util; import java.lang.reflect.Array; import java.util.HashMap; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/ObjectUtils.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/ObjectUtils.java similarity index 98% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/ObjectUtils.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/ObjectUtils.java index 01f03dbb8..a4fb32200 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/ObjectUtils.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/ObjectUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.util; +package org.jvnet.jaxb.annox.util; import java.lang.reflect.Array; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/ReflectionUtils.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/ReflectionUtils.java similarity index 98% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/ReflectionUtils.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/ReflectionUtils.java index 818e8972d..3a677bf61 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/util/ReflectionUtils.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/util/ReflectionUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.util; +package org.jvnet.jaxb.annox.util; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/xml/bind/AnnoxAnnotationReader.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/xml/bind/AnnoxAnnotationReader.java similarity index 95% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/xml/bind/AnnoxAnnotationReader.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/xml/bind/AnnoxAnnotationReader.java index 66aa819b6..ee1857ce6 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/xml/bind/AnnoxAnnotationReader.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/xml/bind/AnnoxAnnotationReader.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.xml.bind; +package org.jvnet.jaxb.annox.xml.bind; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; @@ -9,11 +9,11 @@ import java.util.HashMap; import java.util.Map; -import org.jvnet.annox.reflect.AnnotatedElementException; -import org.jvnet.annox.reflect.AnnotatedElementFactory; -import org.jvnet.annox.reflect.DualAnnotatedElementFactory; -import org.jvnet.annox.reflect.MethodAnnotatedElement; -import org.jvnet.annox.reflect.ParameterizedAnnotatedElement; +import org.jvnet.jaxb.annox.reflect.AnnotatedElementException; +import org.jvnet.jaxb.annox.reflect.AnnotatedElementFactory; +import org.jvnet.jaxb.annox.reflect.DualAnnotatedElementFactory; +import org.jvnet.jaxb.annox.reflect.MethodAnnotatedElement; +import org.jvnet.jaxb.annox.reflect.ParameterizedAnnotatedElement; import com.sun.xml.bind.v2.model.annotation.AbstractInlineAnnotationReaderImpl; import com.sun.xml.bind.v2.model.annotation.Locatable; diff --git a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/xml/bind/LocatableUtils.java b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/xml/bind/LocatableUtils.java similarity index 97% rename from jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/xml/bind/LocatableUtils.java rename to jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/xml/bind/LocatableUtils.java index 1cb079a98..964046f14 100644 --- a/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/annox/xml/bind/LocatableUtils.java +++ b/jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/xml/bind/LocatableUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.xml.bind; +package org.jvnet.jaxb.annox.xml.bind; import java.lang.reflect.Member; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/E.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/E.java deleted file mode 100644 index 17aecd4cc..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/E.java +++ /dev/null @@ -1,3 +0,0 @@ -package org.jvnet.annox.parser.tests; - -public enum E {ONE, TWO, THREE, FOUR;} \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Eleven.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Eleven.java deleted file mode 100644 index 83f1139f1..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Eleven.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.jvnet.annox.parser.tests; - -@H -public class Eleven { - -} diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Five.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Five.java deleted file mode 100644 index 7ca9da64a..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Five.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.jvnet.annox.parser.tests; - -@F(eman = "tset") -public class Five { - -} \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Nine.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Nine.java deleted file mode 100644 index ff11b6983..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Nine.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.jvnet.annox.parser.tests; - -@L(@J("jay")) -public class Nine { - -} diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Seven.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Seven.java deleted file mode 100644 index 037945cf7..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Seven.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.jvnet.annox.parser.tests; - -@J("jay") -public class Seven { - -} diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Six.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Six.java deleted file mode 100644 index a4b022e11..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Six.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.jvnet.annox.parser.tests; - -@G -public class Six { - -} \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Three.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Three.java deleted file mode 100644 index 7681d0569..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Three.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.jvnet.annox.parser.tests; - -@D -public class Three { - -} \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/Eleven.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/Eleven.java deleted file mode 100644 index e92e0fd4e..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/Eleven.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.annox.reader.resourced.tests; - -public class Eleven { - -} diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/Twelve.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/Twelve.java deleted file mode 100644 index 556ceb942..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/Twelve.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.annox.reader.resourced.tests; - -public class Twelve { - -} diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/Comment.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/Comment.java similarity index 68% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/Comment.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/Comment.java index 653082f5f..1f4735f56 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/Comment.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/Comment.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.demos.guide; +package org.jvnet.jaxb.annox.demos.guide; public @interface Comment { public String lang() default "en"; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/DemoClass.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/DemoClass.java similarity index 92% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/DemoClass.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/DemoClass.java index 33f9b3583..ffdda7b33 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/DemoClass.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/DemoClass.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.demos.guide; +package org.jvnet.jaxb.annox.demos.guide; public class DemoClass { diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/MyAnnotation.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/MyAnnotation.java similarity index 88% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/MyAnnotation.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/MyAnnotation.java index 0a2c59af0..a95b401af 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/MyAnnotation.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/MyAnnotation.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.demos.guide; +package org.jvnet.jaxb.annox.demos.guide; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/MyClass.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/MyClass.java similarity index 75% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/MyClass.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/MyClass.java index bf429ceb9..c36ffa8d9 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/MyClass.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/MyClass.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.demos.guide; +package org.jvnet.jaxb.annox.demos.guide; @MyAnnotation(printName = "My class") public class MyClass { diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/tests/DemoClassTest.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/tests/DemoClassTest.java similarity index 76% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/tests/DemoClassTest.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/tests/DemoClassTest.java index b68f5b06e..80589c278 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/tests/DemoClassTest.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/tests/DemoClassTest.java @@ -1,14 +1,14 @@ -package org.jvnet.annox.demos.guide.tests; +package org.jvnet.jaxb.annox.demos.guide.tests; import java.lang.reflect.AnnotatedElement; import junit.framework.TestCase; -import org.jvnet.annox.demos.guide.Comment; -import org.jvnet.annox.demos.guide.DemoClass; -import org.jvnet.annox.reflect.AnnotatedElementFactory; -import org.jvnet.annox.reflect.DualAnnotatedElementFactory; -import org.jvnet.annox.reflect.ParameterizedAnnotatedElement; +import org.jvnet.jaxb.annox.demos.guide.Comment; +import org.jvnet.jaxb.annox.demos.guide.DemoClass; +import org.jvnet.jaxb.annox.reflect.AnnotatedElementFactory; +import org.jvnet.jaxb.annox.reflect.DualAnnotatedElementFactory; +import org.jvnet.jaxb.annox.reflect.ParameterizedAnnotatedElement; public class DemoClassTest extends TestCase { diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/tests/MyClassTest.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/tests/MyClassTest.java similarity index 81% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/tests/MyClassTest.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/tests/MyClassTest.java index d3e039b2c..d929d9803 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/demos/guide/tests/MyClassTest.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/demos/guide/tests/MyClassTest.java @@ -1,11 +1,11 @@ -package org.jvnet.annox.demos.guide.tests; +package org.jvnet.jaxb.annox.demos.guide.tests; import java.lang.reflect.AnnotatedElement; -import org.jvnet.annox.demos.guide.MyAnnotation; -import org.jvnet.annox.demos.guide.MyClass; -import org.jvnet.annox.reflect.AnnotatedElementFactory; -import org.jvnet.annox.reflect.DualAnnotatedElementFactory; +import org.jvnet.jaxb.annox.demos.guide.MyAnnotation; +import org.jvnet.jaxb.annox.demos.guide.MyClass; +import org.jvnet.jaxb.annox.reflect.AnnotatedElementFactory; +import org.jvnet.jaxb.annox.reflect.DualAnnotatedElementFactory; import junit.framework.TestCase; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/model/test/AnnotationWithIntegerField.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/model/test/AnnotationWithIntegerField.java similarity index 70% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/model/test/AnnotationWithIntegerField.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/model/test/AnnotationWithIntegerField.java index 78ae56438..036be26fd 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/model/test/AnnotationWithIntegerField.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/model/test/AnnotationWithIntegerField.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.model.test; +package org.jvnet.jaxb.annox.model.test; public @interface AnnotationWithIntegerField { int integerField(); diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/model/test/AnnotationWithIntegerFieldTest.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/model/test/AnnotationWithIntegerFieldTest.java similarity index 80% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/model/test/AnnotationWithIntegerFieldTest.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/model/test/AnnotationWithIntegerFieldTest.java index 72f0ad1f3..d2849125d 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/model/test/AnnotationWithIntegerFieldTest.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/model/test/AnnotationWithIntegerFieldTest.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.model.test; +package org.jvnet.jaxb.annox.model.test; import org.junit.Assert; import org.junit.Test; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.model.annotation.field.XAnnotationField; -import org.jvnet.annox.parser.XGenericFieldParser; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.parser.XGenericFieldParser; public class AnnotationWithIntegerFieldTest { diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/A.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/A.java similarity index 90% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/A.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/A.java index dbfa330e4..67d42719d 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/A.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/A.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/B.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/B.java similarity index 92% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/B.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/B.java index a1f4c10fd..19d401635 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/B.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/B.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/D.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/D.java similarity index 77% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/D.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/D.java index f15c9fb17..1648617ec 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/D.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/D.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/E.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/E.java new file mode 100644 index 000000000..f1b5f5a87 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/E.java @@ -0,0 +1,3 @@ +package org.jvnet.jaxb.annox.parser.tests; + +public enum E {ONE, TWO, THREE, FOUR;} \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Eight.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Eight.java similarity index 51% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Eight.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Eight.java index 1b8a3e33d..28fd5e742 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Eight.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Eight.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; @K( { "k", "kay" }) public class Eight { diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Eleven.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Eleven.java new file mode 100644 index 000000000..2cea8bb3b --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Eleven.java @@ -0,0 +1,6 @@ +package org.jvnet.jaxb.annox.parser.tests; + +@H +public class Eleven { + +} diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/F.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/F.java similarity index 87% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/F.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/F.java index 3c9fa07d1..d543c6859 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/F.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/F.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Five.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Five.java new file mode 100644 index 000000000..d664068e5 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Five.java @@ -0,0 +1,6 @@ +package org.jvnet.jaxb.annox.parser.tests; + +@F(eman = "tset") +public class Five { + +} \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Four.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Four.java similarity index 95% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Four.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Four.java index 9df88ed15..cf17e7d43 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Four.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Four.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; public class Four { diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/G.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/G.java similarity index 87% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/G.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/G.java index e4ea83953..a57e696b1 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/G.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/G.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/H.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/H.java similarity index 92% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/H.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/H.java index 078a4d492..861b345ea 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/H.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/H.java @@ -1,7 +1,7 @@ /** * */ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/I.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/I.java similarity index 95% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/I.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/I.java index 8fcdab60e..585a952b4 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/I.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/I.java @@ -1,7 +1,7 @@ /** * */ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/J.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/J.java similarity index 79% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/J.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/J.java index de6627d6e..9db685308 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/J.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/J.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/JAXBDemoTest.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/JAXBDemoTest.java similarity index 75% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/JAXBDemoTest.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/JAXBDemoTest.java index 0640814c8..a39742f0b 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/JAXBDemoTest.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/JAXBDemoTest.java @@ -1,11 +1,11 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import javax.xml.bind.annotation.XmlRootElement; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.parser.XAnnotationParser; -import org.jvnet.annox.parser.exception.AnnotationExpressionParseException; -import org.jvnet.annox.parser.exception.AnnotationStringParseException; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.parser.XAnnotationParser; +import org.jvnet.jaxb.annox.parser.exception.AnnotationExpressionParseException; +import org.jvnet.jaxb.annox.parser.exception.AnnotationStringParseException; import junit.framework.TestCase; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/JavaTypeParserTest.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/JavaTypeParserTest.java similarity index 68% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/JavaTypeParserTest.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/JavaTypeParserTest.java index 89f87a3eb..0c1a86ce4 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/JavaTypeParserTest.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/JavaTypeParserTest.java @@ -1,44 +1,44 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import japa.parser.ast.expr.AnnotationExpr; import java.util.List; -import junit.framework.TestCase; +import org.jvnet.jaxb.annox.japa.parser.AnnotationExprParser; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.parser.XAnnotationParser; -import org.jvnet.annox.japa.parser.AnnotationExprParser; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.parser.XAnnotationParser; +import junit.framework.TestCase; public class JavaTypeParserTest extends TestCase { public void testParse() throws Exception { - final String text = "@org.jvnet.annox.parser.tests.A(" + final String text = "@org.jvnet.jaxb.annox.parser.tests.A(" + "booleanField = false,\n" + "byteField = 0,\n" + "charField = 'a',\n" + "classField = java.lang.String.class,\n" + "doubleField = 1,\n" - + "enumField = org.jvnet.annox.parser.tests.E.ONE,\n" + + "enumField = org.jvnet.jaxb.annox.parser.tests.E.ONE,\n" + "floatField = 2.3f,\n" + "intField = 4,\n" + "longField = 5,\n" + "shortField = 6,\n" + "stringField = \"7\",\n" - + "annotationField = @org.jvnet.annox.parser.tests.B(\n" + + "annotationField = @org.jvnet.jaxb.annox.parser.tests.B(\n" + "booleanArrayField = { false, true },\n" + "byteArrayField = { 0, 1 },\n" + "charArrayField = { 'a', 'b' },\n" + "classArrayField = { java.lang.String.class, java.lang.Boolean.class },\n" + "doubleArrayField = { 2, 3 },\n" - + "enumArrayField = { org.jvnet.annox.parser.tests.E.ONE, org.jvnet.annox.parser.tests.E.TWO },\n" + + "enumArrayField = { org.jvnet.jaxb.annox.parser.tests.E.ONE, org.jvnet.jaxb.annox.parser.tests.E.TWO },\n" + "floatArrayField = { 4.5f, 6.7f },\n" + "intArrayField = { 8, 9 },\n" + "longArrayField = { 10, 11 },\n" + "shortArrayField = { 12, 13 },\n" + "stringArrayField = { \"14\", \"15\", \"16\", \"17\" },\n" - + "annotationArrayField = { @org.jvnet.annox.parser.tests.B.C, @org.jvnet.annox.parser.tests.B.C }))"; + + "annotationArrayField = { @org.jvnet.jaxb.annox.parser.tests.B.C, @org.jvnet.jaxb.annox.parser.tests.B.C }))"; final AnnotationExprParser parser = new AnnotationExprParser(); diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/K.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/K.java similarity index 79% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/K.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/K.java index 785ecc40d..992694292 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/K.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/K.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/L.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/L.java similarity index 78% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/L.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/L.java index a6a459c49..a9960ec14 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/L.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/L.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/M.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/M.java similarity index 78% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/M.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/M.java index bec315186..55e427a80 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/M.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/M.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Nine.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Nine.java new file mode 100644 index 000000000..da30e1bfa --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Nine.java @@ -0,0 +1,6 @@ +package org.jvnet.jaxb.annox.parser.tests; + +@L(@J("jay")) +public class Nine { + +} diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/One.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/One.java similarity index 94% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/One.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/One.java index d80c81dd2..1f19ced16 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/One.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/One.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; @A( booleanField = false, byteField = 0, diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Seven.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Seven.java new file mode 100644 index 000000000..e957e8be5 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Seven.java @@ -0,0 +1,6 @@ +package org.jvnet.jaxb.annox.parser.tests; + +@J("jay") +public class Seven { + +} diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Six.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Six.java new file mode 100644 index 000000000..fb30dd6b9 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Six.java @@ -0,0 +1,6 @@ +package org.jvnet.jaxb.annox.parser.tests; + +@G +public class Six { + +} \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Ten.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Ten.java similarity index 62% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Ten.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Ten.java index 8b714dc7d..2a95252ac 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Ten.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Ten.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; @M( { @K( { "k", "kay" }), @K( { "K", "KAY" }) }) public class Ten { diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Three.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Three.java new file mode 100644 index 000000000..23ec9d0da --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Three.java @@ -0,0 +1,6 @@ +package org.jvnet.jaxb.annox.parser.tests; + +@D +public class Three { + +} \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Twelve.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Twelve.java similarity index 89% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Twelve.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Twelve.java index 8fc854745..ffce10326 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Twelve.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Twelve.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; @B( booleanArrayField = false, byteArrayField = 0, diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Two.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Two.java similarity index 94% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Two.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Two.java index f43171d8d..1d328cd49 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/Two.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Two.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; @A( booleanField = false, diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/XAnnotationParserAnnotationExprTest.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/XAnnotationParserAnnotationExprTest.java similarity index 96% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/XAnnotationParserAnnotationExprTest.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/XAnnotationParserAnnotationExprTest.java index 50462148f..b44e08eda 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/XAnnotationParserAnnotationExprTest.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/XAnnotationParserAnnotationExprTest.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import java.io.IOException; import java.io.InputStream; @@ -11,8 +11,8 @@ import org.apache.commons.io.IOUtils; import org.junit.Assert; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.parser.XAnnotationParser; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.parser.XAnnotationParser; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/XAnnotationParserTest.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/XAnnotationParserTest.java similarity index 93% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/XAnnotationParserTest.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/XAnnotationParserTest.java index ca88d758a..0a017acd1 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/parser/tests/XAnnotationParserTest.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/XAnnotationParserTest.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.parser.tests; +package org.jvnet.jaxb.annox.parser.tests; import java.io.IOException; import java.io.InputStream; @@ -10,10 +10,10 @@ import junit.framework.TestCase; import org.junit.Assert; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.model.annotation.field.XSingleAnnotationField; -import org.jvnet.annox.model.annotation.value.XStringAnnotationValue; -import org.jvnet.annox.parser.XAnnotationParser; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.value.XStringAnnotationValue; +import org.jvnet.jaxb.annox.parser.XAnnotationParser; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -67,8 +67,9 @@ public void testA() throws Exception { final XAnnotation four = parser.parse(twoResult); System.out.println(four.toString()); Assert.assertEquals("Annotations should be identical.", three, four); - Assert.assertEquals("Annotation toStrings must have the same length", - zeroToString.length(), oneToString.length()); + // Following line failes on JDK11+ since toString representation changed + // Assert.assertEquals("Annotation toStrings must have the same length", + // zeroToString.length(), oneToString.length()); Assert.assertEquals("Annotation toStrings must have the same length", oneToString.length(), twoToString.length()); Assert.assertEquals("Annotation hashCodes should be identical.", @@ -151,7 +152,7 @@ public void testField() throws Exception { final XAnnotation zero = parser.parse(element); Assert.assertEquals("Annotations should be identical.", zero.toString(), - "@org.hibernate.search.annotations.Field(index=TOKENIZED, store=NO)"); + "@org.hibernate.search.annotations.Field(index=YES, store=NO)"); } diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/Alpha.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/Alpha.java similarity index 91% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/Alpha.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/Alpha.java index 35a46247b..595c02674 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/Alpha.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/Alpha.java @@ -1,7 +1,7 @@ /** * */ -package org.jvnet.annox.reader.resourced.tests; +package org.jvnet.jaxb.annox.reader.resourced.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/Eleven.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/Eleven.java new file mode 100644 index 000000000..586186eef --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/Eleven.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.annox.reader.resourced.tests; + +public class Eleven { + +} diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/Epsilon.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/Epsilon.java similarity index 64% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/Epsilon.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/Epsilon.java index 3f0b1ef2e..2da6041a8 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/Epsilon.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/Epsilon.java @@ -1,7 +1,7 @@ /** * */ -package org.jvnet.annox.reader.resourced.tests; +package org.jvnet.jaxb.annox.reader.resourced.tests; public enum Epsilon { diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/One.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/One.java similarity index 91% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/One.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/One.java index 5832e144c..2269cc859 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/One.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/One.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.reader.resourced.tests; +package org.jvnet.jaxb.annox.reader.resourced.tests; // Class public class One { diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/ResourcedXReaderTests.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/ResourcedXReaderTests.java similarity index 93% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/ResourcedXReaderTests.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/ResourcedXReaderTests.java index e976d119f..ad3f3c8de 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/reader/resourced/tests/ResourcedXReaderTests.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/ResourcedXReaderTests.java @@ -1,15 +1,15 @@ -package org.jvnet.annox.reader.resourced.tests; +package org.jvnet.jaxb.annox.reader.resourced.tests; import java.lang.annotation.Annotation; import org.junit.Assert; -import junit.framework.TestCase; +import org.jvnet.jaxb.annox.model.XClass; +import org.jvnet.jaxb.annox.model.XField; +import org.jvnet.jaxb.annox.model.XMethod; +import org.jvnet.jaxb.annox.reader.XReader; +import org.jvnet.jaxb.annox.reader.resourced.ResourcedXReader; -import org.jvnet.annox.model.XClass; -import org.jvnet.annox.model.XField; -import org.jvnet.annox.model.XMethod; -import org.jvnet.annox.reader.XReader; -import org.jvnet.annox.reader.resourced.ResourcedXReader; +import junit.framework.TestCase; public class ResourcedXReaderTests extends TestCase { diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/Twelve.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/Twelve.java new file mode 100644 index 000000000..aaf197685 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/reader/resourced/tests/Twelve.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.annox.reader.resourced.tests; + +public class Twelve { + +} diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/tests/ProxyTest.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/tests/ProxyTest.java similarity index 95% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/tests/ProxyTest.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/tests/ProxyTest.java index 0f81fc7ce..84878b023 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/tests/ProxyTest.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/tests/ProxyTest.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.tests; +package org.jvnet.jaxb.annox.tests; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/util/tests/ArrayUtilsTest.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/util/tests/ArrayUtilsTest.java similarity index 90% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/util/tests/ArrayUtilsTest.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/util/tests/ArrayUtilsTest.java index 4c3c3c930..d7fe87e4c 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/util/tests/ArrayUtilsTest.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/util/tests/ArrayUtilsTest.java @@ -1,11 +1,11 @@ -package org.jvnet.annox.util.tests; +package org.jvnet.jaxb.annox.util.tests; import java.util.Arrays; import org.junit.Assert; -import junit.framework.TestCase; +import org.jvnet.jaxb.annox.util.ArrayUtils; -import org.jvnet.annox.util.ArrayUtils; +import junit.framework.TestCase; public class ArrayUtilsTest extends TestCase { diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/util/tests/ClassUtilsTest.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/util/tests/ClassUtilsTest.java similarity index 93% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/util/tests/ClassUtilsTest.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/util/tests/ClassUtilsTest.java index b34bcbe91..6570db89d 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/util/tests/ClassUtilsTest.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/util/tests/ClassUtilsTest.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.util.tests; +package org.jvnet.jaxb.annox.util.tests; import java.net.URL; import java.util.Arrays; @@ -6,7 +6,7 @@ import org.junit.Assert; import org.junit.Test; -import org.jvnet.annox.util.ClassUtils; +import org.jvnet.jaxb.annox.util.ClassUtils; public class ClassUtilsTest { diff --git a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/util/tests/ReflectionUtilsTest.java b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/util/tests/ReflectionUtilsTest.java similarity index 93% rename from jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/util/tests/ReflectionUtilsTest.java rename to jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/util/tests/ReflectionUtilsTest.java index bf55b537f..b821fec1d 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/annox/util/tests/ReflectionUtilsTest.java +++ b/jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/util/tests/ReflectionUtilsTest.java @@ -1,10 +1,10 @@ -package org.jvnet.annox.util.tests; +package org.jvnet.jaxb.annox.util.tests; import org.junit.Assert; -import junit.framework.TestCase; +import org.jvnet.jaxb.annox.util.ClassUtils; +import org.jvnet.jaxb.annox.util.ReflectionUtils; -import org.jvnet.annox.util.ClassUtils; -import org.jvnet.annox.util.ReflectionUtils; +import junit.framework.TestCase; public class ReflectionUtilsTest extends TestCase { diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/d.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/d.xml deleted file mode 100644 index d66ee3fed..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/d.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/eight.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/eight.txt deleted file mode 100644 index 617732475..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/eight.txt +++ /dev/null @@ -1 +0,0 @@ -@org.jvnet.annox.parser.tests.K( { "k", "kay" }) \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/eight.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/eight.xml deleted file mode 100644 index 304976c76..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/eight.xml +++ /dev/null @@ -1,2 +0,0 @@ -k kay \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/eleven.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/eleven.txt deleted file mode 100644 index b194bc9e6..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/eleven.txt +++ /dev/null @@ -1 +0,0 @@ -@org.jvnet.annox.parser.tests.H \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/five.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/five.txt deleted file mode 100644 index 5b4dace25..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/five.txt +++ /dev/null @@ -1 +0,0 @@ -@org.jvnet.annox.parser.tests.F(eman = "tset") \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/five.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/five.xml deleted file mode 100644 index 3c041461a..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/five.xml +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/j.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/j.xml deleted file mode 100644 index f0e94c374..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/j.xml +++ /dev/null @@ -1,2 +0,0 @@ -jay \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/k.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/k.xml deleted file mode 100644 index 304976c76..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/k.xml +++ /dev/null @@ -1,2 +0,0 @@ -k kay \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/l.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/l.xml deleted file mode 100644 index 1efc3bbc5..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/l.xml +++ /dev/null @@ -1,4 +0,0 @@ - - jay - \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/m.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/m.xml deleted file mode 100644 index 24dc4cd92..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/m.xml +++ /dev/null @@ -1,5 +0,0 @@ - - k kay - K KAY - \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/nine.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/nine.txt deleted file mode 100644 index 2bb8080ed..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/nine.txt +++ /dev/null @@ -1 +0,0 @@ -@org.jvnet.annox.parser.tests.L(@org.jvnet.annox.parser.tests.J("jay")) \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/nine.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/nine.xml deleted file mode 100644 index 1efc3bbc5..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/nine.xml +++ /dev/null @@ -1,4 +0,0 @@ - - jay - \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/package-info.java b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/package-info.java deleted file mode 100644 index e2e181810..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@D -package org.jvnet.annox.parser.tests; \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/seven.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/seven.txt deleted file mode 100644 index 3b94cb689..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/seven.txt +++ /dev/null @@ -1 +0,0 @@ -@org.jvnet.annox.parser.tests.J("jay") \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/seven.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/seven.xml deleted file mode 100644 index f0e94c374..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/seven.xml +++ /dev/null @@ -1,2 +0,0 @@ -jay \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/six.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/six.txt deleted file mode 100644 index ebe4874e3..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/six.txt +++ /dev/null @@ -1 +0,0 @@ -@org.jvnet.annox.parser.tests.G \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/ten.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/ten.txt deleted file mode 100644 index 7c56c9e98..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/ten.txt +++ /dev/null @@ -1 +0,0 @@ -@org.jvnet.annox.parser.tests.M( { @org.jvnet.annox.parser.tests.K( { "k", "kay" }), @org.jvnet.annox.parser.tests.K( { "K", "KAY" }) }) \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/ten.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/ten.xml deleted file mode 100644 index 24dc4cd92..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/ten.xml +++ /dev/null @@ -1,5 +0,0 @@ - - k kay - K KAY - \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/three.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/three.txt deleted file mode 100644 index b4c3c396e..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/three.txt +++ /dev/null @@ -1 +0,0 @@ -@org.jvnet.annox.parser.tests.D \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/three.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/three.xml deleted file mode 100644 index d66ee3fed..000000000 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/three.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/demos/guide/DemoClass.ann.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/demos/guide/DemoClass.ann.xml similarity index 96% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/demos/guide/DemoClass.ann.xml rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/demos/guide/DemoClass.ann.xml index 42c33b178..db64b65c8 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/demos/guide/DemoClass.ann.xml +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/demos/guide/DemoClass.ann.xml @@ -1,6 +1,6 @@ + xmlns:g="http://annox.dev.java.net/org.jvnet.jaxb.annox.demos.guide"> Annotation for the DemoGuide class. diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/demos/guide/MyClass.ann.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/demos/guide/MyClass.ann.xml similarity index 81% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/demos/guide/MyClass.ann.xml rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/demos/guide/MyClass.ann.xml index 85221c820..aff3cf927 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/demos/guide/MyClass.ann.xml +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/demos/guide/MyClass.ann.xml @@ -1,5 +1,5 @@ + xmlns:g="http://annox.dev.java.net/org.jvnet.jaxb.annox.demos.guide"> diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/demos/guide/package-info.ann.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/demos/guide/package-info.ann.xml similarity index 69% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/demos/guide/package-info.ann.xml rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/demos/guide/package-info.ann.xml index 0decbc65e..a43fb6cf5 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/demos/guide/package-info.ann.xml +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/demos/guide/package-info.ann.xml @@ -1,8 +1,8 @@ + xmlns:g="http://annox.dev.java.net/org.jvnet.jaxb.annox.demos.guide"> - Annotation for the org.jvnet.annox.demos.guide package. + Annotation for the org.jvnet.jaxb.annox.demos.guide package. diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/d.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/d.xml new file mode 100644 index 000000000..881b44007 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/d.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/eight.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/eight.txt new file mode 100644 index 000000000..27db99197 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/eight.txt @@ -0,0 +1 @@ +@org.jvnet.jaxb.annox.parser.tests.K( { "k", "kay" }) \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/eight.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/eight.xml new file mode 100644 index 000000000..805428169 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/eight.xml @@ -0,0 +1,2 @@ +k kay \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/eleven.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/eleven.txt new file mode 100644 index 000000000..ace9a557f --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/eleven.txt @@ -0,0 +1 @@ +@org.jvnet.jaxb.annox.parser.tests.H \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/eleven.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/eleven.xml similarity index 52% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/eleven.xml rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/eleven.xml index 12e3a1ef5..094cd1dcb 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/eleven.xml +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/eleven.xml @@ -1,3 +1,3 @@ \ No newline at end of file + annox:class="org.jvnet.jaxb.annox.parser.tests.H"/> \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/field.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/field.xml similarity index 86% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/field.xml rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/field.xml index bf263a0b3..6de5361df 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/field.xml +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/field.xml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/fieldBridge.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/fieldBridge.xml similarity index 100% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/fieldBridge.xml rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/fieldBridge.xml diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/five.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/five.txt new file mode 100644 index 000000000..8e29c772b --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/five.txt @@ -0,0 +1 @@ +@org.jvnet.jaxb.annox.parser.tests.F(eman = "tset") \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/five.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/five.xml new file mode 100644 index 000000000..ec9d43e37 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/five.xml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/h.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/h.xml similarity index 52% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/h.xml rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/h.xml index 12e3a1ef5..094cd1dcb 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/h.xml +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/h.xml @@ -1,3 +1,3 @@ \ No newline at end of file + annox:class="org.jvnet.jaxb.annox.parser.tests.H"/> \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/j.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/j.xml new file mode 100644 index 000000000..fa5255ed7 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/j.xml @@ -0,0 +1,2 @@ +jay \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/k.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/k.xml new file mode 100644 index 000000000..805428169 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/k.xml @@ -0,0 +1,2 @@ +k kay \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/l.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/l.xml new file mode 100644 index 000000000..c735833c4 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/l.xml @@ -0,0 +1,4 @@ + + jay + \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/m.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/m.xml new file mode 100644 index 000000000..293b6bf4f --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/m.xml @@ -0,0 +1,5 @@ + + k kay + K KAY + \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/nine.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/nine.txt new file mode 100644 index 000000000..fc7606736 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/nine.txt @@ -0,0 +1 @@ +@org.jvnet.jaxb.annox.parser.tests.L(@org.jvnet.jaxb.annox.parser.tests.J("jay")) \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/nine.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/nine.xml new file mode 100644 index 000000000..c735833c4 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/nine.xml @@ -0,0 +1,4 @@ + + jay + \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/one.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/one.txt similarity index 63% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/one.txt rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/one.txt index bb2ebd4a2..6a1ba755d 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/one.txt +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/one.txt @@ -1,25 +1,25 @@ -@org.jvnet.annox.parser.tests.A( +@org.jvnet.jaxb.annox.parser.tests.A( booleanField = false, byteField = 0, charField = 'a', classField = java.lang.String[][][].class, doubleField = 1, - enumField = org.jvnet.annox.parser.tests.E.ONE, + enumField = org.jvnet.jaxb.annox.parser.tests.E.ONE, floatField = 2.3f, intField = 4, longField = 5, shortField = 6, stringField = "7", - annotationField = @org.jvnet.annox.parser.tests.B( + annotationField = @org.jvnet.jaxb.annox.parser.tests.B( booleanArrayField = { false, true }, byteArrayField = { 0, 1 }, charArrayField = { 'a', 'b' }, classArrayField = { java.lang.String.class, java.lang.Boolean.class }, doubleArrayField = { 2, 3d }, - enumArrayField = { org.jvnet.annox.parser.tests.E.ONE, org.jvnet.annox.parser.tests.E.TWO }, + enumArrayField = { org.jvnet.jaxb.annox.parser.tests.E.ONE, org.jvnet.jaxb.annox.parser.tests.E.TWO }, floatArrayField = { 4.5f, 6.7f }, intArrayField = { 8, 9 }, longArrayField = { 10L, -9223372036854775808L }, shortArrayField = { 12, 13 }, stringArrayField = { "14", "15", "16", "17" }, - annotationArrayField = { @org.jvnet.annox.parser.tests.B.C, @org.jvnet.annox.parser.tests.B.C })) \ No newline at end of file + annotationArrayField = { @org.jvnet.jaxb.annox.parser.tests.B.C, @org.jvnet.jaxb.annox.parser.tests.B.C })) \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/one.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/one.xml similarity index 85% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/one.xml rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/one.xml index 8107b1ee5..346fdac4e 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/one.xml +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/one.xml @@ -1,4 +1,4 @@ -17 - + diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/package-info.java b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/package-info.java new file mode 100644 index 000000000..eacb87f5a --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/package-info.java @@ -0,0 +1,2 @@ +@D +package org.jvnet.jaxb.annox.parser.tests; \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/seven.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/seven.txt new file mode 100644 index 000000000..29bedc2a2 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/seven.txt @@ -0,0 +1 @@ +@org.jvnet.jaxb.annox.parser.tests.J("jay") \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/seven.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/seven.xml new file mode 100644 index 000000000..fa5255ed7 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/seven.xml @@ -0,0 +1,2 @@ +jay \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/six.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/six.txt new file mode 100644 index 000000000..cd9ef6247 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/six.txt @@ -0,0 +1 @@ +@org.jvnet.jaxb.annox.parser.tests.G \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/six.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/six.xml similarity index 52% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/six.xml rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/six.xml index a972b4aa4..ab95cf043 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/six.xml +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/six.xml @@ -1,3 +1,3 @@ \ No newline at end of file + annox:class="org.jvnet.jaxb.annox.parser.tests.G"/> \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/ten.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/ten.txt new file mode 100644 index 000000000..78ae7b47e --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/ten.txt @@ -0,0 +1 @@ +@org.jvnet.jaxb.annox.parser.tests.M( { @org.jvnet.jaxb.annox.parser.tests.K( { "k", "kay" }), @org.jvnet.jaxb.annox.parser.tests.K( { "K", "KAY" }) }) \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/ten.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/ten.xml new file mode 100644 index 000000000..293b6bf4f --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/ten.xml @@ -0,0 +1,5 @@ + + k kay + K KAY + \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/three.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/three.txt new file mode 100644 index 000000000..05b431729 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/three.txt @@ -0,0 +1 @@ +@org.jvnet.jaxb.annox.parser.tests.D \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/three.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/three.xml new file mode 100644 index 000000000..881b44007 --- /dev/null +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/three.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/twelve.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/twelve.txt similarity index 63% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/twelve.txt rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/twelve.txt index 4462e313e..47654837d 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/twelve.txt +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/twelve.txt @@ -1,13 +1,13 @@ -@org.jvnet.annox.parser.tests.B( +@org.jvnet.jaxb.annox.parser.tests.B( booleanArrayField = false, byteArrayField = 0, charArrayField = 'a', classArrayField = java.lang.String.class, doubleArrayField = 2, - enumArrayField = org.jvnet.annox.parser.tests.E.ONE, + enumArrayField = org.jvnet.jaxb.annox.parser.tests.E.ONE, floatArrayField = 4.5f, intArrayField = 8, longArrayField = 10L, shortArrayField = 12, stringArrayField = "14", - annotationArrayField = @org.jvnet.annox.parser.tests.B.C) \ No newline at end of file + annotationArrayField = @org.jvnet.jaxb.annox.parser.tests.B.C) \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/twelve.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/twelve.xml similarity index 65% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/twelve.xml rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/twelve.xml index 63712feea..b9e843768 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/twelve.xml +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/twelve.xml @@ -1,4 +1,4 @@ - - + \ No newline at end of file diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/two.txt b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/two.txt similarity index 62% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/two.txt rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/two.txt index 92abfae13..612e9fd9c 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/two.txt +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/two.txt @@ -1,23 +1,23 @@ -@org.jvnet.annox.parser.tests.A( +@org.jvnet.jaxb.annox.parser.tests.A( booleanField = false, byteField = 0, charField = 'a', classField = java.lang.String[][][].class, doubleField = 1, - enumField = org.jvnet.annox.parser.tests.E.ONE, + enumField = org.jvnet.jaxb.annox.parser.tests.E.ONE, floatField = 2.3f, intField = 4, longField = 5, shortField = 6, stringField = "7", - annotationField = @org.jvnet.annox.parser.tests.B( - annotationArrayField = {@org.jvnet.annox.parser.tests.B.C, @org.jvnet.annox.parser.tests.B.C }, + annotationField = @org.jvnet.jaxb.annox.parser.tests.B( + annotationArrayField = {@org.jvnet.jaxb.annox.parser.tests.B.C, @org.jvnet.jaxb.annox.parser.tests.B.C }, booleanArrayField = { false, true }, byteArrayField = {0, 1 }, charArrayField = { 'a', 'b' }, classArrayField = {java.lang.String.class, java.lang.Boolean.class }, doubleArrayField = { 2, 3 }, - enumArrayField = { org.jvnet.annox.parser.tests.E.ONE, org.jvnet.annox.parser.tests.E.TWO }, + enumArrayField = { org.jvnet.jaxb.annox.parser.tests.E.ONE, org.jvnet.jaxb.annox.parser.tests.E.TWO }, floatArrayField = { 4.5f, 6.7f }, intArrayField = { 8, 9 }, longArrayField = { 10, -9223372036854775808L }, diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/two.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/two.xml similarity index 85% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/two.xml rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/two.xml index 8107b1ee5..346fdac4e 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/parser/tests/two.xml +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/two.xml @@ -1,4 +1,4 @@ -17 - + diff --git a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/reader/resourced/tests/One.ann.xml b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/reader/resourced/tests/One.ann.xml similarity index 91% rename from jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/reader/resourced/tests/One.ann.xml rename to jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/reader/resourced/tests/One.ann.xml index 491e3a539..8a0424120 100644 --- a/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/annox/reader/resourced/tests/One.ann.xml +++ b/jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/reader/resourced/tests/One.ann.xml @@ -1,9 +1,9 @@ + xmlns:t="http://annox.dev.java.net/org.jvnet.jaxb.annox.reader.resourced.tests"> + classField="org.jvnet.jaxb.annox.reader.resourced.tests.Twelve"/> diff --git a/jaxb-annox-parent/pom.xml b/jaxb-annox-parent/pom.xml index 4e63378e6..b70692432 100644 --- a/jaxb-annox-parent/pom.xml +++ b/jaxb-annox-parent/pom.xml @@ -10,9 +10,8 @@ pom JAXB Tools :: JAXB Annox :: Parent JAXB Annox is a part of JAXB Tools project which implements support for reading and writing XML annotations. - + jaxb-annox - samples @@ -29,13 +28,5 @@ - - - - junit - junit - test - - diff --git a/jaxb-annox-parent/samples/.gitignore b/jaxb-annox-parent/samples/.gitignore deleted file mode 100644 index ee5779d53..000000000 --- a/jaxb-annox-parent/samples/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -target -.settings -.project diff --git a/jaxb-annox-parent/samples/po/.gitignore b/jaxb-annox-parent/samples/po/.gitignore deleted file mode 100644 index 252d3b1ef..000000000 --- a/jaxb-annox-parent/samples/po/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -target -.settings -.project -.classpath diff --git a/jaxb-annox-parent/samples/po/pom.xml b/jaxb-annox-parent/samples/po/pom.xml index 41573b19d..e0f282022 100644 --- a/jaxb-annox-parent/samples/po/pom.xml +++ b/jaxb-annox-parent/samples/po/pom.xml @@ -15,12 +15,10 @@ org.jvnet.jaxb jaxb-annox - ${project.version} - + org.glassfish.jaxb jaxb-runtime - ${jaxb.version} @@ -58,7 +56,6 @@ maven-invoker-plugin - 2.0.0 maven-integration-test @@ -66,12 +63,6 @@ - - maven-deploy-plugin - - true - - diff --git a/jaxb-annox-parent/samples/po/project-build.xml b/jaxb-annox-parent/samples/po/project-build.xml index 9af67077f..9448e932a 100644 --- a/jaxb-annox-parent/samples/po/project-build.xml +++ b/jaxb-annox-parent/samples/po/project-build.xml @@ -3,37 +3,70 @@ - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -49,8 +82,8 @@ destdir="${basedir}/target/classes" srcdir="${basedir}/src/main/java" classpathref="compile.path" - source="1.5" - target="1.5"> + source="1.8" + target="1.8"> @@ -62,8 +95,8 @@ destdir="${basedir}/target/test-classes" srcdir="${basedir}/src/test/java" classpathref="test-compile.path" - source="1.5" - target="1.5"> + source="1.8" + target="1.8"> diff --git a/jaxb-annox-parent/samples/po/project-pom.xml b/jaxb-annox-parent/samples/po/project-pom.xml index de41f70c9..51dffafa9 100644 --- a/jaxb-annox-parent/samples/po/project-pom.xml +++ b/jaxb-annox-parent/samples/po/project-pom.xml @@ -2,26 +2,26 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.annox + org.jvnet.jaxb annox-samples-po-maven ${project.version} jar Annox Samples [po:maven] - org.jvnet.annox - annox + org.jvnet.jaxb + jaxb-annox ${project.version} - com.sun.xml.bind - jaxb-impl - 2.1.13 + org.glassfish.jaxb + jaxb-runtime + ${jaxb.version} junit junit - 3.8.1 + ${junit4.version} test @@ -32,8 +32,8 @@ true maven-compiler-plugin - 1.6 - 1.6 + 1.8 + 1.8 diff --git a/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/BigDecimalAdapter.java b/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/BigDecimalAdapter.java similarity index 90% rename from jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/BigDecimalAdapter.java rename to jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/BigDecimalAdapter.java index ea6f78151..d575ac14a 100644 --- a/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/BigDecimalAdapter.java +++ b/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/BigDecimalAdapter.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.samples.po; +package org.jvnet.jaxb.annox.samples.po; import java.math.BigDecimal; diff --git a/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/Items.java b/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/Items.java similarity index 97% rename from jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/Items.java rename to jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/Items.java index 648db7143..8cc5f9f5a 100644 --- a/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/Items.java +++ b/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/Items.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.samples.po; +package org.jvnet.jaxb.annox.samples.po; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/ObjectFactory.java b/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/ObjectFactory.java similarity index 96% rename from jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/ObjectFactory.java rename to jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/ObjectFactory.java index 53f8db9f0..f7b22cdae 100644 --- a/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/ObjectFactory.java +++ b/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/ObjectFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.samples.po; +package org.jvnet.jaxb.annox.samples.po; import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; diff --git a/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/PurchaseOrderType.java b/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/PurchaseOrderType.java similarity index 95% rename from jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/PurchaseOrderType.java rename to jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/PurchaseOrderType.java index 8ce241764..02d0b4766 100644 --- a/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/PurchaseOrderType.java +++ b/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/PurchaseOrderType.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.samples.po; +package org.jvnet.jaxb.annox.samples.po; import javax.xml.datatype.XMLGregorianCalendar; diff --git a/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/USAddress.java b/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/USAddress.java similarity index 95% rename from jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/USAddress.java rename to jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/USAddress.java index a95b9a161..5c77fcf7a 100644 --- a/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/annox/samples/po/USAddress.java +++ b/jaxb-annox-parent/samples/po/src/main/java/org/jvnet/jaxb/annox/samples/po/USAddress.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.samples.po; +package org.jvnet.jaxb.annox.samples.po; import java.math.BigDecimal; diff --git a/jaxb-annox-parent/samples/po/src/main/resources/org/jvnet/annox/samples/po/Items$Item.ann.xml b/jaxb-annox-parent/samples/po/src/main/resources/org/jvnet/jaxb/annox/samples/po/Items$Item.ann.xml similarity index 100% rename from jaxb-annox-parent/samples/po/src/main/resources/org/jvnet/annox/samples/po/Items$Item.ann.xml rename to jaxb-annox-parent/samples/po/src/main/resources/org/jvnet/jaxb/annox/samples/po/Items$Item.ann.xml diff --git a/jaxb-annox-parent/samples/po/src/main/resources/org/jvnet/annox/samples/po/package-info.ann.xml b/jaxb-annox-parent/samples/po/src/main/resources/org/jvnet/jaxb/annox/samples/po/package-info.ann.xml similarity index 91% rename from jaxb-annox-parent/samples/po/src/main/resources/org/jvnet/annox/samples/po/package-info.ann.xml rename to jaxb-annox-parent/samples/po/src/main/resources/org/jvnet/jaxb/annox/samples/po/package-info.ann.xml index 7336f6902..abe54838d 100644 --- a/jaxb-annox-parent/samples/po/src/main/resources/org/jvnet/annox/samples/po/package-info.ann.xml +++ b/jaxb-annox-parent/samples/po/src/main/resources/org/jvnet/jaxb/annox/samples/po/package-info.ann.xml @@ -2,7 +2,7 @@ xmlns:adap="http://annox.dev.java.net/javax.xml.bind.annotation.adapters"> - + diff --git a/jaxb-annox-parent/samples/po/src/test/java/org/jvnet/annox/samples/po/tests/AnnotationReaderTest.java b/jaxb-annox-parent/samples/po/src/test/java/org/jvnet/jaxb/annox/samples/po/tests/AnnotationReaderTest.java similarity index 86% rename from jaxb-annox-parent/samples/po/src/test/java/org/jvnet/annox/samples/po/tests/AnnotationReaderTest.java rename to jaxb-annox-parent/samples/po/src/test/java/org/jvnet/jaxb/annox/samples/po/tests/AnnotationReaderTest.java index b22a41d60..0b1d70e6c 100644 --- a/jaxb-annox-parent/samples/po/src/test/java/org/jvnet/annox/samples/po/tests/AnnotationReaderTest.java +++ b/jaxb-annox-parent/samples/po/src/test/java/org/jvnet/jaxb/annox/samples/po/tests/AnnotationReaderTest.java @@ -1,4 +1,4 @@ -package org.jvnet.annox.samples.po.tests; +package org.jvnet.jaxb.annox.samples.po.tests; import java.util.HashMap; import java.util.Map; @@ -8,8 +8,8 @@ import junit.framework.TestCase; -import org.jvnet.annox.samples.po.PurchaseOrderType; -import org.jvnet.annox.xml.bind.AnnoxAnnotationReader; +import org.jvnet.jaxb.annox.samples.po.PurchaseOrderType; +import org.jvnet.jaxb.annox.xml.bind.AnnoxAnnotationReader; import com.sun.xml.bind.api.JAXBRIContext; import com.sun.xml.bind.v2.model.annotation.RuntimeAnnotationReader; @@ -25,7 +25,7 @@ public void testAnnotationReader() throws Exception { properties.put(JAXBRIContext.ANNOTATION_READER, annotationReader); final JAXBContext context = JAXBContext.newInstance( - "org.jvnet.annox.samples.po", Thread.currentThread() + "org.jvnet.jaxb.annox.samples.po", Thread.currentThread() .getContextClassLoader(), properties); @SuppressWarnings("unchecked") diff --git a/jaxb-annox-parent/samples/po/src/test/resources/org/jvnet/annox/samples/po/tests/po.xml b/jaxb-annox-parent/samples/po/src/test/resources/org/jvnet/jaxb/annox/samples/po/tests/po.xml similarity index 100% rename from jaxb-annox-parent/samples/po/src/test/resources/org/jvnet/annox/samples/po/tests/po.xml rename to jaxb-annox-parent/samples/po/src/test/resources/org/jvnet/jaxb/annox/samples/po/tests/po.xml diff --git a/jaxb-annox-parent/samples/pom.xml b/jaxb-annox-parent/samples/pom.xml index 2a7944cf5..6c8d2c0b8 100644 --- a/jaxb-annox-parent/samples/pom.xml +++ b/jaxb-annox-parent/samples/pom.xml @@ -1,5 +1,5 @@ - 4.0.0 @@ -12,10 +12,11 @@ pom JAXB Tools :: JAXB Annox :: Samples Parent - + + true + install @@ -99,7 +100,6 @@ maven-invoker-plugin - 1.9 true @@ -116,14 +116,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.1 - - true - - diff --git a/maven-plugin/dist/pom.xml b/maven-plugin/dist/pom.xml index 0420e5ae7..2c2cdeed3 100644 --- a/maven-plugin/dist/pom.xml +++ b/maven-plugin/dist/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.jvnet.jaxb jaxb-maven-plugin-dist pom JAXB Tools :: Maven Plugin :: Distribution diff --git a/maven-plugin/plugin-core/.gitignore b/maven-plugin/plugin-core/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/plugin-core/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/plugin/.gitignore b/maven-plugin/plugin/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/plugin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/samples/catalog/.gitignore b/maven-plugin/samples/catalog/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/samples/catalog/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/samples/catalog/pom.xml b/maven-plugin/samples/catalog/pom.xml index fa2408c04..a500607e2 100644 --- a/maven-plugin/samples/catalog/pom.xml +++ b/maven-plugin/samples/catalog/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.jvnet.jaxb jaxb-maven-plugin-sample-catalog pom JAXB Tools :: Maven Plugin :: Sample [catalog] diff --git a/maven-plugin/samples/dtd/.gitignore b/maven-plugin/samples/dtd/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/samples/dtd/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/samples/dtd/pom.xml b/maven-plugin/samples/dtd/pom.xml index 02a542f29..a84e56c70 100644 --- a/maven-plugin/samples/dtd/pom.xml +++ b/maven-plugin/samples/dtd/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.jvnet.jaxb jaxb-maven-plugin-sample-dtd pom JAXB Tools :: Maven Plugin :: Sample [dtd] diff --git a/maven-plugin/samples/episode/.gitignore b/maven-plugin/samples/episode/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/samples/episode/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/samples/episode/pom.xml b/maven-plugin/samples/episode/pom.xml index bae882f36..5825294ab 100644 --- a/maven-plugin/samples/episode/pom.xml +++ b/maven-plugin/samples/episode/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.jvnet.jaxb jaxb-maven-plugin-sample-episode pom JAXB Tools :: Maven Plugin :: Sample [episode] diff --git a/maven-plugin/samples/jaxbplugins/.gitignore b/maven-plugin/samples/jaxbplugins/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/samples/jaxbplugins/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/samples/jaxbplugins/pom.xml b/maven-plugin/samples/jaxbplugins/pom.xml index 173672dd1..e3c3d4d9c 100644 --- a/maven-plugin/samples/jaxbplugins/pom.xml +++ b/maven-plugin/samples/jaxbplugins/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.jvnet.jaxb jaxb-maven-plugin-sample-jaxbplugins pom JAXB Tools :: Maven Plugin :: Sample [jaxbplugins] diff --git a/maven-plugin/samples/po/.gitignore b/maven-plugin/samples/po/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/samples/po/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/samples/po/pom.xml b/maven-plugin/samples/po/pom.xml index a40d2deef..3155afde8 100644 --- a/maven-plugin/samples/po/pom.xml +++ b/maven-plugin/samples/po/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.jvnet.jaxb jaxb-maven-plugin-sample-po pom JAXB Tools :: Maven Plugin :: Sample [po] diff --git a/maven-plugin/samples/pom.xml b/maven-plugin/samples/pom.xml index a48c7c95c..316051620 100644 --- a/maven-plugin/samples/pom.xml +++ b/maven-plugin/samples/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.jvnet.jaxb jaxb-maven-plugin-samples pom JAXB Tools :: Maven Plugin :: Samples @@ -20,7 +19,6 @@ org.jvnet.jaxb jaxb2-basics - ${project.version} provided @@ -31,6 +29,9 @@ jaxbplugins po + + true + @@ -72,7 +73,6 @@ maven-invoker-plugin - 2.0.0 maven-integration-test @@ -88,13 +88,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - true - - org.apache.maven.plugins maven-javadoc-plugin diff --git a/maven-plugin/testing/.gitignore b/maven-plugin/testing/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/testing/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/JAXB-1044/.gitignore b/maven-plugin/tests/JAXB-1044/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/JAXB-1044/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/a/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/a/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-69/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-69/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-69/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-70/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-70/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-70/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/a/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/a/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-87/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-87/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-87/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/catalog-xml/.gitignore b/maven-plugin/tests/catalog-xml/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/catalog-xml/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/catalog/.gitignore b/maven-plugin/tests/catalog/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/catalog/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/episodes/a/.gitignore b/maven-plugin/tests/episodes/a/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/episodes/a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/episodes/b/.gitignore b/maven-plugin/tests/episodes/b/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/episodes/b/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/episodes/c/.gitignore b/maven-plugin/tests/episodes/c/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/episodes/c/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/episodes/c/pom.xml b/maven-plugin/tests/episodes/c/pom.xml index 38dfb511c..b01fa29f9 100644 --- a/maven-plugin/tests/episodes/c/pom.xml +++ b/maven-plugin/tests/episodes/c/pom.xml @@ -15,6 +15,12 @@ ${project.version} provided + + org.jvnet.jaxb + jaxb-maven-plugin-tests-episodes-b + ${project.version} + provided + test @@ -26,7 +32,7 @@ true - + org.jvnet.jaxb jaxb-maven-plugin-tests-episodes-b ${project.version} diff --git a/maven-plugin/tests/episodes/d/.gitignore b/maven-plugin/tests/episodes/d/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/episodes/d/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/episodes/e/.gitignore b/maven-plugin/tests/episodes/e/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/episodes/e/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/gh-issue-16/.gitignore b/maven-plugin/tests/gh-issue-16/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/gh-issue-16/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/gh-issue-19/a/.gitignore b/maven-plugin/tests/gh-issue-19/a/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/gh-issue-19/a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/gh-issue-19/b/.gitignore b/maven-plugin/tests/gh-issue-19/b/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/gh-issue-19/b/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/gh-issue-22/a/.gitignore b/maven-plugin/tests/gh-issue-22/a/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/gh-issue-22/a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/gh-issue-22/b/.gitignore b/maven-plugin/tests/gh-issue-22/b/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/gh-issue-22/b/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/gh-issue-22/b/pom.xml b/maven-plugin/tests/gh-issue-22/b/pom.xml index bac653a7b..3fe648407 100644 --- a/maven-plugin/tests/gh-issue-22/b/pom.xml +++ b/maven-plugin/tests/gh-issue-22/b/pom.xml @@ -9,6 +9,12 @@ jar JAXB Tools :: Maven Plugin :: Test [GitHub Issue #22:b] + + org.jvnet.jaxb + jaxb-maven-plugin-tests-gh-issue-22-a + ${project.version} + provided + org.jvnet.jaxb jaxb-maven-plugin-testing diff --git a/maven-plugin/tests/gh-issue-23/one-non-strict/.gitignore b/maven-plugin/tests/gh-issue-23/one-non-strict/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/gh-issue-23/one-non-strict/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/gh-issue-23/two-non-strict/.gitignore b/maven-plugin/tests/gh-issue-23/two-non-strict/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/gh-issue-23/two-non-strict/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/gh-issue-58/.gitignore b/maven-plugin/tests/gh-issue-58/.gitignore deleted file mode 100644 index 9d6abaaf6..000000000 --- a/maven-plugin/tests/gh-issue-58/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.settings -.classpath -.project -/target/ diff --git a/maven-plugin/tests/issues/.gitignore b/maven-plugin/tests/issues/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/issues/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/java-9/.gitignore b/maven-plugin/tests/java-9/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/java-9/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/p_o/.gitignore b/maven-plugin/tests/p_o/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/p_o/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/po-2.3/.gitignore b/maven-plugin/tests/po-2.3/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/po-2.3/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/po-scd/.gitignore b/maven-plugin/tests/po-scd/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/po-scd/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/pom.xml b/maven-plugin/tests/pom.xml index cebbda55f..d3d9f226a 100644 --- a/maven-plugin/tests/pom.xml +++ b/maven-plugin/tests/pom.xml @@ -12,18 +12,20 @@ org.jvnet.jaxb - jaxb2-basics + jaxb-maven-plugin ${project.version} + maven-plugin provided org.jvnet.jaxb - jaxb-maven-plugin - ${project.version} - maven-plugin + jaxb2-basics provided + + true + catalog catalog-xml @@ -56,31 +58,7 @@ jt-194 - - - - org.jvnet.jaxb - jaxb-maven-plugin - ${project.version} - - - generate - - generate - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - org.apache.maven.plugins maven-javadoc-plugin diff --git a/maven-plugin/tests/res/.gitignore b/maven-plugin/tests/res/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/res/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/res/pom.xml b/maven-plugin/tests/res/pom.xml index 1b359799e..cfbbae0f9 100644 --- a/maven-plugin/tests/res/pom.xml +++ b/maven-plugin/tests/res/pom.xml @@ -16,7 +16,6 @@ org.jvnet.jaxb jaxb-maven-plugin-tests-po-2.3 - ${project.version} org.jvnet.jaxb diff --git a/maven-plugin/tests/rnc/.gitignore b/maven-plugin/tests/rnc/.gitignore deleted file mode 100644 index 8bd3a0588..000000000 --- a/maven-plugin/tests/rnc/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -/.settings/ -/.classpath -/.project diff --git a/maven-plugin/tests/tse/.gitignore b/maven-plugin/tests/tse/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/tse/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/two/.gitignore b/maven-plugin/tests/two/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/two/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven-plugin/tests/wsdl-file/.gitignore b/maven-plugin/tests/wsdl-file/.gitignore deleted file mode 100644 index eb5a316cb..000000000 --- a/maven-plugin/tests/wsdl-file/.gitignore +++ /dev/null @@ -1 +0,0 @@ -target diff --git a/maven-plugin/tests/wsdl/.gitignore b/maven-plugin/tests/wsdl/.gitignore deleted file mode 100644 index 73df60d81..000000000 --- a/maven-plugin/tests/wsdl/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -target -.classpath -.project -.settings diff --git a/maven-plugin/tests/xjc-simple/.gitignore b/maven-plugin/tests/xjc-simple/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven-plugin/tests/xjc-simple/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/pom.xml b/pom.xml index e3472bffa..75e68aeb2 100644 --- a/pom.xml +++ b/pom.xml @@ -37,18 +37,29 @@ maintainer + + + laurentschoelens + Laurent Schoelens + + maintainer + + + 3.1 + jaxb-bom-parent jaxb-annotate-parent jaxb-annox-parent - maven-plugin basics + maven-plugin UTF-8 2.0.9 + 1.2.2 1.10.12 @@ -58,11 +69,18 @@ 2.3.7 2.3.3 ${jaxb23.version} + 2.3.0.1 + + 1.9.4 + 2.11.0 + 3.12.0 + 2.5 4.13.2 1.7.36 1.8.3 1.2.0 3.5.1 + 2.1 3.7.1 @@ -84,6 +102,8 @@ 3.7.1 3.0.1 2.21.0 + + 3.3.13 @@ -181,6 +201,11 @@ jaxb-runtime ${jaxb.version} + + org.glassfish.jaxb + jaxb-core + ${jaxb-core.version} + jakarta.xml.bind @@ -262,21 +287,6 @@ jaxb-extra-osgi ${jaxb.version} - - org.jvnet.jaxb - jaxb-maven-plugin-core - ${project.version} - - - org.jvnet.jaxb - jaxb-maven-plugin - ${project.version} - - - org.jvnet.jaxb - jaxb-maven-plugin-testing - ${project.version} - org.apache.maven @@ -319,11 +329,6 @@ maven-plugin-annotations ${maven.plugin.plugin.version} - - junit - junit - ${junit4.version} - org.apache.maven.plugin-testing maven-plugin-testing-tools @@ -352,10 +357,39 @@ plexus-utils ${plexus-utils.version} + + + + commons-beanutils + commons-beanutils + ${commons-beanutils.version} + + + commons-logging + commons-logging + + + org.apache.commons commons-lang3 - 3.12.0 + ${commons-lang3.version} + + + commons-io + commons-io + ${commons-io.version} + + + junit + junit + ${junit4.version} + + + + joda-time + joda-time + ${joda-time.version} @@ -373,12 +407,113 @@ slf4j-simple ${slf4j.version} + + + + org.springframework + spring + 2.0.7 + + + + + org.hibernate + hibernate-search + 4.1.1.Final + + + javax.transaction + jta + 1.1 + + + + xmlunit + xmlunit + 1.5 + + + + + org.apache.ant + ant + ${ant.version} + + + org.apache.ant + ant-launcher + ${ant.version} + + + + + com.google.code.javaparser + javaparser + 1.0.11 + + + + + org.jvnet.jaxb + jaxb-maven-plugin-core + ${project.version} + + + org.jvnet.jaxb + jaxb-maven-plugin + ${project.version} + + + org.jvnet.jaxb + jaxb-maven-plugin-testing + ${project.version} + + + + org.jvnet.jaxb + jaxb2-basics + ${project.version} + + + org.jvnet.jaxb + jaxb2-basics-plugins + ${project.version} + org.jvnet.jaxb jaxb2-basics-runtime ${project.version} + + org.jvnet.jaxb + jaxb2-basics-tools + ${project.version} + + + org.jvnet.jaxb + jaxb2-basics-testing + ${project.version} + + + org.jvnet.jaxb + jaxb2-basics-ant + ${project.version} + + + + + org.jvnet.jaxb + jaxb-annox + ${project.version} + + + + + org.jvnet.jaxb + jaxb-basics-annotate + ${project.version} + @@ -430,8 +565,8 @@ junit junit - 3.8.1 - runtime + ${junit4.version} + compile org.apache.ant @@ -449,10 +584,10 @@ maven-assembly-plugin ${maven-assembly-plugin.version} - + maven-clean-plugin ${maven-clean-plugin.version} - + maven-compiler-plugin ${maven-compiler-plugin.version} @@ -493,10 +628,10 @@ maven-release-plugin ${maven-release-plugin.version} - + maven-resources-plugin ${maven-resources-plugin.version} - + maven-shade-plugin ${maven-shade-plugin.version}