-
Notifications
You must be signed in to change notification settings - Fork 79
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
d2e9cdc
commit 2fdc5b8
Showing
89 changed files
with
4,414 additions
and
4,227 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,6 @@ | |
| * under the License. | ||
| */ | ||
|
|
||
|
|
||
| /** | ||
| * @author <a href="mailto:[email protected]">olamy</a> | ||
| * @version $Id$ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,13 @@ | |
| * under the License. | ||
| */ | ||
|
|
||
| import java.io.File; | ||
| import java.net.URL; | ||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.apache.maven.artifact.DependencyResolutionRequiredException; | ||
| import org.apache.maven.model.Resource; | ||
| import org.apache.maven.plugin.MojoExecutionException; | ||
|
|
@@ -32,13 +39,6 @@ | |
| import org.codehaus.mojo.jaxb2.shared.filters.Filters; | ||
| import org.codehaus.mojo.jaxb2.shared.filters.pattern.PatternFileFilter; | ||
|
|
||
| import java.io.File; | ||
| import java.net.URL; | ||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * <p>Mojo that creates test-scope Java source or binaries from XML schema(s) | ||
| * by invoking the JAXB XJC binding compiler. This implementation is tailored | ||
|
|
@@ -51,7 +51,8 @@ | |
| * @author <a href="mailto:[email protected]">Lennart Jörelid</a> | ||
| * @see <a href="https://jaxb.java.net/">The JAXB Reference Implementation</a> | ||
| */ | ||
| @Mojo(name = "testXjc", | ||
| @Mojo( | ||
| name = "testXjc", | ||
| defaultPhase = LifecyclePhase.GENERATE_TEST_SOURCES, | ||
| requiresDependencyResolution = ResolutionScope.TEST, | ||
| threadSafe = false) | ||
|
|
@@ -112,7 +113,6 @@ public class TestXjcMojo extends AbstractJavaGeneratorMojo { | |
| public static final List<Filter<File>> STANDARD_TEST_XJB_EXCLUDE_FILTERS; | ||
|
|
||
| static { | ||
|
|
||
| final List<Filter<File>> xjbTemp = new ArrayList<Filter<File>>(); | ||
| xjbTemp.addAll(AbstractJaxbMojo.STANDARD_EXCLUDE_FILTERS); | ||
| xjbTemp.add(new PatternFileFilter(Arrays.asList("\\.xsd"), true)); | ||
|
|
@@ -261,9 +261,8 @@ protected boolean shouldExecutionBeSkipped() { | |
| @Override | ||
| protected List<URL> getSources() { | ||
|
|
||
| final List<Filter<File>> excludePatterns = testSourceExcludeFilters == null | ||
| ? STANDARD_TEST_SOURCE_EXCLUDE_FILTERS | ||
| : testSourceExcludeFilters; | ||
| final List<Filter<File>> excludePatterns = | ||
| testSourceExcludeFilters == null ? STANDARD_TEST_SOURCE_EXCLUDE_FILTERS : testSourceExcludeFilters; | ||
| Filters.initialize(getLog(), excludePatterns); | ||
|
|
||
| // All done. | ||
|
|
@@ -282,9 +281,8 @@ protected List<URL> getSources() { | |
| @Override | ||
| protected List<File> getSourceXJBs() { | ||
|
|
||
| final List<Filter<File>> excludePatterns = testXjbExcludeFilters == null | ||
| ? STANDARD_TEST_XJB_EXCLUDE_FILTERS | ||
| : testXjbExcludeFilters; | ||
| final List<Filter<File>> excludePatterns = | ||
| testXjbExcludeFilters == null ? STANDARD_TEST_XJB_EXCLUDE_FILTERS : testXjbExcludeFilters; | ||
| Filters.initialize(getLog(), excludePatterns); | ||
|
|
||
| return FileSystemUtilities.filterFiles( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,13 @@ | |
| * under the License. | ||
| */ | ||
|
|
||
| import java.io.File; | ||
| import java.net.URL; | ||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.apache.maven.artifact.DependencyResolutionRequiredException; | ||
| import org.apache.maven.model.Resource; | ||
| import org.apache.maven.plugin.MojoExecutionException; | ||
|
|
@@ -32,13 +39,6 @@ | |
| import org.codehaus.mojo.jaxb2.shared.filters.Filters; | ||
| import org.codehaus.mojo.jaxb2.shared.filters.pattern.PatternFileFilter; | ||
|
|
||
| import java.io.File; | ||
| import java.net.URL; | ||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * <p>Mojo that creates compile-scope Java source or binaries from XML schema(s) | ||
| * by invoking the JAXB XJC binding compiler. This implementation is tailored | ||
|
|
@@ -51,7 +51,8 @@ | |
| * @author <a href="mailto:[email protected]">Lennart Jörelid</a> | ||
| * @see <a href="https://jaxb.java.net/">The JAXB Reference Implementation</a> | ||
| */ | ||
| @Mojo(name = "xjc", | ||
| @Mojo( | ||
| name = "xjc", | ||
| threadSafe = true, | ||
| defaultPhase = LifecyclePhase.GENERATE_SOURCES, | ||
| requiresDependencyResolution = ResolutionScope.COMPILE) | ||
|
|
@@ -109,7 +110,6 @@ public class XjcMojo extends AbstractJavaGeneratorMojo { | |
| public static final List<Filter<File>> STANDARD_XJB_EXCLUDE_FILTERS; | ||
|
|
||
| static { | ||
|
|
||
| final List<Filter<File>> xjbTemp = new ArrayList<Filter<File>>(); | ||
| xjbTemp.addAll(AbstractJaxbMojo.STANDARD_EXCLUDE_FILTERS); | ||
| xjbTemp.add(new PatternFileFilter(Arrays.asList("\\.xsd"), true)); | ||
|
|
@@ -273,9 +273,8 @@ protected boolean shouldExecutionBeSkipped() { | |
| @Override | ||
| protected List<URL> getSources() { | ||
|
|
||
| final List<Filter<File>> excludePatterns = xjcSourceExcludeFilters == null | ||
| ? STANDARD_SOURCE_EXCLUDE_FILTERS | ||
| : xjcSourceExcludeFilters; | ||
| final List<Filter<File>> excludePatterns = | ||
| xjcSourceExcludeFilters == null ? STANDARD_SOURCE_EXCLUDE_FILTERS : xjcSourceExcludeFilters; | ||
| Filters.initialize(getLog(), excludePatterns); | ||
|
|
||
| return FileSystemUtilities.filterFiles( | ||
|
|
@@ -293,18 +292,12 @@ protected List<URL> getSources() { | |
| @Override | ||
| protected List<File> getSourceXJBs() { | ||
|
|
||
| final List<Filter<File>> excludePatterns = xjbExcludeFilters == null | ||
| ? STANDARD_XJB_EXCLUDE_FILTERS | ||
| : xjbExcludeFilters; | ||
| final List<Filter<File>> excludePatterns = | ||
| xjbExcludeFilters == null ? STANDARD_XJB_EXCLUDE_FILTERS : xjbExcludeFilters; | ||
| Filters.initialize(getLog(), excludePatterns); | ||
|
|
||
| return FileSystemUtilities.filterFiles( | ||
| getProject().getBasedir(), | ||
| xjbSources, | ||
| STANDARD_XJB_DIRECTORY, | ||
| getLog(), | ||
| "xjbSources", | ||
| excludePatterns); | ||
| getProject().getBasedir(), xjbSources, STANDARD_XJB_DIRECTORY, getLog(), "xjbSources", excludePatterns); | ||
| } | ||
|
|
||
| /** | ||
|
|
||
Oops, something went wrong.