Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Merge jaxb basics #282

Merged
merged 633 commits into from
Aug 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
633 commits
Select commit Hold shift + click to select a range
d70b82a
Fixing the 0.8.4 build.
highsource Sep 26, 2014
7c4c42c
Version 0.8.4
highsource Sep 26, 2014
2da31c8
Version 0.8.5-SNAPSHOT
highsource Sep 26, 2014
e9c57a4
Updated the quick release script.
highsource Sep 26, 2014
6e221a3
Fixing further bugs.
highsource Sep 27, 2014
5f4ca8f
Issue #4.
highsource Oct 1, 2014
20f5107
Considering collections.
highsource Oct 1, 2014
070173a
Issue #1.
highsource Oct 1, 2014
f2ed584
Updated release files a bit.
highsource Oct 2, 2014
d2d3c66
Version 0.9.0
highsource Oct 2, 2014
c4565af
Version 0.9.1-SNAPSHOT
highsource Oct 2, 2014
4bf20ec
Test case for dynamic schema creation.
highsource Oct 6, 2014
b791962
Dynamic name test.
highsource Oct 12, 2014
4eab47c
Dynamic element name test.
highsource Oct 12, 2014
c2cb717
Append element example.
highsource Oct 16, 2014
5ab1336
Testing dynamic names.
highsource Oct 18, 2014
66c2969
Create LICENSE
highsource Oct 23, 2014
1219d1d
Create README.md
highsource Oct 24, 2014
dc97637
Update README.md
highsource Oct 24, 2014
837feda
Update README.md
highsource Oct 24, 2014
b4db896
Test case for Issue #3.
highsource Oct 26, 2014
511878b
Merge branch 'master' of https://github.com/highsource/jaxb2-basics
highsource Oct 26, 2014
963c735
Issue #3: test and updated bindings.
highsource Oct 26, 2014
ca8f771
Issue #3. Added the property customization element.
highsource Oct 26, 2014
85ade45
Issue #3. Added methods to check property customization in the property
highsource Oct 26, 2014
99de930
Issue #3. Check for property customization in the class as wel as in the
highsource Oct 26, 2014
7144715
Issue #3, #4, #5, #6.
highsource Oct 28, 2014
0be4b04
commit adapter config, and adapter java class
Oct 29, 2014
099d75e
Merge pull request #8 from yinan-liu/master
highsource Oct 29, 2014
7c1db34
Issue #9.
highsource Oct 29, 2014
24f0c29
Issue #9: small clean-ups.
highsource Oct 29, 2014
85897ed
Issue #9. Adapter is consideren whan simplifying as an element property.
highsource Oct 29, 2014
17fa785
Issue #9. Updated the test to make it more type-checking.
highsource Oct 29, 2014
26089ac
Added the dist module.
highsource Nov 1, 2014
37d83b1
Version 0.9.1
highsource Nov 1, 2014
6996857
Version 0.9.2-SNAPSHOT
highsource Nov 1, 2014
c2aad7f
Issue #11. Basic setup.
highsource Nov 27, 2014
24a2913
Issue #11.
highsource Nov 27, 2014
782b6cc
Issue #11. Support for JAXBElement.
highsource Nov 28, 2014
2dee125
Issue #11.
highsource Nov 28, 2014
dcdce1a
Issue #11. Basic setup.
Nov 28, 2014
3d7a736
Merge remote-tracking branch 'upstream/master'
Nov 28, 2014
6d69735
Issue #11.
Nov 28, 2014
2cd724f
Merge pull request #12 from ja6a/master
highsource Nov 29, 2014
73c6478
Issue #11. Added basic hashCode code generators.
highsource Nov 29, 2014
c91208d
Issue #11. Old version of JAXBElement removed.
highsource Nov 29, 2014
fbb1978
Issue #11. Added JCMArrayClass.
highsource Nov 29, 2014
db13300
Issue #11. More hash code generators.
highsource Nov 29, 2014
c82f25d
Issue #11. Working on the lists.
highsource Nov 30, 2014
cf25d59
Issue #11. Possible types as collection instead of set to allow
highsource Nov 30, 2014
048de03
Issue #11. Adjusting boolean hashCode generator.
Nov 30, 2014
14ebccd
Issue #11. Adding Junit comparing with Eclipse
Nov 30, 2014
0c2d698
Issue #11. Unit tests now passing for Lists
Dec 1, 2014
5dfe4f1
Merge pull request #13 from ja6a/master
highsource Dec 1, 2014
001a248
Issue #11. Reorganized the test project a bit.
highsource Dec 1, 2014
75200fa
Issue #11. Renamed the list hashcode variable to avoid naming collision.
highsource Dec 1, 2014
2b9c876
Issue #11. Added Object[] handling and a test schema.
highsource Dec 1, 2014
535131b
Issue #11. More test cases.
highsource Dec 1, 2014
352affb
Issue #11. Added JCMTypeWildcard and getDeclarableType().
highsource Dec 2, 2014
4b2c65f
Issue #11. Handle T in JAXBElement<T>, especially when type is
highsource Dec 2, 2014
2eef6df
Added toString() and getFullName().
highsource Dec 2, 2014
fa1751b
Issue #11. More test cases.
highsource Dec 2, 2014
323060c
Issue #11. Minor changes.
highsource Dec 2, 2014
b1502e5
Issue #11. Extending the hashCode generator for objects - now also
highsource Dec 2, 2014
3869814
Issue #11. Test cases for arrays.
highsource Dec 2, 2014
fa4efb3
Added a fix for a bug in JAXB: char is not an "unboxed field" and
highsource Dec 3, 2014
e65a938
Issue #11. Doubles were configured with a wrong code generator.
highsource Dec 3, 2014
18539de
Issue #11. Removed debug statements.
highsource Dec 3, 2014
c2c22be
Issue #11. Just delegate to Arrays.hashCode(...) for arrays.
highsource Dec 3, 2014
0131b3d
Issue #11. Minor changes.
highsource Dec 3, 2014
96069cc
Issue #11. Suppress warnings when casting to the possible member types.
highsource Dec 3, 2014
9d85015
Issue #11. Allow subclasses to override the null check.
highsource Dec 3, 2014
5e20509
Issue #11. If the list does not contain arrays or JAXBElements, delegate
highsource Dec 3, 2014
d1df533
Issue #11. More test cases.
highsource Dec 3, 2014
7f70f20
Issue #11.
highsource Dec 4, 2014
ed836d5
Issue #11.
highsource Dec 4, 2014
b8eb9f7
Issue #11. Updated the tests.
highsource Dec 5, 2014
6438f4b
Issue #11. Building the bridge.
highsource Dec 5, 2014
906068b
Issue #11. Large refactoring, using the bridge pattern to separate code
highsource Dec 6, 2014
3a1de27
Issue #11. Further refactorings and fixes.
highsource Dec 7, 2014
c70d481
Issue #11. Minor fix.
highsource Dec 7, 2014
468c6ad
Issue #11. Minor fix.
highsource Dec 7, 2014
2ef3e40
Minor changes.
highsource Dec 15, 2014
4fd7b8d
Issue #14. Test project.
highsource Dec 15, 2014
dfa4a18
Issue #14. A plugin to fix JAXB-1058.
highsource Dec 15, 2014
04196c9
Issue #15.
highsource Dec 15, 2014
7a8a11b
Issue #16.
highsource Dec 15, 2014
5bd946e
Minor changes.
highsource Dec 15, 2014
bb0813d
Issue #13.
highsource Dec 15, 2014
e5d962c
Issue #16.
highsource Dec 15, 2014
2802714
Issue #17. Moving to slf4j.
highsource Dec 17, 2014
a68559a
Issue #17. Moving to slf4j.
highsource Dec 17, 2014
b971cef
Added a file for simple todos tracking.
highsource Dec 17, 2014
251ed6e
Update README.md
highsource Dec 18, 2014
c583484
Update README.md
highsource Dec 18, 2014
8f0d818
Issue #11.
highsource Dec 18, 2014
4bdafcc
Merge branch 'master' of https://github.com/highsource/jaxb2-basics.git
highsource Dec 18, 2014
8391b8b
Minor changes.
highsource Dec 18, 2014
e4fe8cf
Some pom.xml cleanup.
highsource Dec 19, 2014
1e7ca44
Issue #11. Added as sample project.
highsource Dec 19, 2014
792070b
Update README.md
highsource Dec 19, 2014
5b22d92
Issue #14.
highsource Dec 19, 2014
5a7abd6
Issue #11.
highsource Dec 19, 2014
dbcec70
Fixed regression because of issue #11.
highsource Dec 19, 2014
6a9299d
More tests for issue #11.
highsource Dec 19, 2014
9346567
Version 0.9.2
highsource Dec 19, 2014
fb6979b
Version 0.9.3-SNAPSHOT
highsource Dec 19, 2014
1d83c87
Issue #18.
highsource Jan 5, 2015
e3dac6a
Issue #18.
highsource Jan 6, 2015
0045d82
Issue #18.
highsource Jan 7, 2015
094fb91
Version 0.9.3
highsource Jan 24, 2015
a757d02
Version 0.9.4-SNAPSHOT
highsource Jan 24, 2015
efc779a
Issue #23. Added QNameUtils.
highsource Mar 29, 2015
b7c8503
Issue #23. Retrieving type name from the class.
highsource Mar 29, 2015
f100417
Issue #23. Added getTypeName() to MTypeInfo. Made C extends T.
highsource Mar 29, 2015
304a7be
Test for issue #23.
highsource Mar 29, 2015
bd6efa8
Issue #23.
highsource Mar 29, 2015
1a0d87e
Issue #25.
highsource Apr 11, 2015
ea2a941
Version 0.9.4
highsource Apr 11, 2015
3941d3a
Version 0.9.5-SNAPSHOT
highsource Apr 11, 2015
dc45137
Added defaultValue support.
highsource Apr 11, 2015
27c4e6b
Issue #29.
highsource May 25, 2015
4534e1b
Issue #35. Adding `isRequired()`, `SchemaComponentAware` and functions
highsource Sep 11, 2015
aa3c6f6
Eclipse project files.
highsource Sep 11, 2015
9a922d6
Version 0.9.5
highsource Sep 12, 2015
b64a89b
Version 0.9.6-SNAPSHOT
highsource Sep 12, 2015
7bf68c6
Make equals symmetrical if one compares a supertype and a subtype wit…
codecholeric Nov 20, 2015
e16f27c
Merge pull request #39 from petega/master
highsource Nov 20, 2015
75d6841
Issue #39.
highsource Nov 20, 2015
b21d24d
Make simple equals symmetrical if one compares a supertype and a subt…
codecholeric Nov 21, 2015
4844d11
Merge pull request #40 from petega/master
highsource Nov 22, 2015
59277d9
Extended one example schema.
highsource Nov 22, 2015
584c694
Issue #37.
highsource Nov 22, 2015
4d62aeb
Fixes #36.
highsource Nov 22, 2015
5299bcd
Fixes #41
highsource Nov 22, 2015
8081a2f
Fixes #41.
highsource Nov 22, 2015
e258629
Fixes #41.
highsource Nov 22, 2015
aa30ab4
Issue #41.
highsource Nov 22, 2015
57a7b56
Issue #41
highsource Nov 22, 2015
c411343
Issue #24
highsource Nov 22, 2015
1a6a4c2
Fixes #41.
highsource Nov 22, 2015
7cc1b42
Issue #24.
highsource Nov 22, 2015
d6c5df9
Issue #41.
highsource Nov 22, 2015
1255a58
Issues #24, #41.
highsource Nov 22, 2015
5a59b54
Moving to Java 1.7
highsource Nov 22, 2015
e910e45
Version 0.10.0
highsource Nov 22, 2015
8a957f1
Version 0.10.1-SNAPSHOT
highsource Nov 22, 2015
5b0bbac
Updated the maven-jaxb2-plugin version.
highsource Dec 16, 2015
828f231
Issue #42.
highsource Dec 16, 2015
f36674d
Fixes #37.
highsource Dec 17, 2015
d7d0a5c
Issue #38.
highsource Dec 19, 2015
cbd5d91
Tests for issue #42.
highsource Dec 23, 2015
4bc5e4d
Minor refactorings for #38.
highsource Dec 23, 2015
79144e0
Fixes #44.
highsource Dec 23, 2015
d673886
Fixes #47.
highsource Dec 23, 2015
f8da422
Fixes #45.
highsource Dec 23, 2015
3738a29
Fixes #46.
highsource Dec 23, 2015
73cc3f5
Fixes #38.
highsource Dec 23, 2015
9d5ef0e
Issues #38, #44, #45, #46, #47.
highsource Dec 23, 2015
3d68a18
Issue #31.
highsource Dec 23, 2015
c483ce9
Fixes #26.
highsource Dec 23, 2015
38670b0
Issue #22 seems to be fixed already.
highsource Dec 24, 2015
39ad9e3
Issue highsource/jsonix-schema-compiler#60.
highsource Dec 27, 2015
ad3af68
Issue highsource/jsonix-schema-compiler#60.
highsource Dec 27, 2015
3d12364
Issue highsource/jsonix-schema-compiler#60.
highsource Dec 27, 2015
b38d30f
Version 0.11.0
highsource Dec 27, 2015
995ec0e
Version 0.11.1-SNAPSHOT
highsource Dec 27, 2015
4b7299f
Removed a forgotten System.out.println.
highsource Dec 27, 2015
4484c7a
Fixes #67.
highsource Mar 14, 2016
01deed4
Reproduces #7.
highsource Mar 14, 2016
e0a4df5
Initial commit.
highsource Mar 20, 2016
0aecba7
Initial commit.
highsource Mar 20, 2016
06d6f97
Issue #68.
highsource Apr 6, 2016
ffd060b
Initial commit.
highsource Apr 6, 2016
b920678
Merge branch 'master' of https://github.com/highsource/jaxb2-basics
highsource Apr 6, 2016
583f471
added test for IssueGH70 (complexType, interface and xjb customizatio…
Jun 29, 2016
9485a57
Merge pull request #71 from leikingo/master
highsource Jun 29, 2016
07ed863
Fixes #70.
highsource Jun 29, 2016
e2aadc1
Releaseing 1.11.1
highsource Jun 29, 2016
23d9c03
Version 1.11.1
highsource Jun 29, 2016
c9f78f5
Version 1.11.2-SNAPSHOT
highsource Jun 29, 2016
802b762
Version 1.11.1-PUBLISHED-BY-MISTAKE
highsource Jun 30, 2016
dd6765f
Version 0.11.1-SNAPSHOT
highsource Jun 30, 2016
d53ac3c
Version 0.11.1
highsource Jun 30, 2016
935979c
Version 0.11.2-SNAPSHOT
highsource Jun 30, 2016
2f281df
Version 0.11.1
highsource Jun 30, 2016
37049a0
Version 0.11.2-SNAPSHOT
highsource Jun 30, 2016
43fd057
Experiments for #77.
highsource Dec 1, 2016
2f45e2d
Experiments #77.
highsource Dec 1, 2016
811b14d
Fixes #77.
highsource Dec 1, 2016
76e4464
Add depedency-check plugin
hansjoachim Mar 6, 2017
9972388
Upgrade commons-beanutils to latest version in order to pull in newer…
hansjoachim Mar 6, 2017
bf493a4
Merge pull request #81 from hansjoachim/upgrade-beanutils
highsource Mar 7, 2017
1b8d29b
Fixing jaxb2-basics-runtime for #91.
highsource Jun 2, 2018
a3479a4
Fixing ignores for #91.
highsource Jun 2, 2018
7e077b5
Fixing deprecations for #91.
highsource Jun 2, 2018
37227ed
Moving to Java 1.7 for #91.
highsource Jun 2, 2018
2e59f17
Fixing JavaDocs for #91.
highsource Jun 2, 2018
1d0b235
Fixing com.sun.tools.xjc.outline.Aspect and JavaDocs for #91.
highsource Jun 2, 2018
4ab0560
Fixing com.sun.tools.xjc.outline.Aspect for #91.
highsource Jun 2, 2018
47c7851
Fixing plugin and dependency versions for #91.
highsource Jun 2, 2018
58788d8
Fixing tests for #91.
highsource Jun 3, 2018
1bf4019
Fixing Ant and Maven/maven-jaxb2-plugin samples for #91.
highsource Jun 3, 2018
d0afdcc
Fixing Maven/cxf-codegen-plugin samples for #91.
highsource Jun 4, 2018
1c9784a
Fixing some warnings in Ant samples for #91.
highsource Jun 4, 2018
440eb17
Dropped support (samples) for jaxws-maven-plugin.
highsource Jun 4, 2018
b0229f8
Added a few missing ignores #91.
highsource Jun 4, 2018
7ce3b88
Migrated from sonatype parent #91.
highsource Jun 4, 2018
8785ef8
Migrated from sonatype parent #91.
highsource Jun 4, 2018
a009a78
Version 0.12.0
highsource Jun 4, 2018
56b9117
Added JAXB/XJC 2.3.0 and Java 1.7 compatibility notes #91.
highsource Jun 4, 2018
fca5c34
Version 0.12.1-SNAPSHOT
highsource Jun 4, 2018
660cac1
Fixes #60.
highsource Jun 4, 2018
5cd7a01
Reproduced #98.
highsource Sep 14, 2018
bc65824
Removed explicit version, not needed as delivered by the parent.
highsource Feb 9, 2019
acbc18d
Minor changes.
highsource Feb 9, 2019
8ed3e5f
Minor changes - code formatting, removed obsolete imports.
highsource Feb 9, 2019
76dbf74
Suppressed a few warnings.
highsource Feb 9, 2019
eb2d6bb
It is OK to use raw types here.
highsource Feb 9, 2019
f745121
Removed unnecessary imports.
highsource Feb 9, 2019
c0b41d7
Removed unnecessary imports.
highsource Feb 9, 2019
42825ff
Removed unnecessary imports.
highsource Feb 9, 2019
a11a239
Removed unnecessary import.
highsource Feb 9, 2019
a2be933
Removed unnecessary variable.
highsource Feb 9, 2019
fb2212f
Minor: moved the @SuppressWarnings to the parameter.
highsource Feb 9, 2019
b4fb486
Using strategy singleton via getInstance(). Fixes #96.
highsource Feb 9, 2019
bb5f1dc
Minor changes: moved @SuppressWarnings to the method parameter.
highsource Feb 9, 2019
571cca0
Minor changes: removed unnecessary imports.
highsource Feb 9, 2019
d4d2598
Update to Jakarta XML and use latest JAXB (3.0.0-M4).
brcolow Sep 21, 2020
165d8f8
Merge pull request #118 from brcolow/jakarta-update
highsource Sep 22, 2020
d26ca84
[#135] Add GH action to build on PRs and Merge (#136)
mattrpav Apr 4, 2022
67a6b68
Revert "Update to Jakarta XML and use latest JAXB (3.0.0-M4)."
mattrpav Apr 25, 2022
e746206
[#140] Update dependencies for latest jaxb v2 (#141)
mattrpav Apr 26, 2022
70fe701
[#142] Upgrade JUnit 4.13.2 (#143)
mattrpav Apr 26, 2022
cb49809
[#144] Upgrade to commons-io 2.11.0 (#145)
mattrpav Apr 26, 2022
3c71d55
[#138] Update to use oss staging and release plugin (#147)
mattrpav Apr 26, 2022
956b363
[#149] Update maven scm for release automation (#150)
mattrpav Apr 26, 2022
24593fd
[maven-release-plugin] prepare release 0.12.1
Apr 26, 2022
89467b4
[maven-release-plugin] prepare for next development iteration
Apr 26, 2022
2ef2255
[#152] Bump to version 0.13.0-SNAPSHOT (#153)
mattrpav Apr 26, 2022
b023f8a
[maven-release-plugin] prepare release 0.13.0
Apr 26, 2022
a9ad19f
[maven-release-plugin] prepare for next development iteration
Apr 26, 2022
6755753
Fix versions (#156)
mattrpav Apr 26, 2022
fc8bb04
[#154] First pass at fixing release and staging plugin fighting (#155)
mattrpav Apr 26, 2022
3460726
[maven-release-plugin] prepare release 0.13.1
Apr 26, 2022
c21079c
[maven-release-plugin] prepare for next development iteration
Apr 26, 2022
9d02758
[#157] Update version to 2.3.6-SNAPSHOT (#158)
mattrpav Apr 26, 2022
10c885e
GH-168 change artefacts to prepare jakarta migration - align with jax…
laurentschoelens Jun 30, 2023
77fc1a3
GH-160 : take back remaining jaxb_commons plugins (#167)
laurentschoelens Jun 30, 2023
c164f18
Merge remote-tracking branch 'jaxb_basics/master' into jt-264-basics
mattrpav Aug 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
**/.classpath
**/.project
**/.settings
target
target
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2006-2021, Alexey Valikov.
Copyright (c) 2005-2021, Alexey Valikov.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
40 changes: 40 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<<<<<<< HEAD
# JAXB Maven Plugin #

Welcome to the `org.jvnet.jaxb:jaxb-maven-plugin`, the most advanced and feature-full Maven plugin for XML Schema compilation.
Expand Down Expand Up @@ -76,3 +77,42 @@ compiling XML Schemas (as well as WSDL, DTDs, RELAX NG) into Java classes in Mav

> If you are interested in the Mojohaus JAXB2 Maven Plugin (`org.codehaus.mojo:jaxb2-maven-plugin`),
> please follow [this link](https://github.com/mojohaus/jaxb2-maven-plugin) to the corresponding website.
=======
# JAXB2 Basics

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

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)

## JAXB2 Basics Plugins
* [SimpleEquals Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-SimpleEquals-Plugin) - generates runtime-free reflection-free `equals(...)` methods.
* [SimpleHashCode Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-SimpleHashCode-Plugin) - generates runtime-free reflection-free `hashCode()` methods.
* Equals Plugin - generates reflection-free strategic `equals(...)` method.
* HashCode Plugin - generates reflection-free strategic `hashCode()` method.
* ToString Plugin - generates reflection-free strategic `toString()` methods.
* Copyable Plugin - generates reflection-free strategic `copy(...)` deep copying.
* Mergeable Plugin - generates reflection-free strategic `merge(...)` methods to merge data from two source objects into the given object.
* Inheritance Plugin - makes schema-derived classes extend certain class or implement certain interfaces.
* Wildcard Plugin - allows you to specify the wildcard mode for the wildcard properties.
* AutoInheritance Plugin - makes classes derived from global elements or complex types extend or implement certain classes or interfaces automatically.
* [Setters Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-Setters-Plugin) - generates setters for collections.
* [Simplify Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-Simplify-Plugin) - simplifies weird properties like `aOrBOrC`.
* [EnumValue Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-EnumValue-Plugin) - makes all the generated enums implement the `EnumValue<T>` 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).

## 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).
>>>>>>> jaxb_basics/master
2 changes: 2 additions & 0 deletions basics/TODO.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* Register a bug with unboxed fields.
* Add `simplelogger.properties` to samples.
5 changes: 5 additions & 0 deletions basics/ant/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/target/
.settings
.project
.classpath

36 changes: 36 additions & 0 deletions basics/ant/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<artifactId>jaxb2-basics-ant</artifactId>
<packaging>jar</packaging>
<name>JAXB2 Basics - Ant Task</name>
<parent>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-project</artifactId>
<version>2.0.4-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<defaultGoal>install</defaultGoal>
</build>
</project>
38 changes: 38 additions & 0 deletions basics/ant/src/main/java/org/jvnet/jaxb2_commons/xjc/XJC2Task.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package org.jvnet.jaxb2_commons.xjc;

import org.apache.tools.ant.BuildException;

public class XJC2Task extends com.sun.tools.xjc.XJC2Task {

private boolean disableXmlSecurity = true;

public void setDisableXmlSecurity(boolean disableXmlSecurity) {
this.disableXmlSecurity = disableXmlSecurity;
}

private String accessExternalSchema = "all";

public void setAccessExternalSchema(String accessExternalSchema) {
this.accessExternalSchema = accessExternalSchema;
}

private String accessExternalDTD = "all";

public void setAccessExternalDTD(String accessExternalDTD) {
this.accessExternalDTD = accessExternalDTD;
}

@Override
public void execute() throws BuildException {
this.options.disableXmlSecurity = this.disableXmlSecurity;
if (accessExternalSchema != null) {
System.setProperty("javax.xml.accessExternalSchema",
accessExternalSchema);
}
if (accessExternalDTD != null) {
System.setProperty("javax.xml.accessExternalDTD", accessExternalDTD);
}
super.execute();
}

}
4 changes: 4 additions & 0 deletions basics/basic/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/target/
.settings
.project
.classpath
109 changes: 109 additions & 0 deletions basics/basic/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<artifactId>jaxb2-basics</artifactId>
<packaging>jar</packaging>
<name>JAXB2 Basics - Basic Plugins</name>
<parent>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-project</artifactId>
<version>2.0.4-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-tools</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.javaparser</groupId>
<artifactId>javaparser</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-testing</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>only-eclipse</id>
<activation>
<property>
<name>m2e.version</name>
</property>
</activation>
<build>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.felix
</groupId>
<artifactId>
maven-bundle-plugin
</artifactId>
<versionRange>
[2.3.7,)
</versionRange>
<goals>
<goal>manifest</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.jvnet.jaxb2.maven2
</groupId>
<artifactId>
maven-jaxb2-plugin
</artifactId>
<versionRange>
[0.8.1,)
</versionRange>
<goals>
<goal>generate</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>
<build>
<defaultGoal>install</defaultGoal>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package org.jvnet.jaxb2_commons.plugin;

import javax.xml.namespace.QName;

public class Customizations {

public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic";

public static QName GENERATED_ELEMENT_NAME = new QName(NAMESPACE_URI,
"generated");

public static QName IGNORED_ELEMENT_NAME = new QName(NAMESPACE_URI,
"ignored");

public static QName PROPERTY_ELEMENT_NAME = new QName(NAMESPACE_URI,
"property");

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
package org.jvnet.jaxb2_commons.plugin;

import javax.xml.namespace.QName;

import org.jvnet.jaxb2_commons.util.CustomizationUtils;

import com.sun.tools.xjc.model.CClassInfo;
import com.sun.tools.xjc.model.CEnumLeafInfo;
import com.sun.tools.xjc.model.CPropertyInfo;
import com.sun.tools.xjc.outline.ClassOutline;
import com.sun.tools.xjc.outline.EnumOutline;
import com.sun.tools.xjc.outline.FieldOutline;

public class CustomizedIgnoring implements Ignoring {

private final QName[] ignoredCustomizationElementNames;

public CustomizedIgnoring(QName... names) {
this.ignoredCustomizationElementNames = names;
}

public QName[] getIgnoredCustomizationElementNames() {
return ignoredCustomizationElementNames;
}

public boolean isIgnored(ClassOutline classOutline) {
for (QName name : getIgnoredCustomizationElementNames()) {
if (CustomizationUtils.containsCustomization(classOutline, name)) {
return true;
}
}
return false;
}

public boolean isIgnored(EnumOutline enumOutline) {
for (QName name : getIgnoredCustomizationElementNames()) {
if (CustomizationUtils.containsCustomization(enumOutline, name)) {
return true;
}
}
return false;
}

public boolean isIgnored(FieldOutline fieldOutline) {
for (QName name : getIgnoredCustomizationElementNames()) {
if (CustomizationUtils.containsCustomization(fieldOutline, name)) {
return true;
}
}
return false;
}

public boolean isIgnored(CClassInfo classInfo) {
for (QName name : getIgnoredCustomizationElementNames()) {
if (CustomizationUtils.containsCustomization(classInfo, name)) {
return true;
}
}
return false;
}

public boolean isIgnored(CEnumLeafInfo enumLeafInfo) {
for (QName name : getIgnoredCustomizationElementNames()) {
if (CustomizationUtils.containsCustomization(enumLeafInfo, name)) {
return true;
}
}
return false;
}

public boolean isIgnored(CPropertyInfo propertyInfo) {
for (QName name : getIgnoredCustomizationElementNames()) {
if (CustomizationUtils.containsCustomization(propertyInfo, name)) {
return true;
}
}
return false;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package org.jvnet.jaxb2_commons.plugin;

import com.sun.tools.xjc.model.CClassInfo;
import com.sun.tools.xjc.model.CEnumLeafInfo;
import com.sun.tools.xjc.model.CPropertyInfo;
import com.sun.tools.xjc.outline.ClassOutline;
import com.sun.tools.xjc.outline.EnumOutline;
import com.sun.tools.xjc.outline.FieldOutline;

public interface Ignoring {

public boolean isIgnored(ClassOutline classOutline);

public boolean isIgnored(EnumOutline enumOutline);

public boolean isIgnored(FieldOutline fieldOutline);

public boolean isIgnored(CClassInfo classInfo);

public boolean isIgnored(CEnumLeafInfo enumLeafInfo);

public boolean isIgnored(CPropertyInfo propertyInfo);

}
Loading
Loading